diff --git a/asm/crt0.s b/asm/crt0.s index 4ccb9ca7c..efa8d9cab 100644 --- a/asm/crt0.s +++ b/asm/crt0.s @@ -54,51 +54,51 @@ InterruptMain: ; 8000248 and r1, r2, r2, lsr 16 mov r12, 0 ands r0, r1, INTR_FLAG_VCOUNT - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 mov r0, 0x1 strh r0, [r3, OFFSET_REG_IME - 0x200] ands r0, r1, INTR_FLAG_SERIAL - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER3 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_HBLANK - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_VBLANK - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER0 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER1 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_TIMER2 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA0 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA1 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA2 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_DMA3 - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_KEYPAD - bne @foundInterrupt + bne .foundInterrupt add r12, r12, 0x4 ands r0, r1, INTR_FLAG_GAMEPAK strbne r0, [r3, OFFSET_REG_SOUNDCNT_X - 0x200] @loop: bne @loop -@foundInterrupt: +.foundInterrupt: strh r0, [r3, OFFSET_REG_IF - 0x200] bic r2, r2, r0 ldr r0, =0x03007868 diff --git a/asm/dma3_manager.s b/asm/dma3_manager.s index b76526d9c..c76abb419 100644 --- a/asm/dma3_manager.s +++ b/asm/dma3_manager.s @@ -11,14 +11,14 @@ ClearDma3Requests: ; 8000BB8 movs r3, 0 ldr r0, =gDma3Requests movs r1, 0x7F -@loop: +_8000BCC: strh r3, [r0, 0x8] str r3, [r0] str r3, [r0, 0x4] adds r0, 0x10 subs r1, 0x1 cmp r1, 0 - bge @loop + bge _8000BCC movs r0, 0 strb r0, [r2] pop {r0} @@ -38,9 +38,9 @@ ProcessDma3Requests: ; 8000BF0 ldr r0, =gDma3ManagerLocked 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, =gDma3Requests @@ -51,9 +51,9 @@ ProcessDma3Requests: ; 8000BF0 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 @@ -62,7 +62,7 @@ ProcessDma3Requests: ; 8000BF0 ldr r7, =REG_DMA3 movs r2, 0 mov r9, r2 -@08000C2E: +_08000C2E: mov r3, r12 ldrb r0, [r3] lsls r5, r0, 4 @@ -78,47 +78,47 @@ ProcessDma3Requests: ; 8000BF0 lsls r0, 8 ldr r3, [sp, 0x8] cmp r3, r0 - bls @08000C50 - b @08000E46 -@08000C50: + bls _08000C50 + b _08000E46 +_08000C50: ldr r0, =REG_VCOUNT 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 .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, =REG_DMA3 str r3, [r4] str r2, [r4, 0x4] @@ -129,21 +129,21 @@ ProcessDma3Requests: ; 8000BF0 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 .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 @@ -155,8 +155,8 @@ ProcessDma3Requests: ; 8000BF0 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 @@ -175,7 +175,7 @@ ProcessDma3Requests: ; 8000BF0 adds r4, r6 subs r1, r6 cmp r1, r6 - bhi @08000CF4 + bhi _08000CF4 ldrb r0, [r2] lsls r0, 4 adds r0, r5 @@ -187,23 +187,23 @@ ProcessDma3Requests: ; 8000BF0 lsrs r0, r1, 2 movs r1, 0x85 lsls r1, 24 - b @08000DEA + b _08000DEA .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, =REG_DMA3 str r3, [r4] str r2, [r4, 0x4] @@ -214,26 +214,26 @@ ProcessDma3Requests: ; 8000BF0 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 .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 @@ -244,12 +244,12 @@ ProcessDma3Requests: ; 8000BF0 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 @@ -266,7 +266,7 @@ ProcessDma3Requests: ; 8000BF0 adds r2, r6 subs r4, r6 cmp r4, r6 - bhi @08000DB2 + bhi _08000DB2 ldrb r0, [r5] lsls r0, 4 ldr r5, =0x0300001c @@ -278,11 +278,11 @@ ProcessDma3Requests: ; 8000BF0 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, =gDma3Requests mov r3, r12 ldrb r0, [r3] @@ -315,9 +315,9 @@ ProcessDma3Requests: ; 8000BF0 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 @@ -325,9 +325,9 @@ ProcessDma3Requests: ; 8000BF0 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 @@ -364,11 +364,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 @@ -378,38 +378,38 @@ RequestDma3Copy: ; 8000E68 str r3, [r0] strh r7, [r1, 0x8] cmp r4, 0x1 - bne @08000EC0 + bne _08000EC0 strh r4, [r1, 0xA] - b @08000EC4 + b _08000EC4 .pool -@08000EC0: +_08000EC0: movs r0, 0x3 strh r0, [r1, 0xA] -@08000EC4: +_08000EC4: movs r0, 0 ldr r1, =gDma3ManagerLocked strb r0, [r1] lsls r0, r2, 16 asrs r0, 16 - b @08000EF0 + b _08000EF0 .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 @@ -446,11 +446,11 @@ RequestDma3Fill: ; 8000F00 lsls r0, r2, 4 adds r0, 0x8 adds r1, r0, r4 -@loop: +_8000F30: 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 @@ -463,39 +463,39 @@ RequestDma3Fill: ; 8000F00 mov r3, r9 str r3, [r0] cmp r5, 0x1 - bne @08000F64 + bne _08000F64 movs r0, 0x2 - b @08000F66 + b _08000F66 .pool -@08000F64: +_08000F64: movs r0, 0x4 -@08000F66: +_08000F66: strh r0, [r1, 0x2] movs r0, 0 ldr r6, =gDma3ManagerLocked strb r0, [r6] lsls r0, r2, 16 asrs r0, 16 - b @08000F96 + b _08000F96 .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 @loop + ble _8000F30 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 @@ -515,31 +515,31 @@ CheckForSpaceForDma3Request: ; 8000FA4 movs r3, 0x1 negs r3, r3 cmp r1, r3 - bne @08000FCC + bne _08000FCC ldr r1, =gDma3Requests -@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 .pool -@08000FCC: +_08000FCC: ldr r0, =gDma3Requests 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 .pool diff --git a/asm/emerald.s b/asm/emerald.s index e794eec35..2c9519f46 100644 --- a/asm/emerald.s +++ b/asm/emerald.s @@ -31,18 +31,18 @@ sub_80093CC: ; 80093CC bl sub_800BEC0 ldr r1, =0x00008001 cmp r0, r1 - beq @080093F4 + beq _080093F4 bl sub_800B4A4 bl sub_80097E8 bl RestoreSerialTimer3IntrHandlers movs r0, 0 - b @080093FE + b _080093FE .pool -@080093F4: +_080093F4: bl rfu_REQ_stopMode bl rfu_waitREQComplete movs r0, 0x1 -@080093FE: +_080093FE: pop {r1} bx r1 thumb_func_end sub_80093CC @@ -98,19 +98,19 @@ 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 .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 @@ -118,8 +118,8 @@ sub_8009414: ; 8009414 orrs r1, r0 movs r0, 0xA bl SetGpuReg - b @080094C0 -@0800949E: + b _080094C0 +_0800949E: lsls r1, r6, 8 movs r0, 0x1 orrs r1, r0 @@ -127,8 +127,8 @@ sub_8009414: ; 8009414 orrs r1, r0 movs r0, 0xC bl SetGpuReg - b @080094C0 -@080094B0: + b _080094C0 +_080094B0: lsls r1, r6, 8 movs r0, 0x1 orrs r1, r0 @@ -136,7 +136,7 @@ sub_8009414: ; 8009414 orrs r1, r0 movs r0, 0xE bl SetGpuReg -@080094C0: +_080094C0: mov r0, r8 lsls r4, r0, 2 adds r0, r4, 0 @@ -233,7 +233,7 @@ sub_8009570: ; 8009570 ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 -@080095A0: +_080095A0: bl GenerateRandomNumber ldr r1, =0x03005d90 ldr r1, [r1] @@ -242,7 +242,7 @@ sub_8009570: ; 8009570 strb r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble @080095A0 + ble _080095A0 movs r4, 0 str r4, [sp] movs r0, 0 @@ -331,12 +331,12 @@ sub_8009638: ; 8009638 bl FlagGet 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 @@ -361,11 +361,11 @@ sub_80096D0: ; 80096D0 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 @@ -390,13 +390,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 .pool @@ -408,7 +408,7 @@ sub_8009734: ; 8009734 ldr r0, =0x030030fc ldrb r4, [r0] cmp r4, 0 - bne @080097A8 + bne _080097A8 bl sub_800B628 bl sub_80096D0 ldr r1, =0x03003140 @@ -433,11 +433,11 @@ sub_8009734: ; 8009734 ldr r0, =task02_080097CC movs r1, 0x2 bl AddTask - b @080097AC + b _080097AC .pool -@080097A8: +_080097A8: bl sub_800E700 -@080097AC: +_080097AC: ldr r1, =0x03003124 movs r0, 0 strb r0, [r1] @@ -447,7 +447,7 @@ sub_8009734: ; 8009734 movs r5, 0x1 ldr r4, =0x030030f0 ldr r3, =0x030030ec -@080097BE: +_080097BE: adds r0, r1, r6 strb r5, [r0] adds r0, r1, r4 @@ -456,7 +456,7 @@ sub_8009734: ; 8009734 strb r2, [r0] adds r1, 0x1 cmp r1, 0x3 - ble @080097BE + ble _080097BE pop {r4-r6} pop {r0} bx r0 @@ -472,9 +472,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 @@ -495,7 +495,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 @@ -503,10 +503,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 @@ -516,7 +516,7 @@ sub_8009818: ; 8009818 ldrb r0, [r6] ldrh r1, [r4] cmp r0, r1 - beq @08009868 + beq _08009868 ldrh r0, [r4] adds r2, r5, 0x4 lsls r2, 24 @@ -526,29 +526,29 @@ sub_8009818: ; 8009818 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 @@ -566,18 +566,18 @@ sub_8009818: ; 8009818 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 @@ -596,27 +596,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] @@ -624,48 +624,48 @@ sub_8009900: ; 8009900 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@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} @@ -696,16 +696,16 @@ sub_80099E0: ; 80099E0 ldr r0, =0x020229c4 ldrb r0, [r0] cmp r0, 0 - bne @080099F4 + bne _080099F4 movs r0, 0 - b @08009A3C + b _08009A3C .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] @@ -713,7 +713,7 @@ sub_80099E0: ; 80099E0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x7 - bls @080099FC + bls _080099FC ldrh r0, [r4] strh r0, [r5] ldr r0, =0x030030e0 @@ -721,7 +721,7 @@ sub_80099E0: ; 80099E0 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq @08009A38 + beq _08009A38 ldr r0, =0x04000128 ldr r0, [r0] lsls r0, 26 @@ -730,14 +730,14 @@ sub_80099E0: ; 80099E0 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 @@ -755,28 +755,28 @@ sub_8009A58: ; 8009A58 strb r5, [r0] movs r4, 0 adds r6, r1, 0 - b @08009A78 + b _08009A78 .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 @@ -792,7 +792,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 @@ -806,73 +806,73 @@ sub_8009AA0: ; 8009AA0 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 .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 .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 .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 .pool -@08009B68: +_08009B68: bl sub_8009638 ldr r0, =0x03003030 adds r2, r0, 0 @@ -903,15 +903,15 @@ sub_8009AA0: ; 8009AA0 strb r2, [r1, 0x2] movs r1, 0x3C bl sub_800A2F4 - b @08009D6E + b _08009D6E .pool -@08009BB8: +_08009BB8: ldr r1, =0x030030e8 movs r0, 0x1 strb r0, [r1] - b @08009D6E + b _08009D6E .pool -@08009BC4: +_08009BC4: mov r7, r12 adds r1, r7, r6 lsls r1, 2 @@ -929,9 +929,9 @@ sub_8009AA0: ; 8009AA0 adds r0, r4, r0 ldrh r0, [r0] strb r0, [r1, 0x9] - b @08009D6E + b _08009D6E .pool -@08009BF0: +_08009BF0: mov r3, r12 adds r0, r3, r6 lsls r0, 2 @@ -943,14 +943,14 @@ sub_8009AA0: ; 8009AA0 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 @@ -965,10 +965,10 @@ sub_8009AA0: ; 8009AA0 lsls r2, 16 lsrs r2, 16 cmp r2, 0x6 - bls @08009C14 - b @08009C70 + bls _08009C14 + b _08009C70 .pool -@08009C40: +_08009C40: movs r2, 0 ldr r1, =0x020223c4 mov r9, r1 @@ -977,7 +977,7 @@ sub_8009AA0: ; 8009AA0 mov r8, r3 lsls r5, r6, 8 adds r3, r4, 0 -@08009C50: +_08009C50: ldrh r1, [r7] lsrs r1, 1 adds r1, r2 @@ -993,8 +993,8 @@ sub_8009AA0: ; 8009AA0 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 @@ -1007,12 +1007,12 @@ sub_8009AA0: ; 8009AA0 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 @@ -1036,11 +1036,11 @@ sub_8009AA0: ; 8009AA0 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, =gUnknown_082ED1D4 @@ -1048,44 +1048,44 @@ sub_8009AA0: ; 8009AA0 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 bl SetMainCallback2 - b @08009D6E + b _08009D6E .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 .pool -@08009D28: +_08009D28: ldr r0, =0x030030ec -@08009D2A: +_08009D2A: adds r0, r6, r0 movs r1, 0x1 strb r1, [r0] - b @08009D6E + b _08009D6E .pool -@08009D38: +_08009D38: bl sub_800A418 - b @08009D6E -@08009D3E: + b _08009D6E +_08009D3E: ldr r3, =gUnknown_082ED1A8 ldr r0, =0x03003090 adds r0, 0x2 @@ -1099,22 +1099,22 @@ sub_8009AA0: ; 8009AA0 ldrh r2, [r2] movs r0, 0 bl link_0800A448 - b @08009D6E + b _08009D6E .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 @@ -1133,99 +1133,99 @@ sub_8009D90: ; 8009D90 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 .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 .pool -@08009DE0: +_08009DE0: ldr r0, =0x00005fff cmp r2, r0 - bne @08009DE8 - b @08009ED0 -@08009DE8: - b @08009F06 + bne _08009DE8 + b _08009ED0 +_08009DE8: + b _08009F06 .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 .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 .pool -@08009E2C: +_08009E2C: ldr r0, =0x0000cccc cmp r2, r0 - beq @08009EBC - b @08009F06 + beq _08009EBC + b _08009F06 .pool -@08009E38: +_08009E38: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x020229c6 ldrh r1, [r1] - b @08009F04 + b _08009F04 .pool -@08009E4C: +_08009E4C: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x030022c0 ldrh r1, [r1, 0x2C] - b @08009F04 + b _08009F04 .pool -@08009E60: +_08009E60: ldr r0, =0x03003110 movs r1, 0 - b @08009F02 + b _08009F02 .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 @@ -1233,10 +1233,10 @@ sub_8009D90: ; 8009D90 lsls r1, 24 lsrs r1, 24 cmp r1, 0x4 - bls @08009E76 - b @08009F06 + bls _08009E76 + b _08009F06 .pool -@08009E8C: +_08009E8C: ldr r1, =0x03003110 strh r2, [r1] ldr r2, =0x03000d10 @@ -1245,49 +1245,49 @@ sub_8009D90: ; 8009D90 ldrb r0, [r2, 0x9] adds r0, 0x80 strh r0, [r1, 0x4] - b @08009F06 + b _08009F06 .pool -@08009EA8: +_08009EA8: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x0203ce7c ldrh r1, [r1] - b @08009F04 + b _08009F04 .pool -@08009EBC: +_08009EBC: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x03003150 ldrb r1, [r1] - b @08009F04 + b _08009F04 .pool -@08009ED0: +_08009ED0: ldr r0, =0x03003110 strh r2, [r0] ldr r1, =0x030030f4 ldrh r1, [r1] - b @08009F04 + b _08009F04 .pool -@08009EE4: +_08009EE4: ldr r0, =0x03003110 strh r2, [r0] - b @08009F06 + b _08009F06 .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 .pool @@ -1299,9 +1299,9 @@ sub_8009F18: ; 8009F18 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 str r0, [r1] @@ -1316,22 +1316,22 @@ sub_8009F3C: ; 8009F3C ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @08009F50 + beq _08009F50 bl sub_800F7E4 - b @08009F6A + b _08009F6A .pool -@08009F50: +_08009F50: ldr r0, =0x03003140 ldr r1, [r0] ldr r0, =sub_8009F70 cmp r1, r0 - beq @08009F68 + beq _08009F68 movs r0, 0 - b @08009F6A + b _08009F6A .pool -@08009F68: +_08009F68: movs r0, 0x1 -@08009F6A: +_08009F6A: pop {r1} bx r1 thumb_func_end sub_8009F3C @@ -1342,10 +1342,10 @@ sub_8009F70: ; 8009F70 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 .pool @@ -1357,14 +1357,14 @@ sub_8009F8C: ; 8009F8C ldr r0, =0x030030fc ldrb r1, [r0] cmp r1, 0 - beq @08009FA0 + beq _08009FA0 bl Rfu_set_zero - b @08009FA4 + b _08009FA4 .pool -@08009FA0: +_08009FA0: ldr r0, =0x03003140 str r1, [r0] -@08009FA4: +_08009FA4: pop {r0} bx r0 .pool @@ -1376,14 +1376,14 @@ sub_8009FAC: ; 8009FAC ldr r0, =0x030030fc ldrb r1, [r0] cmp r1, 0 - beq @08009FC0 + beq _08009FC0 bl Rfu_set_zero - b @08009FC4 + b _08009FC4 .pool -@08009FC0: +_08009FC0: ldr r0, =0x03003140 str r1, [r0] -@08009FC4: +_08009FC4: pop {r0} bx r0 .pool @@ -1395,19 +1395,19 @@ sub_8009FCC: ; 8009FCC 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 .pool -@08009FEC: +_08009FEC: bl sub_80104F4 lsls r0, 24 lsrs r0, 24 -@08009FF4: +_08009FF4: pop {r1} bx r1 thumb_func_end sub_8009FCC @@ -1422,30 +1422,30 @@ 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 .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 @@ -1464,18 +1464,18 @@ sub_800A040: ; 800A040 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 @@ -1487,12 +1487,12 @@ sub_800A064: ; 800A064 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 @@ -1505,7 +1505,7 @@ sub_800A07C: ; 800A07C bl sub_8009FF8 adds r2, r0, 0 cmp r2, 0 - blt @0800A0A4 + blt _0800A0A4 ldr r0, =0x020229e8 lsls r1, r2, 3 subs r1, r2 @@ -1513,13 +1513,13 @@ sub_800A07C: ; 800A07C adds r1, r0 ldrh r0, [r1, 0x1A] cmp r0, 0x1 - bne @0800A0A4 + bne _0800A0A4 movs r0, 0x1 - b @0800A0A6 + b _0800A0A6 .pool -@0800A0A4: +_0800A0A4: movs r0, 0 -@0800A0A6: +_0800A0A6: pop {r1} bx r1 thumb_func_end sub_800A07C @@ -1547,99 +1547,99 @@ 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 .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 .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 .pool -@0800A178: +_0800A178: cmp r0, 0x2 - beq @0800A190 + beq _0800A190 ldr r3, =0x03000d5c - b @0800A22C + b _0800A22C .pool -@0800A184: +_0800A184: ldr r1, =0x03000d5c movs r0, 0x4 - b @0800A1A0 + b _0800A1A0 .pool -@0800A190: +_0800A190: ldr r1, =0x03000d5c movs r0, 0x5 - b @0800A1A0 + b _0800A1A0 .pool -@0800A19C: +_0800A19C: ldr r1, =0x03000d5c movs r0, 0x1 -@0800A1A0: +_0800A1A0: str r0, [r1] adds r3, r1, 0 - b @0800A22C + b _0800A22C .pool -@0800A1AC: +_0800A1AC: ldr r6, =0x03000d5c movs r0, 0x3 str r0, [r6] @@ -1665,25 +1665,25 @@ sub_800A0C8: ; 800A0C8 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 .pool -@0800A214: +_0800A214: ldr r0, =0x020229c8 ldrh r1, [r0] adds r1, 0x1 @@ -1693,12 +1693,12 @@ sub_800A0C8: ; 800A0C8 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 @@ -1711,9 +1711,9 @@ sub_800A23C: ; 800A23C movs r6, 0 movs r4, 0 ldr r5, =0x020229e8 - b @0800A26C + b _0800A26C .pool -@0800A24C: +_0800A24C: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -1723,36 +1723,36 @@ sub_800A23C: ; 800A23C 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 .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} @@ -1780,7 +1780,7 @@ 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 @@ -1788,7 +1788,7 @@ sub_800A2BC: ; 800A2BC adds r5, 0x1C subs r4, 0x1 cmp r4, 0 - bge @0800A2C2 + bge _0800A2C2 pop {r4,r5} pop {r0} bx r0 @@ -1815,11 +1815,11 @@ sub_800A2F4: ; 800A2F4 ldr r4, =0x03000d10 ldrb r5, [r4, 0x8] cmp r5, 0 - beq @0800A30C + beq _0800A30C movs r0, 0 - b @0800A34A + b _0800A34A .pool -@0800A30C: +_0800A30C: bl link_get_multiplayer_id strb r0, [r4, 0x9] movs r0, 0x1 @@ -1828,20 +1828,20 @@ sub_800A2F4: ; 800A2F4 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 @@ -1851,7 +1851,7 @@ sub_800A2F4: ; 800A2F4 movs r0, 0 str r0, [r1] movs r0, 0x1 -@0800A34A: +_0800A34A: pop {r4-r7} pop {r1} bx r1 @@ -1866,11 +1866,11 @@ sub_800A364: ; 800A364 adds r0, 0x1 str r0, [r1] cmp r0, 0x2 - bls @0800A378 + bls _0800A378 ldr r1, =0x03003140 ldr r0, =sub_800A388 str r0, [r1] -@0800A378: +_0800A378: pop {r0} bx r0 .pool @@ -1888,7 +1888,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 @@ -1901,7 +1901,7 @@ sub_800A388: ; 800A388 adds r2, 0x2 adds r3, 0x1 cmp r3, 0x6 - ble @0800A39C + ble _0800A39C ldrh r0, [r4] adds r0, 0xE strh r0, [r4] @@ -1909,13 +1909,13 @@ sub_800A388: ; 800A388 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 str r0, [r1] -@0800A3D0: +_0800A3D0: pop {r4-r6} pop {r0} bx r0 @@ -1955,15 +1955,15 @@ sub_800A418: ; 800A418 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @0800A438 + beq _0800A438 bl sub_800F850 - b @0800A43E + b _0800A43E .pool -@0800A438: +_0800A438: ldr r1, =0x03003140 ldr r0, =sub_800A3F8 str r0, [r1] -@0800A43E: +_0800A43E: pop {r0} bx r0 .pool @@ -1993,18 +1993,18 @@ link_get_multiplayer_id: ; 800A468 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 .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 @@ -2035,15 +2035,15 @@ 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 .pool -@0800A4C8: +_0800A4C8: adds r0, r3, 0 bl sub_800FE84 -@0800A4CE: +_0800A4CE: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -2059,28 +2059,28 @@ 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 .pool -@0800A4F8: +_0800A4F8: ldr r0, =0x03003140 ldr r0, [r0] cmp r0, 0 - beq @0800A508 + beq _0800A508 movs r0, 0 - b @0800A514 + b _0800A514 .pool -@0800A508: +_0800A508: ldr r0, =0x03003150 strb r2, [r0] ldr r0, =0x0000cccc bl sub_8009D90 movs r0, 0x1 -@0800A514: +_0800A514: pop {r1} bx r1 .pool @@ -2092,22 +2092,22 @@ sub_800A520: ; 800A520 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 .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 .pool @@ -2119,7 +2119,7 @@ sub_800A550: ; 800A550 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - beq @0800A57C + beq _0800A57C ldr r2, =0x0300307c ldrb r0, [r2, 0x3] lsls r0, 3 @@ -2131,11 +2131,11 @@ sub_800A550: ; 800A550 orrs r0, r1 ldrb r1, [r2] orrs r0, r1 - b @0800A580 + b _0800A580 .pool -@0800A57C: +_0800A57C: bl sub_800FCD8 -@0800A580: +_0800A580: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -2150,17 +2150,17 @@ sub_800A588: ; 800A588 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne @0800A5A4 + bne _0800A5A4 adds r0, r1, 0 bl sub_800F6FC - b @0800A5AC + b _0800A5AC .pool -@0800A5A4: +_0800A5A4: ldr r0, =0x0300307c adds r0, r1, r0 movs r1, 0x1 strb r1, [r0] -@0800A5AC: +_0800A5AC: pop {r0} bx r0 .pool @@ -2172,27 +2172,27 @@ sub_800A5B4: ; 800A5B4 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 .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 @@ -2207,20 +2207,20 @@ sub_800A5EC: ; 800A5EC ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne @0800A608 + bne _0800A608 adds r0, r1, 0 bl sub_800F728 - b @0800A616 + b _0800A616 .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 .pool @@ -2234,15 +2234,15 @@ sub_800A620: ; 800A620 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 .pool @@ -2257,8 +2257,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] @@ -2269,8 +2269,8 @@ sub_800A648: ; 800A648 lsls r0, 16 lsrs r2, r0, 16 cmp r2, r1 - bcc @0800A658 -@0800A66E: + bcc _0800A658 +_0800A66E: adds r0, r3, 0 pop {r4} pop {r1} @@ -2351,9 +2351,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 @@ -2362,12 +2362,12 @@ sub_800A6E8: ; 800A6E8 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] @@ -2379,8 +2379,8 @@ sub_800A6E8: ; 800A6E8 lsrs r6, r0, 24 subs r4, 0x1 cmp r4, 0 - bge @0800A71A -@0800A734: + bge _0800A71A +_0800A734: add sp, 0x10 pop {r4-r7} pop {r0} @@ -2408,18 +2408,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 @@ -2432,12 +2432,12 @@ sub_800A73C: ; 800A73C 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] @@ -2449,19 +2449,19 @@ sub_800A73C: ; 800A73C 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 @@ -2483,19 +2483,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 @@ -2503,12 +2503,12 @@ sub_800A7DC: ; 800A7DC 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 @@ -2522,11 +2522,11 @@ sub_800A824: ; 800A824 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] @@ -2642,7 +2642,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 @@ -2654,7 +2654,7 @@ task00_link_test: ; 800A850 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @0800A94E + ble _0800A94E add sp, 0x20 pop {r4-r6} pop {r0} @@ -2680,10 +2680,10 @@ sub_800A9A8: ; 800A9A8 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 @@ -2691,8 +2691,8 @@ sub_800A9A8: ; 800A9A8 lsrs r1, r0, 24 adds r2, 0x1 cmp r2, r3 - blt @0800A9BA -@0800A9CA: + blt _0800A9BA +_0800A9CA: adds r0, r1, 0 pop {r4} pop {r1} @@ -2706,20 +2706,20 @@ sub_800A9D8: ; 800A9D8 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} @@ -2737,7 +2737,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} @@ -2750,7 +2750,7 @@ sub_800AA04: ; 800AA04 adds r3, 0x1C subs r2, 0x1 cmp r2, 0 - bge @0800AA18 + bge _0800AA18 pop {r4-r7} pop {r0} bx r0 @@ -2784,7 +2784,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 @@ -2796,48 +2796,48 @@ 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 .pool -@0800AAE4: +_0800AAE4: movs r0, 0 -@0800AAE6: +_0800AAE6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -2851,7 +2851,7 @@ 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 @@ -2859,7 +2859,7 @@ sub_800AAF4: ; 800AAF4 adds r5, 0x1C subs r4, 0x1 cmp r4, 0 - bge @0800AAFA + bge _0800AAFA pop {r4,r5} pop {r0} bx r0 @@ -2875,7 +2875,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 @@ -2883,7 +2883,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 @@ -2894,29 +2894,29 @@ sub_800AB18: ; 800AB18 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 CompareString 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 bl SetMainCallback2 -@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} @@ -2953,19 +2953,19 @@ sub_800ABBC: ; 800ABBC 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 .pool -@0800ABDC: +_0800ABDC: bl sub_8011AB0 lsls r0, 24 lsrs r0, 24 -@0800ABE4: +_0800ABE4: pop {r1} bx r1 thumb_func_end sub_800ABBC @@ -2986,22 +2986,22 @@ sub_800ABF4: ; 800ABF4 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 .pool -@0800AC0C: +_0800AC0C: ldr r2, =0x03003140 ldr r1, [r2] cmp r1, 0 - bne @0800AC20 + bne _0800AC20 ldr r0, =sub_800AC80 str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] ldr r0, =0x030030f4 strh r3, [r0] -@0800AC20: +_0800AC20: pop {r0} bx r0 .pool @@ -3013,29 +3013,29 @@ sub_800AC34: ; 800AC34 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 .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 .pool -@0800AC64: +_0800AC64: ldr r0, =sub_800AC80 str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] ldr r0, =0x030030f4 strh r1, [r0] -@0800AC70: +_0800AC70: pop {r0} bx r0 .pool @@ -3047,13 +3047,13 @@ sub_800AC80: ; 800AC80 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 str r0, [r1] -@0800AC96: +_0800AC96: pop {r0} bx r0 .pool @@ -3068,21 +3068,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 @@ -3098,7 +3098,7 @@ sub_800ACAC: ; 800ACAC str r0, [r1] ldr r0, =0x030030e4 strb r4, [r0] -@0800ACF4: +_0800ACF4: pop {r4} pop {r0} bx r0 @@ -3111,29 +3111,29 @@ sub_800AD10: ; 800AD10 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 .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 .pool -@0800AD40: +_0800AD40: ldr r0, =sub_800AD5C str r0, [r2] ldr r0, =0x030030e4 strb r1, [r0] ldr r0, =0x030030f4 strh r1, [r0] -@0800AD4C: +_0800AD4C: pop {r0} bx r0 .pool @@ -3145,13 +3145,13 @@ sub_800AD5C: ; 800AD5C 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 str r0, [r1] -@0800AD72: +_0800AD72: pop {r0} bx r0 .pool @@ -3166,27 +3166,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 @@ -3202,7 +3202,7 @@ sub_800AD88: ; 800AD88 str r0, [r1] ldr r0, =0x030030e4 strb r4, [r0] -@0800ADDA: +_0800ADDA: pop {r4,r5} pop {r0} bx r0 @@ -3215,22 +3215,22 @@ sub_800ADF8: ; 800ADF8 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0x1 - bne @0800AE0C + bne _0800AE0C bl sub_8010434 - b @0800AE1E + b _0800AE1E .pool -@0800AE0C: +_0800AE0C: ldr r1, =0x03003140 ldr r0, [r1] cmp r0, 0 - bne @0800AE18 + bne _0800AE18 ldr r0, =sub_800AE30 str r0, [r1] -@0800AE18: +_0800AE18: ldr r1, =0x030030e4 movs r0, 0 strb r0, [r1] -@0800AE1E: +_0800AE1E: pop {r0} bx r0 .pool @@ -3242,13 +3242,13 @@ sub_800AE30: ; 800AE30 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 str r0, [r1] -@0800AE46: +_0800AE46: pop {r0} bx r0 .pool @@ -3262,39 +3262,39 @@ sub_800AE5C: ; 800AE5C 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 @@ -3307,18 +3307,18 @@ sub_800AEB4: ; 800AEB4 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 @@ -3329,12 +3329,12 @@ sub_800AEB4: ; 800AEB4 strb r0, [r1, 0x5] ldr r0, =c2_800ACD4 bl SetMainCallback2 -@0800AEEA: +_0800AEEA: ldr r1, =0x0300306c movs r0, 0x1 strb r0, [r1] bl sub_80097E8 -@0800AEF4: +_0800AEF4: pop {r0} bx r0 .pool @@ -3382,16 +3382,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 bl SetVBlankCallback movs r0, 0 @@ -3412,7 +3412,7 @@ c2_800ACD4: ; 800AF30 bl InitWindows lsls r0, 16 cmp r0, 0 - beq @0800B03C + beq _0800B03C bl DeactivateAllTextPrinters bl reset_temp_tile_data_buffers movs r0, 0x50 @@ -3457,7 +3457,7 @@ c2_800ACD4: ; 800AF30 bl fade_and_return_progress_probably ldr r0, =sub_800B1A0 bl SetMainCallback2 -@0800B03C: +_0800B03C: pop {r4} pop {r0} bx r0 @@ -3585,58 +3585,58 @@ 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 .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 .pool -@0800B1EC: +_0800B1EC: bl sub_800B138 - b @0800B260 -@0800B1F2: + b _0800B260 +_0800B1F2: movs r0, 0 bl ShowBg ldr r0, =0x02022b00 ldrb r0, [r0, 0x6] cmp r0, 0 - beq @0800B260 + beq _0800B260 movs r0, 0x1 bl ShowBg - b @0800B260 + b _0800B260 .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, =gUnknown_082ED224 str r0, [sp] movs r0, 0 @@ -3648,11 +3648,11 @@ sub_800B1A0: ; 800B1A0 movs r2, 0x2 movs r3, 0x14 bl box_print - b @0800B260 + b _0800B260 .pool -@0800B244: +_0800B244: cmp r0, 0x1 - bne @0800B260 + bne _0800B260 ldr r0, =gUnknown_082ED224 str r0, [sp] movs r0, 0 @@ -3664,22 +3664,22 @@ sub_800B1A0: ; 800B1A0 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 @@ -3688,35 +3688,35 @@ sub_800B1A0: ; 800B1A0 movs r0, 0 strb r0, [r1, 0x6] bl sub_81700F8 - b @0800B2C2 + b _0800B2C2 .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 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} @@ -3744,14 +3744,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 @@ -3854,17 +3854,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 bl SetMainCallback2 -@0800B3F4: +_0800B3F4: pop {r4-r6} pop {r0} bx r0 @@ -3877,7 +3877,7 @@ HandleLinkConnection: ; 800B40C ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - bne @0800B45C + bne _0800B45C ldr r0, =0x03003144 ldr r1, =0x03003110 ldr r2, =0x03003090 @@ -3891,32 +3891,32 @@ HandleLinkConnection: ; 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 .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 @@ -3928,11 +3928,11 @@ sub_800B488: ; 800B488 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 .pool @@ -3944,10 +3944,10 @@ sub_800B4A4: ; 800B4A4 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 .pool @@ -3959,10 +3959,10 @@ sub_800B4C0: ; 800B4C0 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 .pool @@ -3974,16 +3974,16 @@ sub_800B4DC: ; 800B4DC 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 .pool -@0800B4FC: +_0800B4FC: bl sub_80124D4 -@0800B500: +_0800B500: pop {r1} bx r1 thumb_func_end sub_800B4DC @@ -3993,12 +3993,12 @@ 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 @@ -4128,75 +4128,75 @@ 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 .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 .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 .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 .pool -@0800B6C0: +_0800B6C0: ldr r0, =0x03003170 movs r1, 0 strb r1, [r0, 0x1] ldr r0, =0x0400012a strh r1, [r0] - b @0800B6EA + b _0800B6EA .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 @@ -4206,10 +4206,10 @@ sub_800B638: ; 800B638 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] @@ -4222,16 +4222,16 @@ sub_800B638: ; 800B638 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 .pool -@0800B728: +_0800B728: adds r0, r2, 0 orrs r0, r3 -@0800B72C: +_0800B72C: orrs r0, r4 orrs r0, r5 orrs r0, r6 @@ -4239,25 +4239,25 @@ sub_800B638: ; 800B638 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} @@ -4273,17 +4273,17 @@ 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 .pool -@0800B788: +_0800B788: movs r0, 0 strb r0, [r2] -@0800B78C: +_0800B78C: pop {r0} bx r0 thumb_func_end sub_800B764 @@ -4294,7 +4294,7 @@ sub_800B790: ; 800B790 ldr r0, =0x03003170 ldrb r0, [r0] cmp r0, 0 - beq @0800B7AE + beq _0800B7AE ldr r1, =0x0400010c ldr r2, =0x0000ff3b adds r0, r2, 0 @@ -4304,7 +4304,7 @@ sub_800B790: ; 800B790 strh r0, [r1] movs r0, 0x40 bl EnableInterrupts -@0800B7AE: +_0800B7AE: pop {r0} bx r0 .pool @@ -4330,7 +4330,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 @@ -4339,11 +4339,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 @@ -4355,7 +4355,7 @@ sub_800B7C0: ; 800B7C0 mov r8, r0 mov r12, r2 movs r7, 0x64 -@0800B814: +_0800B814: ldrh r0, [r4] ldrh r1, [r3] orrs r0, r1 @@ -4372,21 +4372,21 @@ sub_800B7C0: ; 800B7C0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls @0800B814 - b @0800B85C + bls _0800B814 + b _0800B85C .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] @@ -4395,7 +4395,7 @@ sub_800B7C0: ; 800B7C0 strb r1, [r0] mov r4, r9 strh r2, [r4] -@0800B874: +_0800B874: ldr r1, =0x04000208 ldr r2, =0x03004134 ldrh r0, [r2] @@ -4435,19 +4435,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] @@ -4455,23 +4455,23 @@ sub_800B8A8: ; 800B8A8 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 .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] @@ -4481,7 +4481,7 @@ sub_800B8A8: ; 800B8A8 add r2, r12 mov r8, r2 mov r10, r1 -@0800B930: +_0800B930: movs r2, 0 lsls r1, r3, 4 adds r4, r3, 0x1 @@ -4492,7 +4492,7 @@ sub_800B8A8: ; 800B8A8 lsls r0, 3 adds r0, r3 lsls r3, r0, 5 -@0800B944: +_0800B944: lsls r1, r2, 1 adds r1, r5 movs r7, 0x64 @@ -4507,12 +4507,12 @@ sub_800B8A8: ; 800B8A8 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 @@ -4528,12 +4528,12 @@ sub_800B8A8: ; 800B8A8 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] @@ -4554,39 +4554,39 @@ sub_800B9B8: ; 800B9B8 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 .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 @@ -4594,17 +4594,17 @@ sub_800B9B8: ; 800B9B8 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 @@ -4631,34 +4631,34 @@ 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 .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 @@ -4669,13 +4669,13 @@ sub_800BA38: ; 800BA38 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 @@ -4705,15 +4705,15 @@ 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 .pool -@0800BAFC: +_0800BAFC: ldr r1, =0x0400012a ldr r2, =0x0000b9a0 -@0800BB00: +_0800BB00: adds r0, r2, 0 strh r0, [r1] ldr r2, =0x03003174 @@ -4734,7 +4734,7 @@ sub_800BAD0: ; 800BAD0 ldr r2, =0x00008fff ldr r1, =0x0000ffff mov r12, r1 -@0800BB28: +_0800BB28: lsls r0, r4, 1 add r0, r8 ldrh r3, [r0] @@ -4743,66 +4743,66 @@ sub_800BAD0: ; 800BAD0 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 .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 .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 @@ -4826,42 +4826,42 @@ 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 .pool -@0800BC30: +_0800BC30: ldr r2, =0x00000fbc adds r1, r6, r2 adds r2, 0x1 @@ -4872,17 +4872,17 @@ sub_800BBCC: ; 800BBCC 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 @@ -4891,7 +4891,7 @@ sub_800BBCC: ; 800BBCC lsls r2, 2 adds r2, r6 mov r8, r2 -@0800BC68: +_0800BC68: lsls r1, r4, 1 mov r2, sp adds r0, r2, r1 @@ -4918,24 +4918,24 @@ sub_800BBCC: ; 800BBCC lsrs r4, r0, 24 ldrb r0, [r5, 0x3] cmp r4, r0 - bcc @0800BC68 - b @0800BCAC + bcc _0800BC68 + b _0800BCAC .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] @@ -4943,7 +4943,7 @@ sub_800BBCC: ; 800BBCC strb r1, [r0] movs r0, 0 strh r0, [r2] -@0800BCD0: +_0800BCD0: add sp, 0x8 pop {r3} mov r8, r3 @@ -4960,14 +4960,14 @@ sub_800BCE4: ; 800BCE4 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] @@ -4982,37 +4982,37 @@ sub_800BCE4: ; 800BCE4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x31 - bls @0800BD8C + bls _0800BD8C strb r2, [r1] - b @0800BD8C + b _0800BD8C .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 .pool -@0800BD68: +_0800BD68: ldr r3, =0x0400012a movs r1, 0xCE lsls r1, 2 @@ -5028,11 +5028,11 @@ sub_800BCE4: ; 800BCE4 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 @@ -5045,7 +5045,7 @@ sub_800BD98: ; 800BD98 ldr r0, =0x03003170 ldrb r0, [r0] cmp r0, 0 - beq @0800BDB4 + beq _0800BDB4 ldr r2, =0x0400010e ldrh r1, [r2] ldr r0, =0x0000ff7f @@ -5055,7 +5055,7 @@ sub_800BD98: ; 800BD98 ldr r2, =0x0000ff3b adds r0, r2, 0 strh r0, [r1] -@0800BDB4: +_0800BDB4: pop {r0} bx r0 .pool @@ -5067,22 +5067,22 @@ sub_800BDCC: ; 800BDCC 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 .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 .pool @@ -5105,12 +5105,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 @@ -5119,11 +5119,11 @@ sub_800BDFC: ; 800BDFC 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 @@ -5147,7 +5147,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 @@ -5155,13 +5155,13 @@ sub_800BE50: ; 800BE50 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 @@ -5171,15 +5171,15 @@ sub_800BE50: ; 800BE50 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 @@ -5193,22 +5193,22 @@ sub_800BEC0: ; 800BEC0 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] @@ -5233,21 +5233,21 @@ 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 .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} @@ -5262,7 +5262,7 @@ sub_800BF4C: ; 800BF4C adds r5, r0, 0 adds r6, r1, 0 cmp r5, 0 - beq @0800BF94 + beq _0800BF94 mov r1, sp movs r0, 0 strh r0, [r1] @@ -5280,11 +5280,11 @@ sub_800BF4C: ; 800BF4C ldr r0, =sub_800C7B4 bl rfu_setREQCallback movs r0, 0 - b @0800BF96 + b _0800BF96 .pool -@0800BF94: +_0800BF94: movs r0, 0x4 -@0800BF96: +_0800BF96: add sp, 0x4 pop {r4-r6} pop {r1} @@ -5331,9 +5331,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 @@ -5362,7 +5362,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] @@ -5372,7 +5372,7 @@ sub_800C000: ; 800C000 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls @0800C028 + bls _0800C028 pop {r4,r5} pop {r0} bx r0 @@ -5404,25 +5404,25 @@ 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 .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] @@ -5430,70 +5430,70 @@ sub_800C054: ; 800C054 movs r1, 0x1 bl sub_800D30C movs r0, 0x2 - b @0800C122 + b _0800C122 .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 .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} @@ -5514,25 +5514,25 @@ sub_800C12C: ; 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 .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] @@ -5540,9 +5540,9 @@ sub_800C12C: ; 800C12C movs r1, 0x1 bl sub_800D30C movs r0, 0x2 - b @0800C204 + b _0800C204 .pool -@0800C184: +_0800C184: movs r2, 0 ldr r0, =0x03007890 ldr r1, [r0] @@ -5550,67 +5550,67 @@ sub_800C12C: ; 800C12C 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 .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} @@ -5630,7 +5630,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] @@ -5639,35 +5639,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 @@ -5683,75 +5683,75 @@ 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 .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 .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] @@ -5766,24 +5766,24 @@ sub_800C27C: ; 800C27C movs r0, 0x33 movs r1, 0x1 bl sub_800D30C - b @0800C366 + b _0800C366 .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 @@ -5812,7 +5812,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] @@ -5822,21 +5822,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 @@ -5846,12 +5846,12 @@ sub_800C36C: ; 800C36C 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] @@ -5862,16 +5862,16 @@ sub_800C36C: ; 800C36C 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 .pool -@0800C40C: +_0800C40C: movs r0, 0 strb r0, [r6, 0xA] mov r0, sp @@ -5880,11 +5880,11 @@ sub_800C36C: ; 800C36C 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 @@ -5893,17 +5893,17 @@ sub_800C36C: ; 800C36C 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 @@ -5911,27 +5911,27 @@ sub_800C36C: ; 800C36C 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 @@ -5944,35 +5944,35 @@ sub_800C36C: ; 800C36C 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] @@ -5981,14 +5981,14 @@ sub_800C36C: ; 800C36C 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 @@ -5998,18 +5998,18 @@ sub_800C36C: ; 800C36C 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} @@ -6027,12 +6027,12 @@ rfu_syncVBlank_: ; 800C530 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_ @@ -6044,118 +6044,118 @@ sub_800C54C: ; 800C54C 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 .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 .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 .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 .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 .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 .pool -@0800C678: +_0800C678: ldr r0, =0x03004140 ldr r3, [r0, 0x3C] ldrb r0, [r3, 0x4] @@ -6163,87 +6163,87 @@ sub_800C54C: ; 800C54C ldr r2, [r3, 0x8] ldr r3, [r3, 0xC] bl rfu_REQ_configGameData - b @0800C6F6 + b _0800C6F6 .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 .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 .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 @@ -6258,7 +6258,7 @@ sub_800C744: ; 800C744 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] @@ -6266,17 +6266,17 @@ 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 .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] @@ -6289,17 +6289,17 @@ sub_800C744: ; 800C744 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 @@ -6308,7 +6308,7 @@ sub_800C744: ; 800C744 strb r0, [r4, 0x7] movs r0, 0x9 strb r0, [r4, 0x4] -@0800C7AE: +_0800C7AE: pop {r4} pop {r0} bx r0 @@ -6329,172 +6329,172 @@ 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 .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 .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 .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 .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 .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 .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 .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 .pool -@0800C960: +_0800C960: cmp r6, 0 - bne @0800C9A6 + bne _0800C9A6 bl sub_800D294 lsls r0, 24 lsrs r0, 24 @@ -6503,142 +6503,142 @@ sub_800C7B4: ; 800C7B4 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 .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 .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 .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 .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 @@ -6649,9 +6649,9 @@ sub_800C7B4: ; 800C7B4 strh r0, [r1, 0x1E] ldrb r0, [r1, 0x10] strh r0, [r1, 0x14] - b @0800CABC + b _0800CABC .pool -@0800CA9C: +_0800CA9C: adds r1, r4, 0 subs r1, 0x10 strb r6, [r1, 0x5] @@ -6663,25 +6663,25 @@ sub_800C7B4: ; 800C7B4 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 .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] @@ -6695,46 +6695,46 @@ sub_800C7B4: ; 800C7B4 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 .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 @@ -6743,36 +6743,36 @@ sub_800C7B4: ; 800C7B4 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 .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] @@ -6780,9 +6780,9 @@ sub_800C7B4: ; 800C7B4 strb r0, [r1, 0x5] movs r0, 0x32 strh r0, [r1, 0x1E] - b @0800CBA8 + b _0800CBA8 .pool -@0800CB94: +_0800CB94: ldr r4, =0x03004140 strb r6, [r4, 0x5] strb r6, [r4, 0x4] @@ -6792,7 +6792,7 @@ sub_800C7B4: ; 800C7B4 bl sub_800D334 movs r0, 0x33 strh r0, [r4, 0x1E] -@0800CBA8: +_0800CBA8: ldr r5, =0x03004140 ldrb r0, [r5, 0x10] lsls r0, 1 @@ -6810,16 +6810,16 @@ sub_800C7B4: ; 800C7B4 movs r1, 0x1 bl sub_800D30C strh r4, [r5, 0x1E] - b @0800CC8A + b _0800CC8A .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] @@ -6828,14 +6828,14 @@ sub_800C7B4: ; 800C7B4 movs r0, 0x1 strb r0, [r5, 0x2] movs r0, 0x41 -@0800CBF6: +_0800CBF6: movs r1, 0 bl sub_800D30C - b @0800CC8A + b _0800CC8A .pool -@0800CC04: +_0800CC04: cmp r0, 0xF - bne @0800CC8A + bne _0800CC8A strb r1, [r5, 0x4] ldrb r0, [r5, 0x2] movs r4, 0x1 @@ -6867,7 +6867,7 @@ sub_800C7B4: ; 800C7B4 strb r0, [r4] lsls r0, 24 cmp r0, 0 - beq @0800CC8A + beq _0800CC8A strb r7, [r5, 0x5] strb r7, [r5, 0x4] bl sub_800D610 @@ -6883,37 +6883,37 @@ sub_800C7B4: ; 800C7B4 movs r0, 0x25 movs r1, 0x1 bl sub_800D30C - b @0800CC8A + b _0800CC8A .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 .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 @@ -6921,12 +6921,12 @@ sub_800C7B4: ; 800C7B4 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] @@ -6936,34 +6936,34 @@ sub_800C7B4: ; 800C7B4 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 .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] @@ -6973,7 +6973,7 @@ sub_800C7B4: ; 800C7B4 adds r2, 0x30 ldrb r1, [r2] cmp r1, 0 - beq @0800CD6A + beq _0800CD6A ldrb r0, [r4, 0x14] adds r3, r1, 0 bics r3, r0 @@ -6986,28 +6986,28 @@ sub_800C7B4: ; 800C7B4 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] @@ -7020,87 +7020,87 @@ sub_800C7B4: ; 800C7B4 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 .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 .pool -@0800CE20: +_0800CE20: cmp r6, 0 - bne @0800CE42 + bne _0800CE42 ldr r0, =0x03004140 strb r6, [r0, 0xD] strb r6, [r0, 0x1] @@ -7110,21 +7110,21 @@ sub_800C7B4: ; 800C7B4 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 @@ -7134,32 +7134,32 @@ sub_800C7B4: ; 800C7B4 strb r0, [r1, 0x2] bl sub_800D334 bl rfu_waitREQComplete - b @0800CEA4 + b _0800CEA4 .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 @@ -7184,47 +7184,47 @@ 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 .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} @@ -7247,9 +7247,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] @@ -7262,14 +7262,14 @@ sub_800CF34: ; 800CF34 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 @@ -7277,7 +7277,7 @@ sub_800CF34: ; 800CF34 movs r1, 0x24 adds r1, r3 mov r9, r1 -@0800CF88: +_0800CF88: movs r0, 0x80 lsls r0, 17 lsls r0, r6 @@ -7286,7 +7286,7 @@ sub_800CF34: ; 800CF34 mov r0, r8 ands r0, r4 cmp r0, 0 - beq @0800CFDA + beq _0800CFDA lsls r1, r6, 1 adds r0, r7, 0 adds r0, 0x28 @@ -7300,9 +7300,9 @@ sub_800CF34: ; 800CF34 strb r0, [r2] adds r6, 0x1 mov r10, r6 - b @0800D090 + b _0800D090 .pool -@0800CFC0: +_0800CFC0: ldrb r1, [r7] adds r0, r4, 0 orrs r0, r1 @@ -7315,56 +7315,56 @@ sub_800CF34: ; 800CF34 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 .pool -@0800D040: +_0800D040: lsls r1, r6, 1 adds r0, r3, 0 adds r0, 0x28 @@ -7375,13 +7375,13 @@ sub_800CF34: ; 800CF34 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 @@ -7396,52 +7396,52 @@ sub_800CF34: ; 800CF34 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 @@ -7452,50 +7452,50 @@ sub_800CF34: ; 800CF34 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 .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 @@ -7517,7 +7517,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 @@ -7528,7 +7528,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 @@ -7536,8 +7536,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] @@ -7557,22 +7557,22 @@ sub_800D158: ; 800D158 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 @@ -7585,7 +7585,7 @@ sub_800D158: ; 800D158 movs r0, 0x25 movs r1, 0x1 bl sub_800D30C -@0800D1F6: +_0800D1F6: pop {r4-r6} pop {r0} bx r0 @@ -7598,7 +7598,7 @@ sub_800D20C: ; 800D20C 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 @@ -7606,7 +7606,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] @@ -7630,7 +7630,7 @@ sub_800D20C: ; 800D20C movs r0, 0x24 movs r1, 0 bl sub_800D30C -@0800D258: +_0800D258: pop {r4,r5} pop {r0} bx r0 @@ -7643,10 +7643,10 @@ sub_800D268: ; 800D268 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] @@ -7657,7 +7657,7 @@ sub_800D268: ; 800D268 strb r0, [r1, 0x5] movs r0, 0x2 strb r0, [r1, 0xA] -@0800D28C: +_0800D28C: pop {r0} bx r0 .pool @@ -7676,12 +7676,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] @@ -7689,7 +7689,7 @@ sub_800D294: ; 800D294 mov r12, r0 ldr r1, =0x0000ffff cmp r2, r1 - beq @0800D2E6 + beq _0800D2E6 mov r1, r9 ldr r0, [r1] lsls r1, r5, 5 @@ -7698,24 +7698,24 @@ sub_800D294: ; 800D294 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 @@ -7737,9 +7737,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] @@ -7776,9 +7776,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 @@ -7789,31 +7789,31 @@ sub_800D358: ; 800D358 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 @@ -7824,27 +7824,27 @@ sub_800D358: ; 800D358 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 @@ -7852,28 +7852,28 @@ sub_800D358: ; 800D358 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 @@ -7891,14 +7891,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 @@ -7912,13 +7912,13 @@ sub_800D434: ; 800D434 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] @@ -7926,7 +7926,7 @@ sub_800D434: ; 800D434 mov r1, r8 ands r0, r1 cmp r0, 0 - beq @0800D4A4 + beq _0800D4A4 lsls r0, r4, 2 adds r0, r3 ldr r0, [r0] @@ -7934,15 +7934,15 @@ sub_800D434: ; 800D434 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] @@ -7954,26 +7954,26 @@ sub_800D434: ; 800D434 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 @@ -7984,21 +7984,21 @@ sub_800D434: ; 800D434 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 @@ -8041,17 +8041,17 @@ 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 .pool -@0800D578: +_0800D578: ldr r2, =0x04000208 ldrh r1, [r2] movs r0, 0 @@ -8060,7 +8060,7 @@ sub_800D550: ; 800D550 strh r5, [r3, 0x32] strh r1, [r2] movs r0, 0 -@0800D588: +_0800D588: pop {r4,r5} pop {r1} bx r1 @@ -8078,13 +8078,13 @@ 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 .pool -@0800D5B8: +_0800D5B8: ldr r1, =0x03004140 movs r0, 0x6 strh r0, [r1, 0x14] @@ -8092,7 +8092,7 @@ sub_800D594: ; 800D594 movs r1, 0x1 bl sub_800D30C movs r0, 0x6 -@0800D5C8: +_0800D5C8: pop {r1} bx r1 .pool @@ -8110,26 +8110,26 @@ 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 .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 @@ -8140,14 +8140,14 @@ sub_800D610: ; 800D610 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 .pool @@ -8159,20 +8159,20 @@ sub_800D630: ; 800D630 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 .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 @@ -8184,52 +8184,52 @@ sub_800D658: ; 800D658 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 .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 @@ -8241,21 +8241,21 @@ sub_800D6C8: ; 800D6C8 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 @@ -8286,7 +8286,7 @@ sub_800D724: ; 800D724 adds r3, r0, 0 movs r1, 0 movs r4, 0 -@0800D72C: +_0800D72C: lsls r0, r1, 3 adds r2, r1, 0x1 subs r0, r1 @@ -8294,15 +8294,15 @@ sub_800D724: ; 800D724 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 @@ -8333,21 +8333,21 @@ sub_800D780: ; 800D780 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 @@ -8381,7 +8381,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 @@ -8389,29 +8389,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 @@ -8422,7 +8422,7 @@ sub_800D7D8: ; 800D7D8 strb r0, [r1] adds r2, 0x1 cmp r2, 0x45 - ble @0800D81E + ble _0800D81E movs r0, 0x8C lsls r0, 4 adds r1, r3, r0 @@ -8444,23 +8444,23 @@ sub_800D7D8: ; 800D7D8 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 .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 @@ -8476,7 +8476,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 @@ -8485,23 +8485,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 @@ -8513,7 +8513,7 @@ sub_800D888: ; 800D888 strb r1, [r0] adds r2, 0x1 cmp r2, 0xD - ble @0800D8C4 + ble _0800D8C4 movs r1, 0x8C lsls r1, 2 adds r4, r6, r1 @@ -8535,23 +8535,23 @@ sub_800D888: ; 800D888 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 .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 @@ -8576,31 +8576,31 @@ 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 .pool -@0800D984: +_0800D984: movs r2, 0 movs r6, 0x46 -@0800D988: +_0800D988: adds r1, r4, r2 ldrb r0, [r5] adds r7, r0, 0 @@ -8612,7 +8612,7 @@ sub_800D934: ; 800D934 strb r0, [r1] adds r2, 0x1 cmp r2, 0x45 - ble @0800D988 + ble _0800D988 ldr r0, =0x000008c1 adds r1, r3, r0 ldrb r0, [r1] @@ -8634,7 +8634,7 @@ sub_800D934: ; 800D934 mov r1, r12 strh r1, [r0] movs r0, 0x1 -@0800D9CA: +_0800D9CA: pop {r4-r7} pop {r1} bx r1 @@ -8654,24 +8654,24 @@ 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 .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 @@ -8683,7 +8683,7 @@ sub_800D9DC: ; 800D9DC strb r0, [r2] adds r3, 0x1 cmp r3, 0xD - ble @0800DA12 + ble _0800DA12 ldr r0, =0x00000231 adds r4, r5, r0 ldrb r0, [r4] @@ -8704,7 +8704,7 @@ sub_800D9DC: ; 800D9DC ldr r0, =0x04000208 strh r7, [r0] movs r0, 0x1 -@0800DA54: +_0800DA54: pop {r4-r7} pop {r1} bx r1 @@ -8718,14 +8718,14 @@ sub_800DA68: ; 800DA68 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 @@ -8737,7 +8737,7 @@ sub_800DA68: ; 800DA68 strb r1, [r0] adds r3, 0x1 cmp r3, 0xD - ble @0800DA80 + ble _0800DA80 ldrb r0, [r2, 0x1C] adds r0, 0x1 ldrb r1, [r2, 0x1C] @@ -8749,17 +8749,17 @@ sub_800DA68: ; 800DA68 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 @@ -8772,14 +8772,14 @@ sub_800DAC8: ; 800DAC8 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 @@ -8791,8 +8791,8 @@ sub_800DAC8: ; 800DAC8 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] @@ -8807,7 +8807,7 @@ sub_800DAC8: ; 800DAC8 ldrb r1, [r3, 0x1E] strb r0, [r3, 0x1E] movs r0, 0x1 -@0800DB12: +_0800DB12: pop {r4,r5} pop {r1} bx r1 @@ -8822,12 +8822,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 @@ -8837,7 +8837,7 @@ sub_800DB18: ; 800DB18 strb r1, [r0] adds r2, 0x1 cmp r2, 0xFF - ble @0800DB30 + ble _0800DB30 movs r0, 0x80 lsls r0, 2 adds r1, r3, r0 @@ -8856,15 +8856,15 @@ sub_800DB18: ; 800DB18 adds r0, 0x1 ldrb r2, [r1] strb r0, [r1] - b @0800DB7A + b _0800DB7A .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 @@ -8884,19 +8884,19 @@ 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 .pool -@0800DBB0: +_0800DBB0: movs r2, 0 -@0800DBB2: +_0800DBB2: adds r0, r5, r2 ldrb r1, [r4] lsls r1, 8 @@ -8906,7 +8906,7 @@ sub_800DB84: ; 800DB84 strb r1, [r0] adds r2, 0x1 cmp r2, 0xFF - ble @0800DBB2 + ble _0800DBB2 ldr r0, =0x00000201 adds r1, r3, r0 ldrb r0, [r1] @@ -8925,7 +8925,7 @@ sub_800DB84: ; 800DB84 ldrb r2, [r1] strb r0, [r1] movs r0, 0x1 -@0800DBEA: +_0800DBEA: pop {r4,r5} pop {r1} bx r1 @@ -8941,21 +8941,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] @@ -8966,13 +8966,13 @@ sub_800DBF8: ; 800DBF8 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] @@ -8983,12 +8983,12 @@ sub_800DBF8: ; 800DBF8 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 @@ -8999,12 +8999,12 @@ sub_800DBF8: ; 800DBF8 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] @@ -9013,7 +9013,7 @@ sub_800DBF8: ; 800DBF8 adds r2, r1, 0x1 movs r0, 0xFF mov r12, r0 -@0800DC86: +_0800DC86: adds r0, r6, r4 adds r1, r4, 0x1 strb r2, [r0] @@ -9026,13 +9026,13 @@ sub_800DBF8: ; 800DBF8 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 @@ -9046,10 +9046,10 @@ sub_800DCB4: ; 800DCB4 movs r3, 0 ldrb r0, [r1] cmp r0, 0xFF - beq @0800DCD8 + beq _0800DCD8 ldr r5, =gUnknown_082ED470 adds r2, r1, 0 -@0800DCC4: +_0800DCC4: adds r1, r4, r3 ldrb r0, [r2] adds r0, r5 @@ -9059,8 +9059,8 @@ sub_800DCB4: ; 800DCB4 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] @@ -9077,10 +9077,10 @@ sub_800DCE8: ; 800DCE8 movs r3, 0 ldrb r0, [r1] cmp r0, 0 - beq @0800DD0C + beq _0800DD0C ldr r5, =gUnknown_082ED370 adds r2, r1, 0 -@0800DCF8: +_0800DCF8: adds r1, r4, r3 ldrb r0, [r2] adds r0, r5 @@ -9090,8 +9090,8 @@ sub_800DCE8: ; 800DCE8 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] @@ -9113,57 +9113,57 @@ 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 .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 @@ -9186,25 +9186,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] @@ -9296,7 +9296,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 @@ -9306,15 +9306,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 @@ -9323,9 +9323,9 @@ sub_800DE7C: ; 800DE7C movs r1, 0 movs r2, 0x8 bl memset - b @0800DF24 + b _0800DF24 .pool -@0800DED8: +_0800DED8: movs r0, 0 mov r9, r0 ldr r6, =0x03007890 @@ -9335,9 +9335,9 @@ sub_800DE7C: ; 800DE7C 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 @@ -9349,9 +9349,9 @@ sub_800DE7C: ; 800DE7C mov r0, r8 movs r2, 0x8 bl memcpy - b @0800DF24 + b _0800DF24 .pool -@0800DF10: +_0800DF10: adds r0, r7, 0 movs r1, 0 movs r2, 0xD @@ -9360,7 +9360,7 @@ sub_800DE7C: ; 800DE7C movs r1, 0 movs r2, 0x8 bl memset -@0800DF24: +_0800DF24: mov r0, r9 pop {r3,r4} mov r8, r3 @@ -9384,7 +9384,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 @@ -9397,9 +9397,9 @@ sub_800DF34: ; 800DF34 movs r2, 0x8 bl memcpy movs r7, 0x1 - b @0800DF88 + b _0800DF88 .pool -@0800DF74: +_0800DF74: adds r0, r3, 0 movs r1, 0 movs r2, 0xD @@ -9408,7 +9408,7 @@ sub_800DF34: ; 800DF34 movs r1, 0 movs r2, 0x8 bl memset -@0800DF88: +_0800DF88: adds r0, r7, 0 pop {r4-r7} pop {r1} @@ -9440,17 +9440,17 @@ sub_800DFB4: ; 800DFB4 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, =gUnknown_082ED5F0 adds r1, r3, 0 movs r3, 0 @@ -9476,9 +9476,9 @@ sub_800DFB4: ; 800DFB4 strb r0, [r4] ldr r0, =0x02022b10 strb r5, [r0] - b @0800E06A + b _0800E06A .pool -@0800E024: +_0800E024: ldr r0, =gUnknown_082ED5F0 adds r1, r3, 0 movs r3, 0 @@ -9512,7 +9512,7 @@ sub_800DFB4: ; 800DFB4 movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@0800E06A: +_0800E06A: pop {r4,r5} pop {r0} bx r0 @@ -9533,7 +9533,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] @@ -9554,7 +9554,7 @@ sub_800E084: ; 800E084 ldr r1, =0x070003e8 movs r2, 0x4 bl CpuSet -@0800E0CA: +_0800E0CA: pop {r4} pop {r0} bx r0 @@ -9570,10 +9570,10 @@ sub_800E0E8: ; 800E0E8 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne @0800E100 + bne _0800E100 adds r0, r4, 0 bl LoadCompressedObjectPic -@0800E100: +_0800E100: ldr r0, =gUnknown_082ED5E8 bl LoadTaggedObjectPalette ldr r1, =0x02022b10 @@ -9593,26 +9593,26 @@ sub_800E124: ; 800E124 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 .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 @@ -9625,12 +9625,12 @@ sub_800E15C: ; 800E15C 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 @@ -9643,9 +9643,9 @@ sub_800E174: ; 800E174 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 @@ -9656,9 +9656,9 @@ sub_800E174: ; 800E174 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 @@ -9666,15 +9666,15 @@ sub_800E174: ; 800E174 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 .pool -@0800E1C8: +_0800E1C8: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -9683,20 +9683,20 @@ sub_800E174: ; 800E174 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 @@ -9705,55 +9705,55 @@ sub_800E174: ; 800E174 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] @@ -9770,7 +9770,7 @@ sub_800E174: ; 800E174 movs r3, 0x34 ldrsh r1, [r6, r3] cmp r0, r1 - bge @0800E2AC + bge _0800E2AC ldrh r0, [r6, 0x36] adds r0, 0x1 movs r3, 0 @@ -9790,14 +9790,14 @@ sub_800E174: ; 800E174 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 @@ -9867,9 +9867,9 @@ sub_800E174: ; 800E174 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} @@ -9893,19 +9893,19 @@ 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 @@ -9921,16 +9921,16 @@ 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 AllocZeroed str r0, [sp, 0x14] movs r4, 0 - b @0800E434 + b _0800E434 .pool -@0800E3D0: +_0800E3D0: lsls r2, r4, 2 mov r0, sp adds r1, r0, r2 @@ -9953,7 +9953,7 @@ sub_800E3A8: ; 800E3A8 subs r0, 0x4 ldr r1, [sp, 0x1C] adds r3, r1, r0 -@0800E3FC: +_0800E3FC: ldrh r1, [r3] ldr r0, =0x03005d8c ldr r2, [r0] @@ -9962,7 +9962,7 @@ sub_800E3A8: ; 800E3A8 adds r0, r4 ldr r0, [r0] cmp r1, r0 - bne @0800E428 + bne _0800E428 adds r1, r2, r6 adds r1, 0x4 ldr r0, [sp, 0x1C] @@ -9971,42 +9971,42 @@ sub_800E3A8: ; 800E3A8 bl CompareString 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 .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] @@ -10016,7 +10016,7 @@ sub_800E3A8: ; 800E3A8 bl sub_800E378 ldr r2, [r7] cmp r2, 0 - blt @0800E4A0 + blt _0800E4A0 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 1 @@ -10028,20 +10028,20 @@ sub_800E3A8: ; 800E3A8 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 @@ -10053,14 +10053,14 @@ sub_800E3A8: ; 800E3A8 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 @@ -10076,14 +10076,14 @@ sub_800E3A8: ; 800E3A8 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 @@ -10093,7 +10093,7 @@ sub_800E3A8: ; 800E3A8 bl memcpy ldr r0, [sp, 0x14] bl Free -@0800E520: +_0800E520: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -10119,39 +10119,39 @@ 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 CompareString 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 .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 @@ -10172,7 +10172,7 @@ sub_800E5AC: ; 800E5AC mov r6, r8 movs r5, 0 movs r4, 0x13 -@0800E5C0: +_0800E5C0: ldr r0, =0x03005d8c ldr r1, [r0] mov r2, r8 @@ -10189,7 +10189,7 @@ sub_800E5AC: ; 800E5AC adds r5, 0xC subs r4, 0x1 cmp r4, 0 - bge @0800E5C0 + bge _0800E5C0 add sp, 0x4 pop {r3} mov r8, r3 @@ -10232,10 +10232,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 @@ -10246,13 +10246,13 @@ sub_800E604: ; 800E604 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 @@ -10323,7 +10323,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 @@ -10333,7 +10333,7 @@ sub_800E700: ; 800E700 adds r1, r4, 0x4 movs r0, 0x3 bl rfu_setTimerInterrupt -@0800E732: +_0800E732: pop {r4} pop {r0} bx r0 @@ -10349,37 +10349,37 @@ 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 .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 @@ -10391,9 +10391,9 @@ sub_800E748: ; 800E748 lsls r0, 3 adds r0, r1 strh r2, [r0, 0xA] - b @0800E862 + b _0800E862 .pool -@0800E7E4: +_0800E7E4: ldr r4, =0x03005000 ldrb r0, [r4, 0xC] ldr r3, =gUnknown_082ED6E0 @@ -10409,17 +10409,17 @@ sub_800E748: ; 800E748 adds r0, r1 movs r1, 0x6 strh r1, [r0, 0xA] - b @0800E862 + b _0800E862 .pool -@0800E814: +_0800E814: movs r0, 0 bl sub_800C27C ldr r1, =0x03005000 movs r0, 0x5 strh r0, [r1, 0x4] - b @0800E862 + b _0800E862 .pool -@0800E828: +_0800E828: ldr r4, =0x03005000 ldr r0, =0x00000cdb adds r1, r4, r0 @@ -10444,7 +10444,7 @@ sub_800E748: ; 800E748 bl AddTask adds r0, r5, 0 bl remove_task -@0800E862: +_0800E862: pop {r4,r5} pop {r0} bx r0 @@ -10473,98 +10473,98 @@ 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 .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 @@ -10580,39 +10580,39 @@ 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 .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, =gUnknown_082ED608 bl sub_800BFCC ldr r0, =0x03005000 movs r2, 0x1 strh r2, [r0, 0x4] - b @0800E9CC + b _0800E9CC .pool -@0800E9BC: +_0800E9BC: ldrb r0, [r7, 0xC] ldr r3, =gUnknown_082ED6E0 movs r1, 0 @@ -10620,16 +10620,16 @@ sub_800E94C: ; 800E94C 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 .pool -@0800E9E4: +_0800E9E4: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -10637,28 +10637,28 @@ sub_800E94C: ; 800E94C adds r1, r0 movs r0, 0xA strh r0, [r1, 0xA] - b @0800EA9A + b _0800EA9A .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 .pool -@0800EA1C: +_0800EA1C: bl sub_800D630 ldr r0, =0x03005000 ldr r1, =0x00000ce4 @@ -10667,9 +10667,9 @@ sub_800E94C: ; 800E94C strb r1, [r0] adds r0, r6, 0 bl remove_task - b @0800EA9A + b _0800EA9A .pool -@0800EA3C: +_0800EA3C: ldr r0, =0x00000c3e adds r4, r7, r0 ldrb r0, [r4] @@ -10703,16 +10703,16 @@ sub_800E94C: ; 800E94C 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 movs r1, 0x5 bl AddTask -@0800EA9A: +_0800EA9A: pop {r4-r7} pop {r0} bx r0 @@ -10725,11 +10725,11 @@ sub_800EAB4: ; 800EAB4 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 @@ -10742,13 +10742,13 @@ sub_800EAB4: ; 800EAB4 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 @@ -10796,12 +10796,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 @@ -10809,42 +10809,42 @@ 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 .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 @@ -10856,9 +10856,9 @@ sub_800EB44: ; 800EB44 lsls r0, 3 adds r0, r1 strh r2, [r0, 0xA] - b @0800ECF4 + b _0800ECF4 .pool -@0800EC10: +_0800EC10: ldr r3, =gUnknown_082ED6E0 movs r0, 0x2 movs r1, 0 @@ -10869,9 +10869,9 @@ sub_800EB44: ; 800EB44 ldr r1, =0x03005000 movs r0, 0x12 strh r0, [r1, 0x4] - b @0800ECF4 + b _0800ECF4 .pool -@0800EC38: +_0800EC38: ldr r1, =0x00000c3e adds r0, r6, r1 ldrb r1, [r0] @@ -10886,7 +10886,7 @@ sub_800EB44: ; 800EB44 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @0800ECF4 + bne _0800ECF4 strb r0, [r6, 0xC] adds r0, r5, 0 bl remove_task @@ -10898,27 +10898,27 @@ sub_800EB44: ; 800EB44 movs r2, 0x16 ldrsh r0, [r1, r2] cmp r0, 0 - beq @0800EC88 + beq _0800EC88 ldr r0, =sub_8010D0C movs r1, 0x1 bl AddTask - b @0800ECF4 + b _0800ECF4 .pool -@0800EC88: +_0800EC88: ldr r0, =sub_801084C movs r1, 0x5 bl AddTask - b @0800ECF4 + b _0800ECF4 .pool -@0800EC98: +_0800EC98: movs r0, 0 bl sub_800C27C ldr r1, =0x03005000 movs r0, 0xF strh r0, [r1, 0x4] - b @0800ECF4 + b _0800ECF4 .pool -@0800ECAC: +_0800ECAC: ldr r0, =0x00000cdb adds r1, r6, r0 ldrb r0, [r1] @@ -10949,7 +10949,7 @@ sub_800EB44: ; 800EB44 strb r4, [r0] adds r0, r5, 0 bl remove_task -@0800ECF4: +_0800ECF4: pop {r4-r6} pop {r0} bx r0 @@ -10985,12 +10985,12 @@ sub_800ED34: ; 800ED34 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 @@ -11003,7 +11003,7 @@ sub_800ED34: ; 800ED34 ldr r0, [r0] ldrb r0, [r0, 0x12] cmp r0, 0 - beq @0800ED9A + beq _0800ED9A movs r2, 0xCD lsls r2, 4 adds r1, r3, r2 @@ -11026,7 +11026,7 @@ sub_800ED34: ; 800ED34 bl rfu_UNI_readySendData ldrb r0, [r4] bl rfu_UNI_clearRecvNewDataFlag -@0800ED9A: +_0800ED9A: movs r0, 0x1 bl rfu_REQ_sendData_wrapper pop {r4} @@ -11054,45 +11054,45 @@ sub_800EDD4: ; 800EDD4 ldr r4, =0x03005000 ldrb r0, [r4, 0xC] cmp r0, 0x1 - bne @0800EDF0 + bne _0800EDF0 ldr r0, =sub_800E748 - b @0800EDF6 + b _0800EDF6 .pool -@0800EDF0: +_0800EDF0: cmp r0, 0 - bne @0800EE18 + bne _0800EE18 ldr r0, =sub_800E94C -@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 .pool -@0800EE18: +_0800EE18: cmp r0, 0x2 - bne @0800EE38 + bne _0800EE38 ldr r0, =sub_800EB44 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, =gUnknown_082ED7E0 -@0800EE3C: +_0800EE3C: lsls r0, r5, 2 adds r0, r6 ldr r4, [r0] @@ -11101,18 +11101,18 @@ sub_800EDD4: ; 800EDD4 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 @@ -11139,18 +11139,18 @@ sub_800EE94: ; 800EE94 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 .pool -@0800EEB4: +_0800EEB4: movs r0, 0 -@0800EEB6: +_0800EEB6: pop {r1} bx r1 thumb_func_end sub_800EE94 @@ -11161,7 +11161,7 @@ sub_800EEBC: ; 800EEBC ldr r4, =0x03005000 ldrh r0, [r4, 0x4] cmp r0, 0x7 - bne @0800EEF8 + bne _0800EEF8 ldr r0, =0x03007890 ldr r1, [r0] ldr r2, =0x00000c3d @@ -11174,15 +11174,15 @@ sub_800EEBC: ; 800EEBC bl sub_800C12C lsls r0, 24 cmp r0, 0 - bne @0800EEF8 + bne _0800EEF8 movs r0, 0x9 strh r0, [r4, 0x4] movs r0, 0x1 - b @0800EEFA + b _0800EEFA .pool -@0800EEF8: +_0800EEF8: movs r0, 0 -@0800EEFA: +_0800EEFA: pop {r4} pop {r1} bx r1 @@ -11208,13 +11208,13 @@ sub_800EF1C: ; 800EF1C ldr r0, =0x03004140 ldrb r0, [r0] cmp r0, 0 - bne @0800EF30 + bne _0800EF30 movs r0, 0 - b @0800EF32 + b _0800EF32 .pool -@0800EF30: +_0800EF30: movs r0, 0x1 -@0800EF32: +_0800EF32: pop {r1} bx r1 thumb_func_end sub_800EF1C @@ -11240,18 +11240,18 @@ sub_800EF58: ; 800EF58 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 .pool -@0800EF74: +_0800EF74: movs r0, 0 -@0800EF76: +_0800EF76: pop {r1} bx r1 thumb_func_end sub_800EF58 @@ -11271,22 +11271,22 @@ sub_800EF88: ; 800EF88 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 @@ -11301,7 +11301,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 @@ -11310,7 +11310,7 @@ sub_800EFB0: ; 800EFB0 lsls r0, 1 adds r2, r0, r5 adds r1, r6 -@0800EFD0: +_0800EFD0: ldrh r0, [r1] lsrs r0, 8 strb r0, [r2, 0x1] @@ -11320,10 +11320,10 @@ sub_800EFB0: ; 800EFB0 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] @@ -11344,23 +11344,23 @@ sub_800F014: ; 800F014 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 .pool @@ -11374,7 +11374,7 @@ sub_800F048: ; 800F048 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 @@ -11387,19 +11387,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 @@ -11410,7 +11410,7 @@ sub_800F048: ; 800F048 adds r0, r5, r1 adds r1, r4, 0 bl sub_800DA68 -@0800F09E: +_0800F09E: pop {r4,r5} pop {r0} bx r0 @@ -11424,31 +11424,31 @@ sub_800F0B8: ; 800F0B8 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0 - bne @0800F0CC -@0800F0C4: + bne _0800F0CC +_0800F0C4: movs r0, 0 - b @0800F0EC + b _0800F0EC .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 @@ -11461,14 +11461,14 @@ sub_800F0F8: ; 800F0F8 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 .pool -@0800F118: +_0800F118: ldr r0, =0x00000cdb adds r1, r6, r0 ldrb r0, [r1] @@ -11482,27 +11482,27 @@ sub_800F0F8: ; 800F0F8 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 @@ -11510,19 +11510,19 @@ sub_800F0F8: ; 800F0F8 bl sub_8011A64 adds r0, r4, 0 bl sub_8011170 - b @0800F1D2 + b _0800F1D2 .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 .pool -@0800F1A8: +_0800F1A8: bl sub_800EFB0 ldr r0, =0x03005000 ldr r1, =0x00000cda @@ -11531,15 +11531,15 @@ sub_800F0F8: ; 800F0F8 bl rfu_UNI_readySendData movs r0, 0x1 bl rfu_REQ_sendData_wrapper - b @0800F1CC + b _0800F1CC .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} @@ -11559,32 +11559,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 @@ -11595,9 +11595,9 @@ sub_800F1E0: ; 800F1E0 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] @@ -11609,7 +11609,7 @@ sub_800F1E0: ; 800F1E0 strh r0, [r1, 0x6] ldrb r7, [r2] movs r5, 0 -@0800F252: +_0800F252: movs r0, 0x1 ands r0, r7 lsrs r1, r7, 1 @@ -11617,9 +11617,9 @@ sub_800F1E0: ; 800F1E0 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 @@ -11633,13 +11633,13 @@ sub_800F1E0: ; 800F1E0 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 @@ -11650,7 +11650,7 @@ sub_800F1E0: ; 800F1E0 movs r1, 0x7 ands r0, r1 cmp r2, r0 - beq @0800F2E0 + beq _0800F2E0 ldr r0, =0x00000cea adds r1, r6, r0 adds r1, r5, r1 @@ -11660,13 +11660,13 @@ sub_800F1E0: ; 800F1E0 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 .pool -@0800F2E0: +_0800F2E0: ldr r2, =0x03005000 ldr r6, =0x00000cee adds r1, r2, r6 @@ -11707,7 +11707,7 @@ sub_800F1E0: ; 800F1E0 mov r8, r0 adds r2, r5, 0x1 mov r12, r2 -@0800F330: +_0800F330: lsls r1, r6, 1 mov r0, r8 adds r4, r1, r0 @@ -11729,12 +11729,12 @@ sub_800F1E0: ; 800F1E0 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 @@ -11742,9 +11742,9 @@ sub_800F1E0: ; 800F1E0 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 @@ -11754,12 +11754,12 @@ sub_800F1E0: ; 800F1E0 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] @@ -11771,7 +11771,7 @@ sub_800F1E0: ; 800F1E0 movs r5, 0 adds r7, r4, 0 adds r7, 0x14 -@0800F3B2: +_0800F3B2: ldr r0, =0x00000ce5 adds r6, r4, r0 ldrb r0, [r6] @@ -11779,7 +11779,7 @@ sub_800F1E0: ; 800F1E0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @0800F3D6 + beq _0800F3D6 lsls r1, r5, 24 lsrs r1, 24 lsls r2, r5, 3 @@ -11789,12 +11789,12 @@ sub_800F1E0: ; 800F1E0 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] @@ -11821,9 +11821,9 @@ sub_800F1E0: ; 800F1E0 ldr r0, =sub_8010AAC movs r1, 0 bl AddTask - b @0800F452 + b _0800F452 .pool -@0800F444: +_0800F444: ldr r2, =0x00000cdc adds r1, r4, r2 ldrb r0, [r1] @@ -11831,12 +11831,12 @@ sub_800F1E0: ; 800F1E0 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] @@ -11845,17 +11845,17 @@ sub_800F1E0: ; 800F1E0 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0 - beq @0800F484 + beq _0800F484 movs r0, 0x1 ands r0, r1 - b @0800F486 + b _0800F486 .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 @@ -11873,7 +11873,7 @@ sub_800F498: ; 800F498 adds r2, r1, 0 ldrh r1, [r4] cmp r1, 0 - beq @0800F4DC + beq _0800F4DC ldr r0, =0x03005000 movs r5, 0x81 lsls r5, 1 @@ -11889,7 +11889,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] @@ -11898,19 +11898,19 @@ sub_800F498: ; 800F498 adds r3, 0x2 subs r4, 0x1 cmp r4, 0 - bge @0800F4C2 - b @0800F4EA + bge _0800F4C2 + b _0800F4EA .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 @@ -11928,7 +11928,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 @@ -11936,7 +11936,7 @@ sub_800F4F0: ; 800F4F0 lsls r6, r1, 4 subs r0, r1 lsls r5, r0, 1 -@0800F514: +_0800F514: lsls r1, r4, 1 adds r3, r1, r6 add r3, r12 @@ -11954,24 +11954,24 @@ sub_800F4F0: ; 800F4F0 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] @@ -11983,16 +11983,16 @@ sub_800F4F0: ; 800F4F0 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 @@ -12004,7 +12004,7 @@ sub_800F4F0: ; 800F4F0 adds r6, r0, r7 ldrb r0, [r6] cmp r0, 0x1 - bne @0800F5B8 + bne _0800F5B8 movs r4, 0x90 lsls r4, 8 movs r0, 0x2 @@ -12012,19 +12012,19 @@ sub_800F4F0: ; 800F4F0 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] @@ -12041,7 +12041,7 @@ sub_800F4F0: ; 800F4F0 bl sub_800D888 movs r1, 0 movs r2, 0 -@0800F5F4: +_0800F5F4: lsls r0, r1, 1 adds r0, r5 strh r2, [r0] @@ -12049,8 +12049,8 @@ sub_800F4F0: ; 800F4F0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x6 - bls @0800F5F4 -@0800F604: + bls _0800F5F4 +_0800F604: bl sub_800F0B8 add sp, 0x58 pop {r3} @@ -12076,17 +12076,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 @@ -12103,7 +12103,7 @@ sub_800F638: ; 800F638 adds r2, r0, r1 mov r3, r8 adds r3, 0x2 -@0800F686: +_0800F686: ldrb r1, [r2, 0x1] lsls r1, 8 ldrb r0, [r2] @@ -12113,11 +12113,11 @@ sub_800F638: ; 800F638 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] @@ -12127,7 +12127,7 @@ sub_800F638: ; 800F638 adds r1, 0x2 adds r4, 0x1 cmp r4, 0x6 - ble @0800F6A0 + ble _0800F6A0 ldr r0, =0x030059e8 mov r1, r12 bl sub_800D888 @@ -12137,14 +12137,14 @@ sub_800F638: ; 800F638 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 @@ -12163,20 +12163,20 @@ sub_800F6FC: ; 800F6FC 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 .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 @@ -12209,15 +12209,15 @@ sub_800F74C: ; 800F74C ldrb r1, [r0, 0xC] adds r5, r0, 0 cmp r1, 0x1 - bne @0800F764 + bne _0800F764 movs r0, 0 - b @0800F786 + b _0800F786 .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] @@ -12226,13 +12226,13 @@ sub_800F74C: ; 800F74C 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 @@ -12245,15 +12245,15 @@ rfu_func_080F97B8: ; 800F794 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 @@ -12265,7 +12265,7 @@ rfu_func_080F97B8: ; 800F794 movs r0, 0xBE lsls r0, 8 bl sub_800FD14 -@0800F7C6: +_0800F7C6: pop {r0} bx r0 .pool @@ -12286,9 +12286,9 @@ sub_800F7E4: ; 800F7E4 ldr r1, [r0] ldr r0, =rfu_func_080F97B8 cmp r1, r0 - bne @0800F7F4 + bne _0800F7F4 movs r2, 0x1 -@0800F7F4: +_0800F7F4: adds r0, r2, 0 pop {r1} bx r1 @@ -12322,11 +12322,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 @@ -12342,10 +12342,10 @@ sub_800F850: ; 800F850 ldr r1, =0x03005000 ldr r0, [r1] cmp r0, 0 - bne @0800F85E + bne _0800F85E ldr r0, =sub_800F820 str r0, [r1] -@0800F85E: +_0800F85E: pop {r0} bx r0 .pool @@ -12360,7 +12360,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 @@ -12374,95 +12374,95 @@ sub_800F86C: ; 800F86C 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 .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] @@ -12473,9 +12473,9 @@ sub_800F86C: ; 800F86C bl sub_800F74C ldr r4, =0x03005cce strb r0, [r4] - b @0800FC08 + b _0800FC08 .pool -@0800F960: +_0800F960: ldr r0, =0x03005000 mov r9, r0 mov r1, r8 @@ -12491,9 +12491,9 @@ sub_800F86C: ; 800F86C 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 @@ -12521,9 +12521,9 @@ sub_800F86C: ; 800F86C adds r0, 0x5C add r0, r8 strb r2, [r0] - b @0800FC08 + b _0800FC08 .pool -@0800F9C8: +_0800F9C8: ldr r4, =0x03005000 mov r9, r4 mov r0, r8 @@ -12539,9 +12539,9 @@ sub_800F86C: ; 800F86C 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 @@ -12560,7 +12560,7 @@ sub_800F86C: ; 800F86C mov r1, r8 lsls r7, r1, 8 adds r3, r5, 0 -@0800FA0E: +_0800FA0E: mov r2, r12 ldrh r0, [r2] lsls r1, r0, 1 @@ -12580,7 +12580,7 @@ sub_800F86C: ; 800F86C lsls r2, 16 lsrs r4, r2, 16 cmp r4, 0x5 - bls @0800FA0E + bls _0800FA0E ldr r4, =0x03005000 mov r0, r10 add r0, r8 @@ -12598,9 +12598,9 @@ sub_800F86C: ; 800F86C 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 @@ -12614,25 +12614,25 @@ sub_800F86C: ; 800F86C 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 .pool -@0800FAAC: +_0800FAAC: ldr r2, =gUnknown_082ED6B8 ldr r3, =0x03003092 adds r0, r5, r3 @@ -12644,16 +12644,16 @@ sub_800F86C: ; 800F86C adds r1, r2 ldrh r1, [r1] bl sub_800FE84 - b @0800FC04 + b _0800FC04 .pool -@0800FAD0: +_0800FAD0: ldr r1, =0x030050e4 add r1, r8 movs r0, 0x1 strb r0, [r1] - b @0800FC04 + b _0800FC04 .pool -@0800FAE0: +_0800FAE0: ldr r2, =0x03005000 movs r4, 0x80 lsls r4, 1 @@ -12665,27 +12665,27 @@ sub_800F86C: ; 800F86C 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 .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] @@ -12694,7 +12694,7 @@ sub_800F86C: ; 800F86C ldrb r0, [r0, 0x2] ands r1, r0 cmp r1, 0 - beq @0800FB48 + beq _0800FB48 strb r2, [r3] bl sub_800D630 ldr r1, =0x03003094 @@ -12703,7 +12703,7 @@ sub_800F86C: ; 800F86C ldr r2, =0x00000ce4 adds r0, r7, r2 strb r1, [r0] -@0800FB48: +_0800FB48: ldr r0, =0x03003090 adds r0, 0x6 adds r0, r5, r0 @@ -12711,9 +12711,9 @@ sub_800F86C: ; 800F86C strb r0, [r7, 0xD] ldrh r0, [r4] bl sub_80109E8 - b @0800FC08 + b _0800FC08 .pool -@0800FB78: +_0800FB78: movs r0, 0xEE lsls r0, 8 bl sub_800FD14 @@ -12731,15 +12731,15 @@ sub_800F86C: ; 800F86C adds r0, r5, r0 ldrh r0, [r0] strh r0, [r1, 0x6] - b @0800FC04 + b _0800FC04 .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 @@ -12756,9 +12756,9 @@ sub_800F86C: ; 800F86C strb r1, [r0] ldrh r0, [r3] bl sub_80109E8 - b @0800FC08 + b _0800FC08 .pool -@0800FBF4: +_0800FBF4: ldr r0, =0x03003020 mov r3, r8 lsls r1, r3, 1 @@ -12767,14 +12767,14 @@ sub_800F86C: ; 800F86C 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 @@ -12782,28 +12782,28 @@ sub_800F86C: ; 800F86C 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 .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 @@ -12820,20 +12820,20 @@ sub_800FC60: ; 800FC60 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 .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 @@ -12845,31 +12845,31 @@ sub_800FC88: ; 800FC88 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 .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 @@ -12899,23 +12899,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} @@ -12934,52 +12934,52 @@ 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 .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 @@ -12989,19 +12989,19 @@ sub_800FD14: ; 800FD14 ldrb r0, [r0] adds r0, 0x80 strh r0, [r5, 0x4] - b @0800FE46 + b _0800FE46 .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 .pool -@0800FDB0: +_0800FDB0: ldr r3, =0x03005000 ldr r1, =0x00000ce2 adds r0, r3, r1 @@ -13021,7 +13021,7 @@ sub_800FD14: ; 800FD14 movs r4, 0 ldr r0, =0x00000cde adds r3, r0 -@0800FDD6: +_0800FDD6: adds r1, r2, r4 adds r0, r4, r3 ldrb r0, [r0] @@ -13030,28 +13030,28 @@ sub_800FD14: ; 800FD14 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @0800FDD6 - b @0800FE46 + bls _0800FDD6 + b _0800FE46 .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 .pool -@0800FE14: +_0800FE14: strh r1, [r5] ldr r0, =0x030022c0 ldrh r0, [r0, 0x2C] - b @0800FE44 + b _0800FE44 .pool -@0800FE20: +_0800FE20: movs r4, 0 ldr r3, =0x030050f2 -@0800FE24: +_0800FE24: adds r2, r4, 0x1 lsls r1, r2, 1 adds r1, r5 @@ -13062,15 +13062,15 @@ sub_800FD14: ; 800FD14 lsls r2, 24 lsrs r4, r2, 24 cmp r4, 0x5 - bls @0800FE24 - b @0800FE46 + bls _0800FE24 + b _0800FE46 .pool -@0800FE40: +_0800FE40: ldr r0, =0x03005da8 ldrh r0, [r0] -@0800FE44: +_0800FE44: strh r0, [r5, 0x2] -@0800FE46: +_0800FE46: pop {r4,r5} pop {r0} bx r0 @@ -13084,10 +13084,10 @@ sub_800FE50: ; 800FE50 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 @@ -13095,7 +13095,7 @@ sub_800FE50: ; 800FE50 movs r0, 0xBC lsls r0, 6 bl sub_800FD14 -@0800FE76: +_0800FE76: pop {r4} pop {r0} bx r0 @@ -13114,28 +13114,28 @@ 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 .pool -@0800FEC8: +_0800FEC8: adds r0, r6, 0 movs r1, 0xC bl __umodsi3 @@ -13163,20 +13163,20 @@ sub_800FE84: ; 800FE84 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 @@ -13187,7 +13187,7 @@ sub_800FE84: ; 800FE84 movs r1, 0 strb r1, [r0] movs r0, 0x1 -@0800FF32: +_0800FF32: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -13203,7 +13203,7 @@ rfufunc_80F9F44: ; 800FF4C ldr r0, =0x03003110 ldrh r0, [r0] cmp r0, 0 - bne @0800FFA0 + bne _0800FFA0 movs r5, 0x88 lsls r5, 8 adds r0, r5, 0 @@ -13211,7 +13211,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] @@ -13220,10 +13220,10 @@ rfufunc_80F9F44: ; 800FF4C lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bls @0800FFA0 - b @0800FF9C + bls _0800FFA0 + b _0800FF9C .pool -@0800FF84: +_0800FF84: bl link_get_multiplayer_id ldr r1, =0x03003090 lsls r0, 24 @@ -13234,11 +13234,11 @@ rfufunc_80F9F44: ; 800FF4C lsls r0, 8 ands r0, r1 cmp r0, r5 - bne @0800FFA0 -@0800FF9C: + bne _0800FFA0 +_0800FF9C: ldr r0, =sub_800FFB0 str r0, [r4] -@0800FFA0: +_0800FFA0: pop {r4,r5} pop {r0} bx r0 @@ -13263,7 +13263,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 @@ -13279,7 +13279,7 @@ sub_800FFB0: ; 800FFB0 adds r3, 0x2 adds r4, 0x1 cmp r4, 0x6 - ble @0800FFD0 + ble _0800FFD0 mov r0, r12 adds r0, 0x6C ldrh r1, [r0] @@ -13290,7 +13290,7 @@ sub_800FFB0: ; 800FFB0 lsls r1, 16 lsrs r1, 16 cmp r0, r1 - bhi @08010014 + bhi _08010014 mov r0, r12 adds r0, 0x7C movs r1, 0 @@ -13298,7 +13298,7 @@ sub_800FFB0: ; 800FFB0 ldr r0, =rfufunc_80FA020 mov r1, r12 str r0, [r1] -@08010014: +_08010014: pop {r4-r6} pop {r0} bx r0 @@ -13319,7 +13319,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 @@ -13336,7 +13336,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 @@ -13355,7 +13355,7 @@ rfufunc_80FA020: ; 8010028 adds r3, 0x2 adds r4, 0x1 cmp r4, 0x6 - ble @08010064 + ble _08010064 mov r1, r12 adds r0, r5, r1 ldrb r1, [r0] @@ -13365,7 +13365,7 @@ rfufunc_80FA020: ; 8010028 ldrh r0, [r0] subs r0, 0x1 cmp r1, r0 - bne @080100F4 + bne _080100F4 lsls r0, r6, 2 adds r0, r6 lsls r0, 2 @@ -13381,7 +13381,7 @@ rfufunc_80FA020: ; 8010028 ldr r1, [r1] ldr r0, [r0] cmp r1, r0 - beq @080100E8 + beq _080100E8 adds r0, r6, 0 bl sub_800F638 ldr r1, =0x02022b44 @@ -13389,17 +13389,17 @@ rfufunc_80FA020: ; 8010028 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @080100F4 + b _080100F4 .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 @@ -13465,18 +13465,18 @@ sub_8010168: ; 8010168 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 .pool -@08010188: +_08010188: ldr r0, =sub_8010148 str r0, [r4] -@0801018C: +_0801018C: pop {r4} pop {r0} bx r0 @@ -13515,18 +13515,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 @@ -13535,19 +13535,19 @@ sub_80101CC: ; 80101CC 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 .pool -@0801021C: +_0801021C: ldr r0, =sub_8010168 str r0, [r3] -@08010220: +_08010220: pop {r4,r5} pop {r0} bx r0 @@ -13560,19 +13560,19 @@ sub_801022C: ; 801022C 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 str r0, [r4] -@0801024E: +_0801024E: pop {r4} pop {r0} bx r0 @@ -13587,7 +13587,7 @@ sub_8010264: ; 8010264 ldr r2, =0x03005000 ldr r0, [r2] cmp r0, 0 - bne @08010284 + bne _08010284 ldr r1, =0x00000cd9 adds r0, r2, r1 movs r1, 0x1 @@ -13596,7 +13596,7 @@ sub_8010264: ; 8010264 str r0, [r2] adds r0, r3, 0 bl remove_task -@08010284: +_08010284: pop {r0} bx r0 .pool @@ -13610,11 +13610,11 @@ task_add_05_task_del_08FA224_when_no_RfuFunc: ; 8010294 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 @@ -13627,62 +13627,62 @@ sub_80102B8: ; 80102B8 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 @@ -13691,7 +13691,7 @@ sub_80102B8: ; 80102B8 movs r2, 0 strh r1, [r0] str r2, [r4] -@0801033E: +_0801033E: adds r1, r4, 0 adds r1, 0xFE ldrh r0, [r1] @@ -13711,17 +13711,17 @@ sub_8010358: ; 8010358 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 str r0, [r4] -@0801037A: +_0801037A: pop {r4} pop {r0} bx r0 @@ -13734,67 +13734,67 @@ sub_8010390: ; 8010390 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 - b @0801041C + b _0801041C .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 -@0801041C: +_0801041C: str r0, [r4] -@0801041E: +_0801041E: pop {r4} pop {r0} bx r0 @@ -13807,13 +13807,13 @@ sub_8010434: ; 8010434 ldr r1, =0x03005000 ldr r2, [r1] cmp r2, 0 - bne @08010448 + bne _08010448 ldr r0, =sub_8010390 str r0, [r1] adds r0, r1, 0 adds r0, 0xFE strh r2, [r0] -@08010448: +_08010448: pop {r0} bx r0 .pool @@ -13826,25 +13826,25 @@ sub_8010454: ; 8010454 ldr r1, =gUnknown_082ED6E0 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 .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 @@ -13854,20 +13854,20 @@ sub_8010454: ; 8010454 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 @@ -13893,15 +13893,15 @@ rfu_get_multiplayer_id: ; 80104D0 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 .pool -@080104EC: +_080104EC: movs r0, 0 -@080104EE: +_080104EE: pop {r1} bx r1 thumb_func_end rfu_get_multiplayer_id @@ -13922,19 +13922,19 @@ sub_8010500: ; 8010500 adds r0, 0xF1 ldrb r0, [r0] cmp r0, 0x2 - bne @08010518 + bne _08010518 movs r0, 0 - b @08010524 + b _08010524 .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 @@ -13945,9 +13945,9 @@ sub_8010528: ; 8010528 ldr r0, =0x03005000 ldr r0, [r0] cmp r0, 0 - beq @08010536 + beq _08010536 bl _call_via_r0 -@08010536: +_08010536: pop {r0} bx r0 .pool @@ -13964,7 +13964,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 @@ -13973,23 +13973,23 @@ sub_8010540: ; 8010540 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 @@ -14007,9 +14007,9 @@ sub_8010540: ; 8010540 movs r3, 0x1 bl rfu_NI_setSendData movs r7, 0x1 - b @080105DA + b _080105DA .pool -@080105C0: +_080105C0: mov r2, r8 ldrb r0, [r2] lsls r0, 2 @@ -14017,15 +14017,15 @@ sub_8010540: ; 8010540 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 @@ -14042,46 +14042,46 @@ sub_80105EC: ; 80105EC 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 .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 @@ -14099,20 +14099,20 @@ 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 .pool -@08010680: +_08010680: movs r0, 0x1 -@08010682: +_08010682: pop {r1} bx r1 thumb_func_end sub_801064C @@ -14192,23 +14192,23 @@ 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 .pool -@08010748: +_08010748: movs r0, 0x1 -@0801074A: +_0801074A: pop {r1} bx r1 thumb_func_end sub_8010714 @@ -14221,7 +14221,7 @@ sub_8010750: ; 8010750 ldr r0, =0x03005000 ldr r1, =0x00000cd5 adds r5, r0, r1 -@0801075E: +_0801075E: ldr r1, =0x03007880 lsls r0, r4, 2 adds r0, r1 @@ -14231,22 +14231,22 @@ sub_8010750: ; 8010750 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 @@ -14262,7 +14262,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 @@ -14272,19 +14272,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 @@ -14295,15 +14295,15 @@ sub_80107A0: ; 80107A0 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 @@ -14313,21 +14313,21 @@ sub_80107A0: ; 80107A0 movs r1, 0 bl sub_8011A64 ldrb r4, [r4] - b @08010844 + b _08010844 .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} @@ -14347,14 +14347,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 @@ -14364,84 +14364,84 @@ sub_801084C: ; 801084C 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 .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 .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 .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 .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 @@ -14449,24 +14449,24 @@ sub_801084C: ; 801084C 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 @@ -14475,8 +14475,8 @@ sub_801084C: ; 801084C 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 @@ -14484,9 +14484,9 @@ sub_801084C: ; 801084C ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080109D2 + b _080109D2 .pool -@08010984: +_08010984: adds r0, r6, 0 bl remove_task ldr r1, =0x03003124 @@ -14504,29 +14504,29 @@ sub_801084C: ; 801084C 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 @@ -14542,18 +14542,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 @@ -14572,18 +14572,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 @@ -14599,7 +14599,7 @@ sub_8010A14: ; 8010A14 adds r5, 0x1C subs r4, 0x1 cmp r4, 0 - bge @08010A3C + bge _08010A3C pop {r4-r7} pop {r0} bx r0 @@ -14616,7 +14616,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 @@ -14626,7 +14626,7 @@ sub_8010A70: ; 8010A70 bl CpuSet movs r0, 0 bl sub_800A5EC -@08010A9C: +_08010A9C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -14658,14 +14658,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 @@ -14676,50 +14676,50 @@ sub_8010AAC: ; 8010AAC 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 .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 .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 .pool -@08010B78: +_08010B78: bl sub_800A550 lsls r0, 24 lsrs r0, 24 @@ -14727,9 +14727,9 @@ sub_8010AAC: ; 8010AAC 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 @@ -14749,9 +14749,9 @@ sub_8010AAC: ; 8010AAC ldr r2, [r2] str r2, [r1] bl sub_800B524 - b @08010C4A + b _08010C4A .pool -@08010BC0: +_08010BC0: ldr r5, =0x020228c4 adds r1, r5, 0 ldr r0, =gUnknown_082ED7EC @@ -14769,14 +14769,14 @@ sub_8010AAC: ; 8010AAC 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 @@ -14789,7 +14789,7 @@ sub_8010AAC: ; 8010AAC ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@08010C0A: +_08010C0A: ldr r5, =0x020228c4 ldr r1, =0x03005000 ldrb r0, [r1, 0xD] @@ -14801,14 +14801,14 @@ sub_8010AAC: ; 8010AAC 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 @@ -14820,19 +14820,19 @@ sub_8010AAC: ; 8010AAC 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 .pool -@08010C74: +_08010C74: adds r0, r3, 0 lsls r0, r2 ldr r2, =0x00000ce5 @@ -14844,18 +14844,18 @@ sub_8010AAC: ; 8010AAC ldr r4, =0x00000ce8 adds r0, r5, r4 strb r3, [r0] - b @08010CEA + b _08010CEA .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] @@ -14872,25 +14872,25 @@ sub_8010AAC: ; 8010AAC 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} @@ -14911,10 +14911,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 @@ -14923,45 +14923,45 @@ sub_8010D0C: ; 8010D0C 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 .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 .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 @@ -14970,7 +14970,7 @@ sub_8010D0C: ; 8010D0C strb r4, [r0] adds r0, r5, 0 bl remove_task -@08010DA6: +_08010DA6: pop {r4-r6} pop {r0} bx r0 @@ -14986,25 +14986,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 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 adds r0, r4, 0 bl SetMainCallback2 @@ -15031,9 +15031,9 @@ sub_8010DB4: ; 8010DB4 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 @@ -15044,26 +15044,26 @@ sub_8010DB4: ; 8010DB4 movs r1, 0x2 strb r1, [r0] bl sub_80097E8 - b @08010E8E + b _08010E8E .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 @@ -15071,7 +15071,7 @@ sub_8010DB4: ; 8010DB4 bl sub_8011A64 adds r0, r4, 0 bl sub_8011170 -@08010E8E: +_08010E8E: pop {r4-r7} pop {r0} bx r0 @@ -15084,12 +15084,12 @@ rfu_REQ_recvData_then_sendData: ; 8010EA0 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 .pool @@ -15111,30 +15111,30 @@ 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 .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} @@ -15150,15 +15150,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} @@ -15299,20 +15299,20 @@ sub_801103C: ; 801103C push {r4,r5,lr} ldr r5, =0x02022b14 movs r4, 0x1 - b @08011054 + b _08011054 .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 @@ -15344,9 +15344,9 @@ sub_8011090: ; 8011090 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 @@ -15370,7 +15370,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 @@ -15392,12 +15392,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] @@ -15424,17 +15424,17 @@ sub_80110B8: ; 80110B8 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 @@ -15454,7 +15454,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] @@ -15464,7 +15464,7 @@ sub_8011170: ; 8011170 ldrb r0, [r3] movs r0, 0x1 strb r0, [r3] -@08011192: +_08011192: pop {r4} pop {r0} bx r0 @@ -15487,20 +15487,20 @@ 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 .pool -@080111C8: +_080111C8: ldr r0, =0x03005000 adds r0, 0xEE ldrb r1, [r0] movs r1, 0x4 strb r1, [r0] -@080111D2: +_080111D2: pop {r0} bx r0 .pool @@ -15541,75 +15541,75 @@ 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 .pool -@0801128C: +_0801128C: ldr r0, =0x03004140 ldrh r0, [r0, 0x14] bl sub_80115EC @@ -15622,14 +15622,14 @@ sub_801120C: ; 801120C 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 @@ -15643,7 +15643,7 @@ sub_801120C: ; 801120C adds r0, r7, 0 ands r0, r1 cmp r4, r0 - bne @08011304 + bne _08011304 ldr r0, =0x00000cd1 add r0, r9 adds r0, r5, r0 @@ -15656,27 +15656,27 @@ sub_801120C: ; 801120C adds r1, r5, 0 movs r3, 0x1 bl rfu_setRecvBuffer - b @0801130E + b _0801130E .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 @@ -15684,27 +15684,27 @@ sub_801120C: ; 801120C 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 .pool -@08011354: +_08011354: ldr r0, =0x03005000 adds r0, 0xF0 - b @080113EA + b _080113EA .pool -@08011360: +_08011360: ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x3 - b @080113EC + b _080113EC .pool -@0801136C: +_0801136C: ldr r1, =0x03005000 adds r2, r1, 0 adds r2, 0xF0 @@ -15722,21 +15722,21 @@ sub_801120C: ; 801120C 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 .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 @@ -15744,9 +15744,9 @@ sub_801120C: ; 801120C bl sub_8011170 ldr r0, =0x03005000 adds r0, 0xEF - b @080113EA + b _080113EA .pool -@080113D4: +_080113D4: adds r0, r4, 0 bl sub_8011170 movs r0, 0x1 @@ -15756,11 +15756,11 @@ sub_801120C: ; 801120C 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 @@ -15777,95 +15777,95 @@ sub_8011404: ; 8011404 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 .pool -@0801147C: +_0801147C: ldr r0, =0x03005000 ldr r1, =0x03004140 ldrh r1, [r1, 0x14] ldr r2, =0x00000ccd adds r0, r2 - b @080115DC + b _080115DC .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 .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 @@ -15889,14 +15889,14 @@ sub_8011404: ; 8011404 adds r2, r4, 0 movs r3, 0x46 bl rfu_setRecvBuffer - b @080115DE + b _080115DE .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 @@ -15906,26 +15906,26 @@ sub_8011404: ; 8011404 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, =gUnknown_082ED7FC movs r1, 0x5 movs r2, 0x5 @@ -15933,12 +15933,12 @@ sub_8011404: ; 8011404 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0x1 - bne @080115DE + bne _080115DE adds r0, r4, 0 bl sub_8011170 - b @080115DE + b _080115DE .pool -@08011570: +_08011570: ldr r0, =0x03005000 adds r0, 0xF0 movs r1, 0x1 @@ -15947,9 +15947,9 @@ sub_8011404: ; 8011404 movs r1, 0x5 movs r2, 0x5 bl nullsub_5 - b @080115DE + b _080115DE .pool -@0801158C: +_0801158C: ldr r1, =0x03005000 adds r2, r1, 0 adds r2, 0xF0 @@ -15960,9 +15960,9 @@ sub_8011404: ; 8011404 ldrb r0, [r1] movs r0, 0x1 strb r0, [r1] - b @080115DE + b _080115DE .pool -@080115AC: +_080115AC: movs r0, 0x1 movs r1, 0xF3 bl sub_8011A64 @@ -15970,9 +15970,9 @@ sub_8011404: ; 8011404 bl sub_8011170 ldr r0, =0x03005000 adds r0, 0xEF - b @080115DA + b _080115DA .pool -@080115C4: +_080115C4: movs r0, 0x1 adds r1, r4, 0 bl sub_8011A64 @@ -15982,11 +15982,11 @@ sub_8011404: ; 8011404 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 @@ -16004,21 +16004,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 @@ -16034,12 +16034,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] @@ -16048,18 +16048,18 @@ sub_8011628: ; 8011628 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} @@ -16073,131 +16073,131 @@ sub_8011674: ; 8011674 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 .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 @@ -16210,12 +16210,12 @@ sub_8011674: ; 8011674 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] @@ -16224,9 +16224,9 @@ sub_8011674: ; 8011674 strb r1, [r6] mov r0, r12 strb r0, [r3] - b @080117A6 + b _080117A6 .pool -@08011798: +_08011798: ldr r0, =0x03005000 ldr r1, =0x00000ce6 adds r0, r1 @@ -16234,11 +16234,11 @@ sub_8011674: ; 8011674 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 @@ -16251,36 +16251,36 @@ sub_8011674: ; 8011674 adds r2, r0 movs r0, 0x2 strb r0, [r2] - b @080117F6 + b _080117F6 .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 .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 @@ -16292,35 +16292,35 @@ sub_8011674: ; 8011674 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 .pool -@08011850: +_08011850: ldr r0, =0x03005000 ldr r1, =0x03004140 ldrh r1, [r1, 0x14] ldr r2, =0x00000ccd adds r0, r2 - b @08011A40 + b _08011A40 .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 .pool -@08011884: +_08011884: ldr r1, =0x03005000 movs r0, 0x12 strh r0, [r1, 0x4] @@ -16328,20 +16328,20 @@ sub_8011674: ; 8011674 adds r1, r0 ldrb r0, [r1] cmp r0, 0x1 - bhi @080118B0 + bhi _080118B0 adds r0, 0x1 strb r0, [r1] ldr r0, =sub_801209C movs r1, 0x2 bl AddTask - b @08011A42 + b _08011A42 .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] @@ -16357,28 +16357,28 @@ sub_8011674: ; 8011674 adds r2, r4, 0 movs r3, 0x46 bl rfu_setRecvBuffer - b @08011A42 + b _08011A42 .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 .pool -@08011914: +_08011914: ldr r2, =0x03005000 adds r1, r2, 0 adds r1, 0xF0 @@ -16388,37 +16388,37 @@ sub_8011674: ; 8011674 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 .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 @@ -16427,60 +16427,60 @@ sub_8011674: ; 8011674 bics r0, r1 strb r0, [r2] cmp r0, 0 - bne @08011990 + bne _08011990 adds r0, r4, 0 bl sub_8011170 - b @080119B4 + b _080119B4 .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 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 .pool -@080119FC: +_080119FC: ldr r0, =0x03005000 ldr r2, =0x00000ce3 adds r0, r2 - b @08011A3E + b _08011A3E .pool -@08011A0C: +_08011A0C: movs r0, 0x1 movs r1, 0xF3 bl sub_8011A64 @@ -16489,9 +16489,9 @@ sub_8011674: ; 8011674 ldr r0, =0x03005000 adds r0, 0xEF movs r1, 0x1 - b @08011A40 + b _08011A40 .pool -@08011A28: +_08011A28: adds r0, r4, 0 bl sub_8011170 movs r0, 0x1 @@ -16501,11 +16501,11 @@ sub_8011674: ; 8011674 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 @@ -16551,12 +16551,12 @@ sub_8011A80: ; 8011A80 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 @@ -16625,7 +16625,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 @@ -16636,7 +16636,7 @@ sub_8011AFC: ; 8011AFC ldrh r0, [r0, 0x24] bl SeedRng movs r4, 0 -@08011B38: +_08011B38: bl GenerateRandomNumber ldr r1, =0x03005d90 ldr r1, [r1] @@ -16645,7 +16645,7 @@ sub_8011AFC: ; 8011AFC strb r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble @08011B38 + ble _08011B38 movs r1, 0xAA lsls r1, 5 movs r0, 0 @@ -16657,7 +16657,7 @@ sub_8011AFC: ; 8011AFC bl sub_8011BA4 ldr r0, =sub_8011BF8 bl SetMainCallback2 -@08011B70: +_08011B70: pop {r4} pop {r0} bx r0 @@ -16684,14 +16684,14 @@ sub_8011BA4: ; 8011BA4 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 @@ -16706,12 +16706,12 @@ sub_8011BD0: ; 8011BD0 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 .pool @@ -16833,7 +16833,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 @@ -16850,7 +16850,7 @@ sub_8011CE4: ; 8011CE4 ldrh r0, [r0, 0x18] bl sub_8010454 cmp r0, 0 - beq @08011D4C + beq _08011D4C mov r0, r8 ldr r1, [r0] adds r1, r5 @@ -16858,23 +16858,23 @@ sub_8011CE4: ; 8011CE4 ldr r0, [sp] bl CompareString 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} @@ -16930,11 +16930,11 @@ 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 @@ -16944,37 +16944,37 @@ 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 @@ -16989,13 +16989,13 @@ sub_8011E2C: ; 8011E2C 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 @@ -17020,7 +17020,7 @@ sub_8011E2C: ; 8011E2C strh r0, [r6, 0x6] adds r0, r4, 0 bl remove_task -@08011E7A: +_08011E7A: pop {r4-r6} pop {r0} bx r0 @@ -17038,7 +17038,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 @@ -17050,9 +17050,9 @@ sub_8011E94: ; 8011E94 lsls r0, 3 adds r0, r1 strh r4, [r0, 0x8] - b @08011EDC + b _08011EDC .pool -@08011ECC: +_08011ECC: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -17061,7 +17061,7 @@ sub_8011E94: ; 8011E94 ldrh r0, [r1, 0x8] orrs r4, r0 strh r4, [r1, 0x8] -@08011EDC: +_08011EDC: ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 @@ -17087,7 +17087,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 @@ -17099,46 +17099,46 @@ 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 .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] @@ -17146,24 +17146,24 @@ sub_8011EF4: ; 8011EF4 ldr r1, =0x00000c3d adds r0, r1 strb r2, [r0] - b @08011FAA + b _08011FAA .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 @@ -17211,23 +17211,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 @@ -17236,20 +17236,20 @@ sub_801200C: ; 801200C 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 .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] @@ -17257,7 +17257,7 @@ sub_801200C: ; 801200C ands r1, r2 ands r0, r3 cmp r1, r0 - bne @0801202E + bne _0801202E ldrb r2, [r4, 0x9] movs r0, 0xFC ldrb r3, [r5, 0x9] @@ -17265,10 +17265,10 @@ sub_801200C: ; 801200C 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 @@ -17287,10 +17287,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 @@ -17303,23 +17303,23 @@ sub_801209C: ; 801209C 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 @@ -17333,7 +17333,7 @@ sub_801209C: ; 801209C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @0801217C + beq _0801217C movs r1, 0xA ldrsh r0, [r4, r1] ldr r7, =0x03007890 @@ -17345,32 +17345,32 @@ sub_801209C: ; 801209C 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 sub_800C12C 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 .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} @@ -17421,26 +17421,26 @@ 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 .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 @@ -17453,13 +17453,13 @@ sub_8012224: ; 8012224 adds r0, 0xF0 ldrb r0, [r0] cmp r0, 0x1 - beq @08012238 + beq _08012238 movs r0, 0 - b @0801223A + b _0801223A .pool -@08012238: +_08012238: movs r0, 0x1 -@0801223A: +_0801223A: pop {r1} bx r1 thumb_func_end sub_8012224 @@ -17472,25 +17472,25 @@ sub_8012240: ; 8012240 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 .pool -@0801226C: +_0801226C: adds r1, 0x1 cmp r1, 0x3 - ble @0801224C + ble _0801224C movs r0, 0x1 -@08012274: +_08012274: pop {r4} pop {r1} bx r1 @@ -17500,7 +17500,7 @@ sub_8012240: ; 8012240 sub_801227C: ; 801227C push {r4,lr} movs r4, 0 -@08012280: +_08012280: lsls r2, r4, 24 lsrs r2, 24 ldr r0, =gUnknown_082ED82C @@ -17508,7 +17508,7 @@ sub_801227C: ; 801227C bl nullsub_5 adds r4, 0x1 cmp r4, 0x13 - ble @08012280 + ble _08012280 pop {r4} pop {r0} bx r0 @@ -17543,18 +17543,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] @@ -17576,15 +17576,15 @@ sub_801229C: ; 801229C 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 @@ -17596,7 +17596,7 @@ sub_801229C: ; 801229C adds r1, 0x14 adds r4, r0, r1 lsls r6, r2, 24 -@08012342: +_08012342: ldrb r0, [r4] lsls r1, r5, 25 lsrs r1, 24 @@ -17606,28 +17606,28 @@ sub_801229C: ; 801229C 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, =gUnknown_082ED868 movs r1, 0x1 movs r2, 0xF bl nullsub_5 - b @080124AA + b _080124AA .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 @@ -17647,7 +17647,7 @@ sub_801229C: ; 801229C adds r5, r1 adds r6, 0x1 cmp r6, 0x3 - ble @0801238C + ble _0801238C ldr r5, =0x03007890 ldr r1, [r5] ldr r4, =0x03005000 @@ -17679,25 +17679,25 @@ sub_801229C: ; 801229C movs r1, 0x16 movs r2, 0x3 bl nullsub_5 - b @080124AA + b _080124AA .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 @@ -17719,22 +17719,22 @@ sub_801229C: ; 801229C 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 @@ -17754,8 +17754,8 @@ sub_801229C: ; 801229C adds r5, r0 adds r6, 0x1 cmp r6, 0x3 - ble @0801247C -@080124AA: + ble _0801247C +_080124AA: pop {r3} mov r8, r3 pop {r4-r7} @@ -17807,54 +17807,54 @@ 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, =gUnknown_082EDB60 subs r0, r5, 0x1 lsls r0, 2 - b @0801256C + b _0801256C .pool -@08012544: +_08012544: ldr r1, =gUnknown_082EDB60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x14 - b @0801256C + b _0801256C .pool -@08012554: +_08012554: ldr r1, =gUnknown_082EDB60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x28 - b @0801256C + b _0801256C .pool -@08012564: +_08012564: ldr r1, =gUnknown_082EDB60 subs r0, r5, 0x1 lsls r0, 2 adds r1, 0x3C -@0801256C: +_0801256C: adds r0, r1 ldr r2, [r0] movs r0, 0x1 @@ -17865,9 +17865,9 @@ sub_80124EC: ; 80124EC movs r1, 0x1 movs r3, 0 bl sub_80173E0 - b @080125A6 + b _080125A6 .pool -@08012588: +_08012588: ldr r1, =gUnknown_082EDB60 subs r0, r5, 0x1 lsls r0, 2 @@ -17882,7 +17882,7 @@ sub_80124EC: ; 80124EC movs r1, 0x1 movs r3, 0 bl sub_80173E0 -@080125A6: +_080125A6: adds r0, r6, 0 movs r1, 0x2 bl CopyWindowToVram @@ -17952,48 +17952,48 @@ sub_801262C: ; 801262C 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 .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, =gUnknown_082ED960 bl ExpandStringRefs -@080126C0: +_080126C0: pop {r0} bx r0 .pool @@ -18004,40 +18004,40 @@ 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 .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 @@ -18081,54 +18081,54 @@ 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 .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 @@ -18137,10 +18137,10 @@ sub_8012780: ; 8012780 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, =gUnknown_082F00C4 ldrh r0, [r3] @@ -18167,9 +18167,9 @@ sub_8012780: ; 8012780 bl sub_8011C10 movs r0, 0x3 strb r0, [r6, 0xC] - b @08012F50 + b _08012F50 .pool -@080128A0: +_080128A0: movs r0, 0x70 bl AllocZeroed str r0, [r6, 0x4] @@ -18220,23 +18220,23 @@ sub_8012780: ; 8012780 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 .pool -@08012928: +_08012928: ldr r0, =gUnknown_082F011C - b @08012932 + b _08012932 .pool -@08012930: +_08012930: ldr r0, =gUnknown_082F0124 -@08012932: +_08012932: bl AddWindow strb r0, [r6, 0xF] -@08012938: +_08012938: ldr r0, =gUnknown_082F012C bl AddWindow strb r0, [r6, 0x11] @@ -18287,9 +18287,9 @@ sub_8012780: ; 8012780 mov r5, r8 strb r5, [r6, 0x13] strb r4, [r6, 0xC] - b @08012F50 + b _08012F50 .pool -@080129C8: +_080129C8: ldr r0, =0x02021cc4 ldr r2, =gUnknown_082F0048 ldr r4, =0x02022c2c @@ -18302,31 +18302,31 @@ sub_8012780: ; 8012780 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, =gUnknown_082ED990 bl ExpandStringRefs - b @08012A34 + b _08012A34 .pool -@08012A18: +_08012A18: ldr r0, =0x02021fc4 ldr r1, =gUnknown_082ED960 bl ExpandStringRefs - b @08012A34 + b _08012A34 .pool -@08012A2C: +_08012A2C: ldr r0, =0x02021fc4 ldrb r1, [r4] bl sub_801262C -@08012A34: +_08012A34: ldrb r0, [r6, 0x11] ldr r1, =0x02022c2d ldrb r1, [r1] @@ -18334,23 +18334,23 @@ sub_8012780: ; 8012780 bl sub_80124EC movs r0, 0x5 strb r0, [r6, 0xC] - b @08012F50 + b _08012F50 .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 .pool -@08012A6C: +_08012A6C: adds r0, r6, 0 movs r1, 0x7 movs r2, 0xA @@ -18360,88 +18360,88 @@ sub_8012780: ; 8012780 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 .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 .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 .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, =gUnknown_082EDDC4 @@ -18451,17 +18451,17 @@ sub_8012780: ; 8012780 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 .pool -@08012B54: +_08012B54: ldr r0, =0x02022c2d ldrb r0, [r0] movs r1, 0xF @@ -18480,28 +18480,28 @@ sub_8012780: ; 8012780 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 .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 .pool -@08012BA8: +_08012BA8: adds r4, r6, 0 adds r4, 0xD ldrb r1, [r6, 0x13] @@ -18526,20 +18526,20 @@ sub_8012780: ; 8012780 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 @@ -18561,8 +18561,8 @@ sub_8012780: ; 8012780 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] @@ -18580,16 +18580,16 @@ sub_8012780: ; 8012780 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] @@ -18605,10 +18605,10 @@ sub_8012780: ; 8012780 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 @@ -18628,18 +18628,18 @@ sub_8012780: ; 8012780 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 .pool -@08012CC4: +_08012CC4: ldr r0, =0x02021cc4 ldrb r2, [r6, 0x13] lsls r2, 5 @@ -18652,16 +18652,16 @@ sub_8012780: ; 8012780 bl ExpandStringRefs 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 .pool -@08012D04: +_08012D04: ldrb r1, [r6, 0x13] lsls r1, 5 ldr r0, [r6] @@ -18688,62 +18688,62 @@ sub_8012780: ; 8012780 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 .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, =gUnknown_082EDC5C 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 .pool -@08012DA8: +_08012DA8: adds r0, r6, 0 adds r0, 0xD movs r1, 0 @@ -18751,52 +18751,52 @@ sub_8012780: ; 8012780 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 .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, =gUnknown_082EDC78 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 .pool -@08012E10: +_08012E10: adds r0, r6, 0 adds r0, 0xD movs r1, 0 @@ -18804,67 +18804,67 @@ sub_8012780: ; 8012780 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 .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] @@ -18872,31 +18872,31 @@ sub_8012780: ; 8012780 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, =gUnknown_082EDD58 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 .pool -@08012ED0: +_08012ED0: bl sub_800E084 bl sub_800EDD4 adds r0, r6, 0 @@ -18904,44 +18904,44 @@ sub_8012780: ; 8012780 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 .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 .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 @@ -18949,7 +18949,7 @@ sub_8012780: ; 8012780 bl sub_8012F64 adds r0, r4, 0 bl remove_task -@08012F50: +_08012F50: add sp, 0x8 pop {r3} mov r8, r3 @@ -19006,59 +19006,59 @@ sub_8012FC4: ; 8012FC4 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 .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, =gUnknown_082EDBE8 - b @0801305A + b _0801305A .pool -@08013058: +_08013058: ldr r1, =gUnknown_082EDC0C -@0801305A: +_0801305A: adds r0, r2, 0 bl ExpandStringRefs - b @08013070 + b _08013070 .pool -@08013068: +_08013068: ldr r1, =gUnknown_082EDC34 adds r0, r2, 0 bl ExpandStringRefs -@08013070: +_08013070: pop {r0} bx r0 .pool @@ -19071,27 +19071,27 @@ sub_8013078: ; 8013078 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, =gUnknown_082EE560 bl ExpandStringRefs - b @080130AA + b _080130AA .pool -@080130A4: +_080130A4: ldr r1, =gUnknown_082EE57C bl ExpandStringRefs -@080130AA: +_080130AA: pop {r0} bx r0 .pool @@ -19105,54 +19105,54 @@ sub_80130B4: ; 80130B4 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 .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, =gUnknown_082EFC3C adds r0, r2, 0 bl ExpandStringRefs - b @08013158 + b _08013158 .pool -@08013150: +_08013150: ldr r1, =gUnknown_082EFC54 adds r0, r2, 0 bl ExpandStringRefs -@08013158: +_08013158: pop {r0} bx r0 .pool @@ -19166,54 +19166,54 @@ sub_8013160: ; 8013160 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 .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, =gUnknown_082EDDF4 adds r0, r2, 0 bl ExpandStringRefs - b @08013204 + b _08013204 .pool -@080131FC: +_080131FC: ldr r1, =gUnknown_082EDE0C adds r0, r2, 0 bl ExpandStringRefs -@08013204: +_08013204: pop {r0} bx r0 .pool @@ -19230,11 +19230,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] @@ -19250,9 +19250,9 @@ sub_801320C: ; 801320C ldrb r1, [r1] bl sub_8012FC4 strb r6, [r4, 0xC] - b @08013270 + b _08013270 .pool -@0801325C: +_0801325C: movs r0, 0 movs r1, 0 bl sub_8011A64 @@ -19260,10 +19260,10 @@ sub_801320C: ; 801320C 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 @@ -19288,20 +19288,20 @@ 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 .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 @@ -19331,7 +19331,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 @@ -19340,7 +19340,7 @@ sub_80132D4: ; 80132D4 lsrs r0, 30 mov r9, r0 cmp r0, 0x1 - bne @08013348 + bne _08013348 ldr r1, [r5, 0x4] adds r0, r2, 0 str r3, [sp] @@ -19348,7 +19348,7 @@ sub_80132D4: ; 80132D4 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 @@ -19364,9 +19364,9 @@ sub_80132D4: ; 80132D4 adds r0, r6 mov r1, r9 strh r1, [r0, 0x18] - b @08013348 + b _08013348 .pool -@08013330: +_08013330: ldr r2, [r5] adds r2, r6 ldrb r1, [r2, 0x1A] @@ -19379,15 +19379,15 @@ sub_80132D4: ; 80132D4 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 @@ -19397,24 +19397,24 @@ sub_80132D4: ; 80132D4 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} @@ -19435,7 +19435,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] @@ -19451,18 +19451,18 @@ sub_8013398: ; 8013398 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} @@ -19474,15 +19474,15 @@ sub_8013398: ; 8013398 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, =gUnknown_082F045C mov r9, r0 movs r1, 0 @@ -19490,7 +19490,7 @@ sub_8013398: ; 8013398 movs r2, 0x4 negs r2, r2 mov r8, r2 -@08013410: +_08013410: ldr r1, [r4] lsls r3, r5, 5 adds r1, r3 @@ -19524,39 +19524,39 @@ sub_8013398: ; 8013398 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 .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 @@ -19604,47 +19604,47 @@ 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 .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 @@ -19653,10 +19653,10 @@ sub_80134E8: ; 80134E8 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, =gUnknown_082F0530 ldrh r0, [r3] @@ -19679,9 +19679,9 @@ sub_80134E8: ; 80134E8 str r0, [r6] movs r0, 0x1 strb r0, [r6, 0x8] - b @08013B82 + b _08013B82 .pool -@080135E0: +_080135E0: adds r0, r6, 0 adds r0, 0x9 ldr r2, =gUnknown_082EFB70 @@ -19693,14 +19693,14 @@ sub_80134E8: ; 80134E8 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 .pool -@0801360C: +_0801360C: ldr r0, [r6, 0x4] movs r1, 0x4 bl sub_80175EC @@ -19770,22 +19770,22 @@ sub_80134E8: ; 80134E8 strb r4, [r6, 0xF] movs r0, 0x3 strb r0, [r6, 0x8] - b @08013B82 + b _08013B82 .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 @@ -19794,11 +19794,11 @@ sub_80134E8: ; 80134E8 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 @@ -19807,23 +19807,23 @@ sub_80134E8: ; 80134E8 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 .pool -@08013744: +_08013744: ldr r0, =0x02021fc4 ldr r2, =gUnknown_082EDD50 subs r1, 0x1 @@ -19832,30 +19832,30 @@ sub_80134E8: ; 80134E8 ldr r1, [r1] bl CopyString movs r0, 0x12 -@08013756: +_08013756: strb r0, [r6, 0x8] movs r0, 0x6E bl audio_play - b @08013B82 + b _08013B82 .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 .pool -@08013788: +_08013788: ldr r4, =0x02021fc4 ldr r0, =0x02022c2c ldrb r1, [r0] @@ -19867,22 +19867,22 @@ sub_80134E8: ; 80134E8 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 .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] @@ -19898,82 +19898,82 @@ sub_80134E8: ; 80134E8 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 .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 .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] @@ -19985,21 +19985,21 @@ sub_80134E8: ; 80134E8 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 .pool -@08013904: +_08013904: movs r0, 0x7 movs r1, 0 bl sub_8011A64 @@ -20013,106 +20013,106 @@ sub_80134E8: ; 80134E8 ldr r1, =gUnknown_082EDE48 adds r0, r5, 0 bl ExpandStringRefs - b @080139EC + b _080139EC .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 .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 .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 .pool -@08013A10: +_08013A10: adds r0, r6, 0 adds r0, 0x9 ldr r1, =gUnknown_082EDE64 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 .pool -@08013A2C: +_08013A2C: adds r4, r6, 0 adds r4, 0x9 bl sub_8011A74 @@ -20126,45 +20126,45 @@ sub_80134E8: ; 80134E8 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 ClearWindowTilemap ldrb r0, [r6, 0xD] @@ -20196,8 +20196,8 @@ sub_80134E8: ; 80134E8 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 @@ -20211,18 +20211,18 @@ sub_80134E8: ; 80134E8 bl sub_8017064 lsls r0, 24 cmp r0, 0 - beq @08013B82 + beq _08013B82 ldr r0, =0x020375f0 movs r1, 0x6 - b @08013B58 + b _08013B58 .pool -@08013B14: +_08013B14: bl sub_800E084 ldr r0, =0x020375f0 movs r1, 0x5 - b @08013B58 + b _08013B58 .pool -@08013B24: +_08013B24: bl sub_800E084 adds r5, r6, 0 adds r5, 0x9 @@ -20233,36 +20233,36 @@ sub_80134E8: ; 80134E8 adds r0, r4 ldr r1, [r0] adds r0, r5, 0 - b @08013B4A + b _08013B4A .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 .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} @@ -20278,12 +20278,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] @@ -20291,22 +20291,22 @@ sub_8013B8C: ; 8013B8C adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne @08013BC4 + bne _08013BC4 movs r0, 0x1 - b @08013BD4 + b _08013BD4 .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 @@ -20389,28 +20389,28 @@ 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 .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 @@ -20429,8 +20429,8 @@ sub_8013C7C: ; 8013C7C 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 @@ -20445,16 +20445,16 @@ sub_8013C7C: ; 8013C7C 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 @@ -20463,12 +20463,12 @@ sub_8013C7C: ; 8013C7C 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 .pool -@08013D58: +_08013D58: ldrb r0, [r4, 0x11] bl remove_task ldr r0, [r4] @@ -20479,12 +20479,12 @@ sub_8013C7C: ; 8013C7C 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 @@ -20495,31 +20495,31 @@ 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, =gUnknown_082F04D8 lsls r1, 2 adds r1, r0 ldr r1, [r1] - b @08013DB0 + b _08013DB0 .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 @@ -20534,28 +20534,28 @@ 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 @@ -20610,7 +20610,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 @@ -20618,7 +20618,7 @@ sub_8013E44: ; 8013E44 lsls r0, 30 mov r8, r5 cmp r0, 0 - beq @08013F20 + beq _08013F20 ldr r1, [r6, 0x4] adds r0, r2, 0 str r3, [sp] @@ -20626,14 +20626,14 @@ sub_8013E44: ; 8013E44 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 @@ -20643,7 +20643,7 @@ sub_8013E44: ; 8013E44 bl sub_8017678 ldr r3, [sp] cmp r0, 0 - beq @08013EB0 + beq _08013EB0 ldr r1, [r6] ldr r0, [r6, 0x4] adds r1, r5 @@ -20652,24 +20652,24 @@ sub_8013E44: ; 8013E44 stm r1!, {r2,r4,r7} ldm r0!, {r2,r4,r7} stm r1!, {r2,r4,r7} - b @08013EDA + b _08013EDA .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 @@ -20677,26 +20677,26 @@ sub_8013E44: ; 8013E44 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] @@ -20705,7 +20705,7 @@ sub_8013E44: ; 8013E44 ldrh r1, [r2, 0x18] ldr r0, =0x0000012b cmp r1, r0 - bls @08013F20 + bls _08013F20 ldrb r0, [r2, 0x1A] movs r7, 0x4 negs r7, r7 @@ -20715,15 +20715,15 @@ sub_8013E44: ; 8013E44 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 @@ -20732,13 +20732,13 @@ sub_8013E44: ; 8013E44 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} @@ -20800,20 +20800,20 @@ 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 .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] @@ -20825,14 +20825,14 @@ sub_8013F90: ; 8013F90 movs r0, 0 movs r2, 0x64 bl link_0800A448 - b @080140BC + b _080140BC .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 @@ -20847,9 +20847,9 @@ sub_8013F90: ; 8013F90 movs r0, 0x32 bl sav12_xor_increment bl sub_800A5B4 - b @0801405A + b _0801405A .pool -@08014038: +_08014038: ldr r4, =0x020228c4 ldr r0, =0x03005d8c ldr r1, [r0] @@ -20864,19 +20864,19 @@ sub_8013F90: ; 8013F90 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 .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 @@ -20903,7 +20903,7 @@ sub_8013F90: ; 8013F90 bl sub_801807C adds r0, r6, 0 bl remove_task -@080140BC: +_080140BC: pop {r3} mov r8, r3 pop {r4-r7} @@ -20925,36 +20925,36 @@ 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 .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 .pool -@08014138: +_08014138: lsls r1, r4, 8 ldr r0, =0x020223c4 adds r3, r1, r0 @@ -20967,17 +20967,17 @@ sub_80140E0: ; 80140E0 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 @@ -20989,15 +20989,15 @@ sub_80140E0: ; 80140E0 adds r0, 0x60 ldrh r0, [r0] bl sub_801B94C - b @08014194 + b _08014194 .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 @@ -21012,26 +21012,26 @@ 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 .pool -@080141C0: +_080141C0: ldr r0, =sub_80140E0 movs r1, 0x5 bl AddTask ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @080141F2 + b _080141F2 .pool -@080141D4: +_080141D4: ldr r0, =sub_80140E0 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 @@ -21039,7 +21039,7 @@ sub_80141A4: ; 80141A4 lsrs r0, 24 ldr r1, =c2_exit_to_overworld_2_switch bl sub_80C4E74 -@080141F2: +_080141F2: bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks @@ -21220,29 +21220,29 @@ 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 .pool -@080143A0: +_080143A0: ldr r0, =sub_80140E0 movs r1, 0x5 bl AddTask ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @080143C6 + b _080143C6 .pool -@080143B4: +_080143B4: ldr r0, =sub_80140E0 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne @080143C6 + bne _080143C6 ldr r0, =sub_8086074 bl SetMainCallback2 -@080143C6: +_080143C6: bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks @@ -21260,17 +21260,17 @@ sub_80143E4: ; 80143E4 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 @@ -21287,139 +21287,139 @@ 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 .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 .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 str r0, [r1, 0x8] movs r0, 0x3 bl sub_81B8518 - b @08014764 + b _08014764 .pool -@080145F4: +_080145F4: bl overworld_free_bg_tilemaps ldr r0, =0x020228c4 movs r1, 0x1 @@ -21433,9 +21433,9 @@ sub_801440C: ; 801440C movs r1, 0x18 movs r2, 0x6 movs r3, 0x8 - b @080146B0 + b _080146B0 .pool -@08014620: +_08014620: bl overworld_free_bg_tilemaps bl sp000_heal_pokemon bl copy_player_party_to_sav1 @@ -21449,9 +21449,9 @@ sub_801440C: ; 801440C movs r1, 0x18 movs r2, 0x6 movs r3, 0x8 - b @080146B0 + b _080146B0 .pool -@0801464C: +_0801464C: bl overworld_free_bg_tilemaps bl sp000_heal_pokemon bl copy_player_party_to_sav1 @@ -21465,9 +21465,9 @@ sub_801440C: ; 801440C movs r1, 0x1B movs r2, 0x5 movs r3, 0x8 - b @080146B0 + b _080146B0 .pool -@08014678: +_08014678: ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 @@ -21478,9 +21478,9 @@ sub_801440C: ; 801440C movs r1, 0x19 movs r2, 0x5 movs r3, 0x8 - b @080146B0 + b _080146B0 .pool -@08014698: +_08014698: ldr r0, =0x020228c4 movs r1, 0x1 bl sub_80143E4 @@ -21491,44 +21491,44 @@ sub_801440C: ; 801440C movs r1, 0x1A movs r2, 0x8 movs r3, 0x9 -@080146B0: +_080146B0: bl sub_8014304 ldr r0, =sub_8014384 bl SetMainCallback2 - b @08014764 + b _08014764 .pool -@080146C4: +_080146C4: bl overworld_free_bg_tilemaps ldr r0, =sub_8013F90 movs r1, 0 bl AddTask - b @08014764 + b _08014764 .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 bl SetMainCallback2 - b @08014764 + b _08014764 .pool -@08014714: +_08014714: movs r0, 0x8 movs r1, 0x5 movs r2, 0x1 @@ -21538,18 +21538,18 @@ sub_801440C: ; 801440C lsrs r0, 24 ldr r1, =c2_load_new_map bl sub_802A9A8 - b @08014764 + b _08014764 .pool -@08014734: +_08014734: movs r0, 0x7 movs r1, 0x9 movs r2, 0x1 bl sub_8014290 ldr r0, =c2_load_new_map bl sub_8020C70 - b @08014764 + b _08014764 .pool -@0801474C: +_0801474C: movs r0, 0x8 movs r1, 0x5 movs r2, 0x1 @@ -21559,7 +21559,7 @@ sub_801440C: ; 801440C lsrs r0, 24 ldr r1, =c2_load_new_map bl sub_802493C -@08014764: +_08014764: adds r0, r4, 0 bl remove_task ldr r1, =0x020375f0 @@ -21568,9 +21568,9 @@ sub_801440C: ; 801440C 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} @@ -21597,27 +21597,27 @@ 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 .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] @@ -21625,31 +21625,31 @@ sub_8014790: ; 8014790 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 .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] @@ -21684,76 +21684,76 @@ sub_8014790: ; 8014790 strh r0, [r7] bl sub_800E3A8 bl sub_800A5B4 - b @080149B2 + b _080149B2 .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 bl SetMainCallback2 - b @080149B2 + b _080149B2 .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 @@ -21761,38 +21761,38 @@ sub_8014790: ; 8014790 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 .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 @@ -21871,36 +21871,36 @@ 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 .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] @@ -21920,9 +21920,9 @@ sub_8014A40: ; 8014A40 bl sub_8011C10 movs r0, 0x1 strb r0, [r5, 0xC] - b @08014EF2 + b _08014EF2 .pool -@08014AEC: +_08014AEC: movs r0, 0x70 bl AllocZeroed str r0, [r5, 0x4] @@ -22004,9 +22004,9 @@ sub_8014A40: ; 8014A40 bl CopyBgTilemapBufferToVram movs r0, 0x1 strb r0, [r5, 0x13] - b @08014C42 + b _08014C42 .pool -@08014BBC: +_08014BBC: ldr r0, =0x02021cc4 ldr r2, =gUnknown_082F0048 ldr r4, =0x02022c2c @@ -22020,16 +22020,16 @@ sub_8014A40: ; 8014A40 bl sub_801262C movs r0, 0x3 strb r0, [r5, 0xC] - b @08014EF2 + b _08014EF2 .pool -@08014BEC: +_08014BEC: ldr r0, =0x02021fc4 bl sub_8018884 movs r0, 0x4 strb r0, [r5, 0xC] - b @08014EF2 + b _08014EF2 .pool -@08014BFC: +_08014BFC: adds r0, r5, 0 movs r1, 0x5 movs r2, 0x6 @@ -22039,38 +22039,38 @@ sub_8014A40: ; 8014A40 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 .pool -@08014C24: +_08014C24: adds r0, r5, 0 adds r0, 0xD ldr r1, =gUnknown_082EDF40 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 .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 @@ -22081,20 +22081,20 @@ sub_8014A40: ; 8014A40 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 .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 @@ -22123,8 +22123,8 @@ sub_8014A40: ; 8014A40 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] @@ -22142,12 +22142,12 @@ sub_8014A40: ; 8014A40 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] @@ -22164,10 +22164,10 @@ sub_8014A40: ; 8014A40 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 @@ -22192,9 +22192,9 @@ sub_8014A40: ; 8014A40 movs r0, 0x9 strb r0, [r5, 0xC] bl sub_800EF38 - b @08014DA4 + b _08014DA4 .pool -@08014D64: +_08014D64: ldrb r1, [r5, 0x13] lsls r1, 5 ldr r0, [r5] @@ -22223,68 +22223,68 @@ sub_8014A40: ; 8014A40 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 .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] @@ -22303,46 +22303,46 @@ sub_8014A40: ; 8014A40 bl Free ldr r0, [r5, 0x4] bl Free - b @08014EDA -@08014E4E: + b _08014EDA +_08014E4E: adds r0, r5, 0 adds r0, 0xD ldr r1, =gUnknown_082ED8D0 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 .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 .pool -@08014EA8: +_08014EA8: ldrb r0, [r5, 0x12] movs r1, 0 movs r2, 0 @@ -22360,19 +22360,19 @@ sub_8014A40: ; 8014A40 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} @@ -22420,31 +22420,31 @@ 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 .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 @@ -22464,15 +22464,15 @@ sub_8014F48: ; 8014F48 str r0, [r7] movs r0, 0x1 strb r0, [r7, 0x8] - b @080152A0 -@08014FD8: + b _080152A0 +_08014FD8: ldr r0, =gUnknown_082EF7F8 bl sub_8018884 movs r0, 0x2 strb r0, [r7, 0x8] - b @080152A0 + b _080152A0 .pool -@08014FE8: +_08014FE8: ldr r0, [r7, 0x4] movs r1, 0x4 bl sub_80175EC @@ -22549,23 +22549,23 @@ sub_8014F48: ; 8014F48 strb r6, [r7, 0xF] movs r0, 0x3 strb r0, [r7, 0x8] - b @080152A0 + b _080152A0 .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 @@ -22574,11 +22574,11 @@ sub_8014F48: ; 8014F48 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 @@ -22587,10 +22587,10 @@ sub_8014F48: ; 8014F48 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 @@ -22621,26 +22621,26 @@ sub_8014F48: ; 8014F48 bl audio_play movs r0, 0x4 strb r0, [r7, 0x8] - b @080152A0 + b _080152A0 .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 .pool -@08015180: +_08015180: ldr r0, =gUnknown_082EFC3C bl sub_8018884 ldr r0, =0x02021cc4 @@ -22651,13 +22651,13 @@ sub_8014F48: ; 8014F48 bl sub_8018404 movs r0, 0x5 strb r0, [r7, 0x8] - b @080152A0 + b _080152A0 .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] @@ -22669,36 +22669,36 @@ sub_8014F48: ; 8014F48 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 .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, =gUnknown_082EDDF4 bl sub_8018884 movs r0, 0 movs r1, 0 bl sub_8011A64 - b @080152A0 + b _080152A0 .pool -@08015204: +_08015204: ldrb r0, [r7, 0xE] movs r1, 0 movs r2, 0 @@ -22718,8 +22718,8 @@ sub_8014F48: ; 8014F48 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, =gUnknown_082EDF80 @@ -22731,37 +22731,37 @@ sub_8014F48: ; 8014F48 adds r0, r5, 0 bl mevent_0814257C cmp r0, 0 - beq @080152A0 + beq _080152A0 bl sub_800E084 - b @0801526A + b _0801526A .pool -@08015260: +_08015260: bl sub_800E084 ldr r0, =gUnknown_082ED8D0 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 .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} @@ -22809,33 +22809,33 @@ 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 .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 @@ -22852,15 +22852,15 @@ task00_081182DC: ; 80152F4 str r0, [r5] movs r0, 0x1 strb r0, [r5, 0x8] - b @08015604 -@08015386: + b _08015604 +_08015386: ldr r0, =gUnknown_082EFBC8 bl sub_8018884 movs r0, 0x2 strb r0, [r5, 0x8] - b @08015604 + b _08015604 .pool -@08015398: +_08015398: ldr r0, [r5, 0x4] movs r1, 0x4 bl sub_80175EC @@ -22874,7 +22874,7 @@ task00_081182DC: ; 80152F4 strb r0, [r5, 0x11] ldrb r0, [r5, 0x13] cmp r0, 0 - beq @08015404 + beq _08015404 ldr r0, =gUnknown_082F0174 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -22907,61 +22907,61 @@ task00_081182DC: ; 80152F4 strb r0, [r5, 0xE] movs r0, 0 bl CopyBgTilemapBufferToVram -@08015404: +_08015404: movs r0, 0 strb r0, [r5, 0xF] movs r0, 0x3 strb r0, [r5, 0x8] - b @08015604 + b _08015604 .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 @@ -22982,31 +22982,31 @@ task00_081182DC: ; 80152F4 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 .pool -@080154E0: +_080154E0: ldr r0, =gUnknown_082EFC90 bl sub_8018884 ldr r0, =0x02021cc4 @@ -23017,13 +23017,13 @@ task00_081182DC: ; 80152F4 bl sub_8018404 movs r0, 0x5 strb r0, [r5, 0x8] - b @08015604 + b _08015604 .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] @@ -23035,39 +23035,39 @@ task00_081182DC: ; 80152F4 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 .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, =gUnknown_082EDEC4 bl sub_8018884 movs r0, 0 movs r1, 0 bl sub_8011A64 - b @08015604 + b _08015604 .pool -@08015564: +_08015564: ldrb r0, [r5, 0x13] cmp r0, 0 - beq @08015580 + beq _08015580 ldrb r0, [r5, 0xE] movs r1, 0 movs r2, 0 @@ -23076,7 +23076,7 @@ task00_081182DC: ; 80152F4 bl CopyBgTilemapBufferToVram ldrb r0, [r5, 0xB] bl RemoveWindow -@08015580: +_08015580: ldrb r0, [r5, 0x11] bl remove_task ldr r0, [r5] @@ -23086,20 +23086,20 @@ task00_081182DC: ; 80152F4 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, =gUnknown_082EDF04 - b @080155C2 + b _080155C2 .pool -@080155A8: +_080155A8: adds r0, r5, 0 adds r0, 0x9 ldr r1, =gUnknown_082ED8F8 - b @080155C2 + b _080155C2 .pool -@080155B4: +_080155B4: adds r0, r5, 0 adds r0, 0x9 ldr r2, =gUnknown_082EFD58 @@ -23107,10 +23107,10 @@ task00_081182DC: ; 80152F4 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 @@ -23118,22 +23118,22 @@ task00_081182DC: ; 80152F4 ldr r1, =0x020375f0 movs r0, 0x5 strh r0, [r1] - b @08015604 + b _08015604 .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} @@ -23190,10 +23190,10 @@ sub_8015664: ; 8015664 strb r0, [r2, 0x15] ldr r0, =0x02021fc4 cmp r3, r0 - beq @0801567E + beq _0801567E adds r1, r3, 0 bl ExpandStringRefs -@0801567E: +_0801567E: pop {r0} bx r0 .pool @@ -23209,10 +23209,10 @@ sub_801568C: ; 801568C strb r0, [r1, 0x14] ldr r0, =0x02021fc4 cmp r2, r0 - beq @080156A4 + beq _080156A4 adds r1, r2, 0 bl ExpandStringRefs -@080156A4: +_080156A4: pop {r0} bx r0 .pool @@ -23261,75 +23261,75 @@ 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 .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 AllocZeroed str r0, [r6, 0x4] @@ -23361,9 +23361,9 @@ sub_80156E0: ; 80156E0 bl sub_8019BA8 bl sub_8019F2C movs r0, 0x1 - bl @08016876 + bl _08016876 .pool -@08015854: +_08015854: adds r0, r6, 0 adds r0, 0x21 movs r2, 0 @@ -23375,12 +23375,12 @@ sub_80156E0: ; 80156E0 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 @@ -23406,41 +23406,41 @@ sub_80156E0: ; 80156E0 movs r0, 0 strh r0, [r1] movs r0, 0x3 - bl @08016876 + bl _08016876 .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 .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 @@ -23449,36 +23449,36 @@ sub_80156E0: ; 80156E0 bl sub_8010FCC ldr r0, =gUnknown_082EF4FC bl sub_801568C - b @0801598E + b _0801598E .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, =gUnknown_082EF47C movs r0, 0x34 bl sub_8015664 - b @0801598E + b _0801598E .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, =gUnknown_082EF544 bl sub_801568C - b @0801598E + b _0801598E .pool -@0801596C: +_0801596C: movs r0, 0x54 movs r1, 0 movs r2, 0x1 @@ -23492,24 +23492,24 @@ sub_80156E0: ; 80156E0 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 .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 @@ -23522,19 +23522,19 @@ sub_80156E0: ; 80156E0 bl CopyString movs r1, 0 movs r0, 0x2A - b @08015A02 + b _08015A02 .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] @@ -23542,24 +23542,24 @@ sub_80156E0: ; 80156E0 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 @@ -23567,17 +23567,17 @@ sub_80156E0: ; 80156E0 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 .pool -@08015A4C: +_08015A4C: bl sub_8017940 cmp r0, 0 - beq @08015A80 + beq _08015A80 movs r0, 0x54 movs r1, 0 movs r2, 0x1 @@ -23590,31 +23590,31 @@ sub_80156E0: ; 80156E0 ldr r1, [r1] bl CopyString movs r0, 0x2D - bl @08016876 + bl _08016876 .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 @@ -23630,26 +23630,26 @@ sub_80156E0: ; 80156E0 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 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 .pool -@08015B00: +_08015B00: bl sub_801704C movs r3, 0x2 ldrsh r0, [r7, r3] @@ -23666,20 +23666,20 @@ sub_80156E0: ; 80156E0 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 @@ -23692,52 +23692,52 @@ sub_80156E0: ; 80156E0 bl sub_8012188 strh r5, [r6, 0x12] movs r0, 0x19 - bl @08016876 + bl _08016876 .pool -@08015B68: +_08015B68: ldr r1, =0x02021fc4 movs r0, 0x13 bl sub_8015664 - bl @08016878 + bl _08016878 .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, =gUnknown_082EE6C8 bl sub_801568C - b @08015BB8 + b _08015BB8 .pool -@08015BB0: +_08015BB0: ldr r1, =gUnknown_082EE6C8 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 @@ -23745,35 +23745,35 @@ sub_80156E0: ; 80156E0 movs r1, 0x5 bl AddTask movs r0, 0x26 - bl @08016876 + bl _08016876 .pool -@08015BF4: +_08015BF4: ldr r0, =sub_80140E0 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, =gUnknown_082EE004 movs r0, 0x1F bl sub_8015664 - bl @08016878 + bl _08016878 .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 @@ -23783,9 +23783,9 @@ sub_80156E0: ; 80156E0 ldr r2, [r6] bl sub_801A3D0 movs r0, 0x2 - bl @08016876 + bl _08016876 .pool -@08015C54: +_08015C54: adds r0, r6, 0 adds r0, 0x16 adds r1, r6, 0 @@ -23800,17 +23800,17 @@ sub_80156E0: ; 80156E0 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 .pool -@08015C94: +_08015C94: adds r1, r6, 0 adds r1, 0x98 movs r0, 0 @@ -23822,10 +23822,10 @@ sub_80156E0: ; 80156E0 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 @@ -23840,9 +23840,9 @@ sub_80156E0: ; 80156E0 ldr r1, [r1] bl CopyString movs r0, 0x20 - bl @08016876 + bl _08016876 .pool -@08015CE4: +_08015CE4: ldr r0, =0x02022c2c strb r5, [r0] ldr r1, =0x02022c2d @@ -23851,16 +23851,16 @@ sub_80156E0: ; 80156E0 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, =gUnknown_082EEBD0 movs r0, 0x5 bl sub_8015664 - bl @08016878 + bl _08016878 .pool -@08015D18: +_08015D18: ldr r0, =0x02022c2c ldrb r0, [r0] movs r1, 0x40 @@ -23870,16 +23870,16 @@ sub_80156E0: ; 80156E0 strh r1, [r0] bl sub_800FE50 movs r0, 0x1B - bl @08016876 + bl _08016876 .pool -@08015D34: +_08015D34: ldr r0, =0x02021fc4 ldr r1, =gUnknown_082EEB88 bl CopyString movs r0, 0x24 - bl @08016876 + bl _08016876 .pool -@08015D4C: +_08015D4C: adds r0, r6, 0 bl sub_8017FD8 movs r3, 0x2 @@ -23905,19 +23905,19 @@ sub_80156E0: ; 80156E0 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 .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 @@ -23933,46 +23933,46 @@ sub_80156E0: ; 80156E0 strh r2, [r1] bl sub_800FE50 movs r0, 0x1D - bl @08016876 + bl _08016876 .pool -@08015DD0: +_08015DD0: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @08015DF4 + bne _08015DF4 ldr r0, =0x02021fc4 ldr r1, =gUnknown_082EEB88 bl CopyString movs r0, 0x1C - bl @08016876 + bl _08016876 .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 .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] @@ -23985,9 +23985,9 @@ sub_80156E0: ; 80156E0 ldrb r2, [r2, 0x13] bl sub_8017D9C strb r5, [r4] - bl @08016878 + bl _08016878 .pool -@08015E5C: +_08015E5C: movs r0, 0x2 ldrsh r1, [r7, r0] lsls r1, 5 @@ -24008,18 +24008,18 @@ sub_80156E0: ; 80156E0 ldr r1, [r0] movs r0, 0x6 bl sub_8015664 - bl @08016878 + bl _08016878 .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] @@ -24029,19 +24029,19 @@ sub_80156E0: ; 80156E0 strh r4, [r0] adds r0, 0x2 strh r4, [r0] - bl @08016878 + bl _08016878 .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 @@ -24067,12 +24067,12 @@ sub_80156E0: ; 80156E0 ldr r1, [r1] bl ExpandStringRefs movs r0, 0x21 - bl @08016876 + bl _08016876 .pool -@08015F2C: +_08015F2C: movs r0, 0x7 - bl @08016876 -@08015F32: + bl _08016876 +_08015F32: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -24080,19 +24080,19 @@ sub_80156E0: ; 80156E0 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 CopyBgTilemapBufferToVram ldr r4, =0x02022c2c @@ -24116,9 +24116,9 @@ sub_80156E0: ; 80156E0 movs r0, 0x14 strb r0, [r6, 0x14] strh r5, [r7, 0x6] - bl @08016878 + bl _08016878 .pool -@08015F98: +_08015F98: movs r3, 0x2 ldrsh r0, [r7, r3] ldr r1, [r6] @@ -24129,40 +24129,40 @@ sub_80156E0: ; 80156E0 adds r0, r1 ldr r0, [r0] bl sub_801568C - bl @08016878 + bl _08016878 .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] @@ -24174,35 +24174,35 @@ sub_80156E0: ; 80156E0 bl sub_8011090 bl sub_8011B90 cmp r0, 0x1 - bne @08016028 + bne _08016028 ldr r0, =gUnknown_082EED3C lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] bl sub_801568C - b @08016040 + b _08016040 .pool -@08016028: +_08016028: ldr r0, =gUnknown_082EED3C lsls r1, r4, 2 adds r1, r0 ldr r1, [r1] movs r0, 0x1E bl sub_8015664 - b @08016040 + b _08016040 .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] @@ -24214,32 +24214,32 @@ sub_80156E0: ; 80156E0 bl sub_8011090 bl sub_8011B90 cmp r0, 0x1 - bne @08016084 + bne _08016084 ldr r0, =gUnknown_082EED3C lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] bl sub_801568C - b @08016092 + b _08016092 .pool -@08016084: +_08016084: ldr r0, =gUnknown_082EED3C 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 .pool -@080160AC: +_080160AC: movs r0, 0x49 bl audio_play bl sub_800EF7C @@ -24249,22 +24249,22 @@ sub_80156E0: ; 80156E0 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 @@ -24272,18 +24272,18 @@ sub_80156E0: ; 80156E0 movs r1, 0x5 bl AddTask movs r0, 0x27 - b @08016876 + b _08016876 .pool -@08016104: +_08016104: adds r0, r6, 0 bl sub_801689C ldr r0, =sub_80140E0 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 @@ -24302,9 +24302,9 @@ sub_80156E0: ; 80156E0 adds r1, r2 ldr r1, [r1] bl ExpandStringRefs - b @08016878 + b _08016878 .pool -@08016158: +_08016158: adds r0, r6, 0 bl sub_801689C adds r0, r6, 0 @@ -24313,44 +24313,44 @@ sub_80156E0: ; 80156E0 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 .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, =gUnknown_082EE598 bl CopyString movs r0, 0x24 - b @08016876 + b _08016876 .pool -@080161B8: +_080161B8: ldr r1, =0x02021fc4 movs r0, 0x9 bl sub_8015664 - b @08016878 + b _08016878 .pool -@080161C8: +_080161C8: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -24358,19 +24358,19 @@ sub_80156E0: ; 80156E0 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 @@ -24379,7 +24379,7 @@ sub_80156E0: ; 80156E0 ldrb r1, [r1] adds r5, r0, 0 cmp r1, 0x45 - bne @08016220 + bne _08016220 movs r4, 0x40 orrs r4, r1 movs r0, 0x1 @@ -24390,9 +24390,9 @@ sub_80156E0: ; 80156E0 adds r0, r4, 0 movs r2, 0 bl sub_8011090 - b @0801623E + b _0801623E .pool -@08016220: +_08016220: movs r0, 0x40 adds r4, r1, 0 orrs r4, r0 @@ -24406,7 +24406,7 @@ sub_80156E0: ; 80156E0 adds r0, r4, 0 movs r2, 0x1 bl sub_8011090 -@0801623E: +_0801623E: ldr r1, [r6, 0x8] movs r0, 0 strb r0, [r1, 0x1B] @@ -24414,10 +24414,10 @@ sub_80156E0: ; 80156E0 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 @@ -24427,16 +24427,16 @@ sub_80156E0: ; 80156E0 ldr r0, =0x02021fc4 ldr r1, =gUnknown_082EEC14 bl CopyString - b @08016878 + b _08016878 .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 @@ -24444,14 +24444,14 @@ sub_80156E0: ; 80156E0 movs r2, 0x1 bl sub_8018220 movs r0, 0x28 - b @08016876 + b _08016876 .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 @@ -24463,19 +24463,19 @@ sub_80156E0: ; 80156E0 ldr r1, =0x02022c2c ldrb r1, [r1] bl sub_8013078 - b @08016878 + b _08016878 .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] @@ -24492,15 +24492,15 @@ sub_80156E0: ; 80156E0 strh r4, [r0] subs r0, 0x2 strh r4, [r0] - b @08016878 + b _08016878 .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] @@ -24511,22 +24511,22 @@ sub_80156E0: ; 80156E0 movs r0, 0xE adds r1, r4, 0 bl sub_8015664 - b @08016878 + b _08016878 .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] @@ -24543,8 +24543,8 @@ sub_80156E0: ; 80156E0 adds r0, 0x21 bl sub_8019F04 movs r0, 0x11 - b @08016876 -@0801638E: + b _08016876 +_0801638E: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -24553,14 +24553,14 @@ sub_80156E0: ; 80156E0 movs r3, 0x10 bl pal_fade_maybe 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 @@ -24568,20 +24568,20 @@ sub_80156E0: ; 80156E0 ldr r0, [r0] bl Free bl sub_80149D8 - b @08016878 + b _08016878 .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 .pool -@080163E4: +_080163E4: bl sub_800F7DC ldrh r1, [r0, 0x8] adds r0, r4, 0 @@ -24589,13 +24589,13 @@ sub_80156E0: ; 80156E0 movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne @08016408 + bne _08016408 ldr r0, =0x02021fc4 ldr r1, =gUnknown_082EF590 bl CopyString - b @0801643E + b _0801643E .pool -@08016408: +_08016408: ldr r4, =0x02021cc4 bl sub_800F7DC ldrh r0, [r0, 0x8] @@ -24618,26 +24618,26 @@ sub_80156E0: ; 80156E0 ldr r0, =0x02021fc4 ldr r1, =gUnknown_082EF564 bl ExpandStringRefs -@0801643E: +_0801643E: ldr r1, =0x02021fc4 movs r0, 0x2C bl sub_8015664 - b @08016878 + b _08016878 .pool -@0801645C: +_0801645C: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gUnknown_082EF20C 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 .pool -@08016478: +_08016478: adds r0, r6, 0 adds r0, 0x16 adds r1, r6, 0 @@ -24652,40 +24652,40 @@ sub_80156E0: ; 80156E0 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 .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, =gUnknown_082EF4C4 movs r0, 0x35 bl sub_8015664 - b @08016878 + b _08016878 .pool -@080164D0: +_080164D0: ldr r1, =gUnknown_082EF298 movs r0, 0x2F bl sub_8015664 - b @08016878 + b _08016878 .pool -@080164E0: +_080164E0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -24694,16 +24694,16 @@ sub_80156E0: ; 80156E0 movs r3, 0x10 bl pal_fade_maybe 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] @@ -24713,9 +24713,9 @@ sub_80156E0: ; 80156E0 ldr r1, =c2_exit_to_overworld_2_switch movs r0, 0x8 bl sub_81B8904 - b @08016878 + b _08016878 .pool -@0801652C: +_0801652C: adds r0, r6, 0 adds r0, 0x16 adds r1, r6, 0 @@ -24730,15 +24730,15 @@ sub_80156E0: ; 80156E0 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 @@ -24747,15 +24747,15 @@ sub_80156E0: ; 80156E0 bl sub_8010FCC ldr r0, =gUnknown_082EF4FC bl sub_801568C - b @08016878 + b _08016878 .pool -@08016580: +_08016580: ldr r0, =0x02022c40 strh r5, [r0, 0x2] movs r0, 0x37 - b @08016876 + b _08016876 .pool -@0801658C: +_0801658C: ldr r2, =0x02022c40 ldrh r0, [r2, 0x2] ldrh r1, [r2, 0xA] @@ -24763,9 +24763,9 @@ sub_80156E0: ; 80156E0 bl sub_8010FCC ldr r0, =gUnknown_082EF520 bl sub_801568C - b @08016878 + b _08016878 .pool -@080165A8: +_080165A8: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -24773,36 +24773,36 @@ sub_80156E0: ; 80156E0 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, =gUnknown_082EF5B8 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 @@ -24812,26 +24812,26 @@ sub_80156E0: ; 80156E0 movs r0, 0x1 bl sub_801818C movs r0, 0x4 - b @08016876 + b _08016876 .pool -@08016610: +_08016610: adds r0, r6, 0 adds r0, 0x16 ldr r1, =gUnknown_082EF1EC 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 .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 @@ -24851,21 +24851,21 @@ sub_80156E0: ; 80156E0 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 .pool -@0801667C: +_0801667C: bl sub_80173B0 ldr r1, [r6] lsls r4, r5, 5 @@ -24877,17 +24877,17 @@ sub_80156E0: ; 80156E0 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 @@ -24896,9 +24896,9 @@ sub_80156E0: ; 80156E0 movs r0, 0x31 bl sub_8015664 strh r5, [r7, 0x2] - b @08016878 + b _08016878 .pool -@080166C8: +_080166C8: ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 @@ -24914,9 +24914,9 @@ sub_80156E0: ; 80156E0 adds r1, r2 bl CopyString ldr r1, =gUnknown_082EF6E4 - b @0801671E + b _0801671E .pool -@080166FC: +_080166FC: ldr r0, =0x02021cc4 ldr r1, [r6] adds r1, r4 @@ -24932,12 +24932,12 @@ sub_80156E0: ; 80156E0 adds r1, r2 bl CopyString ldr r1, =gUnknown_082EF718 -@0801671E: +_0801671E: movs r0, 0x2E bl sub_8015664 - b @08016878 + b _08016878 .pool -@08016738: +_08016738: adds r0, r6, 0 adds r0, 0x16 movs r1, 0 @@ -24945,36 +24945,36 @@ sub_80156E0: ; 80156E0 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, =gUnknown_082EF4C4 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] @@ -25015,9 +25015,9 @@ sub_80156E0: ; 80156E0 bl sub_80156B0 ldrh r0, [r7, 0x2] strb r0, [r4, 0x8] - b @08016878 + b _08016878 .pool -@080167F4: +_080167F4: ldr r1, =0x02022c2c movs r0, 0x44 strb r0, [r1] @@ -25041,16 +25041,16 @@ sub_80156E0: ; 80156E0 ldr r0, [r0, 0x8] bl sub_8017020 movs r0, 0x19 - b @08016876 + b _08016876 .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 @@ -25060,20 +25060,20 @@ sub_80156E0: ; 80156E0 ldr r2, [r6] bl sub_801A3D0 movs r0, 0x4 - b @08016876 + b _08016876 .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} @@ -25086,11 +25086,11 @@ var_800D_set_xB: ; 8016884 push {lr} bl InUnionRoom cmp r0, 0x1 - bne @08016894 + bne _08016894 ldr r1, =0x020375f0 movs r0, 0xB strh r0, [r1] -@08016894: +_08016894: pop {r0} bx r0 .pool @@ -25104,7 +25104,7 @@ sub_801689C: ; 801689C 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 @@ -25112,19 +25112,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 @@ -25139,7 +25139,7 @@ sub_80168DC: ; 80168DC adds r5, 0x9A ldrh r0, [r5] cmp r0, 0 - beq @0801692C + beq _0801692C ldr r0, =0x02021fc4 ldr r1, =0x020229e8 adds r1, 0x2F @@ -25148,28 +25148,28 @@ 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 .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 @@ -25215,27 +25215,27 @@ 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 .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 @@ -25247,8 +25247,8 @@ task00_081199FC: ; 801697C bl sub_80111B0 movs r0, 0x2 strb r0, [r5, 0x14] - b @08016AC8 -@080169E0: + b _08016AC8 +_080169E0: movs r0, 0x70 bl AllocZeroed str r0, [r5, 0x4] @@ -25279,21 +25279,21 @@ task00_081199FC: ; 801697C 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 @@ -25301,7 +25301,7 @@ task00_081199FC: ; 801697C lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne @08016A78 + bne _08016A78 mov r0, sp bl sub_8018404 ldr r0, [r5] @@ -25313,20 +25313,20 @@ task00_081199FC: ; 801697C 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 .pool -@08016A84: +_08016A84: ldr r0, =0x02022c20 mov r1, sp bl CopyString - b @08016AC8 + b _08016AC8 .pool -@08016A94: +_08016A94: ldr r0, [r5, 0x8] bl Free ldr r0, [r5] @@ -25345,7 +25345,7 @@ task00_081199FC: ; 801697C bl sub_800EDD4 adds r0, r4, 0 bl remove_task -@08016AC8: +_08016AC8: add sp, 0x20 pop {r4-r6} pop {r0} @@ -25359,18 +25359,18 @@ sp182_move_string: ; 8016AD4 ldr r4, =0x02022c20 ldrb r0, [r4] cmp r0, 0xFF - bne @08016AE8 + bne _08016AE8 movs r0, 0 - b @08016AF6 + b _08016AF6 .pool -@08016AE8: +_08016AE8: ldr r0, =0x02021cc4 adds r1, r4, 0 bl CopyString movs r0, 0xFF strb r0, [r4] movs r0, 0x1 -@08016AF6: +_08016AF6: pop {r4} pop {r1} bx r1 @@ -25388,7 +25388,7 @@ sub_8016B00: ; 8016B00 movs r7, 0 movs r6, 0 movs r5, 0 -@08016B12: +_08016B12: ldr r0, [r4, 0xC] adds r0, r5 ldr r1, =gUnknown_082F045C @@ -25396,7 +25396,7 @@ sub_8016B00: ; 8016B00 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 @@ -25419,16 +25419,16 @@ sub_8016B00: ; 8016B00 ldr r0, [r4, 0x8] strb r3, [r0, 0x1B] movs r0, 0x4 - b @08016C90 + b _08016C90 .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 @@ -25437,20 +25437,20 @@ sub_8016B00: ; 8016B00 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 @@ -25459,7 +25459,7 @@ sub_8016B00: ; 8016B00 adds r0, r2, 0 bl sub_8017678 cmp r0, 0 - beq @08016BC6 + beq _08016BC6 ldr r1, [r4] ldr r0, [r4, 0x4] adds r1, r5 @@ -25473,22 +25473,22 @@ sub_8016B00: ; 8016B00 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 @@ -25500,22 +25500,22 @@ sub_8016B00: ; 8016B00 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] @@ -25524,7 +25524,7 @@ sub_8016B00: ; 8016B00 ldrh r1, [r2, 0x18] ldr r0, =0x00000257 cmp r1, r0 - bls @08016C5C + bls _08016C5C ldrb r0, [r2, 0x1A] movs r5, 0x4 negs r5, r5 @@ -25534,12 +25534,12 @@ sub_8016B00: ; 8016B00 orrs r0, r1 strb r0, [r2, 0x1A] movs r7, 0x2 - b @08016C5C + b _08016C5C .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] @@ -25548,23 +25548,23 @@ sub_8016B00: ; 8016B00 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 @@ -25573,15 +25573,15 @@ sub_8016B00: ; 8016B00 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 @@ -25611,7 +25611,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 @@ -25633,39 +25633,39 @@ sub_8016CA0: ; 8016CA0 ldrsh r1, [r1, r5] bl sub_8013D88 cmp r0, 0 - bne @08016D00 + bne _08016D00 mov r1, sp ldr r0, =gUnknown_082F045C 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, =gUnknown_082F045C 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 @@ -25673,21 +25673,21 @@ sub_8016CA0: ; 8016CA0 bl sub_8017630 lsls r0, 24 cmp r0, 0 - bne @08016D4C + bne _08016D4C mov r1, sp ldr r0, =gUnknown_082F045C 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 @@ -25713,9 +25713,9 @@ sub_8016CA0: ; 8016CA0 ands r0, r1 orrs r0, r2 strb r0, [r3, 0x18] - b @08016DD4 + b _08016DD4 .pool -@08016D9C: +_08016D9C: ldr r1, [r6] lsls r4, r7, 3 subs r4, r7 @@ -25743,12 +25743,12 @@ sub_8016CA0: ; 8016CA0 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 @@ -25803,7 +25803,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 @@ -25832,7 +25832,7 @@ sub_8016E24: ; 8016E24 mov r8, r4 ldr r3, [sp] cmp r0, 0 - bne @08016E8E + bne _08016E8E ldr r1, [r6] adds r1, r5 ldr r0, =gUnknown_082F045C @@ -25840,16 +25840,16 @@ sub_8016E24: ; 8016E24 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 @@ -25860,7 +25860,7 @@ sub_8016E24: ; 8016E24 lsls r0, 24 ldr r3, [sp] cmp r0, 0 - bne @08016EC6 + bne _08016EC6 ldr r1, [r6] ldr r5, [sp, 0x4] adds r1, r5 @@ -25869,14 +25869,14 @@ sub_8016E24: ; 8016E24 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 @@ -25897,7 +25897,7 @@ sub_8016E24: ; 8016E24 strb r0, [r3, 0x18] mov r3, r9 cmp r3, 0x3 - ble @08016E42 + ble _08016E42 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -25915,24 +25915,24 @@ sub_8016F1C: ; 8016F1C 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 @@ -25954,7 +25954,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 @@ -25964,14 +25964,14 @@ sub_8016F44: ; 8016F44 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, =gUnknown_082F045C @@ -25990,7 +25990,7 @@ sub_8016F44: ; 8016F44 adds r5, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble @08016F62 + ble _08016F62 pop {r3} mov r8, r3 pop {r4-r7} @@ -26074,12 +26074,12 @@ sub_801704C: ; 801704C 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 @@ -26091,11 +26091,11 @@ sub_8017064: ; 8017064 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 @@ -26108,20 +26108,20 @@ sub_8017064: ; 8017064 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @080170AE + b _080170AE .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 @@ -26134,32 +26134,32 @@ sub_80170B8: ; 80170B8 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 @@ -26168,14 +26168,14 @@ sub_80170B8: ; 80170B8 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 @@ -26239,11 +26239,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] @@ -26254,13 +26254,13 @@ sub_8017178: ; 8017178 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 @@ -26268,20 +26268,20 @@ sub_8017178: ; 8017178 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 AddWindow strb r0, [r5] @@ -26308,9 +26308,9 @@ sub_8017178: ; 8017178 ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] - b @0801728E + b _0801728E .pool -@08017228: +_08017228: mov r3, r9 ldrb r0, [r3] bl sub_81AE604 @@ -26319,7 +26319,7 @@ sub_8017178: ; 8017178 ldrh r1, [r0, 0x2E] ands r4, r1 cmp r4, 0 - beq @08017264 + beq _08017264 mov r4, r9 ldrb r0, [r4] movs r1, 0 @@ -26333,13 +26333,13 @@ sub_8017178: ; 8017178 movs r0, 0 strb r0, [r7] mov r0, r8 - b @08017292 + b _08017292 .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 @@ -26353,11 +26353,11 @@ sub_8017178: ; 8017178 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 @@ -26380,17 +26380,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, =gUnknown_082F0344 bl sub_8017118 mov r1, r9 @@ -26415,18 +26415,18 @@ sub_80172A0: ; 80172A0 bl calls_per_item_funcs_in_list_outer mov r1, r10 strb r0, [r1] - b @08017314 + b _08017314 .pool -@0801730C: +_0801730C: ldrb r0, [r6] movs r1, 0x1 bl CopyWindowToVram -@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 @@ -26436,14 +26436,14 @@ sub_80172A0: ; 80172A0 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 @@ -26458,14 +26458,14 @@ sub_80172A0: ; 80172A0 strb r0, [r5] movs r0, 0x2 negs r0, r0 - b @080173A0 + b _080173A0 .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 @@ -26479,14 +26479,14 @@ sub_80172A0: ; 80172A0 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 @@ -26557,25 +26557,25 @@ 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 .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] @@ -26597,8 +26597,8 @@ sub_80173E0: ; 80173E0 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] @@ -26620,8 +26620,8 @@ sub_80173E0: ; 80173E0 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] @@ -26643,8 +26643,8 @@ sub_80173E0: ; 80173E0 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] @@ -26666,8 +26666,8 @@ sub_80173E0: ; 80173E0 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] @@ -26689,8 +26689,8 @@ sub_80173E0: ; 80173E0 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] @@ -26702,8 +26702,8 @@ sub_80173E0: ; 80173E0 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] @@ -26715,7 +26715,7 @@ sub_80173E0: ; 80173E0 adds r0, r3, 0 ands r0, r1 movs r1, 0xE0 -@0801755A: +_0801755A: orrs r0, r1 strb r0, [r2, 0xC] mov r1, sp @@ -26724,10 +26724,10 @@ sub_80173E0: ; 80173E0 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 @@ -26748,7 +26748,7 @@ sub_8017580: ; 8017580 lsls r1, 24 lsrs r1, 24 cmp r1, 0 - beq @080175D8 + beq _080175D8 ldr r2, =gUnknown_082F045C mov r8, r2 movs r5, 0 @@ -26762,7 +26762,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} @@ -26784,8 +26784,8 @@ sub_8017580: ; 8017580 adds r4, 0x20 subs r3, 0x1 cmp r3, 0 - bne @080175AC -@080175D8: + bne _080175AC +_080175D8: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -26810,7 +26810,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} @@ -26825,7 +26825,7 @@ sub_80175EC: ; 80175EC adds r3, 0x1C subs r4, 0x1 cmp r4, 0 - bge @08017604 + bge _08017604 pop {r3} mov r8, r3 pop {r4-r7} @@ -26842,37 +26842,37 @@ sub_8017630: ; 8017630 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 @@ -26890,26 +26890,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] @@ -26917,7 +26917,7 @@ sub_8017678: ; 8017678 ands r1, r2 ands r0, r3 cmp r1, r0 - bne @080176DC + bne _080176DC ldrb r2, [r5, 0x9] movs r0, 0xFC ldrb r3, [r6, 0x9] @@ -26925,13 +26925,13 @@ sub_8017678: ; 8017678 ands r1, r2 ands r0, r3 cmp r1, r0 - bne @080176DC + bne _080176DC movs r0, 0 - b @080176DE + b _080176DE .pool -@080176DC: +_080176DC: movs r0, 0x1 -@080176DE: +_080176DE: pop {r4-r6} pop {r1} bx r1 @@ -26948,18 +26948,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] @@ -26968,12 +26968,12 @@ sub_80176E4: ; 80176E4 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 @@ -26996,10 +26996,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 @@ -27009,12 +27009,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} @@ -27037,16 +27037,16 @@ sub_8017734: ; 8017734 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 @@ -27105,11 +27105,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 @@ -27149,7 +27149,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 @@ -27183,7 +27183,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 @@ -27224,7 +27224,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 @@ -27248,24 +27248,24 @@ 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 .pool -@08017978: +_08017978: movs r0, 0 -@0801797A: +_0801797A: add sp, 0x4 pop {r4} pop {r1} @@ -27276,26 +27276,26 @@ sub_8017940: ; 8017940 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 @@ -27334,9 +27334,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 @@ -27352,7 +27352,7 @@ sub_80179D4: ; 80179D4 movs r0, 0x7F ands r0, r1 cmp r0, 0x45 - bne @08017A38 + bne _08017A38 ldr r0, =0x02021fc4 ldr r3, =gUnknown_082EE6B8 lsls r1, r6, 2 @@ -27362,49 +27362,49 @@ sub_80179D4: ; 80179D4 ldr r1, [r1] bl ExpandStringRefs movs r0, 0x2 - b @08017B2A + b _08017B2A .pool -@08017A38: +_08017A38: ldr r0, =gUnknown_082EE17C lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] bl sub_8017020 movs r0, 0x1 - b @08017B2A + b _08017B2A .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 .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, =gUnknown_082EEEAC bl GenerateRandomNumber @@ -27417,9 +27417,9 @@ sub_80179D4: ; 80179D4 adds r1, r0 adds r1, r4 ldr r1, [r1] - b @08017B0E + b _08017B0E .pool -@08017AB0: +_08017AB0: ldr r5, =0x02021fc4 ldr r4, =gUnknown_082EF1CC bl GenerateRandomNumber @@ -27429,9 +27429,9 @@ sub_80179D4: ; 80179D4 ands r0, r1 lsls r0, 2 lsls r1, r6, 4 - b @08017B08 + b _08017B08 .pool -@08017AD0: +_08017AD0: ldr r5, =0x02021fc4 ldr r4, =gUnknown_082EF010 bl GenerateRandomNumber @@ -27444,9 +27444,9 @@ sub_80179D4: ; 80179D4 adds r1, r0 adds r1, r4 ldr r1, [r1] - b @08017B0E + b _08017B0E .pool -@08017AF4: +_08017AF4: ldr r5, =0x02021fc4 ldr r4, =gUnknown_082EF100 bl GenerateRandomNumber @@ -27456,22 +27456,22 @@ sub_80179D4: ; 80179D4 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 ExpandStringRefs - b @08017B28 + b _08017B28 .pool -@08017B20: +_08017B20: ldr r0, =0x02021fc4 ldr r1, =gUnknown_082EE6C8 bl ExpandStringRefs -@08017B28: +_08017B28: movs r0, 0 -@08017B2A: +_08017B2A: pop {r4-r6} pop {r1} bx r1 @@ -27516,7 +27516,7 @@ sub_8017B3C: ; 8017B3C movs r0, 0xCE lsls r0, 1 cmp r8, r0 - bne @08017B94 + bne _08017B94 ldr r2, =gUnknown_082EF7D0 str r5, [sp] str r4, [sp, 0x4] @@ -27524,9 +27524,9 @@ sub_8017B3C: ; 8017B3C movs r1, 0x1 movs r3, 0x44 bl sub_80173E0 - b @08017BD4 + b _08017BD4 .pool -@08017B94: +_08017B94: adds r1, r7, 0x1 adds r0, r6, 0 movs r2, 0x44 @@ -27555,7 +27555,7 @@ sub_8017B3C: ; 8017B3C add r2, sp, 0x8 movs r3, 0xC6 bl sub_80173E0 -@08017BD4: +_08017BD4: add sp, 0xC pop {r3,r4} mov r8, r3 @@ -27585,20 +27585,20 @@ sub_8017BE8: ; 8017BE8 movs r0, 0x3 negs r0, r0 cmp r4, r0 - bne @08017C6C + bne _08017C6C ldr r0, =gUnknown_082F03A4 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 @@ -27606,9 +27606,9 @@ sub_8017BE8: ; 8017BE8 mov r0, r9 adds r1, r7, 0 bl sub_8017B3C - b @08017CA0 + b _08017CA0 .pool -@08017C4C: +_08017C4C: mov r0, r12 adds r1, r0, r4 add r0, sp, 0x4 @@ -27622,8 +27622,8 @@ sub_8017BE8: ; 8017BE8 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 @@ -27632,27 +27632,27 @@ sub_8017BE8: ; 8017BE8 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 @@ -27672,32 +27672,32 @@ 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 .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 @@ -27720,10 +27720,10 @@ sub_8017D04: ; 8017D04 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 @@ -27734,24 +27734,24 @@ sub_8017D04: ; 8017D04 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 .pool -@08017D44: +_08017D44: movs r4, 0 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - bge @08017D8E + bge _08017D8E ldr r6, =gBaseStats -@08017D50: +_08017D50: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -27765,23 +27765,23 @@ sub_8017D04: ; 8017D04 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 .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 @@ -27793,47 +27793,47 @@ 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, =gUnknown_082EEA68 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] - b @08017DDA + b _08017DDA .pool -@08017DC8: +_08017DC8: ldr r0, =gUnknown_082EED3C lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] - b @08017DDA + b _08017DDA .pool -@08017DD8: +_08017DD8: ldr r1, =gUnknown_082EF7B0 -@08017DDA: +_08017DDA: adds r0, r3, 0 bl ExpandStringRefs - b @08017DF6 + b _08017DF6 .pool -@08017DE8: +_08017DE8: ldr r0, =gUnknown_082EEB08 lsls r1, r2, 2 adds r1, r0 ldr r1, [r1] adds r0, r3, 0 bl ExpandStringRefs -@08017DF6: +_08017DF6: pop {r0} bx r0 .pool @@ -27859,18 +27859,18 @@ 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 .pool -@08017E38: +_08017E38: cmp r6, 0x45 - beq @08017E78 - b @08017E94 -@08017E3E: + beq _08017E78 + b _08017E94 +_08017E3E: ldr r2, =gUnknown_082EE984 lsls r1, r0, 1 adds r1, r0 @@ -27879,9 +27879,9 @@ sub_8017E00: ; 8017E00 adds r0, r3 lsls r0, 3 adds r1, r0 - b @08017E66 + b _08017E66 .pool -@08017E54: +_08017E54: ldr r2, =gUnknown_082EE984 lsls r1, r0, 1 adds r1, r0 @@ -27891,14 +27891,14 @@ sub_8017E00: ; 8017E00 lsls r0, 3 adds r1, r0 adds r2, 0x8 -@08017E66: +_08017E66: adds r1, r2 ldr r1, [r1] adds r0, r5, 0 bl CopyString - b @08017E94 + b _08017E94 .pool -@08017E78: +_08017E78: ldr r2, =gUnknown_082EE984 lsls r1, r0, 1 adds r1, r0 @@ -27912,7 +27912,7 @@ sub_8017E00: ; 8017E00 ldr r1, [r1] adds r0, r5, 0 bl CopyString -@08017E94: +_08017E94: pop {r4-r6} pop {r0} bx r0 @@ -27932,35 +27932,35 @@ 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 .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, =gUnknown_082EE3DC - b @08017FAE + b _08017FAE .pool -@08017EF4: +_08017EF4: ldr r1, =gUnknown_082EE430 - b @08017FAE + b _08017FAE .pool -@08017EFC: +_08017EFC: adds r0, r6, 0 adds r0, 0x58 ldr r4, =0x02022c40 @@ -27977,20 +27977,20 @@ sub_8017EA0: ; 8017EA0 adds r1, r2 bl CopyString movs r4, 0 - b @08017F2E + b _08017F2E .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 @@ -28007,21 +28007,21 @@ sub_8017EA0: ; 8017EA0 bl CopyString ldrh r5, [r5, 0x2] mov r8, r5 -@08017F64: +_08017F64: movs r0, 0xCE lsls r0, 1 cmp r8, r0 - bne @08017F84 + bne _08017F84 ldr r1, =gUnknown_082EE4F0 adds r0, r7, 0 bl CopyString - b @08017FB4 + b _08017FB4 .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 @@ -28029,27 +28029,27 @@ sub_8017EA0: ; 8017EA0 adds r5, 0x10 adds r4, 0x1 cmp r4, 0x3 - ble @08017F8A + ble _08017F8A ldr r1, =gUnknown_082EE47C adds r0, r7, 0 bl sub_81AFC28 - b @08017FB4 + b _08017FB4 .pool -@08017FAC: +_08017FAC: ldr r1, =gUnknown_082EE380 -@08017FAE: +_08017FAE: adds r0, r7, 0 bl ExpandStringRefs -@08017FB4: +_08017FB4: movs r2, 0x1 - b @08017FC6 + b _08017FC6 .pool -@08017FBC: +_08017FBC: ldr r1, =gUnknown_082EE544 adds r0, r7, 0 bl ExpandStringRefs movs r2, 0x2 -@08017FC6: +_08017FC6: adds r0, r2, 0 pop {r3} mov r8, r3 @@ -28066,21 +28066,21 @@ sub_8017FD8: ; 8017FD8 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 .pool -@08017FFC: +_08017FFC: movs r0, 0 -@08017FFE: +_08017FFE: pop {r1} bx r1 thumb_func_end sub_8017FD8 @@ -28094,9 +28094,9 @@ InUnionRoom: ; 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 @@ -28111,8 +28111,8 @@ sub_8018024: ; 8018024 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 @@ -28122,30 +28122,30 @@ sub_8018024: ; 8018024 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 .pool -@08018074: +_08018074: movs r0, 0x1 -@08018076: +_08018076: pop {r4-r6} pop {r1} bx r1 @@ -28200,13 +28200,13 @@ sub_80180A0: ; 80180A0 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq @080180E0 + beq _080180E0 movs r0, 0 - b @080180E2 + b _080180E2 .pool -@080180E0: +_080180E0: movs r0, 0x1 -@080180E2: +_080180E2: pop {r4,r5} pop {r1} bx r1 @@ -28248,22 +28248,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 @@ -28273,22 +28273,22 @@ sub_8018120: ; 8018120 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 @@ -28309,7 +28309,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] @@ -28319,7 +28319,7 @@ sub_801818C: ; 801818C movs r1, 0 movs r2, 0 bl sub_8011090 -@080181BC: +_080181BC: pop {r4} pop {r0} bx r0 @@ -28341,7 +28341,7 @@ sub_80181DC: ; 80181DC movs r3, 0x80 movs r2, 0 ldr r4, [r0, 0xC] -@080181E4: +_080181E4: lsls r0, r2, 3 subs r0, r2 lsls r0, 2 @@ -28349,7 +28349,7 @@ sub_80181DC: ; 80181DC ldrb r0, [r1, 0x18] lsls r0, 31 cmp r0, 0 - beq @0801820C + beq _0801820C ldrb r0, [r1, 0xB] lsls r0, 31 lsrs r0, 31 @@ -28361,14 +28361,14 @@ sub_80181DC: ; 80181DC 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} @@ -28477,9 +28477,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 @@ -28490,9 +28490,9 @@ sub_8018220: ; 8018220 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 @@ -28517,7 +28517,7 @@ sub_8018220: ; 8018220 mov r5, r8 adds r5, 0x28 mov r4, r10 -@08018360: +_08018360: ldrh r1, [r5] adds r0, r4, 0 bl CopyEasyChatWord @@ -28531,7 +28531,7 @@ sub_8018220: ; 8018220 adds r4, 0xF adds r7, 0x1 cmp r7, 0x3 - ble @08018360 + ble _08018360 movs r4, 0xD2 lsls r4, 1 add r4, r9 @@ -28544,19 +28544,19 @@ sub_8018220: ; 8018220 bl AppendString ldr r0, [sp] cmp r0, 0x1 - bne @080183D0 + bne _080183D0 ldr r1, =gUnknown_082F0020 adds r0, r4, 0 bl sub_81AFC28 adds r0, r5, 0 adds r1, r4, 0 bl AppendString - b @080183F0 + b _080183F0 .pool -@080183D0: +_080183D0: ldr r2, [sp] cmp r2, 0 - bne @080183F0 + bne _080183F0 ldr r0, =gUnknown_082F0018 mov r2, r8 ldrb r1, [r2] @@ -28568,7 +28568,7 @@ sub_8018220: ; 8018220 adds r0, r5, 0 adds r1, r4, 0 bl AppendString -@080183F0: +_080183F0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -28629,26 +28629,26 @@ 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 .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 @@ -28734,9 +28734,9 @@ sub_8018450: ; 8018450 movs r0, 0x54 movs r1, 0 bl SetGpuReg - b @08018610 + b _08018610 .pool -@08018574: +_08018574: ldr r0, =gUnknown_082F0548 movs r1, 0 movs r2, 0x20 @@ -28788,9 +28788,9 @@ sub_8018450: ; 8018450 lsrs r0, 24 movs r1, 0 bl sub_80186EC - b @08018610 + b _08018610 .pool -@080185F8: +_080185F8: movs r0, 0x3 bl CopyBgTilemapBufferToVram movs r0, 0x2 @@ -28799,12 +28799,12 @@ sub_8018450: ; 8018450 bl CopyBgTilemapBufferToVram movs r0, 0 bl CopyBgTilemapBufferToVram -@08018610: +_08018610: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b @08018644 -@08018618: + b _08018644 +_08018618: movs r0, 0 bl ShowBg movs r0, 0x3 @@ -28816,11 +28816,11 @@ sub_8018450: ; 8018450 movs r0, 0xC5 bl EnableInterrupts movs r0, 0x1 - b @08018646 + b _08018646 .pool -@08018644: +_08018644: movs r0, 0 -@08018646: +_08018646: add sp, 0xC pop {r4-r7} pop {r1} @@ -28833,14 +28833,14 @@ c2_mystery_gift: ; 8018650 movs r0, 0 bl sub_8018450 cmp r0, 0 - beq @0801866C + beq _0801866C ldr r0, =sub_8018438 bl SetMainCallback2 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 @@ -28853,14 +28853,14 @@ sub_801867C: ; 801867C movs r0, 0x1 bl sub_8018450 cmp r0, 0 - beq @08018698 + beq _08018698 ldr r0, =sub_8018438 bl SetMainCallback2 ldr r1, =0x02022c60 movs r0, 0x1 strb r0, [r1] bl sub_81D5014 -@08018698: +_08018698: pop {r0} bx r0 .pool @@ -28904,18 +28904,18 @@ sub_80186EC: ; 80186EC movs r1, 0 bl FillWindowPixelBuffer cmp r4, 0 - bne @0801871C + bne _0801871C ldr r0, =gUnknown_085EF654 ldr r7, =gUnknown_085EF678 cmp r5, 0 - bne @08018720 + bne _08018720 ldr r7, =gUnknown_085EF664 - b @08018720 + b _08018720 .pool -@0801871C: +_0801871C: ldr r0, =gUnknown_085EDFBF ldr r7, =gUnknown_085EDFC9 -@08018720: +_08018720: movs r4, 0 str r4, [sp] str r4, [sp, 0x4] @@ -28995,7 +28995,7 @@ sub_8018798: ; 8018798 bl FillBgTilemapBufferRect mov r8, r4 movs r4, 0x1 -@080187C8: +_080187C8: movs r7, 0 mov r0, r9 adds r0, 0x2 @@ -29004,13 +29004,13 @@ sub_8018798: ; 8018798 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] @@ -29021,8 +29021,8 @@ sub_8018798: ; 8018798 movs r1, 0x1 lsrs r3, r5, 24 bl FillBgTilemapBufferRect - b @08018812 -@080187FC: + b _08018812 +_080187FC: lsrs r2, r6, 24 str r4, [sp] str r4, [sp, 0x4] @@ -29033,17 +29033,17 @@ sub_8018798: ; 8018798 movs r1, 0x2 lsrs r3, r5, 24 bl FillBgTilemapBufferRect -@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 @@ -29059,11 +29059,11 @@ 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] @@ -29074,8 +29074,8 @@ sub_8018838: ; 8018838 movs r2, 0 movs r3, 0 bl FillBgTilemapBufferRect - b @08018876 -@0801885E: + b _08018876 +_0801885E: movs r0, 0x20 str r0, [sp] movs r0, 0x1E @@ -29087,7 +29087,7 @@ sub_8018838: ; 8018838 movs r2, 0 movs r3, 0x2 bl FillBgTilemapBufferRect -@08018876: +_08018876: movs r0, 0 bl CopyBgTilemapBufferToVram add sp, 0xC @@ -29156,22 +29156,22 @@ mevent_0814257C: ; 80188F8 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 @@ -29188,13 +29188,13 @@ mevent_0814257C: ; 80188F8 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 .pool -@08018954: +_08018954: movs r0, 0x1 str r0, [sp] ldr r0, =0x02022c58 @@ -29210,15 +29210,15 @@ mevent_0814257C: ; 80188F8 strb r0, [r4] bl sub_80188DC movs r0, 0x1 - b @08018982 + b _08018982 .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} @@ -29273,32 +29273,32 @@ sub_80189DC: ; 80189DC 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 .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 @@ -29310,25 +29310,25 @@ sub_8018A1C: ; 8018A1C 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 @@ -29351,13 +29351,13 @@ sub_8018A50: ; 8018A50 str r0, [sp, 0x1C] str r1, [sp, 0x20] cmp r2, 0 - bne @08018A80 + bne _08018A80 ldr r0, =gUnknown_082F0608 - b @08018A82 + b _08018A82 .pool -@08018A80: +_08018A80: ldr r0, =gUnknown_082F0620 -@08018A82: +_08018A82: str r0, [sp, 0x4] add r0, sp, 0x4 bl sub_81DB41C @@ -29365,9 +29365,9 @@ sub_8018A50: ; 8018A50 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] @@ -29375,7 +29375,7 @@ sub_8018A50: ; 8018A50 orrs r2, r1 str r2, [sp, 0x1C] cmp r3, 0x1D - bgt @08018ACC + bgt _08018ACC movs r0, 0x1E subs r0, r3 lsrs r1, r0, 31 @@ -29387,13 +29387,13 @@ sub_8018A50: ; 8018A50 ands r1, r2 orrs r1, r0 str r1, [sp, 0x1C] - b @08018AD2 + b _08018AD2 .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] @@ -29405,13 +29405,13 @@ sub_8018A50: ; 8018A50 movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq @08018AFA + beq _08018AFA movs r0, 0x2 bl ClearWindowTilemap movs r0, 0x2 movs r1, 0x1 bl CopyWindowToVram -@08018AFA: +_08018AFA: adds r0, r4, 0 add sp, 0x24 pop {r4,r5} @@ -29431,29 +29431,29 @@ 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 ExpandStringRefs cmp r6, 0 - bne @08018B48 + bne _08018B48 ldr r0, =gUnknown_082F05C8 - b @08018B4A + b _08018B4A .pool -@08018B48: +_08018B48: ldr r0, =gUnknown_082F05D0 -@08018B4A: +_08018B4A: bl AddWindow strh r0, [r4] ldrb r0, [r4] @@ -29480,30 +29480,30 @@ sub_8018B08: ; 8018B08 bl CopyWindowToVram ldrb r0, [r4] bl PutWindowTilemap - b @08018BD6 + b _08018BD6 .pool -@08018B98: +_08018B98: ldr r0, =gUnknown_082F05E8 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 .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 @@ -29511,13 +29511,13 @@ sub_8018B08: ; 8018B08 movs r2, 0xE movs r3, 0 bl sub_81996C0 -@08018BD6: +_08018BD6: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b @08018C3E + b _08018C3E .pool -@08018BE4: +_08018BE4: bl sub_8198C58 lsls r0, 24 asrs r6, r0, 24 @@ -29526,7 +29526,7 @@ sub_8018B08: ; 8018B08 adds r0, r1 lsrs r0, 24 cmp r0, 0x2 - bhi @08018C3E + bhi _08018C3E movs r0, 0 strb r0, [r5] ldrb r0, [r4] @@ -29539,8 +29539,8 @@ sub_8018B08: ; 8018B08 ldrb r0, [r4] bl RemoveWindow adds r0, r6, 0 - b @08018C42 -@08018C1A: + b _08018C42 +_08018C1A: movs r0, 0 strb r0, [r5] ldrb r0, [r4] @@ -29554,11 +29554,11 @@ sub_8018B08: ; 8018B08 bl RemoveWindow 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} @@ -29573,31 +29573,31 @@ sub_8018C4C: ; 8018C4C 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, =gUnknown_085EF2FC bl ExpandStringRefs - b @08018C8C + b _08018C8C .pool -@08018C84: +_08018C84: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EF330 bl ExpandStringRefs -@08018C8C: +_08018C8C: ldr r0, =gUnknown_082F05D8 bl AddWindow strh r0, [r5] @@ -29629,33 +29629,33 @@ sub_8018C4C: ; 8018C4C ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b @08018D8C + b _08018D8C .pool -@08018CE8: +_08018CE8: cmp r3, 0 - beq @08018D10 + beq _08018D10 cmp r2, 0 - bne @08018D00 + bne _08018D00 ldr r0, =gUnknown_082F05F8 ldr r1, =gUnknown_082F06C8 - b @08018D28 + b _08018D28 .pool -@08018D00: +_08018D00: ldr r0, =gUnknown_082F0600 ldr r1, =gUnknown_082F06F8 - b @08018D28 + b _08018D28 .pool -@08018D10: +_08018D10: cmp r2, 0 - bne @08018D24 + bne _08018D24 ldr r0, =gUnknown_082F05F0 ldr r1, =gUnknown_082F06B0 - b @08018D28 + b _08018D28 .pool -@08018D24: +_08018D24: ldr r0, =gUnknown_082F05F8 ldr r1, =gUnknown_082F06E0 -@08018D28: +_08018D28: movs r2, 0xE0 str r2, [sp] movs r2, 0x1 @@ -29665,7 +29665,7 @@ sub_8018C4C: ; 8018C4C movs r0, 0x1 negs r0, r0 cmp r4, r0 - beq @08018D8C + beq _08018D8C movs r0, 0 strb r0, [r6] ldrb r0, [r5] @@ -29678,9 +29678,9 @@ sub_8018C4C: ; 8018C4C ldrb r0, [r5] bl RemoveWindow adds r0, r4, 0 - b @08018D90 + b _08018D90 .pool -@08018D68: +_08018D68: movs r0, 0 strb r0, [r6] ldrb r0, [r5] @@ -29694,11 +29694,11 @@ sub_8018C4C: ; 8018C4C bl RemoveWindow 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} @@ -29709,12 +29709,12 @@ sub_8018C4C: ; 8018C4C 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 @@ -29725,47 +29725,47 @@ sub_8018DAC: ; 8018DAC 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 @@ -29775,12 +29775,12 @@ sub_8018DAC: ; 8018DAC 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 @@ -29790,26 +29790,26 @@ sub_8018E08: ; 8018E08 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 @@ -29818,13 +29818,13 @@ sub_8018E20: ; 8018E20 sub_8018E50: ; 8018E50 push {lr} cmp r2, 0 - beq @08018E60 + beq _08018E60 ldr r3, =gUnknown_085EF55C - b @08018E62 + b _08018E62 .pool -@08018E60: +_08018E60: ldr r3, =gUnknown_085EF520 -@08018E62: +_08018E62: movs r2, 0x1 bl sub_8018B08 lsls r0, 24 @@ -29838,13 +29838,13 @@ sub_8018E50: ; 8018E50 mevent_message_was_thrown_away: ; 8018E74 push {lr} cmp r1, 0 - beq @08018E84 + beq _08018E84 ldr r1, =gUnknown_085EF630 - b @08018E86 + b _08018E86 .pool -@08018E84: +_08018E84: ldr r1, =gUnknown_085EF60C -@08018E86: +_08018E86: bl mevent_0814257C pop {r1} bx r1 @@ -29857,56 +29857,56 @@ mevent_save_game: ; 8018E94 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 .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, =gUnknown_085EF5BC bl sub_8018884 - b @08018EEC + b _08018EEC .pool -@08018ECC: +_08018ECC: movs r0, 0 bl save_game_when_memory_present - b @08018EEC -@08018ED4: + b _08018EEC +_08018ED4: ldr r0, =gUnknown_085EF5E0 bl sub_8018884 - b @08018EEC + b _08018EEC .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 .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 @@ -29923,127 +29923,127 @@ 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 .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, =gUnknown_085EF2E4 - b @08019034 + b _08019034 .pool -@08018F78: +_08018F78: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF244 - b @08019034 + b _08019034 .pool -@08018F84: +_08018F84: movs r0, 0x1 str r0, [r4] ldr r2, =gUnknown_085EF0C8 cmp r5, 0 - bne @08019034 + bne _08019034 ldr r2, =gUnknown_085EF124 - b @08019034 + b _08019034 .pool -@08018F9C: +_08018F9C: movs r0, 0x1 str r0, [r4] ldr r2, =gUnknown_085EF0F4 cmp r5, 0 - bne @08019034 + bne _08019034 ldr r2, =gUnknown_085EF14C - b @08019034 + b _08019034 .pool -@08018FB4: +_08018FB4: movs r0, 0x1 str r0, [r4] ldr r2, =gUnknown_085EF178 - b @08019034 + b _08019034 .pool -@08018FC0: +_08018FC0: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF1B4 - b @08019034 + b _08019034 .pool -@08018FCC: +_08018FCC: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF200 - b @08019034 + b _08019034 .pool -@08018FD8: +_08018FD8: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF1D8 - b @08019034 + b _08019034 .pool -@08018FE4: +_08018FE4: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF21C - b @08019034 + b _08019034 .pool -@08018FF0: +_08018FF0: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF02C - b @08019034 + b _08019034 .pool -@08018FFC: +_08018FFC: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF2B4 cmp r6, 0 - bne @08019034 + bne _08019034 ldr r2, =gUnknown_085EF280 - b @08019034 + b _08019034 .pool -@08019014: +_08019014: movs r0, 0 str r0, [r4] ldr r2, =gUnknown_085EF014 - b @08019034 + b _08019034 .pool -@08019020: +_08019020: movs r0, 0x1 str r0, [r4] ldr r2, =gUnknown_085EF198 - b @08019034 + b _08019034 .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} @@ -30058,52 +30058,52 @@ mevent_08142CE8: ; 801903C 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 @@ -30118,83 +30118,83 @@ 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 .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, =gUnknown_085EF2E4 - b @08019166 + b _08019166 .pool -@0801910C: +_0801910C: ldr r1, =gUnknown_085EF244 - b @08019166 + b _08019166 .pool -@08019114: +_08019114: ldr r1, =gUnknown_085EF39C - b @0801911E + b _0801911E .pool -@0801911C: +_0801911C: ldr r1, =gUnknown_085EF3C4 -@0801911E: +_0801911E: movs r0, 0x1 str r0, [r3] - b @08019166 + b _08019166 .pool -@08019128: +_08019128: ldr r1, =gUnknown_085EF3F0 - b @08019166 + b _08019166 .pool -@08019130: +_08019130: ldr r1, =gUnknown_085EF42C - b @08019166 + b _08019166 .pool -@08019138: +_08019138: ldr r1, =gUnknown_085EF494 - b @08019166 + b _08019166 .pool -@08019140: +_08019140: ldr r1, =gUnknown_085EF460 - b @08019166 + b _08019166 .pool -@08019148: +_08019148: ldr r1, =gUnknown_085EF21C - b @08019166 + b _08019166 .pool -@08019150: +_08019150: ldr r1, =gUnknown_085EF4C4 - b @08019166 + b _08019166 .pool -@08019158: +_08019158: adds r1, r4, 0 - b @08019166 -@0801915C: + b _08019166 +_0801915C: ldr r1, =gUnknown_085EF410 - b @08019166 + b _08019166 .pool -@08019164: +_08019164: ldr r1, =gUnknown_085EF4F0 -@08019166: +_08019166: adds r0, r1, 0 pop {r4} pop {r1} @@ -30217,15 +30217,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} @@ -30280,60 +30280,60 @@ 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 .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 @@ -30341,77 +30341,77 @@ task00_mystery_gift: ; 80191F4 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, =gUnknown_085EEEF0 - b @0801931A + b _0801931A .pool -@08019314: +_08019314: adds r0, r5, 0 adds r0, 0x9 ldr r1, =gUnknown_085EEF2C -@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 .pool -@08019338: +_08019338: ldrb r0, [r5, 0xC] cmp r0, 0 - bne @0801934C + bne _0801934C ldr r0, =gUnknown_085EEF68 bl sub_8018884 - b @08019352 + b _08019352 .pool -@0801934C: +_0801934C: ldr r0, =gUnknown_085EEF94 bl sub_8018884 -@08019352: +_08019352: movs r0, 0x4 strb r0, [r5, 0x8] - b @08019922 + b _08019922 .pool -@0801935C: +_0801935C: adds r0, r5, 0 adds r0, 0x9 adds r1, r5, 0 @@ -30419,39 +30419,39 @@ task00_mystery_gift: ; 80191F4 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] @@ -30461,100 +30461,100 @@ task00_mystery_gift: ; 80191F4 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 .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 .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 .pool -@08019444: +_08019444: ldr r0, =gUnknown_085EEFE8 bl sub_8018884 movs r0, 0x8 strb r0, [r5, 0x8] - b @08019922 + b _08019922 .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 .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 @@ -30562,24 +30562,24 @@ task00_mystery_gift: ; 80191F4 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 CopyString - b @08019922 + b _08019922 .pool -@080194CC: +_080194CC: adds r4, r5, 0 adds r4, 0x9 bl sub_801D4F4 @@ -30591,12 +30591,12 @@ task00_mystery_gift: ; 80191F4 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 @@ -30604,11 +30604,11 @@ task00_mystery_gift: ; 80191F4 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, =gUnknown_085EF050 @@ -30618,20 +30618,20 @@ task00_mystery_gift: ; 80191F4 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 .pool -@08019534: +_08019534: movs r0, 0 - b @08019566 -@08019538: + b _08019566 +_08019538: adds r0, r5, 0 adds r0, 0x9 ldr r3, =gUnknown_085EF084 @@ -30641,61 +30641,61 @@ task00_mystery_gift: ; 80191F4 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 .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 .pool -@0801958C: +_0801958C: adds r0, r5, 0 adds r0, 0x9 ldr r1, =gUnknown_085EEFF8 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 CopyString -@080195AA: +_080195AA: movs r0, 0xF strb r0, [r5, 0x8] - b @08019922 + b _08019922 .pool -@080195BC: +_080195BC: ldrb r1, [r5, 0xC] ldrb r2, [r5, 0xD] ldrb r3, [r5, 0xE] @@ -30703,171 +30703,171 @@ task00_mystery_gift: ; 80191F4 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 .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 .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] @@ -30875,23 +30875,23 @@ task00_mystery_gift: ; 80191F4 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, =gUnknown_085EF584 @@ -30901,129 +30901,129 @@ task00_mystery_gift: ; 80191F4 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 .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 .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 .pool -@0801982C: +_0801982C: ldr r0, =0x02021cc4 movs r1, 0xFF strb r1, [r0] @@ -31033,51 +31033,51 @@ task00_mystery_gift: ; 80191F4 strb r1, [r0] ldrb r0, [r5, 0xC] cmp r0, 0 - bne @0801985C + bne _0801985C ldr r0, =gUnknown_085EF360 bl sub_8018884 bl mevent_srv_new_wcard - b @08019866 + b _08019866 .pool -@0801985C: +_0801985C: ldr r0, =gUnknown_085EF37C bl sub_8018884 bl mevent_srv_init_wnews -@08019866: +_08019866: movs r0, 0x20 strb r0, [r5, 0x8] - b @08019922 + b _08019922 .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 CopyString movs r0, 0x22 strb r0, [r5, 0x8] - b @08019922 + b _08019922 .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 .pool -@080198B8: +_080198B8: adds r0, r5, 0 adds r0, 0x9 ldrb r2, [r5, 0xD] @@ -31085,37 +31085,37 @@ task00_mystery_gift: ; 80191F4 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 .pool -@080198EC: +_080198EC: adds r0, r5, 0 adds r0, 0x9 ldr r1, =gUnknown_085EF014 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 .pool -@0801990C: +_0801990C: bl sub_80097E8 ldr r0, [r5, 0x10] bl Free @@ -31123,7 +31123,7 @@ task00_mystery_gift: ; 80191F4 bl remove_task ldr r0, =sub_80186A4 bl SetMainCallback2 -@08019922: +_08019922: add sp, 0x4 pop {r4,r5} pop {r0} @@ -31162,16 +31162,16 @@ is_walking_or_running: ; 8019958 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 .pool -@08019970: +_08019970: movs r0, 0 -@08019972: +_08019972: pop {r1} bx r1 thumb_func_end is_walking_or_running @@ -31250,7 +31250,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 @@ -31263,13 +31263,13 @@ sub_80199E0: ; 80199E0 adds r1, r0 adds r1, 0x7 cmp r1, r12 - bne @08019A28 + bne _08019A28 movs r0, 0x1 - b @08019A2A + b _08019A2A .pool -@08019A28: +_08019A28: movs r0, 0 -@08019A2A: +_08019A2A: pop {r4-r7} pop {r1} bx r1 @@ -31379,7 +31379,7 @@ sub_8019AD8: ; 8019AD8 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08019B30 + bne _08019B30 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -31391,19 +31391,19 @@ sub_8019AD8: ; 8019AD8 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - bne @08019B30 + bne _08019B30 ldrb r1, [r5] adds r0, r4, 0 bl FieldObjectSetSpecialAnim lsls r0, 24 cmp r0, 0 - bne @08019B30 + bne _08019B30 movs r0, 0x1 - b @08019B32 + b _08019B32 .pool -@08019B30: +_08019B30: movs r0, 0 -@08019B32: +_08019B32: add sp, 0x4 pop {r4,r5} pop {r1} @@ -31425,7 +31425,7 @@ sub_8019B3C: ; 8019B3C bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08019B9C + bne _08019B9C mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -31437,24 +31437,24 @@ sub_8019B3C: ; 8019B3C bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - bne @08019B84 + bne _08019B84 movs r0, 0 - b @08019B9E + b _08019B9E .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} @@ -31471,7 +31471,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] @@ -31479,7 +31479,7 @@ sub_8019BA8: ; 8019BA8 adds r0, 0x4 subs r2, 0x1 cmp r2, 0 - bge @08019BB8 + bge _08019BB8 bl sub_8019DF4 lsls r0, 24 lsrs r0, 24 @@ -31496,28 +31496,28 @@ sub_8019BDC: ; 8019BDC 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, =gUnknown_082F078C 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 .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 @@ -31525,10 +31525,10 @@ sub_8019BDC: ; 8019BDC 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 @@ -31544,20 +31544,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 @@ -31572,7 +31572,7 @@ sub_8019C38: ; 8019C38 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 @@ -31585,7 +31585,7 @@ sub_8019C38: ; 8019C38 movs r1, 0 bl sub_80199E0 cmp r0, 0x1 - beq @08019CE6 + beq _08019CE6 ldrb r1, [r7, 0x1] adds r0, r5, 0 bl sub_8019A7C @@ -31596,29 +31596,29 @@ sub_8019C38: ; 8019C38 ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -@08019CBC: +_08019CBC: ldr r1, =gUnknown_082F078E 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 .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} @@ -31640,13 +31640,13 @@ sub_8019CF0: ; 8019CF0 strb r0, [r4, 0x1] ldrb r0, [r4] cmp r0, 0 - beq @08019D18 + beq _08019D18 movs r0, 0 - b @08019D1A + b _08019D1A .pool -@08019D18: +_08019D18: movs r0, 0x1 -@08019D1A: +_08019D1A: pop {r4} pop {r1} bx r1 @@ -31663,13 +31663,13 @@ AGBAssert: ; 8019D20 strb r0, [r1, 0x3] ldrb r0, [r1] cmp r0, 0x1 - beq @08019D3C + beq _08019D3C movs r0, 0 - b @08019D3E + b _08019D3E .pool -@08019D3C: +_08019D3C: movs r0, 0x1 -@08019D3E: +_08019D3E: pop {r1} bx r1 thumb_func_end AGBAssert @@ -31681,69 +31681,69 @@ sub_8019D44: ; 8019D44 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} @@ -31756,7 +31756,7 @@ 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 @@ -31764,7 +31764,7 @@ sub_8019DD0: ; 8019DD0 bl sub_8019D44 adds r4, 0x1 cmp r4, 0x7 - ble @08019DD6 + ble _08019DD6 pop {r4,r5} pop {r0} bx r0 @@ -31780,17 +31780,17 @@ 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 .pool -@08019E18: +_08019E18: movs r0, 0x10 -@08019E1A: +_08019E1A: pop {r4} pop {r1} bx r1 @@ -31804,9 +31804,9 @@ sub_8019E20: ; 8019E20 lsls r0, 24 lsrs r0, 24 cmp r0, 0xF - bhi @08019E34 + bhi _08019E34 bl remove_task -@08019E34: +_08019E34: pop {r0} bx r0 .pool @@ -31816,19 +31816,19 @@ sub_8019E20: ; 8019E20 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] @@ -31864,7 +31864,7 @@ sub_8019E70: ; 8019E70 ldrh r0, [r0] mov r10, r0 ldr r6, =gUnknown_082F0760 -@08019E9E: +_08019E9E: mov r5, r8 add r5, r9 adds r5, r7 @@ -31900,7 +31900,7 @@ sub_8019E70: ; 8019E70 adds r6, 0x2 adds r7, 0x1 cmp r7, 0x4 - ble @08019E9E + ble _08019E9E add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -31918,7 +31918,7 @@ sub_8019F04: ; 8019F04 adds r5, r0, 0 movs r4, 0 ldr r6, =0x02020630 -@08019F0C: +_08019F0C: adds r0, r5, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -31928,7 +31928,7 @@ sub_8019F04: ; 8019F04 bl RemoveObjectAndFreeTiles adds r4, 0x1 cmp r4, 0x27 - ble @08019F0C + ble _08019F0C pop {r4-r6} pop {r0} bx r0 @@ -31941,10 +31941,10 @@ sub_8019F2C: ; 8019F2C 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 @@ -31956,10 +31956,10 @@ sub_8019F2C: ; 8019F2C 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} @@ -31971,23 +31971,23 @@ sub_8019F64: ; 8019F64 push {lr} adds r1, r0, 0 cmp r1, 0 - beq @08019F78 + beq _08019F78 ldr r0, =gUnknown_082F076F adds r0, r1, r0 ldrb r0, [r0] - b @08019F88 + b _08019F88 .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 @@ -32026,7 +32026,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 @@ -32037,7 +32037,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 @@ -32132,7 +32132,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] @@ -32143,7 +32143,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 @@ -32152,7 +32152,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 @@ -32166,19 +32166,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] @@ -32189,7 +32189,7 @@ sub_801A064: ; 801A064 adds r1, r5, 0 bl sub_80199E0 cmp r0, 0 - bne @0801A154 + bne _0801A154 mov r0, r9 movs r1, 0 ldrsh r2, [r0, r1] @@ -32199,7 +32199,7 @@ sub_801A064: ; 801A064 adds r1, r5, 0 bl sub_80199E0 cmp r0, 0 - bne @0801A154 + bne _0801A154 ldrb r2, [r4] lsrs r0, r2, 3 movs r1, 0x1 @@ -32214,12 +32214,12 @@ sub_801A064: ; 801A064 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 @@ -32240,37 +32240,37 @@ 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 .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 @@ -32278,21 +32278,21 @@ sub_801A16C: ; 801A16C 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 @@ -32304,13 +32304,13 @@ sub_801A214: ; 801A214 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 @@ -32324,28 +32324,28 @@ sub_801A234: ; 801A234 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 .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 @@ -32372,10 +32372,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 .pool @@ -32394,9 +32394,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, =gUnknown_082F076A bl player_get_direction_lower_nybble lsls r0, 24 @@ -32413,9 +32413,9 @@ sub_801A2A8: ; 801A2A8 ldr r1, [sp, 0x8] strh r2, [r1] movs r0, 0x1 - b @0801A398 + b _0801A398 .pool -@0801A2F0: +_0801A2F0: mov r4, sp adds r4, 0x2 mov r0, sp @@ -32430,7 +32430,7 @@ sub_801A2A8: ; 801A2A8 adds r2, r0, 0x2 str r2, [sp, 0x10] str r0, [sp, 0x14] -@0801A30E: +_0801A30E: movs r6, 0 ldr r4, [sp, 0x14] movs r0, 0 @@ -32439,7 +32439,7 @@ sub_801A2A8: ; 801A2A8 ldr r1, [sp, 0x10] mov r8, r1 ldr r5, =gUnknown_082F0760 -@0801A31E: +_0801A31E: mov r2, r10 adds r3, r2, r6 mov r0, sp @@ -32450,7 +32450,7 @@ sub_801A2A8: ; 801A2A8 add r0, r9 adds r0, 0x7 cmp r1, r0 - bne @0801A372 + bne _0801A372 mov r1, sp movs r2, 0x2 ldrsh r0, [r1, r2] @@ -32462,7 +32462,7 @@ sub_801A2A8: ; 801A2A8 adds r1, r2 adds r1, 0x7 cmp r0, r1 - bne @0801A372 + bne _0801A372 adds r0, r3, 0 subs r0, 0x38 lsls r0, 24 @@ -32470,21 +32470,21 @@ sub_801A2A8: ; 801A2A8 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 @@ -32498,10 +32498,10 @@ sub_801A2A8: ; 801A2A8 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 @@ -32558,13 +32558,13 @@ sub_801A3F4: ; 801A3F4 bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0801A414 + bne _0801A414 bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably -@0801A414: +_0801A414: pop {r0} bx r0 thumb_func_end sub_801A3F4 @@ -32709,14 +32709,14 @@ sub_801A584: ; 801A584 push {r4,lr} bl FreeAllWindowBuffers movs r4, 0 -@0801A58C: +_0801A58C: lsls r0, r4, 24 lsrs r0, 24 bl GetBgTilemap bl Free adds r4, 0x1 cmp r4, 0x1 - ble @0801A58C + ble _0801A58C ldr r0, =0x03000dac ldr r0, [r0] bl Free @@ -32738,20 +32738,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 @@ -32797,7 +32797,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 @@ -32817,7 +32817,7 @@ sub_801A600: ; 801A600 bl sub_801A8B0 adds r1, r4, 0 cmp r4, 0x2 - ble @0801A644 + ble _0801A644 ldr r1, =gUnknown_082F0D5C adds r0, r4, 0x1 lsls r0, 2 @@ -32871,24 +32871,24 @@ 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 .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 @@ -32898,9 +32898,9 @@ sub_801A6C0: ; 801A6C0 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @0801A89C + b _0801A89C .pool -@0801A728: +_0801A728: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -32914,23 +32914,23 @@ sub_801A6C0: ; 801A6C0 bl CopyBgTilemapBufferToVram movs r0, 0 bl ShowBg - 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 .pool -@0801A768: +_0801A768: ldr r0, =0x03000dac ldr r0, [r0] adds r1, r0, 0 @@ -32944,7 +32944,7 @@ sub_801A6C0: ; 801A6C0 lsls r1, r5, 2 mov r8, r1 cmp r0, 0 - beq @0801A7F8 + beq _0801A7F8 movs r0, 0x2 movs r1, 0 bl FillWindowPixelBuffer @@ -32952,7 +32952,7 @@ sub_801A6C0: ; 801A6C0 ldr r6, =0x02021fc4 movs r7, 0x80 lsls r7, 20 -@0801A796: +_0801A796: ldr r0, =0x03000dac ldr r0, [r0] lsls r1, r4, 2 @@ -32963,7 +32963,7 @@ sub_801A6C0: ; 801A6C0 movs r3, 0x2 bl ConvertIntToDecimalString cmp r4, 0x3 - beq @0801A7CC + beq _0801A7CC lsrs r0, r7, 24 str r0, [sp] movs r0, 0x1 @@ -32973,9 +32973,9 @@ sub_801A6C0: ; 801A6C0 adds r2, r6, 0 movs r3, 0xC bl sub_801A8B0 - b @0801A7DE + b _0801A7DE .pool -@0801A7CC: +_0801A7CC: movs r0, 0x62 str r0, [sp] movs r0, 0x2 @@ -32984,30 +32984,30 @@ sub_801A6C0: ; 801A6C0 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 PutWindowTilemap movs r0, 0x2 movs r1, 0x3 bl CopyWindowToVram -@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 @@ -33028,7 +33028,7 @@ sub_801A6C0: ; 801A6C0 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@0801A836: +_0801A836: mov r2, r8 adds r1, r2, r5 lsls r1, 3 @@ -33038,9 +33038,9 @@ sub_801A6C0: ; 801A6C0 adds r0, 0xE adds r1, 0x10 bl sub_801A5BC - b @0801A89C + b _0801A89C .pool -@0801A85C: +_0801A85C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -33048,30 +33048,30 @@ sub_801A6C0: ; 801A6C0 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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 .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 bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@0801A89C: +_0801A89C: add sp, 0x8 pop {r3} mov r8, r3 @@ -33099,62 +33099,62 @@ 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 .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] @@ -33198,7 +33198,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 @@ -33207,55 +33207,55 @@ sub_801A960: ; 801A960 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 .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} @@ -33273,21 +33273,21 @@ sub_801AA08: ; 801AA08 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 @@ -33317,7 +33317,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 @@ -33326,27 +33326,27 @@ sub_801AA30: ; 801AA30 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 .pool -@0801AA9C: +_0801AA9C: adds r1, r6, 0 mov r0, sp ldm r0!, {r2-r4} @@ -33367,9 +33367,9 @@ sub_801AA30: ; 801AA30 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 @@ -33388,7 +33388,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] @@ -33402,22 +33402,22 @@ sub_801AAD4: ; 801AAD4 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 @@ -33426,7 +33426,7 @@ sub_801AAD4: ; 801AAD4 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 @@ -33511,11 +33511,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 @@ -33534,20 +33534,20 @@ sub_801ABDC: ; 801ABDC ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b @0801AC36 -@0801AC22: + b _0801AC36 +_0801AC22: movs r0, 0 bl IsTextPrinterActive 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} @@ -33575,70 +33575,70 @@ 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 .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 SetGpuReg @@ -33660,9 +33660,9 @@ sub_801AC54: ; 801AC54 bl InitWindows lsls r0, 16 cmp r0, 0 - bne @0801AD8C - b @0801AFC2 -@0801AD8C: + bne _0801AD8C + b _0801AFC2 +_0801AD8C: bl DeactivateAllTextPrinters movs r0, 0 bl ClearWindowTilemap @@ -33698,25 +33698,25 @@ sub_801AC54: ; 801AC54 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0801AF8A + b _0801AF8A .pool -@0801ADFC: +_0801ADFC: ldr r0, =0x02022c6c ldr r0, [r0] ldr r1, =gUnknown_085EFBD2 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 .pool -@0801AE24: +_0801AE24: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -33730,15 +33730,15 @@ sub_801AC54: ; 801AC54 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0801AF8A + b _0801AF8A .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 @@ -33748,13 +33748,13 @@ sub_801AC54: ; 801AC54 ldrb r1, [r0] ldrb r0, [r0, 0x1] cmn r1, r0 - bne @0801AE78 + bne _0801AE78 movs r0, 0x52 - b @0801AE7A + b _0801AE7A .pool -@0801AE78: +_0801AE78: movs r0, 0x51 -@0801AE7A: +_0801AE7A: strb r0, [r4] ldr r1, =0x020228c4 movs r0, 0 @@ -33764,26 +33764,26 @@ sub_801AC54: ; 801AC54 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @0801AF8A + b _0801AF8A .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 @@ -33796,9 +33796,9 @@ sub_801AC54: ; 801AC54 lsls r1, 3 adds r0, r1 movs r1, 0x32 - b @0801AF16 + b _0801AF16 .pool -@0801AEE0: +_0801AEE0: bl sub_800AC34 ldr r4, =0x020223c4 bl link_get_multiplayer_id @@ -33807,89 +33807,89 @@ sub_801AC54: ; 801AC54 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 .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 .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 .pool -@0801AF40: +_0801AF40: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq @0801AFAE + beq _0801AFAE ldr r0, =sub_801AAD4 bl SetMainCallback2 - b @0801AFAE + b _0801AFAE .pool -@0801AF58: +_0801AF58: ldr r0, =0x02022c6c ldr r0, [r0] ldr r1, =gUnknown_085EFC27 movs r2, 0x1 bl sub_801ABDC cmp r0, 0 - beq @0801AFAE + beq _0801AFAE ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 - b @0801AFAE + b _0801AFAE .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 .pool -@0801AF98: +_0801AF98: ldr r0, =0x02022c6c ldr r0, [r0] ldr r1, =gUnknown_085EFC0C movs r2, 0x1 bl sub_801ABDC cmp r0, 0 - beq @0801AFAE + beq _0801AFAE ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 -@0801AFAE: +_0801AFAE: bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably -@0801AFC2: +_0801AFC2: add sp, 0xC pop {r4} pop {r0} @@ -33983,7 +33983,7 @@ sub_801B078: ; 801B078 adds r7, r0, 0 bl sub_801B114 cmp r0, 0 - beq @0801B0C4 + beq _0801B0C4 bl sub_801B14C ldr r4, =0x03005d8c ldr r0, [r4] @@ -34005,11 +34005,11 @@ sub_801B078: ; 801B078 lsrs r0, 16 str r0, [r1] movs r0, 0x1 - b @0801B0C6 + b _0801B0C6 .pool -@0801B0C4: +_0801B0C4: movs r0, 0 -@0801B0C6: +_0801B0C6: pop {r4-r7} pop {r1} bx r1 @@ -34032,18 +34032,18 @@ 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 .pool -@0801B10C: +_0801B10C: movs r0, 0 -@0801B10E: +_0801B10E: pop {r4} pop {r1} bx r1 @@ -34054,12 +34054,12 @@ 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 @@ -34073,13 +34073,13 @@ sub_801B128: ; 801B128 adds r0, r1 ldrb r0, [r0, 0x2] cmp r0, 0 - beq @0801B144 + beq _0801B144 movs r0, 0x1 - b @0801B146 + b _0801B146 .pool -@0801B144: +_0801B144: movs r0, 0 -@0801B146: +_0801B146: pop {r1} bx r1 thumb_func_end sub_801B128 @@ -34135,26 +34135,26 @@ 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 .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 @@ -34186,7 +34186,7 @@ sub_801B21C: ; 801B21C adds r7, r0, 0 bl sub_801B2CC cmp r0, 0 - beq @0801B274 + beq _0801B274 bl sub_801B1E8 ldr r4, =0x03005d8c ldr r0, [r4] @@ -34214,11 +34214,11 @@ sub_801B21C: ; 801B21C ldrh r0, [r1, 0x2] strh r0, [r2, 0x6] movs r0, 0x1 - b @0801B276 + b _0801B276 .pool -@0801B274: +_0801B274: movs r0, 0 -@0801B276: +_0801B276: pop {r4-r7} pop {r1} bx r1 @@ -34240,22 +34240,22 @@ 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 .pool -@0801B2C4: +_0801B2C4: movs r0, 0 -@0801B2C6: +_0801B2C6: pop {r4,r5} pop {r1} bx r1 @@ -34267,33 +34267,33 @@ sub_801B2CC: ; 801B2CC 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 @@ -34309,13 +34309,13 @@ sub_801B308: ; 801B308 movs r0, 0xC0 ands r0, r1 cmp r0, 0 - beq @0801B328 + beq _0801B328 movs r0, 0x1 - b @0801B32A + b _0801B32A .pool -@0801B328: +_0801B328: movs r0, 0 -@0801B32A: +_0801B32A: pop {r1} bx r1 thumb_func_end sub_801B308 @@ -34372,16 +34372,16 @@ 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 .pool @@ -34395,11 +34395,11 @@ sub_801B3C0: ; 801B3C0 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 @@ -34412,13 +34412,13 @@ sub_801B3D8: ; 801B3D8 adds r0, r1 lsrs r0, 16 cmp r0, 0x13 - bls @0801B3F0 + bls _0801B3F0 movs r0, 0 - b @0801B3F2 + b _0801B3F2 .pool -@0801B3F0: +_0801B3F0: movs r0, 0x1 -@0801B3F2: +_0801B3F2: pop {r1} bx r1 thumb_func_end sub_801B3D8 @@ -34432,7 +34432,7 @@ sub_801B3F8: ; 801B3F8 adds r0, r4, 0 bl sub_801B3D8 cmp r0, 0 - beq @0801B430 + beq _0801B430 ldr r1, =gUnknown_082F0DE8 ldr r2, =0xfffffc18 adds r0, r4, r2 @@ -34443,13 +34443,13 @@ sub_801B3F8: ; 801B3F8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0801B430 + beq _0801B430 movs r0, 0x1 - b @0801B432 + b _0801B432 .pool -@0801B430: +_0801B430: movs r0, 0 -@0801B432: +_0801B432: pop {r4} pop {r1} bx r1 @@ -34460,23 +34460,23 @@ 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 @@ -34489,36 +34489,36 @@ sub_801B460: ; 801B460 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 @@ -34530,19 +34530,19 @@ sub_801B4A4: ; 801B4A4 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 .pool -@0801B4C4: +_0801B4C4: movs r0, 0 -@0801B4C6: +_0801B4C6: pop {r1} bx r1 thumb_func_end sub_801B4A4 @@ -34552,7 +34552,7 @@ sub_801B4CC: ; 801B4CC push {lr} bl sub_801B27C cmp r0, 0 - beq @0801B500 + beq _0801B500 ldr r0, =0x03005d8c ldr r3, [r0] ldr r0, =0x000033f0 @@ -34561,17 +34561,17 @@ 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 .pool -@0801B500: +_0801B500: movs r0, 0 -@0801B502: +_0801B502: pop {r1} bx r1 thumb_func_end sub_801B4CC @@ -34588,7 +34588,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 @@ -34597,41 +34597,41 @@ sub_801B508: ; 801B508 adds r2, r4, 0 bl sub_801B460 cmp r0, 0 - beq @0801B54C - b @0801B572 + beq _0801B54C + b _0801B572 .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 @@ -34660,22 +34660,22 @@ 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 .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] @@ -34693,10 +34693,10 @@ sub_801B580: ; 801B580 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 @@ -34718,14 +34718,14 @@ sub_801B580: ; 801B580 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 @@ -34741,14 +34741,14 @@ sub_801B580: ; 801B580 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 @@ -34776,37 +34776,37 @@ sub_801B6A0: ; 801B6A0 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 .pool -@0801B6E4: +_0801B6E4: movs r0, 0x1 -@0801B6E6: +_0801B6E6: pop {r4} pop {r1} bx r1 @@ -34817,18 +34817,18 @@ 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 @@ -34847,25 +34847,25 @@ 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 @@ -34877,21 +34877,21 @@ sub_801B748: ; 801B748 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 @@ -34915,43 +34915,43 @@ 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 .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 @@ -34969,41 +34969,41 @@ 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 .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 .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] @@ -35011,9 +35011,9 @@ sub_801B7D8: ; 801B7D8 lsrs r0, 16 ldr r1, =0x000003e7 cmp r0, r1 - bls @0801B850 + bls _0801B850 strh r1, [r2] -@0801B850: +_0801B850: pop {r4} pop {r0} bx r0 @@ -35024,21 +35024,21 @@ sub_801B7D8: ; 801B7D8 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 .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 @@ -35047,14 +35047,14 @@ mevent_081445C0: ; 801B860 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 .pool -@0801B8AC: +_0801B8AC: ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x000033f0 @@ -35063,14 +35063,14 @@ mevent_081445C0: ; 801B860 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 .pool -@0801B8D0: +_0801B8D0: ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x000033f0 @@ -35079,14 +35079,14 @@ mevent_081445C0: ; 801B860 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 .pool -@0801B8F4: +_0801B8F4: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000033f0 @@ -35095,13 +35095,13 @@ mevent_081445C0: ; 801B860 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 .pool -@0801B918: +_0801B918: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000033f0 @@ -35110,13 +35110,13 @@ mevent_081445C0: ; 801B860 movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne @0801B938 + bne _0801B938 ldrb r0, [r2, 0x9] - b @0801B93A + b _0801B93A .pool -@0801B938: +_0801B938: movs r0, 0 -@0801B93A: +_0801B93A: pop {r1} bx r1 thumb_func_end mevent_081445C0 @@ -35140,24 +35140,24 @@ 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 .pool -@0801B988: +_0801B988: movs r0, 0 -@0801B98A: +_0801B98A: pop {r4,r5} pop {r1} bx r1 @@ -35170,32 +35170,32 @@ sub_801B990: ; 801B990 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 .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 .pool -@0801B9DC: +_0801B9DC: ldr r0, =0x03005d8c ldr r2, [r0] ldr r0, =0x00003570 @@ -35203,7 +35203,7 @@ sub_801B990: ; 801B990 movs r0, 0x1 movs r3, 0x5 bl sub_801BA8C -@0801B9EC: +_0801B9EC: pop {r0} bx r0 .pool @@ -35235,57 +35235,57 @@ sub_801BA24: ; 801BA24 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 @@ -35300,10 +35300,10 @@ 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 @@ -35315,20 +35315,20 @@ sub_801BAAC: ; 801BAAC 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 AllocZeroed str r0, [r7] cmp r0, 0 - bne @0801BAD4 -@0801BAC8: + bne _0801BAD4 +_0801BAC8: movs r0, 0 - b @0801BB3E + b _0801BB3E .pool -@0801BAD4: +_0801BAD4: movs r4, 0xA6 lsls r4, 1 adds r1, r5, 0 @@ -35348,30 +35348,30 @@ sub_801BAAC: ; 801BAAC 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 @@ -35384,7 +35384,7 @@ sub_801BAAC: ; 801BAAC adds r0, r1 str r0, [r2] movs r0, 0x1 -@0801BB3E: +_0801BB3E: pop {r4-r7} pop {r1} bx r1 @@ -35397,7 +35397,7 @@ sub_801BB48: ; 801BB48 ldr r4, =0x02022c74 ldr r0, [r4] cmp r0, 0 - beq @0801BB64 + beq _0801BB64 ldr r2, =0x0000145c movs r1, 0 bl memset @@ -35405,7 +35405,7 @@ sub_801BB48: ; 801BB48 bl Free movs r0, 0 str r0, [r4] -@0801BB64: +_0801BB64: pop {r4} pop {r0} bx r0 @@ -35419,37 +35419,37 @@ sub_801BB74: ; 801BB74 ldr r5, =0x02022c74 ldr r0, [r5] cmp r0, 0 - bne @0801BB8C + bne _0801BB8C movs r0, 0x1 negs r0, r0 - b @0801BD98 + b _0801BD98 .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 .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 @@ -35457,16 +35457,16 @@ sub_801BB74: ; 801BB74 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 @@ -35533,16 +35533,16 @@ sub_801BB74: ; 801BB74 lsls r2, 1 adds r1, r2 strh r0, [r1] - b @0801BD86 + b _0801BD86 .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 @@ -35591,12 +35591,12 @@ sub_801BB74: ; 801BB74 bl CopyRectToBgTilemapBufferRect movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @0801BD86 + b _0801BD86 .pool -@0801BD14: +_0801BD14: bl sub_801BEF8 - b @0801BD86 -@0801BD1A: + b _0801BD86 +_0801BD1A: movs r0, 0 bl sub_801C178 movs r0, 0x1 @@ -35605,11 +35605,11 @@ sub_801BB74: ; 801BB74 bl sub_801C178 movs r0, 0x1 bl CopyBgTilemapBufferToVram - b @0801BD86 -@0801BD34: + b _0801BD86 +_0801BD34: bl sub_80D2F04 - b @0801BD86 -@0801BD3A: + b _0801BD86 +_0801BD3A: movs r0, 0x1 bl ShowBg movs r0, 0x2 @@ -35628,20 +35628,20 @@ sub_801BB74: ; 801BB74 movs r3, 0 bl pal_fade_maybe bl fade_and_return_progress_probably - b @0801BD86 + b _0801BD86 .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 @@ -35650,9 +35650,9 @@ sub_801BB74: ; 801BB74 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@0801BD96: +_0801BD96: movs r0, 0 -@0801BD98: +_0801BD98: add sp, 0x24 pop {r4-r6} pop {r1} @@ -35668,35 +35668,35 @@ sub_801BDA4: ; 801BDA4 ldr r5, =0x02022c74 ldr r0, [r5] cmp r0, 0 - bne @0801BDBC + bne _0801BDBC movs r0, 0x1 negs r0, r0 - b @0801BEEC + b _0801BEEC .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 .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 @@ -35704,14 +35704,14 @@ sub_801BDA4: ; 801BDA4 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 @@ -35741,8 +35741,8 @@ sub_801BDA4: ; 801BDA4 bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @0801BEDA -@0801BE56: + b _0801BEDA +_0801BE56: movs r0, 0x1 bl HideBg movs r0, 0x2 @@ -35766,13 +35766,13 @@ sub_801BDA4: ; 801BDA4 adds r0, r1 ldrb r0, [r0] bl RemoveWindow - b @0801BEDA + b _0801BEDA .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 @@ -35786,20 +35786,20 @@ sub_801BDA4: ; 801BDA4 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @0801BEDA + b _0801BEDA .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 @@ -35808,9 +35808,9 @@ sub_801BDA4: ; 801BDA4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@0801BEEA: +_0801BEEA: movs r0, 0 -@0801BEEC: +_0801BEEC: add sp, 0x8 pop {r4,r5} pop {r1} @@ -35861,9 +35861,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 @@ -35872,7 +35872,7 @@ sub_801BEF8: ; 801BEF8 movs r3, 0x6 bl ConvertIntToDecimalString adds r6, r4, 0 -@0801BF66: +_0801BF66: ldr r2, [r6] lsls r1, r5, 2 adds r1, r5 @@ -35900,7 +35900,7 @@ sub_801BEF8: ; 801BEF8 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls @0801BF66 + bls _0801BF66 ldr r6, =0x02022c74 ldr r1, [r6] movs r3, 0xA2 @@ -35923,18 +35923,18 @@ sub_801BEF8: ; 801BEF8 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 .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 @@ -35945,18 +35945,18 @@ sub_801BEF8: ; 801BEF8 ldr r1, [r6] ldr r0, =0x000002d9 adds r1, r0 - b @0801C01C + b _0801C01C .pool -@0801C018: +_0801C018: ldr r2, =0x000002b1 adds r1, r2 -@0801C01C: +_0801C01C: ldrb r0, [r1] orrs r0, r4 strb r0, [r1] - b @0801C168 + b _0801C168 .pool -@0801C028: +_0801C028: ldr r3, =0x000002b1 adds r0, r1, r3 ldrb r1, [r0] @@ -35970,9 +35970,9 @@ sub_801BEF8: ; 801BEF8 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 @@ -35980,9 +35980,9 @@ sub_801BEF8: ; 801BEF8 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 @@ -35990,12 +35990,12 @@ sub_801BEF8: ; 801BEF8 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 @@ -36018,7 +36018,7 @@ sub_801BEF8: ; 801BEF8 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls @0801C06E + bls _0801C06E movs r5, 0 movs r6, 0 ldr r1, =0x02022c74 @@ -36030,7 +36030,7 @@ sub_801BEF8: ; 801BEF8 movs r3, 0xB7 lsls r3, 2 mov r9, r3 -@0801C0B6: +_0801C0B6: mov r4, r8 ldr r2, [r4] mov r0, r10 @@ -36038,7 +36038,7 @@ sub_801BEF8: ; 801BEF8 adds r0, r1, r5 ldrb r3, [r0] cmp r3, 0xF7 - beq @0801C0F8 + beq _0801C0F8 ldr r1, =0x00000175 adds r0, r2, r1 ldrb r1, [r0] @@ -36053,18 +36053,18 @@ sub_801BEF8: ; 801BEF8 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 - b @0801C15E + b _0801C15E .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 @@ -36103,18 +36103,18 @@ sub_801BEF8: ; 801BEF8 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 @@ -36154,23 +36154,23 @@ sub_801C178: ; 801C178 movs r1, 0 bl FillWindowPixelBuffer 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 .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 @@ -36213,9 +36213,9 @@ sub_801C178: ; 801C178 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] @@ -36241,9 +36241,9 @@ sub_801C178: ; 801C178 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] @@ -36264,11 +36264,11 @@ sub_801C178: ; 801C178 movs r2, 0xA6 movs r3, 0x11 bl box_print - b @0801C498 + b _0801C498 .pool -@0801C2A0: +_0801C2A0: mov r9, r6 -@0801C2A2: +_0801C2A2: ldr r2, [sp, 0xC] lsls r4, r2, 24 asrs r4, 24 @@ -36311,10 +36311,10 @@ sub_801C178: ; 801C178 str r0, [sp, 0xC] asrs r4, 24 cmp r4, 0x3 - ble @0801C2A2 - b @0801C498 + ble _0801C2A2 + b _0801C498 .pool -@0801C304: +_0801C304: ldr r4, =gUnknown_082F0E18 ldr r2, [r7] ldrb r0, [r2, 0x8] @@ -36350,7 +36350,7 @@ sub_801C178: ; 801C178 movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq @0801C398 + beq _0801C398 lsls r0, r1, 30 lsrs r0, 30 adds r0, r4 @@ -36379,9 +36379,9 @@ sub_801C178: ; 801C178 movs r2, 0 bl box_print mov r9, r6 - b @0801C498 + b _0801C498 .pool -@0801C398: +_0801C398: movs r2, 0 mov r8, r2 lsls r0, r1, 30 @@ -36402,13 +36402,13 @@ sub_801C178: ; 801C178 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 @@ -36449,7 +36449,7 @@ sub_801C178: ; 801C178 adds r0, r2 ldrb r0, [r0] cmp r0, 0xFF - beq @0801C482 + beq _0801C482 adds r1, r4 adds r1, 0x1 movs r0, 0x3 @@ -36495,7 +36495,7 @@ sub_801C178: ; 801C178 ldrb r1, [r1] adds r0, r1 add r8, r0 -@0801C482: +_0801C482: adds r1, r6, 0x1 lsls r1, 24 lsrs r0, r1, 24 @@ -36506,8 +36506,8 @@ sub_801C178: ; 801C178 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 @@ -36545,7 +36545,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 @@ -36577,16 +36577,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, =gUnknown_082F1D00 bl LoadCompressedObjectPicUsingHeap ldr r0, [r4] @@ -36603,7 +36603,7 @@ sub_801C4C0: ; 801C4C0 ldr r0, [r4] ldrb r0, [r0, 0x9] cmp r7, r0 - bcs @0801C5EE + bcs _0801C5EE adds r6, r4, 0 ldr r0, =0x0000017d mov r10, r0 @@ -36611,7 +36611,7 @@ sub_801C4C0: ; 801C4C0 mov r9, r1 movs r2, 0xFF mov r8, r2 -@0801C572: +_0801C572: ldr r1, [r6] lsls r4, r7, 1 add r1, r10 @@ -36647,7 +36647,7 @@ sub_801C4C0: ; 801C4C0 adds r1, r0, r4 ldrh r0, [r1] cmp r0, 0 - beq @0801C5E0 + beq _0801C5E0 bl sub_80D2E84 lsls r0, 16 lsrs r0, 16 @@ -36664,15 +36664,15 @@ sub_801C4C0: ; 801C4C0 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 @@ -36695,7 +36695,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 @@ -36703,21 +36703,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 @@ -36725,14 +36725,14 @@ sub_801C61C: ; 801C61C 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 RemoveObjectAndFreeTiles -@0801C678: +_0801C678: ldr r0, [r6] movs r2, 0xBF lsls r2, 1 @@ -36740,29 +36740,29 @@ sub_801C61C: ; 801C61C 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 FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag -@0801C6B4: +_0801C6B4: pop {r4-r7} pop {r0} bx r0 @@ -36774,18 +36774,18 @@ 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 AllocZeroed str r0, [r5] cmp r0, 0 - bne @0801C6EC -@0801C6DE: + bne _0801C6EC +_0801C6DE: movs r0, 0 - b @0801C71C + b _0801C71C .pool -@0801C6EC: +_0801C6EC: movs r6, 0xDE lsls r6, 1 adds r1, r4, 0 @@ -36794,10 +36794,10 @@ sub_801C6C8: ; 801C6C8 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] @@ -36810,7 +36810,7 @@ sub_801C6C8: ; 801C6C8 movs r0, 0xFF strb r0, [r1] movs r0, 0x1 -@0801C71C: +_0801C71C: pop {r4-r6} pop {r1} bx r1 @@ -36823,7 +36823,7 @@ sub_801C72C: ; 801C72C ldr r4, =0x02022c78 ldr r0, [r4] cmp r0, 0 - beq @0801C748 + beq _0801C748 ldr r2, =0x000013a4 movs r1, 0 bl memset @@ -36831,7 +36831,7 @@ sub_801C72C: ; 801C72C bl Free movs r0, 0 str r0, [r4] -@0801C748: +_0801C748: pop {r4} pop {r0} bx r0 @@ -36849,37 +36849,37 @@ 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 .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 .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 @@ -36887,14 +36887,14 @@ sub_801C758: ; 801C758 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 @@ -36927,9 +36927,9 @@ sub_801C758: ; 801C758 lsls r1, 6 movs r0, 0 bl SetGpuRegBits - b @0801CA1E + b _0801CA1E .pool -@0801C82C: +_0801C82C: movs r5, 0x1E str r5, [sp] movs r4, 0x14 @@ -36997,16 +36997,16 @@ sub_801C758: ; 801C758 lsls r3, 1 adds r1, r3 strh r0, [r1] - b @0801CA1E + b _0801CA1E .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 @@ -37081,19 +37081,19 @@ sub_801C758: ; 801C758 bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @0801CA1E + b _0801CA1E .pool -@0801C990: +_0801C990: bl sub_801CDCC - b @0801CA1E -@0801C996: + b _0801CA1E +_0801C996: bl sub_801CE7C movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @0801CA1E -@0801C9A8: + b _0801CA1E +_0801C9A8: movs r0, 0x1 bl ShowBg movs r0, 0x2 @@ -37126,13 +37126,13 @@ sub_801C758: ; 801C758 movs r3, 0 bl pal_fade_maybe bl fade_and_return_progress_probably - b @0801CA1E + b _0801CA1E .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] @@ -37140,8 +37140,8 @@ sub_801C758: ; 801C758 ands r1, r2 strb r1, [r0] movs r0, 0x1 - b @0801CA3A -@0801CA1E: + b _0801CA3A +_0801CA1E: ldr r0, =0x02022c78 ldr r2, [r0] movs r0, 0xE0 @@ -37155,9 +37155,9 @@ sub_801C758: ; 801C758 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 @@ -37177,36 +37177,36 @@ sub_801CA50: ; 801CA50 ldr r5, =0x02022c78 ldr r0, [r5] cmp r0, 0 - bne @0801CA68 + bne _0801CA68 movs r0, 0x1 negs r0, r0 - b @0801CC2A + b _0801CC2A .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 .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 @@ -37214,14 +37214,14 @@ sub_801CA50: ; 801CA50 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 @@ -37242,8 +37242,8 @@ sub_801CA50: ; 801CA50 lsls r1, 6 movs r0, 0 bl ResetGpuRegBits - b @0801CC0E -@0801CAF4: + b _0801CC0E +_0801CAF4: movs r4, 0x1E str r4, [sp] movs r5, 0x14 @@ -37283,8 +37283,8 @@ sub_801CA50: ; 801CA50 bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @0801CC0E -@0801CB54: + b _0801CC0E +_0801CB54: movs r0, 0x1 bl HideBg movs r0, 0x2 @@ -37302,9 +37302,9 @@ sub_801CA50: ; 801CA50 adds r0, r2 ldrb r0, [r0] bl RemoveWindow - b @0801CC0E + b _0801CC0E .pool -@0801CB84: +_0801CB84: movs r0, 0x2 movs r1, 0 movs r2, 0 @@ -37319,16 +37319,16 @@ sub_801CA50: ; 801CA50 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 .pool -@0801CBC0: +_0801CBC0: ldr r0, =0x02022c60 ldrb r0, [r0] adds r1, r2, 0 @@ -37346,13 +37346,13 @@ sub_801CA50: ; 801CA50 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @0801CC0E + b _0801CC0E .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] @@ -37360,8 +37360,8 @@ sub_801CA50: ; 801CA50 ands r1, r2 strb r1, [r0] movs r0, 0x1 - b @0801CC2A -@0801CC0E: + b _0801CC2A +_0801CC0E: ldr r0, =0x02022c78 ldr r2, [r0] movs r0, 0xE0 @@ -37375,9 +37375,9 @@ sub_801CA50: ; 801CA50 ands r0, r3 orrs r0, r1 strb r0, [r2] -@0801CC28: +_0801CC28: movs r0, 0 -@0801CC2A: +_0801CC2A: add sp, 0x8 pop {r4,r5} pop {r1} @@ -37397,12 +37397,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 @@ -37415,7 +37415,7 @@ sub_801CC38: ; 801CC38 movs r2, 0x1 orrs r0, r2 strb r0, [r1] -@0801CC72: +_0801CC72: pop {r4,r5} pop {r0} bx r0 @@ -37434,7 +37434,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 @@ -37455,7 +37455,7 @@ sub_801CC80: ; 801CC80 negs r0, r0 ands r0, r2 strb r0, [r1] -@0801CCC0: +_0801CCC0: pop {r4} pop {r0} bx r0 @@ -37480,39 +37480,39 @@ 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 .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 @@ -37520,16 +37520,16 @@ sub_801CCD0: ; 801CCD0 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 .pool -@0801CD50: +_0801CD50: movs r0, 0xE3 lsls r0, 1 add r0, r12 @@ -37539,7 +37539,7 @@ sub_801CCD0: ; 801CCD0 ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - beq @0801CCF6 + beq _0801CCF6 movs r0, 0xE0 lsls r0, 1 add r0, r12 @@ -37547,13 +37547,13 @@ sub_801CCD0: ; 801CCD0 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 @@ -37584,13 +37584,13 @@ sub_801CCD0: ; 801CCD0 ldrb r0, [r0] ands r2, r0 cmp r2, 0 - beq @0801CDC4 + beq _0801CDC4 movs r0, 0x3 - b @0801CDC6 + b _0801CDC6 .pool -@0801CDC4: +_0801CDC4: movs r0, 0x2 -@0801CDC6: +_0801CDC6: pop {r4-r6} pop {r1} bx r1 @@ -37615,7 +37615,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 @@ -37635,26 +37635,26 @@ sub_801CDCC: ; 801CDCC 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 @@ -37730,9 +37730,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] @@ -37756,7 +37756,7 @@ sub_801CE7C: ; 801CE7C movs r1, 0x3 movs r3, 0x6 bl box_print -@0801CF1C: +_0801CF1C: ldr r6, =0x02022c78 ldr r4, [r6] movs r1, 0xE5 @@ -37795,7 +37795,7 @@ sub_801CE7C: ; 801CE7C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls @0801CF1C + bls _0801CF1C ldr r0, [r6] movs r3, 0xE4 lsls r3, 1 @@ -37836,7 +37836,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 @@ -37845,9 +37845,9 @@ sub_801CFA4: ; 801CFA4 adds r1, r4, 0 movs r2, 0x1 bl ChangeBgY - b @0801CFF8 + b _0801CFF8 .pool -@0801CFE4: +_0801CFE4: movs r0, 0x2 adds r1, r4, 0 movs r2, 0x2 @@ -37856,7 +37856,7 @@ sub_801CFA4: ; 801CFA4 adds r1, r4, 0 movs r2, 0x2 bl ChangeBgY -@0801CFF8: +_0801CFF8: ldr r3, =0x02022c78 ldr r0, [r3] ldr r2, =0x000001c3 @@ -37880,25 +37880,25 @@ sub_801CFA4: ; 801CFA4 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 .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 @@ -37916,7 +37916,7 @@ sub_801CFA4: ; 801CFA4 movs r0, 0x1 ands r0, r1 strb r0, [r2] -@0801D070: +_0801D070: pop {r4-r6} pop {r0} bx r0 @@ -37964,15 +37964,15 @@ sub_801D0C4: ; 801D0C4 ldr r4, =0x02022c7c ldr r0, [r4] cmp r0, 0 - bne @0801D0D8 + bne _0801D0D8 movs r0, 0x3 - b @0801D0F8 + b _0801D0F8 .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] @@ -37981,9 +37981,9 @@ sub_801D0C4: ; 801D0C4 bl Free movs r0, 0 str r0, [r4] -@0801D0F6: +_0801D0F6: adds r0, r5, 0 -@0801D0F8: +_0801D0F8: pop {r4-r6} pop {r1} bx r1 @@ -38062,9 +38062,9 @@ mevent_srv_814501C: ; 801D17C 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 @@ -38073,17 +38073,17 @@ sub_801D188: ; 801D188 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 @@ -38109,10 +38109,10 @@ sub_801D1B8: ; 801D1B8 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} @@ -38126,10 +38126,10 @@ sub_801D1D4: ; 801D1D4 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} @@ -38150,59 +38150,59 @@ 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 .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] @@ -38210,37 +38210,37 @@ sub_801D1F0: ; 801D1F0 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 @@ -38248,13 +38248,13 @@ sub_801D1F0: ; 801D1F0 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 @@ -38263,29 +38263,29 @@ sub_801D1F0: ; 801D1F0 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 @@ -38295,8 +38295,8 @@ sub_801D1F0: ; 801D1F0 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 @@ -38306,8 +38306,8 @@ sub_801D1F0: ; 801D1F0 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 @@ -38317,88 +38317,88 @@ sub_801D1F0: ; 801D1F0 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 @@ -38408,8 +38408,8 @@ sub_801D1F0: ; 801D1F0 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 @@ -38417,18 +38417,18 @@ sub_801D1F0: ; 801D1F0 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} @@ -38475,15 +38475,15 @@ sub_801D4A8: ; 801D4A8 ldr r4, =0x02022c80 ldr r0, [r4] cmp r0, 0 - bne @0801D4BC + bne _0801D4BC movs r0, 0x6 - b @0801D4DC + b _0801D4DC .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] @@ -38492,9 +38492,9 @@ sub_801D4A8: ; 801D4A8 bl Free movs r0, 0 str r0, [r4] -@0801D4DA: +_0801D4DA: adds r0, r5, 0 -@0801D4DC: +_0801D4DC: pop {r4-r6} pop {r1} bx r1 @@ -38661,12 +38661,12 @@ sub_801D5FC: ; 801D5FC 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} @@ -38680,12 +38680,12 @@ sub_801D61C: ; 801D61C 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} @@ -38704,56 +38704,56 @@ 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 .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] @@ -38761,8 +38761,8 @@ sub_801D63C: ; 801D63C 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 @@ -38770,23 +38770,23 @@ sub_801D63C: ; 801D63C 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 @@ -38796,8 +38796,8 @@ sub_801D63C: ; 801D63C 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 @@ -38807,8 +38807,8 @@ sub_801D63C: ; 801D63C 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 @@ -38818,15 +38818,15 @@ sub_801D63C: ; 801D63C 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 @@ -38836,49 +38836,49 @@ sub_801D63C: ; 801D63C 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 @@ -38887,22 +38887,22 @@ sub_801D63C: ; 801D63C movs r2, 0xBC bl memcpy bl sub_81652B4 - b @0801D804 + b _0801D804 .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 @@ -38915,12 +38915,12 @@ sub_801D810: ; 801D810 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 @@ -38932,27 +38932,27 @@ sub_801D828: ; 801D828 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} @@ -38971,12 +38971,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} @@ -39058,14 +39058,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} @@ -39110,12 +39110,12 @@ 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 @@ -39138,21 +39138,21 @@ sub_801D988: ; 801D988 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 @@ -39166,28 +39166,28 @@ sub_801D988: ; 801D988 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 @@ -39195,7 +39195,7 @@ sub_801D988: ; 801D988 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 @@ -39206,8 +39206,8 @@ sub_801D988: ; 801D988 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 @@ -39216,11 +39216,11 @@ sub_801D988: ; 801D988 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 @@ -39228,14 +39228,14 @@ sub_801D988: ; 801D988 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} @@ -39249,23 +39249,23 @@ sub_801DA5C: ; 801DA5C 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] @@ -39292,17 +39292,17 @@ sub_801DA5C: ; 801DA5C mov r1, sp movs r2, 0x8 bl link_0800A448 - b @0801DB3E + b _0801DB3E .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] @@ -39312,7 +39312,7 @@ sub_801DA5C: ; 801DA5C 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 @@ -39322,8 +39322,8 @@ sub_801DA5C: ; 801DA5C 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 @@ -39332,12 +39332,12 @@ sub_801DA5C: ; 801DA5C 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 @@ -39345,28 +39345,28 @@ sub_801DA5C: ; 801DA5C 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} @@ -39389,32 +39389,32 @@ 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 @@ -39446,21 +39446,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 @@ -39475,57 +39475,57 @@ sub_801DC20: ; 801DC20 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 .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 .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 @@ -39582,12 +39582,12 @@ 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 @@ -39612,12 +39612,12 @@ 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 @@ -39631,48 +39631,48 @@ sub_801DD44: ; 801DD44 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 @@ -39729,7 +39729,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 @@ -39738,7 +39738,7 @@ sub_801DDD0: ; 801DDD0 adds r4, 0x15 subs r5, 0x1 cmp r5, 0 - bge @0801DE0E + bge _0801DE0E pop {r4-r7} pop {r0} bx r0 @@ -39773,29 +39773,29 @@ 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 .pool -@0801DE74: +_0801DE74: cmp r0, 0x2 - beq @0801DEC8 - b @0801DF04 -@0801DE7A: + beq _0801DEC8 + b _0801DF04 +_0801DE7A: bl clear_tasks bl ResetAllObjectData bl ResetObjectPaletteAllocator 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 @@ -39810,20 +39810,20 @@ c2_081284E0: ; 801DE54 bl pal_fade_maybe ldr r0, =sub_801DF20 bl SetVBlankCallback -@0801DEBC: +_0801DEBC: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b @0801DF04 + b _0801DF04 .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 bl SetMainCallback2 ldr r0, =sub_801DF54 @@ -39841,7 +39841,7 @@ c2_081284E0: ; 801DE54 movs r0, 0xE8 movs r1, 0x96 bl sub_800DFB4 -@0801DF04: +_0801DF04: add sp, 0x4 pop {r4-r6} pop {r0} @@ -39879,31 +39879,31 @@ sub_801DF54: ; 801DF54 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 .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, =gUnknown_082F2A7C ldr r0, =0x02022c84 ldr r0, [r0] @@ -39925,18 +39925,18 @@ sub_801DFAC: ; 801DFAC 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 .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 @@ -39945,14 +39945,14 @@ sub_801DFAC: ; 801DFAC 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 @@ -39963,21 +39963,21 @@ sub_801DFAC: ; 801DFAC 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 .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 @@ -39990,42 +39990,42 @@ sub_801E030: ; 801E030 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 .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 .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 @@ -40033,53 +40033,53 @@ sub_801E030: ; 801E030 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 @@ -40090,12 +40090,12 @@ sub_801E030: ; 801E030 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 @@ -40108,42 +40108,42 @@ sub_801E120: ; 801E120 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 .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 .pool -@0801E17C: +_0801E17C: bl ProcessMenuInput lsls r0, 24 asrs r0, 8 @@ -40152,10 +40152,10 @@ sub_801E120: ; 801E120 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 @@ -40163,36 +40163,36 @@ sub_801E120: ; 801E120 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 .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 .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 .pool -@0801E1EC: +_0801E1EC: movs r1, 0 strb r1, [r2, 0x11] ldr r0, [r5] @@ -40205,30 +40205,30 @@ sub_801E120: ; 801E120 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 @@ -40242,29 +40242,29 @@ sub_801E240: ; 801E240 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 .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 @@ -40272,47 +40272,47 @@ sub_801E240: ; 801E240 ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x6] - b @0801E458 + b _0801E458 .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 .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 @@ -40323,9 +40323,9 @@ sub_801E240: ; 801E240 ldr r1, [r4] movs r0, 0x9 strh r0, [r1, 0x6] - b @0801E458 + b _0801E458 .pool -@0801E310: +_0801E310: movs r2, 0xC8 lsls r2, 1 adds r0, r1, r2 @@ -40333,26 +40333,26 @@ sub_801E240: ; 801E240 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 @@ -40360,39 +40360,39 @@ sub_801E240: ; 801E240 ldr r1, [r0] movs r0, 0xA strh r0, [r1, 0x6] - b @0801E458 + b _0801E458 .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 .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 @@ -40400,9 +40400,9 @@ sub_801E240: ; 801E240 ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] - b @0801E458 + b _0801E458 .pool -@0801E3AC: +_0801E3AC: bl sub_80104B0 ldr r4, =0x02022c84 ldr r0, [r4] @@ -40417,16 +40417,16 @@ sub_801E240: ; 801E240 lsls r2, 1 adds r0, r2 strh r5, [r0] - b @0801E458 + b _0801E458 .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 @@ -40437,36 +40437,36 @@ sub_801E240: ; 801E240 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 .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 .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 .pool -@0801E438: +_0801E438: ldr r3, [r2] movs r1, 0xDC lsls r1, 1 @@ -40478,12 +40478,12 @@ sub_801E240: ; 801E240 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 @@ -40497,59 +40497,59 @@ sub_801E460: ; 801E460 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 .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 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 .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 .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 @@ -40557,16 +40557,16 @@ sub_801E460: ; 801E460 adds r0, r1 bl sub_801EFA8 ldr r1, [r4] - b @0801E59A + b _0801E59A .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 @@ -40577,69 +40577,69 @@ sub_801E460: ; 801E460 bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq @0801E5BC + beq _0801E5BC ldr r1, [r4] - b @0801E59A + b _0801E59A .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 .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 .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 .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 @@ -40652,78 +40652,78 @@ sub_801E5C4: ; 801E5C4 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 .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 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 .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 .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 @@ -40737,108 +40737,108 @@ sub_801E668: ; 801E668 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 .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 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 .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 .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 .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 .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 @@ -40852,30 +40852,30 @@ sub_801E764: ; 801E764 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 .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 .pool -@0801E7AC: +_0801E7AC: ldr r0, [r4] movs r1, 0xC8 lsls r1, 1 @@ -40885,15 +40885,15 @@ sub_801E764: ; 801E764 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 @@ -40904,39 +40904,39 @@ sub_801E764: ; 801E764 bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq @0801E830 + beq _0801E830 ldr r1, [r4] - b @0801E812 + b _0801E812 .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 .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 @@ -40949,52 +40949,52 @@ sub_801E838: ; 801E838 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 .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 .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 .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 @@ -41002,84 +41002,84 @@ sub_801E838: ; 801E838 ldr r0, =0x02022c84 ldr r1, [r0] movs r0, 0x3 - b @0801E966 + b _0801E966 .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 .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 .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 .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 @@ -41095,53 +41095,53 @@ 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 .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 @@ -41149,31 +41149,31 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0x2 strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 .pool -@0801EA40: +_0801EA40: movs r0, 0x7 movs r1, 0 bl sub_801F5EC @@ -41181,16 +41181,16 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0x3 strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 @@ -41198,45 +41198,45 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0x4 strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 .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 .pool -@0801EAC4: +_0801EAC4: movs r0, 0x7 movs r1, 0 bl sub_801F5EC @@ -41244,14 +41244,14 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0x6 strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 @@ -41260,14 +41260,14 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0x7 strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 @@ -41275,9 +41275,9 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0x8 strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .pool -@0801EB28: +_0801EB28: movs r0, 0x11 movs r1, 0 bl sub_801F5EC @@ -41285,14 +41285,14 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0x9 strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 @@ -41300,17 +41300,17 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0xA strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 @@ -41318,12 +41318,12 @@ sub_801E978: ; 801E978 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 @@ -41336,20 +41336,20 @@ sub_801E978: ; 801E978 ldr r1, [r0] movs r0, 0xD strh r0, [r1, 0x6] - b @0801EBC2 + b _0801EBC2 .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 bl SetMainCallback2 -@0801EBC2: +_0801EBC2: add sp, 0x4 pop {r4} pop {r0} @@ -41378,11 +41378,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, =gUnknown_082F2AA4 @@ -41391,72 +41391,72 @@ 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 .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 .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 .pool -@0801EC80: +_0801EC80: ldr r0, =gUnknown_082F2AA4 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 .pool @@ -41470,7 +41470,7 @@ sub_801EC94: ; 801EC94 ldr r5, [r0] ldrb r0, [r5, 0x10] cmp r0, 0x3 - beq @0801ECDC + beq _0801ECDC ldr r3, =gUnknown_082F2BA8 ldrb r1, [r5, 0x12] lsls r1, 2 @@ -41483,23 +41483,23 @@ 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 .pool -@0801ECDC: +_0801ECDC: ldrb r0, [r5, 0x12] lsls r1, r0, 2 adds r1, r0 @@ -41517,33 +41517,33 @@ sub_801EC94: ; 801EC94 mov r0, sp bl GetStringLength_Multibyte 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 @@ -41556,15 +41556,15 @@ sub_801EC94: ; 801EC94 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} @@ -41582,7 +41582,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] @@ -41590,7 +41590,7 @@ sub_801ED68: ; 801ED68 ldrb r0, [r1, 0x15] subs r0, 0x1 strb r0, [r1, 0x15] -@0801ED8A: +_0801ED8A: pop {r4} pop {r0} bx r0 @@ -41609,14 +41609,14 @@ sub_801ED94: ; 801ED94 adds r2, r0, 0 ldrb r0, [r2] cmp r0, 0xF9 - beq @0801EDB8 + beq _0801EDB8 ldr r1, =gUnknown_082F2AA8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @0801EDB8 + beq _0801EDB8 strb r0, [r2] -@0801EDB8: +_0801EDB8: pop {r0} bx r0 .pool @@ -41629,13 +41629,13 @@ sub_801EDC4: ; 801EDC4 ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0 - bne @0801EDD8 + bne _0801EDD8 movs r0, 0 - b @0801EDDA + b _0801EDDA .pool -@0801EDD8: +_0801EDD8: movs r0, 0x1 -@0801EDDA: +_0801EDDA: pop {r1} bx r1 thumb_func_end sub_801EDC4 @@ -41691,7 +41691,7 @@ sub_801EE2C: ; 801EE2C movs r6, 0xB9 ldr r5, =0x00003c88 movs r4, 0x9 -@0801EE3E: +_0801EE3E: mov r1, r8 ldr r0, [r1] adds r0, r5 @@ -41702,7 +41702,7 @@ sub_801EE2C: ; 801EE2C adds r5, 0x15 subs r4, 0x1 cmp r4, 0 - bge @0801EE3E + bge _0801EE3E pop {r3} mov r8, r3 pop {r4-r7} @@ -41734,13 +41734,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 @@ -41757,19 +41757,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 @@ -41789,23 +41789,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} @@ -41935,33 +41935,33 @@ 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, =gUnknown_085ED2A9 - b @0801F094 + b _0801F094 .pool -@0801F044: +_0801F044: adds r0, r6, 0 adds r1, r4, 0 bl CopyString @@ -41980,34 +41980,34 @@ sub_801EFF8: ; 801EFF8 adds r1, r5, 0 bl CopyString movs r0, 0x1 - b @0801F0AA -@0801F06E: + b _0801F0AA +_0801F06E: ldr r0, =0x02022c84 ldr r0, [r0] adds r0, 0x79 adds r1, r4, 0 bl CopyString -@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, =gUnknown_085ED2BD -@0801F094: +_0801F094: adds r0, r6, 0 bl sub_81AFC28 movs r0, 0x1 - b @0801F0AA + b _0801F0AA .pool -@0801F0A8: +_0801F0A8: movs r0, 0 -@0801F0AA: +_0801F0AA: pop {r4-r6} pop {r1} bx r1 @@ -42062,14 +42062,14 @@ 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 .pool -@0801F108: +_0801F108: str r2, [r4] -@0801F10A: +_0801F10A: str r0, [r1] pop {r4} pop {r0} @@ -42087,18 +42087,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 @@ -42118,21 +42118,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} @@ -42173,21 +42173,21 @@ sub_801F1A4: ; 801F1A4 bl sub_801EEA8 ldrb r1, [r0] cmp r1, 0xFF - bhi @0801F1BE + bhi _0801F1BE ldr r0, =gUnknown_082F2AA8 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 .pool -@0801F1C8: +_0801F1C8: movs r0, 0 -@0801F1CA: +_0801F1CA: pop {r1} bx r1 thumb_func_end sub_801F1A4 @@ -42274,35 +42274,35 @@ 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 .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 @@ -42314,34 +42314,34 @@ sub_801F2B4: ; 801F2B4 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 .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 @@ -42350,16 +42350,16 @@ sub_801F2B4: ; 801F2B4 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 @@ -42367,15 +42367,15 @@ sub_801F2B4: ; 801F2B4 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 @@ -42388,35 +42388,35 @@ sub_801F2B4: ; 801F2B4 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 .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] @@ -42428,7 +42428,7 @@ sub_801F2B4: ; 801F2B4 adds r1, r2 bl sub_801EFF8 cmp r0, 0 - beq @0801F42C + beq _0801F42C ldr r0, [r5] ldrh r1, [r4, 0x2] strb r1, [r0, 0x16] @@ -42436,87 +42436,87 @@ sub_801F2B4: ; 801F2B4 movs r1, 0x2 bl sub_801F5EC movs r0, 0x7 - b @0801F42E + b _0801F42E .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 .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 .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 .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 @@ -42531,10 +42531,10 @@ sub_801F4D0: ; 801F4D0 bl Alloc str r0, [r4] cmp r0, 0 - beq @0801F52C + beq _0801F52C bl sub_8020890 cmp r0, 0 - beq @0801F52C + beq _0801F52C movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_082F2C60 @@ -42552,11 +42552,11 @@ sub_801F4D0: ; 801F4D0 movs r1, 0 bl sub_801F5EC movs r0, 0x1 - b @0801F52E + b _0801F52E .pool -@0801F52C: +_0801F52C: movs r0, 0 -@0801F52E: +_0801F52E: pop {r4} pop {r1} bx r1 @@ -42580,11 +42580,11 @@ sub_801F544: ; 801F544 ldr r4, =0x02022c88 ldr r0, [r4] cmp r0, 0 - beq @0801F55A + beq _0801F55A bl Free movs r0, 0 str r0, [r4] -@0801F55A: +_0801F55A: bl FreeAllWindowBuffers ldr r1, =0x02039b28 movs r0, 0x3 @@ -42611,12 +42611,12 @@ sub_801F580: ; 801F580 ldr r1, =0x02022c88 ldr r0, [r1] cmp r0, 0 - beq @0801F5A8 + beq _0801F5A8 movs r2, 0 adds r4, r1, 0 ldr r5, =sub_801FDD8 movs r3, 0 -@0801F592: +_0801F592: ldr r0, [r4] lsls r1, r2, 3 adds r0, r1 @@ -42627,8 +42627,8 @@ sub_801F580: ; 801F580 strb r3, [r0, 0x5] adds r2, 0x1 cmp r2, 0x2 - ble @0801F592 -@0801F5A8: + ble _0801F592 +_0801F5A8: pop {r4,r5} pop {r0} bx r0 @@ -42641,10 +42641,10 @@ sub_801F5B8: ; 801F5B8 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 @@ -42656,8 +42656,8 @@ sub_801F5B8: ; 801F5B8 strb r0, [r1, 0x4] adds r5, 0x1 cmp r5, 0x2 - ble @0801F5C6 -@0801F5E0: + ble _0801F5C6 +_0801F5E0: pop {r4-r6} pop {r0} bx r0 @@ -42683,10 +42683,10 @@ sub_801F5EC: ; 801F5EC ldr r1, =gUnknown_082F2C98 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] @@ -42696,15 +42696,15 @@ sub_801F5EC: ; 801F5EC adds r0, r3 mov r1, r12 strb r1, [r0, 0x5] - b @0801F63E + b _0801F63E .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 @@ -42730,66 +42730,66 @@ sub_801F658: ; 801F658 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 .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 IsDma3ManagerBusyWithBgCopy 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 @@ -42801,27 +42801,27 @@ sub_801F6F8: ; 801F6F8 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 CopyWindowToVram - b @0801F720 -@0801F716: + b _0801F720 +_0801F716: bl IsDma3ManagerBusyWithBgCopy 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 @@ -42833,27 +42833,27 @@ sub_801F730: ; 801F730 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 CopyWindowToVram - b @0801F758 -@0801F74E: + b _0801F758 +_0801F74E: bl IsDma3ManagerBusyWithBgCopy 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 @@ -42865,50 +42865,50 @@ sub_801F768: ; 801F768 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 CopyWindowToVram - b @0801F7C4 -@0801F79E: + b _0801F7C4 +_0801F79E: bl IsDma3ManagerBusyWithBgCopy 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 @@ -42929,11 +42929,11 @@ sub_801F7E0: ; 801F7E0 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 @@ -42946,19 +42946,19 @@ sub_801F7E0: ; 801F7E0 ldrb r0, [r0, 0x1E] movs r1, 0x3 bl CopyWindowToVram - b @0801F81E + b _0801F81E .pool -@0801F814: +_0801F814: bl IsDma3ManagerBusyWithBgCopy 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 @@ -42970,32 +42970,32 @@ sub_801F82C: ; 801F82C 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 CopyBgTilemapBufferToVram - b @0801F862 -@0801F84C: + b _0801F862 +_0801F84C: bl IsDma3ManagerBusyWithBgCopy 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 @@ -43008,11 +43008,11 @@ sub_801F870: ; 801F870 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 @@ -43035,22 +43035,22 @@ sub_801F870: ; 801F870 movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram - b @0801F8CC -@0801F8BA: + b _0801F8CC +_0801F8BA: bl IsDma3ManagerBusyWithBgCopy 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} @@ -43064,19 +43064,19 @@ sub_801F8DC: ; 801F8DC 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 @@ -43100,12 +43100,12 @@ sub_801F8DC: ; 801F8DC movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram - b @0801F972 -@0801F938: + b _0801F972 +_0801F938: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0801F978 + bne _0801F978 movs r0, 0x1 movs r1, 0x10 bl sub_801FF18 @@ -43114,26 +43114,26 @@ sub_801F8DC: ; 801F8DC ldrb r0, [r0, 0x1E] movs r1, 0x3 bl CopyWindowToVram - b @0801F972 + b _0801F972 .pool -@0801F95C: +_0801F95C: bl IsDma3ManagerBusyWithBgCopy 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} @@ -43147,19 +43147,19 @@ sub_801F984: ; 801F984 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 @@ -43183,39 +43183,39 @@ sub_801F984: ; 801F984 movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram - b @0801FA1A -@0801F9E0: + b _0801FA1A +_0801F9E0: bl IsDma3ManagerBusyWithBgCopy 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 CopyWindowToVram - b @0801FA1A + b _0801FA1A .pool -@0801FA00: +_0801FA00: bl IsDma3ManagerBusyWithBgCopy 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} @@ -43228,11 +43228,11 @@ sub_801FA2C: ; 801FA2C 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 @@ -43240,17 +43240,17 @@ sub_801FA2C: ; 801FA2C ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FA5E -@0801FA50: + b _0801FA5E +_0801FA50: bl IsDma3ManagerBusyWithBgCopy 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 @@ -43262,21 +43262,21 @@ sub_801FA68: ; 801FA68 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 .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] @@ -43292,33 +43292,33 @@ sub_801FA68: ; 801FA68 movs r0, 0 movs r1, 0x2 bl CopyWindowToVram - b @0801FB34 + b _0801FB34 .pool -@0801FAC0: +_0801FAC0: bl IsDma3ManagerBusyWithBgCopy 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 .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 @@ -43335,28 +43335,28 @@ sub_801FA68: ; 801FA68 ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] -@0801FB14: +_0801FB14: bl IsDma3ManagerBusyWithBgCopy 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 .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 @@ -43368,22 +43368,22 @@ sub_801FB44: ; 801FB44 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 @@ -43395,11 +43395,11 @@ sub_801FB70: ; 801FB70 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 @@ -43411,16 +43411,16 @@ sub_801FB70: ; 801FB70 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FBAA + b _0801FBAA .pool -@0801FBA0: +_0801FBA0: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FBAC -@0801FBAA: + b _0801FBAC +_0801FBAA: movs r0, 0x1 -@0801FBAC: +_0801FBAC: pop {r4} pop {r1} bx r1 @@ -43432,11 +43432,11 @@ sub_801FBB4: ; 801FBB4 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 @@ -43448,16 +43448,16 @@ sub_801FBB4: ; 801FBB4 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FBEE + b _0801FBEE .pool -@0801FBE4: +_0801FBE4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FBF0 -@0801FBEE: + b _0801FBF0 +_0801FBEE: movs r0, 0x1 -@0801FBF0: +_0801FBF0: pop {r4} pop {r1} bx r1 @@ -43469,11 +43469,11 @@ sub_801FBF8: ; 801FBF8 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 @@ -43490,16 +43490,16 @@ sub_801FBF8: ; 801FBF8 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FC42 + b _0801FC42 .pool -@0801FC38: +_0801FC38: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FC44 -@0801FC42: + b _0801FC44 +_0801FC42: movs r0, 0x1 -@0801FC44: +_0801FC44: pop {r4} pop {r1} bx r1 @@ -43511,11 +43511,11 @@ sub_801FC4C: ; 801FC4C 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 @@ -43531,16 +43531,16 @@ sub_801FC4C: ; 801FC4C ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FC92 + b _0801FC92 .pool -@0801FC88: +_0801FC88: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FC94 -@0801FC92: + b _0801FC94 +_0801FC92: movs r0, 0x1 -@0801FC94: +_0801FC94: pop {r4} pop {r1} bx r1 @@ -43552,11 +43552,11 @@ sub_801FC9C: ; 801FC9C 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 @@ -43572,16 +43572,16 @@ sub_801FC9C: ; 801FC9C ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FCE2 + b _0801FCE2 .pool -@0801FCD8: +_0801FCD8: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FCE4 -@0801FCE2: + b _0801FCE4 +_0801FCE2: movs r0, 0x1 -@0801FCE4: +_0801FCE4: pop {r4} pop {r1} bx r1 @@ -43593,11 +43593,11 @@ sub_801FCEC: ; 801FCEC 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 @@ -43609,16 +43609,16 @@ sub_801FCEC: ; 801FCEC ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FD26 + b _0801FD26 .pool -@0801FD1C: +_0801FD1C: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FD28 -@0801FD26: + b _0801FD28 +_0801FD26: movs r0, 0x1 -@0801FD28: +_0801FD28: pop {r4} pop {r1} bx r1 @@ -43630,11 +43630,11 @@ sub_801FD30: ; 801FD30 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] @@ -43651,16 +43651,16 @@ sub_801FD30: ; 801FD30 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FD7E + b _0801FD7E .pool -@0801FD74: +_0801FD74: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FD80 -@0801FD7E: + b _0801FD80 +_0801FD7E: movs r0, 0x1 -@0801FD80: +_0801FD80: pop {r4} pop {r1} bx r1 @@ -43672,11 +43672,11 @@ sub_801FD88: ; 801FD88 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 @@ -43692,16 +43692,16 @@ sub_801FD88: ; 801FD88 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0801FDCE + b _0801FDCE .pool -@0801FDC4: +_0801FDC4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0801FDD0 -@0801FDCE: + b _0801FDD0 +_0801FDCE: movs r0, 0x1 -@0801FDD0: +_0801FDD0: pop {r4} pop {r1} bx r1 @@ -43762,7 +43762,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 @@ -43800,7 +43800,7 @@ sub_801FDDC: ; 801FDDC movs r1, 0x2 adds r2, r7, 0 bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed -@0801FE94: +_0801FE94: add sp, 0x14 pop {r4-r7} pop {r0} @@ -43815,7 +43815,7 @@ sub_801FEBC: ; 801FEBC ldr r0, [r4] ldrh r0, [r0, 0x18] cmp r0, 0xFF - beq @0801FEDA + beq _0801FEDA lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -43823,7 +43823,7 @@ sub_801FEBC: ; 801FEBC ldr r0, [r4] ldrb r0, [r0, 0x18] bl ClearWindowTilemap -@0801FEDA: +_0801FEDA: pop {r4} pop {r0} bx r0 @@ -43837,14 +43837,14 @@ sub_801FEE4: ; 801FEE4 ldr r0, [r4] ldrh r0, [r0, 0x18] cmp r0, 0xFF - beq @0801FEFE + beq _0801FEFE lsls r0, 24 lsrs r0, 24 bl RemoveWindow ldr r1, [r4] movs r0, 0xFF strh r0, [r1, 0x18] -@0801FEFE: +_0801FEFE: pop {r4} pop {r0} bx r0 @@ -43912,7 +43912,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 @@ -43927,7 +43927,7 @@ sub_801FF18: ; 801FF18 ands r0, r2 orrs r0, r1 str r0, [sp, 0x14] -@0801FF98: +_0801FF98: add r0, sp, 0x14 bl AddWindow ldr r5, =0x02022c88 @@ -43936,10 +43936,10 @@ sub_801FF18: ; 801FF18 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] @@ -43947,11 +43947,11 @@ sub_801FF18: ; 801FF18 ldr r0, [r5] adds r6, r0, 0 adds r6, 0x22 - b @0801FFE2 + b _0801FFE2 .pool -@0801FFE0: +_0801FFE0: ldr r6, [r4] -@0801FFE2: +_0801FFE2: mov r0, r9 lsls r1, r0, 8 movs r0, 0 @@ -43972,7 +43972,7 @@ sub_801FF18: ; 801FF18 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 @@ -43998,9 +43998,9 @@ sub_801FF18: ; 801FF18 movs r1, 0x1 adds r2, r6, 0 bl sub_8199F74 - b @0802007A + b _0802007A .pool -@08020050: +_08020050: adds r0, r5, 0 movs r1, 0xA movs r2, 0x2 @@ -44020,12 +44020,12 @@ sub_801FF18: ; 801FF18 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 @@ -44043,7 +44043,7 @@ sub_8020094: ; 8020094 ldr r0, [r4] ldrh r0, [r0, 0x1E] cmp r0, 0xFF - beq @080200B2 + beq _080200B2 lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -44051,7 +44051,7 @@ sub_8020094: ; 8020094 ldr r0, [r4] ldrb r0, [r0, 0x1E] bl ClearWindowTilemap -@080200B2: +_080200B2: movs r0, 0 movs r1, 0 movs r2, 0 @@ -44069,14 +44069,14 @@ sub_80200C8: ; 80200C8 ldr r0, [r4] ldrh r0, [r0, 0x1E] cmp r0, 0xFF - beq @080200E2 + beq _080200E2 lsls r0, 24 lsrs r0, 24 bl RemoveWindow ldr r1, [r4] movs r0, 0xFF strh r0, [r1, 0x1E] -@080200E2: +_080200E2: pop {r4} pop {r0} bx r0 @@ -44128,7 +44128,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 @@ -44137,7 +44137,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] @@ -44199,7 +44199,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] @@ -44210,10 +44210,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 @@ -44223,12 +44223,12 @@ sub_80201A4: ; 80201A4 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 CopyString @@ -44252,15 +44252,15 @@ sub_80201A4: ; 80201A4 lsls r0, 16 lsrs r6, r0, 16 cmp r7, 0x9 - ble @080201FE - b @0802030C + ble _080201FE + b _0802030C .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 @@ -44269,7 +44269,7 @@ sub_80201A4: ; 80201A4 movs r2, 0 bl GetStringWidth cmp r0, 0x28 - bgt @08020286 + bgt _08020286 lsls r3, r6, 24 lsrs r3, 24 add r4, sp, 0xC @@ -44288,8 +44288,8 @@ sub_80201A4: ; 80201A4 str r0, [sp, 0x48] adds r6, 0xC mov r10, r6 - b @08020300 -@08020286: + b _08020300 +_08020286: adds r0, r5, 0 bl GetStringLength_Multibyte adds r4, r0, 0 @@ -44308,7 +44308,7 @@ sub_80201A4: ; 80201A4 ldr r7, [sp, 0x40] adds r7, 0x23 ldr r6, [sp, 0x44] -@080202AC: +_080202AC: subs r4, 0x1 adds r0, r6, 0 adds r1, r5, 0 @@ -44319,7 +44319,7 @@ sub_80201A4: ; 80201A4 movs r2, 0 bl GetStringWidth cmp r0, 0x23 - bgt @080202AC + bgt _080202AC mov r1, r8 lsrs r2, r1, 24 mov r0, r9 @@ -44347,14 +44347,14 @@ sub_80201A4: ; 80201A4 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 @@ -44375,31 +44375,31 @@ 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 .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 @@ -44414,30 +44414,30 @@ 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 .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 @@ -44726,7 +44726,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 @@ -44744,7 +44744,7 @@ task_tutorial_story_unknown: ; 8020604 adds r1, r2 movs r2, 0x8 bl CpuFastSet -@0802064E: +_0802064E: ldr r1, =gUnknown_08DD4AB8 movs r0, 0x2 movs r2, 0 @@ -44819,7 +44819,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 @@ -44835,7 +44835,7 @@ sub_80206E8: ; 80206E8 bl BlitBitmapToWindow adds r4, 0x1 cmp r4, 0xE - ble @080206F8 + ble _080206F8 movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -45005,13 +45005,13 @@ sub_8020890: ; 8020890 push {r4,r5,lr} movs r5, 0 ldr r4, =gUnknown_082F3134 -@08020896: +_08020896: adds r0, r4, 0 bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0x4 - bls @08020896 + bls _08020896 ldr r0, =gUnknown_082F315C bl LoadTaggedObjectPalette ldr r4, =0x02022c8c @@ -45019,13 +45019,13 @@ sub_8020890: ; 8020890 bl Alloc str r0, [r4] cmp r0, 0 - beq @080208C8 + beq _080208C8 movs r0, 0x1 - b @080208CA + b _080208CA .pool -@080208C8: +_080208C8: movs r0, 0 -@080208CA: +_080208CA: pop {r4,r5} pop {r1} bx r1 @@ -45037,9 +45037,9 @@ sub_80208D0: ; 80208D0 ldr r0, =0x02022c8c ldr r0, [r0] cmp r0, 0 - beq @080208DE + beq _080208DE bl Free -@080208DE: +_080208DE: pop {r0} bx r0 .pool @@ -45101,7 +45101,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] @@ -45115,9 +45115,9 @@ sub_802093C: ; 802093C adds r0, 0xA strh r0, [r2, 0x20] ldr r2, [r1] - b @08020992 + b _08020992 .pool -@0802097C: +_0802097C: ldr r4, =0x02022c8c ldr r0, [r4] ldr r0, [r0] @@ -45128,7 +45128,7 @@ sub_802093C: ; 802093C movs r0, 0x18 strh r0, [r1, 0x20] ldr r2, [r2] -@08020992: +_08020992: ldrb r1, [r5] lsls r0, r1, 1 adds r0, r1 @@ -45173,21 +45173,21 @@ sub_80209E0: ; 80209E0 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 StartObjectImageAnim - b @08020A0C + b _08020A0C .pool -@08020A00: +_08020A00: ldr r0, =0x02022c8c ldr r0, [r0] ldr r0, [r0] movs r1, 0x3 bl StartObjectImageAnim -@08020A0C: +_08020A0C: ldr r0, =0x02022c8c ldr r1, [r0] movs r0, 0 @@ -45204,37 +45204,37 @@ sub_8020A1C: ; 8020A1C ldr r1, [r4] ldrh r0, [r1, 0x14] cmp r0, 0x3 - bls @08020A30 -@08020A28: + bls _08020A30 +_08020A28: movs r0, 0 - b @08020A62 + b _08020A62 .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 StartObjectImageAnim - b @08020A28 -@08020A54: + b _08020A28 +_08020A54: ldr r0, [r4] ldr r0, [r0] movs r1, 0x2 bl StartObjectImageAnim - b @08020A28 -@08020A60: + b _08020A28 +_08020A60: movs r0, 0x1 -@08020A62: +_08020A62: pop {r4} pop {r1} bx r1 @@ -45284,15 +45284,15 @@ sub_8020ABC: ; 8020ABC 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] @@ -45303,7 +45303,7 @@ sub_8020ABC: ; 8020ABC lsls r0, r3, 3 adds r0, 0x4C strh r0, [r4, 0x20] -@08020AEC: +_08020AEC: pop {r4} pop {r0} bx r0 @@ -45320,7 +45320,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 @@ -45328,9 +45328,9 @@ 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 @@ -45384,10 +45384,10 @@ sub_8020B80: ; 8020B80 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] @@ -45401,14 +45401,14 @@ sub_8020B80: ; 8020B80 ldr r0, [r0, 0x10] movs r1, 0x3 bl StartObjectImageAnim - b @08020BF6 + b _08020BF6 .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] @@ -45417,9 +45417,9 @@ sub_8020B80: ; 8020B80 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b @08020BF6 + b _08020BF6 .pool -@08020BD8: +_08020BD8: ldr r3, =0x02022c8c ldr r0, [r3] ldr r1, [r0, 0x10] @@ -45434,7 +45434,7 @@ sub_8020B80: ; 8020B80 lsls r1, r4, 24 lsrs r1, 24 bl StartObjectImageAnim -@08020BF6: +_08020BF6: pop {r4} pop {r0} bx r0 @@ -45456,15 +45456,15 @@ sub_8020C0C: ; 8020C0C ldr r5, =0x02022c90 ldr r0, [r5] cmp r0, 0 - bne @08020C20 + bne _08020C20 movs r0, 0x2 - b @08020C5C + b _08020C5C .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] @@ -45475,7 +45475,7 @@ sub_8020C0C: ; 8020C0C bl SetMainCallback2 ldr r0, =c2_exit_to_overworld_2_switch cmp r4, r0 - bne @08020C5A + bne _08020C5A ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x4 @@ -45486,9 +45486,9 @@ sub_8020C0C: ; 8020C0C bl current_map_music_set ldr r0, =c1_overworld bl set_callback1 -@08020C5A: +_08020C5A: movs r0, 0 -@08020C5C: +_08020C5C: pop {r4,r5} pop {r1} bx r1 @@ -45507,21 +45507,21 @@ 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 SetMainCallback2 ldr r0, =0x03005000 mov r1, r8 strh r1, [r0, 0x10] strh r1, [r0, 0x12] - b @08020CF8 + b _08020CF8 .pool -@08020CAC: +_08020CAC: bl sub_8009FCC lsls r0, 24 lsrs r0, 24 @@ -45531,39 +45531,39 @@ sub_8020C70: ; 8020C70 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 SetMainCallback2 ldr r0, =0x03005000 movs r1, 0 strh r1, [r0, 0x10] strh r1, [r0, 0x12] - b @08020CF8 + b _08020CF8 .pool -@08020CDC: +_08020CDC: ldr r6, =0x02022c90 ldr r0, =0x000041c0 bl AllocZeroed adds r5, r0, 0 str r5, [r6] cmp r5, 0 - bne @08020D10 + bne _08020D10 adds r0, r4, 0 bl SetMainCallback2 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 .pool -@08020D10: +_08020D10: str r4, [r5] movs r4, 0 strb r7, [r5, 0x8] @@ -45609,7 +45609,7 @@ sub_8020C70: ; 8020C70 negs r0, r0 ands r0, r1 strb r0, [r2] -@08020D74: +_08020D74: add sp, 0xC pop {r3} mov r8, r3 @@ -45629,16 +45629,16 @@ 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 .pool -@08020DA8: +_08020DA8: ldrh r0, [r1] movs r1, 0x1 bl sub_80D6AA4 -@08020DB0: +_08020DB0: ldr r4, =0x02022c90 ldr r2, [r4] ldrb r0, [r2, 0x8] @@ -45744,20 +45744,20 @@ 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 .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 @@ -45767,7 +45767,7 @@ sub_8020E58: ; 8020E58 lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bls @08020F48 + bls _08020F48 adds r2, 0x25 ldrb r0, [r2] movs r1, 0x2 @@ -45778,16 +45778,16 @@ sub_8020E58: ; 8020E58 ldrh r1, [r1, 0x16] movs r2, 0xF6 lsls r2, 1 - b @08020F14 + b _08020F14 .pool -@08020EDC: +_08020EDC: ldr r5, =0x03005d90 ldr r0, [r5] movs r6, 0xF7 lsls r6, 1 - b @08020F28 + b _08020F28 .pool -@08020EEC: +_08020EEC: ldr r5, =0x03005d90 ldr r1, [r5] movs r0, 0xF8 @@ -45797,7 +45797,7 @@ sub_8020E58: ; 8020E58 lsrs r0, 16 ldrh r1, [r1] cmp r0, r1 - bls @08020F48 + bls _08020F48 adds r2, 0x25 ldrb r0, [r2] movs r1, 0x2 @@ -45808,23 +45808,23 @@ sub_8020E58: ; 8020E58 ldrh r1, [r1, 0x16] movs r2, 0xF8 lsls r2, 1 -@08020F14: +_08020F14: adds r0, r2 strh r1, [r0] - b @08020F48 + b _08020F48 .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 @@ -45835,7 +45835,7 @@ sub_8020E58: ; 8020E58 ldrh r0, [r0, 0x16] adds r1, r6 strh r0, [r1] -@08020F48: +_08020F48: ldr r4, =0x02022c90 ldr r1, [r4] ldr r0, [r1, 0x68] @@ -45843,14 +45843,14 @@ sub_8020E58: ; 8020E58 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 @@ -45885,11 +45885,11 @@ sub_8020FA0: ; 8020FA0 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} @@ -45903,8 +45903,8 @@ 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 @@ -45917,13 +45917,13 @@ sub_8020FC4: ; 8020FC4 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 @@ -45939,36 +45939,36 @@ sub_8020FC4: ; 8020FC4 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 .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 @@ -45981,35 +45981,35 @@ sub_802104C: ; 802104C 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 .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 @@ -46019,8 +46019,8 @@ sub_802104C: ; 802104C bl SetGpuReg 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] @@ -46032,14 +46032,14 @@ sub_802104C: ; 802104C strb r4, [r0] movs r0, 0x3 bl sub_8034C54 - b @080212FC + b _080212FC .pool -@080210E4: +_080210E4: bl sub_80A1A74 bl ResetAllObjectData bl ResetObjectPaletteAllocator - b @080212FC -@080210F2: + b _080212FC +_080210F2: movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_082F32C8 @@ -46091,9 +46091,9 @@ sub_802104C: ; 802104C movs r0, 0x52 movs r1, 0 bl SetGpuReg - b @080212FC + b _080212FC .pool -@08021178: +_08021178: movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -46124,8 +46124,8 @@ sub_802104C: ; 802104C movs r2, 0 movs r3, 0 bl FillBgTilemapBufferRect_Palette0 - b @080212FC -@080211BE: + b _080212FC +_080211BE: movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0x1 @@ -46141,15 +46141,15 @@ sub_802104C: ; 802104C movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @080212FC + b _080212FC .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 @@ -46161,9 +46161,9 @@ sub_802104C: ; 802104C movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x8] - b @080212FC + b _080212FC .pool -@0802121C: +_0802121C: ldr r0, =gUnknown_08DE3398 movs r2, 0xC0 lsls r2, 1 @@ -46192,9 +46192,9 @@ sub_802104C: ; 802104C bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080212FC + b _080212FC .pool -@08021278: +_08021278: bl sub_800E0E8 movs r0, 0 movs r1, 0 @@ -46216,9 +46216,9 @@ sub_802104C: ; 802104C movs r1, 0 movs r2, 0 bl ChangeBgY - b @080212FC + b _080212FC .pool -@080212B4: +_080212B4: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -46245,15 +46245,15 @@ sub_802104C: ; 802104C movs r0, 0 strb r0, [r5, 0xC] movs r0, 0x1 - b @08021304 + b _08021304 .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} @@ -46267,41 +46267,41 @@ sub_802130C: ; 802130C 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 .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 @@ -46310,14 +46310,14 @@ sub_802130C: ; 802130C movs r3, 0x10 bl pal_fade_maybe 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] @@ -46355,8 +46355,8 @@ sub_802130C: ; 802130C bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @0802143E -@080213E6: + b _0802143E +_080213E6: bl FreeAllWindowBuffers movs r0, 0 bl HideBg @@ -46378,25 +46378,25 @@ sub_802130C: ; 802130C lsls r1, 5 movs r0, 0 bl ResetGpuRegBits - 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} @@ -46419,13 +46419,13 @@ sub_8021450: ; 8021450 bl SetGpuReg 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} @@ -46462,9 +46462,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, =gUnknown_082F41E8 mov r2, r9 lsls r0, r2, 1 @@ -46535,9 +46535,9 @@ sub_80214A8: ; 80214A8 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 @@ -46589,11 +46589,11 @@ sub_80214A8: ; 80214A8 movs r2, 0x8 ldrsh r0, [r0, r2] cmp r0, 0 - bge @080215D0 + bge _080215D0 ldr r0, [r6] movs r1, 0x1 bl StartObjectRotScalAnim -@080215D0: +_080215D0: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -46602,9 +46602,9 @@ sub_80214A8: ; 80214A8 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 @@ -46637,7 +46637,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 @@ -46656,19 +46656,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 @@ -46682,14 +46682,14 @@ sub_8021608: ; 8021608 ldr r0, =0x00007fff ands r0, r2 cmp r1, r0 - blt @0802169A + blt _0802169A ldr r0, =DummyObjectCallback str r0, [r5, 0x1C] adds r0, r5, 0 bl obj_free_rotscale_entry adds r0, r5, 0 bl RemoveObjectAndFreeTiles -@0802169A: +_0802169A: pop {r4-r6} pop {r0} bx r0 @@ -46703,9 +46703,9 @@ sub_80216A8: ; 80216A8 movs r5, 0 ldrb r0, [r6, 0x9] cmp r5, r0 - bcs @080216D4 + bcs _080216D4 ldr r7, =gUnknown_082F41E8 -@080216B6: +_080216B6: lsls r0, r5, 1 adds r0, r7 ldrh r4, [r0] @@ -46718,8 +46718,8 @@ sub_80216A8: ; 80216A8 lsrs r5, r0, 24 ldrb r0, [r6, 0x9] cmp r5, r0 - bcc @080216B6 -@080216D4: + bcc _080216B6 +_080216D4: pop {r4-r7} pop {r0} bx r0 @@ -46744,9 +46744,9 @@ sub_80216E0: ; 80216E0 mov r9, r0 ldrb r2, [r6, 0x9] cmp r0, r2 - bcs @080217AE + bcs _080217AE ldr r7, =gUnknown_082F41CC -@08021704: +_08021704: mov r3, r10 ldrh r0, [r3, 0xA] mov r4, r9 @@ -46760,7 +46760,7 @@ sub_80216E0: ; 80216E0 lsrs r1, 16 mov r8, r1 cmp r1, 0 - beq @0802179E + beq _0802179E ldr r0, [sp, 0x4] adds r0, 0x1 lsls r0, 24 @@ -46769,7 +46769,7 @@ sub_80216E0: ; 80216E0 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @08021748 + beq _08021748 lsls r4, 2 ldr r5, [sp] adds r5, 0x24 @@ -46777,9 +46777,9 @@ sub_80216E0: ; 80216E0 ldr r0, [r0] movs r1, 0x1 bl StartObjectImageAnim - b @0802175A + b _0802175A .pool -@08021748: +_08021748: mov r0, r9 lsls r4, r0, 2 ldr r5, [sp] @@ -46788,7 +46788,7 @@ sub_80216E0: ; 80216E0 ldr r0, [r0] movs r1, 0 bl StartObjectImageAnim -@0802175A: +_0802175A: adds r3, r5, r4 ldr r2, [r3] adds r2, 0x3E @@ -46823,7 +46823,7 @@ sub_80216E0: ; 80216E0 movs r0, 0 ldrsb r0, [r1, r0] strh r0, [r2, 0x26] -@0802179E: +_0802179E: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -46831,17 +46831,17 @@ sub_80216E0: ; 80216E0 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 .pool -@080217C0: +_080217C0: ldrh r0, [r6, 0x28] movs r1, 0x3 bl __umodsi3 @@ -46860,8 +46860,8 @@ sub_80216E0: ; 80216E0 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] @@ -46874,7 +46874,7 @@ sub_80216E0: ; 80216E0 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @0802187E + beq _0802187E ldr r0, =sub_8022B28 str r0, [r2, 0x1C] lsls r1, r4, 1 @@ -46909,17 +46909,17 @@ sub_80216E0: ; 80216E0 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @08021860 + beq _08021860 ldr r0, [r7] movs r1, 0x1 bl StartObjectImageAnim - b @08021868 + b _08021868 .pool -@08021860: +_08021860: ldr r0, [r7] movs r1, 0 bl StartObjectImageAnim -@08021868: +_08021868: mov r0, r8 adds r0, 0x1 lsls r0, 16 @@ -46928,10 +46928,10 @@ sub_80216E0: ; 80216E0 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 @@ -46940,37 +46940,37 @@ sub_80216E0: ; 80216E0 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 @@ -46989,12 +46989,12 @@ sub_80218D4: ; 80218D4 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] @@ -47003,18 +47003,18 @@ sub_80218D4: ; 80218D4 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] @@ -47023,25 +47023,25 @@ sub_80218D4: ; 80218D4 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 @@ -47082,24 +47082,24 @@ sub_8021944: ; 8021944 mov r12, r0 ldr r5, =gUnknown_082F334C 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 @@ -47188,12 +47188,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 @@ -47201,35 +47201,35 @@ sub_8021A28: ; 8021A28 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 @@ -47240,13 +47240,13 @@ sub_8021A28: ; 8021A28 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 @@ -47257,8 +47257,8 @@ sub_8021A28: ; 8021A28 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 @@ -47268,7 +47268,7 @@ sub_8021A28: ; 8021A28 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 @@ -47276,9 +47276,9 @@ sub_8021A28: ; 8021A28 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 @@ -47305,9 +47305,9 @@ sub_8021A28: ; 8021A28 ldr r0, [sp, 0x18] lsls r0, 5 mov r8, r0 - b @08021C5A + b _08021C5A .pool -@08021B48: +_08021B48: ldr r1, [sp, 0x20] adds r0, r1, r5 adds r0, 0x28 @@ -47317,7 +47317,7 @@ sub_8021A28: ; 8021A28 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 @@ -47327,9 +47327,9 @@ sub_8021A28: ; 8021A28 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 @@ -47364,7 +47364,7 @@ sub_8021A28: ; 8021A28 adds r5, 0x1 ldr r1, =gUnknown_082F334C mov r12, r1 -@08021BB8: +_08021BB8: movs r0, 0x3 subs r1, r0, r2 adds r0, r3, 0 @@ -47372,17 +47372,17 @@ sub_8021A28: ; 8021A28 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 @@ -47399,9 +47399,9 @@ sub_8021A28: ; 8021A28 ldr r1, [r0] ldr r0, =0x02021fc4 bl ExpandStringRefs - b @08021C5E + b _08021C5E .pool -@08021C1C: +_08021C1C: str r5, [sp, 0x18] str r5, [sp, 0x1C] lsls r7, r5, 5 @@ -47410,9 +47410,9 @@ sub_8021A28: ; 8021A28 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 @@ -47432,10 +47432,10 @@ sub_8021A28: ; 8021A28 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 @@ -47462,17 +47462,17 @@ sub_8021A28: ; 8021A28 ldr r2, [sp, 0xC] ldrb r2, [r2, 0x8] cmp r3, r2 - bne @08021CC0 + bne _08021CC0 ldr r0, =0x02021ec4 ldr r1, =gUnknown_085ED7D4 bl CopyString - b @08021CC8 + b _08021CC8 .pool -@08021CC0: +_08021CC0: ldr r0, =0x02021ec4 ldr r1, =gUnknown_085ED7E0 bl CopyString -@08021CC8: +_08021CC8: ldr r4, =0x02021ec4 mov r3, r9 strb r3, [r4] @@ -47506,9 +47506,9 @@ sub_8021A28: ; 8021A28 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 @@ -47723,7 +47723,7 @@ sub_8021D34: ; 8021D34 mov r9, r1 movs r5, 0x1 ldr r3, =gUnknown_082F334C -@08021EEC: +_08021EEC: mov r4, r9 mov r0, r10 subs r1, r4, r0 @@ -47731,7 +47731,7 @@ sub_8021D34: ; 8021D34 asrs r0, r1 ands r0, r5 cmp r0, 0 - beq @08021F0A + beq _08021F0A mov r1, r10 lsls r0, r1, 2 adds r0, r3 @@ -47739,14 +47739,14 @@ sub_8021D34: ; 8021D34 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 @@ -47782,7 +47782,7 @@ sub_8021D34: ; 8021D34 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq @08021FC4 + beq _08021FC4 movs r0, 0xDD lsls r0, 1 add r0, r8 @@ -47796,9 +47796,9 @@ sub_8021D34: ; 8021D34 adds r2, r6, 0 adds r3, r7, 0 bl box_print - b @08021FDE + b _08021FDE .pool -@08021FC4: +_08021FC4: movs r0, 0xDD lsls r0, 1 add r0, r8 @@ -47811,7 +47811,7 @@ sub_8021D34: ; 8021D34 adds r2, r6, 0 adds r3, r7, 0 bl box_print -@08021FDE: +_08021FDE: adds r0, r7, 0 adds r0, 0xE lsls r0, 24 @@ -47882,24 +47882,24 @@ 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 .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 @@ -47915,14 +47915,14 @@ sub_8022070: ; 8022070 stm r1!, {r2,r3} ldrh r0, [r4, 0x12] cmp r0, 0xD - bne @080220DC + bne _080220DC ldr r0, =gUnknown_082F3344 adds r0, 0x4 - b @080220DE + b _080220DE .pool -@080220DC: +_080220DC: ldr r0, =gUnknown_082F3344 -@080220DE: +_080220DE: adds r0, r5, r0 ldrb r1, [r0] mov r0, sp @@ -47932,9 +47932,9 @@ sub_8022070: ; 8022070 adds r1, r6, 0 adds r1, 0x82 strb r0, [r1] - b @08022218 + b _08022218 .pool -@080220F8: +_080220F8: adds r4, r6, 0 adds r4, 0x82 ldrb r0, [r4] @@ -47942,8 +47942,8 @@ sub_8022070: ; 8022070 ldrb r0, [r4] movs r1, 0 bl FillWindowPixelBuffer - b @08022218 -@0802210C: + b _08022218 +_0802210C: adds r5, r6, 0 adds r5, 0x82 ldrb r0, [r5] @@ -47956,26 +47956,26 @@ sub_8022070: ; 8022070 adds r2, r4, 0 movs r3, 0xD bl SetWindowBorderStyle - b @08022218 + b _08022218 .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] @@ -47995,9 +47995,9 @@ sub_8022070: ; 8022070 adds r1, r6, 0 adds r1, 0x80 movs r0, 0x5 - b @08022220 + b _08022220 .pool -@08022184: +_08022184: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] @@ -48024,9 +48024,9 @@ sub_8022070: ; 8022070 adds r1, r6, 0 adds r1, 0x80 movs r0, 0x5 - b @08022220 + b _08022220 .pool -@080221C8: +_080221C8: adds r0, r6, 0 adds r0, 0x82 ldrb r0, [r0] @@ -48044,13 +48044,13 @@ sub_8022070: ; 8022070 movs r1, 0x2 movs r2, 0xB0 bl sub_8021A28 - b @08022218 + b _08022218 .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] @@ -48061,16 +48061,16 @@ sub_8022070: ; 8022070 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} @@ -48118,24 +48118,24 @@ 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 .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, =gUnknown_082F32EC bl AddWindow strh r0, [r6, 0x2] @@ -48155,9 +48155,9 @@ sub_8022250: ; 8022250 adds r2, r4, 0 movs r3, 0xD bl SetWindowBorderStyle - b @080224BA + b _080224BA .pool -@080222D0: +_080222D0: ldr r0, =gUnknown_085ED8D0 mov r10, r0 movs r1, 0x1 @@ -48205,7 +48205,7 @@ sub_8022250: ; 8022250 bl box_print movs r0, 0x29 mov r10, r0 -@08022336: +_08022336: mov r1, r9 adds r1, 0x2 ldr r0, =0x02021cc4 @@ -48261,7 +48261,7 @@ sub_8022250: ; 8022250 movs r0, 0x1 mov r8, r0 ldr r5, =gUnknown_082F334C -@080223AE: +_080223AE: mov r0, r12 subs r1, r0, r2 adds r0, r3, 0 @@ -48269,19 +48269,19 @@ sub_8022250: ; 8022250 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 @@ -48330,24 +48330,24 @@ sub_8022250: ; 8022250 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 CopyWindowToVram - b @080224BA + b _080224BA .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 .pool -@08022494: +_08022494: ldrb r0, [r6, 0x2] movs r1, 0x1 bl sub_8198070 @@ -48360,13 +48360,13 @@ sub_8022250: ; 8022250 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 @@ -48473,9 +48473,9 @@ sub_8022588: ; 8022588 movs r6, 0 ldrb r0, [r5, 0x9] cmp r6, r0 - bcs @080225E8 + bcs _080225E8 ldr r7, =gUnknown_082F417C -@08022596: +_08022596: lsls r0, r6, 2 movs r1, 0xA2 lsls r1, 1 @@ -48513,8 +48513,8 @@ sub_8022588: ; 8022588 lsrs r6, r0, 24 ldrb r0, [r5, 0x9] cmp r6, r0 - bcc @08022596 -@080225E8: + bcc _08022596 +_080225E8: pop {r4-r7} pop {r0} bx r0 @@ -48531,10 +48531,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 @@ -48542,7 +48542,7 @@ sub_8022600: ; 8022600 bl PutWindowTilemap ldrb r0, [r6, 0x8] cmp r7, r0 - bne @08022668 + bne _08022668 lsls r4, r7, 5 adds r4, 0x98 adds r4, r6, r4 @@ -48567,9 +48567,9 @@ sub_8022600: ; 8022600 movs r1, 0x2 movs r3, 0x1 bl AddTextPrinterParametrized2 - b @0802269C + b _0802269C .pool -@08022668: +_08022668: lsls r4, r7, 5 adds r4, 0x98 adds r4, r6, r4 @@ -48594,7 +48594,7 @@ sub_8022600: ; 8022600 movs r1, 0x2 movs r3, 0x1 bl AddTextPrinterParametrized2 -@0802269C: +_0802269C: ldr r1, =0x000001bb adds r0, r6, r1 adds r0, r7 @@ -48606,8 +48606,8 @@ sub_8022600: ; 8022600 lsrs r7, r0, 24 ldrb r0, [r6, 0x9] cmp r7, r0 - bcc @08022616 -@080226B6: + bcc _08022616 +_080226B6: movs r0, 0 bl CopyBgTilemapBufferToVram add sp, 0x14 @@ -48629,9 +48629,9 @@ sub_80226D0: ; 80226D0 ldr r4, =0x0201c000 adds r1, r4, 0 bl LZ77UnCompWram - b @0802271A + b _0802271A .pool -@080226EC: +_080226EC: lsls r1, r5, 2 movs r2, 0xA2 lsls r2, 1 @@ -48654,10 +48654,10 @@ sub_80226D0: ; 80226D0 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 CopyBgTilemapBufferToVram add sp, 0x8 @@ -48679,7 +48679,7 @@ sub_8022730: ; 8022730 ldr r1, =0x02021bbe strh r0, [r1] ldr r4, =gUnknown_082F41F4 -@08022746: +_08022746: lsls r0, r5, 3 adds r0, r4 bl LoadCompressedObjectPic @@ -48687,7 +48687,7 @@ sub_8022730: ; 8022730 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @08022746 + bls _08022746 ldr r0, =gUnknown_082F421C bl LoadTaggedObjectPalettes ldr r0, =gUnknown_082F430C @@ -48725,9 +48725,9 @@ sub_8022730: ; 8022730 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 @@ -48786,12 +48786,12 @@ sub_8022730: ; 8022730 lsrs r5, r0, 24 ldrb r0, [r6, 0x9] cmp r5, r0 - bcc @080227AA -@08022822: + bcc _080227AA +_08022822: movs r5, 0 ldr r4, =gUnknown_082F41D2 adds r7, r4, 0x1 -@08022828: +_08022828: lsls r2, r5, 1 adds r0, r2, r4 movs r1, 0 @@ -48840,9 +48840,9 @@ sub_8022730: ; 8022730 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 @@ -48892,7 +48892,7 @@ sub_8022730: ; 8022730 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls @0802288E + bls _0802288E ldr r4, =gUnknown_082F4384 movs r0, 0 movs r1, 0 @@ -48910,12 +48910,12 @@ sub_8022730: ; 8022730 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 @@ -48944,7 +48944,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] @@ -48953,7 +48953,7 @@ sub_8022960: ; 8022960 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @08022996 + bls _08022996 movs r0, 0x2 bl sub_80353DC movs r0, 0x1 @@ -48964,7 +48964,7 @@ sub_8022960: ; 8022960 movs r1, 0xC2 lsls r1, 1 adds r6, r5, r1 -@080229C4: +_080229C4: lsls r0, r4, 2 adds r0, r6, r0 ldr r0, [r0] @@ -48973,12 +48973,12 @@ sub_8022960: ; 8022960 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 @@ -48991,8 +48991,8 @@ sub_8022960: ; 8022960 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 @@ -49003,10 +49003,10 @@ sub_8022960: ; 8022960 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @08022A18 + beq _08022A18 adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@08022A18: +_08022A18: pop {r4-r6} pop {r0} bx r0 @@ -49021,7 +49021,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] @@ -49033,7 +49033,7 @@ sub_8022A20: ; 8022A20 movs r1, 0x40 orrs r0, r1 strb r0, [r2] -@08022A46: +_08022A46: pop {r0} bx r0 thumb_func_end sub_8022A20 @@ -49047,7 +49047,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] @@ -49055,7 +49055,7 @@ sub_8022A4C: ; 8022A4C 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] @@ -49098,7 +49098,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 @@ -49117,19 +49117,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 @@ -49143,10 +49143,10 @@ sub_8022A94: ; 8022A94 ldr r0, =0x00007fff ands r0, r2 cmp r1, r0 - ble @08022B1A + ble _08022B1A ldr r0, =sub_8022A4C str r0, [r5, 0x1C] -@08022B1A: +_08022B1A: pop {r4-r6} pop {r0} bx r0 @@ -49212,9 +49212,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] @@ -49262,17 +49262,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, =gUnknown_082F43CC lsls r1, r5, 2 adds r1, r0 @@ -49280,26 +49280,26 @@ sub_8022BEC: ; 8022BEC 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, =gUnknown_082F43CC ldrb r1, [r6, 0xE] lsls r1, 2 - b @08022C44 + b _08022C44 .pool -@08022C40: +_08022C40: ldr r0, =gUnknown_082F43CC 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} @@ -49360,53 +49360,53 @@ sub_8022CB0: ; 8022CB0 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 @@ -49426,19 +49426,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 @@ -49449,7 +49449,7 @@ sub_8022D14: ; 8022D14 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq @08022D90 + beq _08022D90 ldr r4, =0x02021fc4 ldr r1, =gUnknown_082F32A4 ldrb r0, [r5] @@ -49470,9 +49470,9 @@ sub_8022D14: ; 8022D14 movs r1, 0x1 adds r2, r4, 0 bl AddTextPrinterParametrized - b @08022DB2 + b _08022DB2 .pool -@08022D90: +_08022D90: ldr r1, =gUnknown_082F32A4 ldrb r0, [r5] lsls r0, 2 @@ -49489,54 +49489,54 @@ sub_8022D14: ; 8022D14 movs r0, 0 movs r1, 0x1 bl AddTextPrinterParametrized -@08022DB2: +_08022DB2: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - b @08022E08 + b _08022E08 .pool -@08022DC0: +_08022DC0: movs r0, 0 bl IsTextPrinterActive 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 .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} @@ -49552,13 +49552,13 @@ sub_8022E1C: ; 8022E1C 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} @@ -49571,13 +49571,13 @@ sub_8022E3C: ; 8022E3C 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} @@ -49590,18 +49590,18 @@ sub_8022E5C: ; 8022E5C 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 @@ -49612,13 +49612,13 @@ sub_8022E5C: ; 8022E5C movs r0, 0x3 strh r0, [r4, 0x12] strb r1, [r4, 0xC] - b @08022EA2 + b _08022EA2 .pool -@08022E9C: +_08022E9C: ldrb r0, [r4, 0xC] adds r0, 0x1 strb r0, [r4, 0xC] -@08022EA2: +_08022EA2: movs r0, 0 pop {r4} pop {r1} @@ -49633,12 +49633,12 @@ sub_8022EAC: ; 8022EAC 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 @@ -49654,8 +49654,8 @@ sub_8022EAC: ; 8022EAC 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 @@ -49663,9 +49663,9 @@ sub_8022EAC: ; 8022EAC 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} @@ -49694,24 +49694,24 @@ sub_8022F1C: ; 8022F1C 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 .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 @@ -49725,15 +49725,15 @@ sub_8022F1C: ; 8022F1C 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 @@ -49750,16 +49750,16 @@ sub_8022F1C: ; 8022F1C 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, =gUnknown_082F4448 ldrb r4, [r5, 0x9] @@ -49769,14 +49769,14 @@ sub_8022F1C: ; 8022F1C 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, =gUnknown_0858AB24 -@08022FDC: +_08022FDC: lsls r0, r3, 5 adds r0, r5, r0 lsls r1, r3, 8 @@ -49788,9 +49788,9 @@ sub_8022F1C: ; 8022F1C 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 @@ -49810,8 +49810,8 @@ sub_8022F1C: ; 8022F1C 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 @@ -49822,9 +49822,9 @@ sub_8022F1C: ; 8022F1C lsls r1, 6 bl sub_81515FC str r0, [r5, 0x20] - b @08023060 + b _08023060 .pool -@08023044: +_08023044: movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -49836,12 +49836,12 @@ sub_8022F1C: ; 8022F1C 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} @@ -49855,37 +49855,37 @@ sub_8023070: ; 8023070 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 .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 @@ -49900,9 +49900,9 @@ sub_8023070: ; 8023070 adds r3, 0x2 adds r1, r4, r3 strb r0, [r1] - b @080231A8 + b _080231A8 .pool -@080230E8: +_080230E8: movs r0, 0x9C lsls r0, 1 adds r3, r4, r0 @@ -49926,9 +49926,9 @@ sub_8023070: ; 8023070 strb r0, [r1] movs r0, 0x3D bl audio_play - b @080231A8 + b _080231A8 .pool -@08023120: +_08023120: movs r3, 0x9C lsls r3, 1 adds r2, r4, r3 @@ -49941,46 +49941,46 @@ sub_8023070: ; 8023070 ldr r1, [r0, 0x1C] ldr r0, =sub_8021608 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 .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 @@ -49991,13 +49991,13 @@ sub_8023070: ; 8023070 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} @@ -50010,27 +50010,27 @@ sub_80231B8: ; 80231B8 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 @@ -50053,9 +50053,9 @@ sub_80231B8: ; 80231B8 strb r0, [r1] movs r0, 0xD6 bl audio_play - b @080232DC + b _080232DC .pool -@0802321C: +_0802321C: ldr r7, =gUnknown_082F326C movs r0, 0x9C lsls r0, 1 @@ -50098,10 +50098,10 @@ sub_80231B8: ; 80231B8 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] @@ -50112,9 +50112,9 @@ sub_80231B8: ; 80231B8 strb r0, [r2] movs r0, 0 strb r0, [r6] - b @080232E2 + b _080232E2 .pool -@0802329C: +_0802329C: movs r0, 0 strh r0, [r4, 0x2C] movs r0, 0x12 @@ -50127,12 +50127,12 @@ sub_80231B8: ; 80231B8 movs r1, 0 bl SetGpuReg 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 @@ -50141,12 +50141,12 @@ sub_80231B8: ; 80231B8 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} @@ -50160,23 +50160,23 @@ sub_80232EC: ; 80232EC 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 @@ -50185,19 +50185,19 @@ sub_80232EC: ; 80232EC 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 @@ -50215,29 +50215,29 @@ sub_80232EC: ; 80232EC 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 .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} @@ -50259,13 +50259,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, =gUnknown_082F325C mov r10, r3 -@080233C0: +_080233C0: lsls r0, r7, 4 ldr r1, =0x03003090 adds r2, r0, r1 @@ -50276,17 +50276,17 @@ sub_802339C: ; 802339C 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 @@ -50328,10 +50328,10 @@ sub_802339C: ; 802339C 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] @@ -50343,11 +50343,11 @@ sub_802339C: ; 802339C ldrh r1, [r1] ldrh r2, [r0] cmp r1, r2 - bls @08023476 + bls _08023476 strh r1, [r0] - b @08023476 + b _08023476 .pool -@08023468: +_08023468: adds r0, r4, r6 adds r2, r0, 0 adds r2, 0xA8 @@ -50355,7 +50355,7 @@ sub_802339C: ; 802339C strh r1, [r2] adds r0, 0xAA strh r3, [r0] -@08023476: +_08023476: adds r1, r4, r6 ldrh r0, [r4, 0x28] adds r3, r1, 0 @@ -50369,55 +50369,55 @@ sub_802339C: ; 802339C 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] @@ -50442,7 +50442,7 @@ sub_802339C: ; 802339C 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 @@ -50452,9 +50452,9 @@ sub_802339C: ; 802339C adds r0, r4, 0 adds r0, 0x24 strb r2, [r0] - b @08023548 + b _08023548 .pool -@08023534: +_08023534: adds r1, r4, 0 adds r1, 0x24 movs r0, 0x20 @@ -50465,7 +50465,7 @@ sub_802339C: ; 802339C movs r1, 0x1 orrs r0, r1 strb r0, [r2] -@08023548: +_08023548: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -50484,17 +50484,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 @@ -50505,10 +50505,10 @@ sub_8023558: ; 8023558 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 @@ -50517,42 +50517,42 @@ sub_8023558: ; 8023558 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 .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, =gUnknown_082F3290 @@ -50563,18 +50563,18 @@ sub_8023558: ; 8023558 lsls r4, 1 adds r1, r3, r4 strb r0, [r1] - b @08023640 + b _08023640 .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 @@ -50594,12 +50594,12 @@ sub_8023558: ; 8023558 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 @@ -50609,7 +50609,7 @@ sub_8023558: ; 8023558 ldrb r0, [r1] ldrb r5, [r2] cmp r0, r5 - bcc @0802367C + bcc _0802367C movs r0, 0 strb r0, [r1] ldr r5, =0x00000139 @@ -50618,9 +50618,9 @@ sub_8023558: ; 8023558 strb r0, [r2] strb r0, [r4] movs r1, 0 - b @08023690 + b _08023690 .pool -@0802367C: +_0802367C: ldr r2, =gUnknown_082F3290 ldrb r1, [r1] ldr r4, =0x00000139 @@ -50631,18 +50631,18 @@ sub_8023558: ; 8023558 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 .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 @@ -50664,19 +50664,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 @@ -50685,22 +50685,22 @@ sub_80236B8: ; 80236B8 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 @@ -50713,7 +50713,7 @@ sub_80236B8: ; 80236B8 adds r6, r5, 0 adds r6, 0x25 cmp r0, 0 - bne @08023768 + bne _08023768 movs r0, 0x2E ldrsh r2, [r5, r0] ldr r1, =gUnknown_082F4444 @@ -50722,34 +50722,34 @@ sub_80236B8: ; 80236B8 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 .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, =gUnknown_082F4434 @@ -50759,86 +50759,86 @@ sub_80236B8: ; 80236B8 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 .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 @@ -50862,7 +50862,7 @@ sub_80236B8: ; 80236B8 bl memcpy adds r0, r4, 0 bl sub_800FE50 -@0802384C: +_0802384C: pop {r3} mov r8, r3 pop {r4-r7} @@ -50879,9 +50879,9 @@ sub_802385C: ; 802385C 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 @@ -50891,8 +50891,8 @@ sub_802385C: ; 802385C 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 @@ -50901,11 +50901,11 @@ sub_802385C: ; 802385C 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] @@ -50913,9 +50913,9 @@ sub_802385C: ; 802385C negs r0, r0 ands r0, r1 strb r0, [r2] - b @080238EA + b _080238EA .pool -@080238AC: +_080238AC: adds r4, r5, 0 adds r4, 0x4E adds r0, r4, 0 @@ -50938,14 +50938,14 @@ sub_802385C: ; 802385C 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 @@ -50990,31 +50990,31 @@ 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 .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] @@ -51025,7 +51025,7 @@ sub_80238F0: ; 80238F0 adds r0, r4, 0 bl sub_80236B8 movs r0, 0 -@08023992: +_08023992: pop {r4} pop {r1} bx r1 @@ -51070,35 +51070,35 @@ 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 .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 @@ -51110,24 +51110,24 @@ sub_8023A30: ; 8023A30 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 .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 @@ -51142,9 +51142,9 @@ sub_8023A30: ; 8023A30 adds r1, r4, r0 movs r0, 0x2 strb r0, [r1] - b @08023BB2 + b _08023BB2 .pool -@08023A8C: +_08023A8C: movs r1, 0x9C lsls r1, 1 adds r5, r4, r1 @@ -51154,9 +51154,9 @@ sub_8023A30: ; 8023A30 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 @@ -51178,9 +51178,9 @@ sub_8023A30: ; 8023A30 lsls r2, 1 adds r1, r4, r2 strb r0, [r1] - b @08023BB2 + b _08023BB2 .pool -@08023ADC: +_08023ADC: ldr r7, =gUnknown_082F326C movs r0, 0x9C lsls r0, 1 @@ -51223,10 +51223,10 @@ sub_8023A30: ; 8023A30 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] @@ -51237,9 +51237,9 @@ sub_8023A30: ; 8023A30 strb r0, [r2] movs r0, 0 strb r0, [r6] - b @08023BB8 + b _08023BB8 .pool -@08023B5C: +_08023B5C: movs r0, 0 strh r0, [r4, 0x2C] movs r0, 0x12 @@ -51251,24 +51251,24 @@ sub_8023A30: ; 8023A30 movs r0, 0x1E movs r1, 0 bl SetGpuReg - 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 @@ -51277,14 +51277,14 @@ sub_8023A30: ; 8023A30 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 @@ -51298,19 +51298,19 @@ sub_8023BC0: ; 8023BC0 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 @@ -51325,8 +51325,8 @@ sub_8023BC0: ; 8023BC0 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 @@ -51336,7 +51336,7 @@ sub_8023BC0: ; 8023BC0 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne @08023CA2 + bne _08023CA2 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -51344,15 +51344,15 @@ sub_8023BC0: ; 8023BC0 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] @@ -51365,12 +51365,12 @@ sub_8023BC0: ; 8023BC0 movs r0, 0x1E movs r1, 0 bl SetGpuReg - 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 @@ -51391,14 +51391,14 @@ sub_8023BC0: ; 8023BC0 bl sub_8022BEC movs r0, 0 strh r4, [r5, 0x10] - b @08023CA0 + b _08023CA0 .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} @@ -51417,26 +51417,26 @@ 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 .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 @@ -51451,9 +51451,9 @@ sub_8023CAC: ; 8023CAC 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 @@ -51464,16 +51464,16 @@ sub_8023CAC: ; 8023CAC 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, =gUnknown_082F4448 ldrb r3, [r7, 0x9] @@ -51483,17 +51483,17 @@ sub_8023CAC: ; 8023CAC 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 @@ -51509,22 +51509,22 @@ sub_8023CAC: ; 8023CAC 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 .pool -@08023D9C: +_08023D9C: movs r0, 0x6 - b @08024032 -@08023DA0: + b _08024032 +_08023DA0: adds r0, r7, 0 adds r0, 0x68 movs r1, 0 @@ -51596,9 +51596,9 @@ sub_8023CAC: ; 8023CAC 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 @@ -51628,20 +51628,20 @@ sub_8023CAC: ; 8023CAC 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] @@ -51652,11 +51652,11 @@ sub_8023CAC: ; 8023CAC 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] @@ -51667,25 +51667,25 @@ sub_8023CAC: ; 8023CAC 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 @@ -51694,12 +51694,12 @@ sub_8023CAC: ; 8023CAC 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 @@ -51712,9 +51712,9 @@ sub_8023CAC: ; 8023CAC 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] @@ -51723,8 +51723,8 @@ sub_8023CAC: ; 8023CAC 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 @@ -51733,7 +51733,7 @@ sub_8023CAC: ; 8023CAC adds r2, 0x1 str r2, [sp, 0x8] cmp r4, r8 - bls @08023FB4 + bls _08023FB4 adds r3, r7, 0 adds r3, 0x74 str r3, [sp] @@ -51746,7 +51746,7 @@ sub_8023CAC: ; 8023CAC movs r1, 0x7E adds r1, r7 mov r9, r1 -@08023F5C: +_08023F5C: subs r2, r4, 0x1 mov r12, r2 lsls r6, r2, 1 @@ -51757,7 +51757,7 @@ sub_8023CAC: ; 8023CAC ldrh r2, [r3] ldrh r0, [r1] cmp r2, r0 - bcs @08023F86 + bcs _08023F86 ldrh r0, [r1] strh r2, [r1] strh r0, [r3] @@ -51768,14 +51768,14 @@ sub_8023CAC: ; 8023CAC 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] @@ -51787,13 +51787,13 @@ sub_8023CAC: ; 8023CAC 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 @@ -51801,25 +51801,25 @@ sub_8023CAC: ; 8023CAC 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 @@ -51831,12 +51831,12 @@ sub_8023CAC: ; 8023CAC movs r2, 0x30 bl memcpy bl sub_800A5B4 -@08024004: +_08024004: movs r0, 0 strh r0, [r7, 0x10] - b @0802402E + b _0802402E .pool -@08024010: +_08024010: bl sub_8020E58 movs r0, 0x12 movs r1, 0x1 @@ -51849,13 +51849,13 @@ sub_8023CAC: ; 8023CAC 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} @@ -51875,30 +51875,30 @@ sub_8024048: ; 8024048 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 .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 CopyBgTilemapBufferToVram movs r0, 0x9C @@ -51906,40 +51906,40 @@ sub_8024048: ; 8024048 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 .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 @@ -51966,13 +51966,13 @@ sub_8024048: ; 8024048 movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b @0802412A + b _0802412A .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} @@ -51988,30 +51988,30 @@ sub_8024134: ; 8024134 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 .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 @@ -52027,16 +52027,16 @@ sub_8024134: ; 8024134 movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b @0802421E + b _0802421E .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 @@ -52059,17 +52059,17 @@ sub_8024134: ; 8024134 ldr r0, =sub_8153688 movs r1, 0 bl AddTask - b @08024218 + b _08024218 .pool -@080241F0: +_080241F0: ldr r0, =sub_8153688 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq @08024218 - b @0802421E + beq _08024218 + b _0802421E .pool -@08024204: +_08024204: movs r0, 0x14 movs r1, 0x1 movs r2, 0 @@ -52078,12 +52078,12 @@ sub_8024134: ; 8024134 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} @@ -52099,17 +52099,17 @@ sub_8024228: ; 8024228 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 @@ -52125,39 +52125,39 @@ sub_8024228: ; 8024228 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 @@ -52175,14 +52175,14 @@ sub_8024228: ; 8024228 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} @@ -52196,26 +52196,26 @@ sub_80242E0: ; 80242E0 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 @@ -52226,15 +52226,15 @@ sub_80242E0: ; 80242E0 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, =gUnknown_082F4448 ldrb r3, [r4, 0x9] @@ -52244,16 +52244,16 @@ sub_80242E0: ; 80242E0 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] @@ -52265,23 +52265,23 @@ sub_80242E0: ; 80242E0 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 .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 @@ -52289,14 +52289,14 @@ sub_80242E0: ; 80242E0 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 @@ -52309,33 +52309,33 @@ sub_80243BC: ; 80243BC 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 @@ -52347,28 +52347,28 @@ sub_80243BC: ; 80243BC str r1, [sp] movs r2, 0x10 movs r3, 0 -@08024410: +_08024410: bl pal_fade_maybe 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} @@ -52383,23 +52383,23 @@ sub_8024444: ; 8024444 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, =gUnknown_082F32A4 ldr r2, [r0, 0x14] ldrb r3, [r5, 0xB] @@ -52412,9 +52412,9 @@ sub_8024444: ; 8024444 movs r0, 0 movs r1, 0x1 bl AddTextPrinterParametrized - b @080244AC + b _080244AC .pool -@08024490: +_08024490: ldr r0, =gUnknown_082F32A4 ldr r2, [r0, 0x18] ldrb r3, [r5, 0xB] @@ -52428,47 +52428,47 @@ sub_8024444: ; 8024444 movs r0, 0 movs r1, 0x1 bl AddTextPrinterParametrized -@080244AC: +_080244AC: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - b @080244F6 + b _080244F6 .pool -@080244BC: +_080244BC: movs r0, 0 bl IsTextPrinterActive 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} @@ -52482,31 +52482,31 @@ sub_8024508: ; 8024508 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 @@ -52514,13 +52514,13 @@ sub_8024508: ; 8024508 movs r2, 0 bl sub_8022BEC strb r4, [r5, 0xC] - b @0802455E + b _0802455E .pool -@08024558: +_08024558: ldrb r0, [r5, 0xC] adds r0, 0x1 strb r0, [r5, 0xC] -@0802455E: +_0802455E: movs r0, 0 pop {r4,r5} pop {r1} @@ -52570,7 +52570,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 @@ -52602,7 +52602,7 @@ sub_8024578: ; 8024578 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls @080245B8 + bls _080245B8 pop {r4-r6} pop {r0} bx r0 @@ -52716,13 +52716,13 @@ sub_80246AC: ; 80246AC adds r0, r1 bl sub_8024668 cmp r0, r4 - bcc @080246CC + bcc _080246CC movs r0, 0x1 - b @080246CE + b _080246CE .pool -@080246CC: +_080246CC: movs r0, 0 -@080246CE: +_080246CE: pop {r4} pop {r1} bx r1 @@ -52740,13 +52740,13 @@ sub_80246D4: ; 80246D4 ldr r1, =0x020375e0 ldrh r1, [r1] cmp r0, r1 - bcc @080246F8 + bcc _080246F8 movs r0, 0x1 - b @080246FA + b _080246FA .pool -@080246F8: +_080246F8: movs r0, 0 -@080246FA: +_080246FA: pop {r1} bx r1 thumb_func_end sub_80246D4 @@ -52765,18 +52765,18 @@ 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 .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 @@ -52795,7 +52795,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 @@ -52803,11 +52803,11 @@ sub_8024740: ; 8024740 adds r0, r4, 0 bl sub_802467C movs r0, 0x1 - b @08024776 + b _08024776 .pool -@08024774: +_08024774: movs r0, 0 -@08024776: +_08024776: pop {r4,r5} pop {r1} bx r1 @@ -52826,7 +52826,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 @@ -52835,11 +52835,11 @@ sub_802477C: ; 802477C adds r0, r4, 0 bl sub_802467C movs r0, 0x1 - b @080247B6 + b _080247B6 .pool -@080247B4: +_080247B4: movs r0, 0 -@080247B6: +_080247B6: pop {r4,r5} pop {r1} bx r1 @@ -53044,13 +53044,13 @@ sub_802493C: ; 802493C ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq @08024A10 + beq _08024A10 ldr r4, =0x02022c98 ldr r0, =0x00003330 bl AllocZeroed str r0, [r4] cmp r0, 0 - beq @08024A10 + beq _08024A10 bl sub_8024A1C ldr r0, [r4] bl sub_8024A30 @@ -53104,12 +53104,12 @@ sub_802493C: ; 802493C bl sub_80A2F30 ldr r0, =0x0000021e bl current_map_music_set - b @08024A16 + b _08024A16 .pool -@08024A10: +_08024A10: adds r0, r5, 0 bl SetMainCallback2 -@08024A16: +_08024A16: pop {r4-r6} pop {r0} bx r0 @@ -53162,14 +53162,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 @@ -53217,7 +53217,7 @@ sub_8024A30: ; 8024A30 movs r7, 0x98 lsls r7, 1 adds r2, r7 -@08024AE2: +_08024AE2: ldr r1, [sp] adds r0, r1, r5 strb r3, [r0] @@ -53250,12 +53250,12 @@ sub_8024A30: ; 8024A30 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] @@ -53279,14 +53279,14 @@ sub_8024A30: ; 8024A30 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 @@ -53299,10 +53299,10 @@ sub_8024A30: ; 8024A30 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 @@ -53313,18 +53313,18 @@ sub_8024A30: ; 8024A30 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 @@ -53345,41 +53345,41 @@ 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 .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 movs r1, 0x4 bl sub_802620C - b @08024D20 + b _08024D20 .pool -@08024C24: +_08024C24: ldr r0, =sub_8025910 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 @@ -53387,30 +53387,30 @@ sub_8024BC8: ; 8024BC8 adds r0, r1 bl sub_8029274 ldr r1, [r4] - b @08024D24 + b _08024D24 .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 .pool -@08024C80: +_08024C80: ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x24 @@ -53418,8 +53418,8 @@ sub_8024BC8: ; 8024BC8 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 @@ -53438,8 +53438,8 @@ sub_8024BC8: ; 8024BC8 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 @@ -53447,15 +53447,15 @@ sub_8024BC8: ; 8024BC8 movs r0, 0 bl sub_802868C ldr r1, [r4] - b @08024D24 + b _08024D24 .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 @@ -53471,31 +53471,31 @@ sub_8024BC8: ; 8024BC8 bl pal_fade_maybe ldr r0, =sub_80261E4 bl SetVBlankCallback - b @08024D20 + b _08024D20 .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 .pool -@08024D34: +_08024D34: adds r0, r1, 0 bl remove_task ldr r0, =sub_802589C bl sub_802621C -@08024D40: +_08024D40: add sp, 0x4 pop {r4,r5} pop {r0} @@ -53518,9 +53518,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 @@ -53542,9 +53542,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 @@ -53558,12 +53558,12 @@ sub_8024DBC: ; 8024DBC 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 .pool -@08024DD4: +_08024DD4: movs r0, 0x1 bl sub_8028504 movs r0, 0x1 @@ -53572,14 +53572,14 @@ sub_8024DBC: ; 8024DBC 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 @@ -53592,15 +53592,15 @@ sub_8024E00: ; 8024E00 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 .pool -@08024E20: +_08024E20: movs r0, 0x8C lsls r0, 1 adds r1, r0 @@ -53608,7 +53608,7 @@ sub_8024E00: ; 8024E00 str r0, [r1] movs r0, 0x2 bl sub_8026240 -@08024E30: +_08024E30: pop {r4} pop {r0} bx r0 @@ -53623,22 +53623,22 @@ 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 .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 @@ -53648,19 +53648,19 @@ sub_8024E38: ; 8024E38 bl sub_802EB24 ldr r0, =0x02022c98 ldr r1, [r0] - b @08024EF0 + b _08024EF0 .pool -@08024E90: +_08024E90: bl sub_8010434 ldr r0, =0x02022c98 ldr r1, [r0] - b @08024EF0 + b _08024EF0 .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] @@ -53670,17 +53670,17 @@ sub_8024E38: ; 8024E38 ldr r0, [r2] adds r0, 0x30 strb r3, [r0] - b @08024F08 + b _08024F08 .pool -@08024EC4: +_08024EC4: bl sub_802EB84 cmp r0, 0 - bne @08024F08 + bne _08024F08 ldr r0, =0x02022c98 ldr r1, [r0] - b @08024EF0 + b _08024EF0 .pool -@08024ED8: +_08024ED8: ldr r1, [r4] adds r1, 0x30 ldrb r0, [r1] @@ -53689,22 +53689,22 @@ sub_8024E38: ; 8024E38 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} @@ -53718,16 +53718,16 @@ sub_8024F10: ; 8024F10 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 .pool @@ -53740,88 +53740,88 @@ sub_8024F38: ; 8024F38 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 .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 .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 .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 .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 @@ -53836,13 +53836,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] @@ -53854,18 +53854,18 @@ 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 .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] @@ -53877,20 +53877,20 @@ 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, 0x1 strb r0, [r1] - b @080250CA + b _080250CA .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] @@ -53902,23 +53902,23 @@ 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, 0x3 strb r0, [r1] - b @080250CA + b _080250CA .pool -@080250B8: +_080250B8: ldr r3, =0x000032f8 adds r0, r2, r3 strb r1, [r0] - b @080250CA + b _080250CA .pool -@080250C4: +_080250C4: movs r0, 0xB bl sub_8026240 -@080250CA: +_080250CA: bl sub_8026044 pop {r0} bx r0 @@ -53931,12 +53931,12 @@ sub_80250D4: ; 80250D4 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 @@ -53950,18 +53950,18 @@ sub_80250D4: ; 80250D4 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 .pool -@08025124: +_08025124: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -53970,7 +53970,7 @@ sub_80250D4: ; 80250D4 adds r0, 0x24 ldrb r0, [r0] cmp r3, r0 - bcs @08025150 + bcs _08025150 lsls r0, r3, 2 movs r4, 0x98 lsls r4, 1 @@ -53978,13 +53978,13 @@ sub_80250D4: ; 80250D4 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 @@ -53996,10 +53996,10 @@ sub_8025158: ; 8025158 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 @@ -54015,13 +54015,13 @@ 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 @@ -54034,72 +54034,72 @@ sub_8025198: ; 8025198 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 .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 @@ -54113,18 +54113,18 @@ sub_8025230: ; 8025230 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 .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 @@ -54136,25 +54136,25 @@ sub_8025230: ; 8025230 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 @@ -54168,13 +54168,13 @@ sub_8025230: ; 8025230 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 @@ -54182,23 +54182,23 @@ sub_8025230: ; 8025230 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 .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 @@ -54220,7 +54220,7 @@ sub_8025230: ; 8025230 ldr r0, =0x0000020b movs r1, 0x4 bl sub_80A2F88 -@08025316: +_08025316: pop {r4,r5} pop {r0} bx r0 @@ -54238,23 +54238,23 @@ 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 .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 @@ -54265,19 +54265,19 @@ sub_8025324: ; 8025324 bl sub_80292E0 ldr r0, =0x02022c98 ldr r1, [r0] - b @08025448 + b _08025448 .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 .pool -@0802539C: +_0802539C: bl sub_802A794 mov r1, sp strb r0, [r1] @@ -54286,16 +54286,16 @@ sub_8025324: ; 8025324 bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq @08025466 + beq _08025466 ldr r0, =0x02022c98 ldr r1, [r0] - b @08025448 + b _08025448 .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] @@ -54304,24 +54304,24 @@ sub_8025324: ; 8025324 strb r0, [r1, 0x10] ldr r0, [r3] strb r2, [r0, 0x8] - b @08025466 + b _08025466 .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 @@ -54341,8 +54341,8 @@ sub_8025324: ; 8025324 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 @@ -54350,30 +54350,30 @@ sub_8025324: ; 8025324 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 .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} @@ -54388,83 +54388,83 @@ sub_8025470: ; 8025470 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 .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 .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 .pool -@080254F0: +_080254F0: bl sub_8028FCC bl sub_80272E8 ldr r0, =0x02022c98 ldr r1, [r0] - b @080255E8 + b _080255E8 .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 .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 .pool -@0802553C: +_0802553C: bl sub_802A794 mov r1, sp strb r0, [r1] @@ -54473,39 +54473,39 @@ sub_8025470: ; 8025470 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 .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 .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 @@ -54525,8 +54525,8 @@ sub_8025470: ; 8025470 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 @@ -54534,60 +54534,60 @@ sub_8025470: ; 8025470 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 .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} @@ -54601,47 +54601,47 @@ sub_8025644: ; 8025644 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 .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 @@ -54656,18 +54656,18 @@ sub_80256AC: ; 80256AC 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 .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] @@ -54675,18 +54675,18 @@ sub_80256AC: ; 80256AC movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 .pool -@080256F8: +_080256F8: bl sub_8028B80 bl sub_80287E4 ldr r0, [r4] @@ -54699,17 +54699,17 @@ sub_80256AC: ; 80256AC 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 .pool -@08025728: +_08025728: bl sub_802A770 cmp r0, 0 - bne @0802574C + bne _0802574C ldr r4, =0x02022c98 ldr r0, [r4] ldr r0, [r0] @@ -54720,7 +54720,7 @@ sub_80256AC: ; 80256AC ldr r0, [r4] bl Free bl FreeAllWindowBuffers -@0802574C: +_0802574C: add sp, 0x4 pop {r4} pop {r0} @@ -54736,25 +54736,25 @@ sub_8025758: ; 8025758 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 .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 @@ -54764,8 +54764,8 @@ sub_8025758: ; 8025758 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @08025848 -@080257B0: + b _08025848 +_080257B0: movs r0, 0 movs r1, 0 movs r2, 0 @@ -54798,17 +54798,17 @@ sub_8025758: ; 8025758 movs r1, 0 movs r2, 0 bl ChangeBgY - 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 .pool -@08025818: +_08025818: movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -54822,24 +54822,24 @@ sub_8025758: ; 8025758 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - 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 .pool -@0802585C: +_0802585C: ldrb r0, [r1, 0x4] bl remove_task ldr r0, =sub_802589C @@ -54850,16 +54850,16 @@ sub_8025758: ; 8025758 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} @@ -54877,51 +54877,51 @@ 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 .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 bl sub_802621C - b @080258FE + b _080258FE .pool -@080258F8: +_080258F8: ldr r0, =sub_8024D84 bl sub_802621C -@080258FE: +_080258FE: adds r0, r5, 0 bl remove_task -@08025904: +_08025904: pop {r4,r5} pop {r0} bx r0 @@ -54941,18 +54941,18 @@ 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 .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 @@ -54967,36 +54967,36 @@ sub_8025910: ; 8025910 bl link_0800A448 lsls r0, 24 cmp r0, 0 - beq @080259E8 + beq _080259E8 ldr r0, [r6] strb r4, [r0, 0x8] - b @08025976 + b _08025976 .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 @@ -55017,8 +55017,8 @@ sub_8025910: ; 8025910 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 @@ -55026,7 +55026,7 @@ sub_8025910: ; 8025910 ldrb r0, [r0, 0x8] ldrb r1, [r1] cmp r0, r1 - bcc @080259E8 + bcc _080259E8 adds r0, r6, 0 bl remove_task movs r0, 0x6 @@ -55035,7 +55035,7 @@ sub_8025910: ; 8025910 ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] -@080259E8: +_080259E8: pop {r4-r6} pop {r0} bx r0 @@ -55092,15 +55092,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 @@ -55111,7 +55111,7 @@ sub_80259FC: ; 80259FC bl sub_8028318 adds r1, r0, 0 cmp r1, 0 - bne @08025A9A + bne _08025A9A ldr r0, [r6] adds r0, r4 ldr r3, =0x000031cc @@ -55122,13 +55122,13 @@ sub_80259FC: ; 80259FC 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 @@ -55140,39 +55140,39 @@ sub_80259FC: ; 80259FC 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 .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 @@ -55183,16 +55183,16 @@ sub_80259FC: ; 80259FC 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 @@ -55200,16 +55200,16 @@ sub_80259FC: ; 80259FC adds r0, r5 ldrb r0, [r0] cmp r0, 0x3 - bgt @08025B54 + bgt _08025B54 cmp r0, 0x1 - bge @08025B5A - b @08025BEC + bge _08025B5A + b _08025BEC .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] @@ -55219,7 +55219,7 @@ sub_80259FC: ; 80259FC lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls @08025BEC + bls _08025BEC ldr r0, [r3] adds r0, 0xB0 adds r0, r5 @@ -55243,9 +55243,9 @@ sub_80259FC: ; 80259FC adds r0, r1 ldr r1, =0x000031d4 adds r0, r1 - b @08025BEA + b _08025BEA .pool -@08025BA8: +_08025BA8: adds r1, 0xB0 adds r1, r5 ldrb r0, [r1] @@ -55255,7 +55255,7 @@ sub_80259FC: ; 80259FC lsls r0, 24 lsrs r0, 24 cmp r0, 0x27 - bls @08025BEC + bls _08025BEC ldr r0, [r4] adds r0, 0xB0 adds r0, r5 @@ -55279,15 +55279,15 @@ sub_80259FC: ; 80259FC 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 @@ -55345,12 +55345,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 @@ -55365,13 +55365,13 @@ sub_8025C0C: ; 8025C0C 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 @@ -55383,31 +55383,31 @@ sub_8025C0C: ; 8025C0C 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 .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} @@ -55421,35 +55421,35 @@ sub_8025D04: ; 8025D04 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 .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 @@ -55463,12 +55463,12 @@ sub_8025D50: ; 8025D50 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 .pool -@08025D68: +_08025D68: ldr r1, =0x000032cc adds r0, r5, r1 ldr r2, =0x000031cc @@ -55498,9 +55498,9 @@ sub_8025D50: ; 8025D50 ldr r4, [r4] str r4, [sp, 0x10] bl sub_8027E30 - b @08025DF4 + b _08025DF4 .pool -@08025DB8: +_08025DB8: ldr r1, =0x000032cc adds r0, r5, r1 ldr r2, =0x000031cc @@ -55530,7 +55530,7 @@ sub_8025D50: ; 8025D50 ldr r4, [r4] str r4, [sp, 0x10] bl sub_8027E30 -@08025DF4: +_08025DF4: add sp, 0x14 pop {r4-r6} pop {r0} @@ -55546,12 +55546,12 @@ sub_8025E0C: ; 8025E0C 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 .pool -@08025E24: +_08025E24: adds r0, r5, 0 adds r0, 0x28 ldrb r0, [r0] @@ -55585,9 +55585,9 @@ sub_8025E0C: ; 8025E0C adds r4, r5, r6 str r4, [sp, 0x14] bl sub_8028164 - b @08025EC0 + b _08025EC0 .pool -@08025E7C: +_08025E7C: adds r0, r5, 0 adds r0, 0x28 ldrb r0, [r0] @@ -55621,7 +55621,7 @@ sub_8025E0C: ; 8025E0C adds r4, r5, r6 str r4, [sp, 0x14] bl sub_8028164 -@08025EC0: +_08025EC0: add sp, 0x18 pop {r4-r6} pop {r0} @@ -55636,18 +55636,18 @@ sub_8025ED8: ; 8025ED8 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 .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] @@ -55656,31 +55656,31 @@ sub_8025ED8: ; 8025ED8 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 .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 @@ -55702,31 +55702,31 @@ 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 .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 @@ -55735,33 +55735,33 @@ sub_8025F48: ; 8025F48 movs r2, 0xA2 lsls r2, 1 adds r0, r2 - b @08025FE8 + b _08025FE8 .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 @@ -55770,26 +55770,26 @@ sub_8025F48: ; 8025F48 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 .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] @@ -55797,9 +55797,9 @@ sub_8025F48: ; 8025F48 lsls r2, 1 adds r0, r2 movs r1, 0x2 -@0802603A: +_0802603A: strb r1, [r0] -@0802603C: +_0802603C: pop {r4-r6} pop {r0} bx r0 @@ -55829,35 +55829,35 @@ 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 .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 @@ -55866,38 +55866,38 @@ sub_8026044: ; 8026044 movs r3, 0xA2 lsls r3, 1 adds r0, r3 - b @080260FC + b _080260FC .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 @@ -55914,14 +55914,14 @@ sub_8026044: ; 8026044 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 @@ -55932,23 +55932,23 @@ sub_8026044: ; 8026044 adds r0, r1 adds r0, r4 movs r1, 0x1 - b @08026166 + b _08026166 .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 @@ -55957,26 +55957,26 @@ sub_8026044: ; 8026044 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 .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] @@ -55984,9 +55984,9 @@ sub_8026044: ; 8026044 lsls r3, 1 adds r0, r3 movs r1, 0x2 -@080261BE: +_080261BE: strb r1, [r0] -@080261C0: +_080261C0: pop {r3} mov r8, r3 pop {r4-r7} @@ -56087,13 +56087,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, =gUnknown_082F7A94 adds r0, r3, 0 adds r0, 0x24 @@ -56102,11 +56102,11 @@ sub_8026264: ; 8026264 adds r0, r1 ldrb r0, [r0] cmp r2, r0 - bcc @080262A0 + bcc _080262A0 movs r0, 0x1 - b @080262BA + b _080262BA .pool -@080262A0: +_080262A0: lsls r4, r2, 3 adds r1, r4, 0 movs r0, 0x14 @@ -56117,9 +56117,9 @@ sub_8026264: ; 8026264 movs r0, 0x18 adds r1, r4, 0 bl SetGpuReg -@080262B8: +_080262B8: movs r0, 0 -@080262BA: +_080262BA: pop {r4} pop {r1} bx r1 @@ -56138,13 +56138,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 @@ -56156,9 +56156,9 @@ sub_80262C0: ; 80262C0 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] @@ -56166,8 +56166,8 @@ sub_80262C0: ; 80262C0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r5 - bcc @080262E2 -@0802630C: + bcc _080262E2 +_0802630C: pop {r3} mov r8, r3 pop {r4-r7} @@ -56202,14 +56202,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 @@ -56224,20 +56224,20 @@ sub_8026324: ; 8026324 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, =gUnknown_082F449C add r0, r10 ldrb r5, [r0] @@ -56248,24 +56248,24 @@ sub_8026324: ; 8026324 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 @@ -56273,7 +56273,7 @@ sub_8026324: ; 8026324 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0xFF - bne @08026404 + bne _08026404 strb r6, [r1] ldr r0, [r3] adds r0, 0xA8 @@ -56285,16 +56285,16 @@ sub_8026324: ; 8026324 adds r0, r5 movs r1, 0x1 strb r1, [r0] - b @08026434 + b _08026434 .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 @@ -56304,7 +56304,7 @@ sub_8026324: ; 8026324 adds r0, r4 ldrb r0, [r0] cmp r0, 0x1 - beq @08026434 + beq _08026434 mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -56312,25 +56312,25 @@ sub_8026324: ; 8026324 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, =gUnknown_082F449C add r0, r10 @@ -56341,9 +56341,9 @@ sub_8026324: ; 8026324 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 @@ -56359,9 +56359,9 @@ sub_8026324: ; 8026324 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls @0802648E + bls _0802648E movs r3, 0x2 -@0802648E: +_0802648E: ldr r2, =gUnknown_082F7A88 ldr r0, =0x000031b4 adds r1, r4, r0 @@ -56378,14 +56378,14 @@ sub_8026324: ; 8026324 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 @@ -56397,9 +56397,9 @@ sub_8026324: ; 8026324 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 @@ -56413,27 +56413,27 @@ sub_8026324: ; 8026324 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 .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 @@ -56447,13 +56447,13 @@ sub_8026324: ; 8026324 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 @@ -56541,7 +56541,7 @@ sub_8026324: ; 8026324 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] -@08026602: +_08026602: mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -56549,9 +56549,9 @@ sub_8026324: ; 8026324 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 @@ -56585,19 +56585,19 @@ 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 .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 @@ -56606,7 +56606,7 @@ sub_8026634: ; 8026634 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi @080266D4 + bhi _080266D4 ldr r0, =gUnknown_082F45AF lsls r1, r4, 1 adds r1, r4 @@ -56617,7 +56617,7 @@ sub_8026634: ; 8026634 adds r1, r0 ldrb r1, [r1] cmp r6, r1 - bne @0802670A + bne _0802670A mov r0, r12 ldr r1, [r0] adds r0, r1, 0 @@ -56628,7 +56628,7 @@ sub_8026634: ; 8026634 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi @080266D0 + bhi _080266D0 lsls r0, r4, 4 subs r0, r4 lsls r0, 2 @@ -56637,12 +56637,12 @@ sub_8026634: ; 8026634 adds r0, r1 movs r1, 0x1 strb r1, [r0] - b @0802670A + b _0802670A .pool -@080266D0: +_080266D0: movs r0, 0x1 - b @0802670C -@080266D4: + b _0802670C +_080266D4: ldr r0, =gUnknown_082F45AF lsls r1, r4, 1 adds r1, r4 @@ -56653,7 +56653,7 @@ sub_8026634: ; 8026634 adds r1, r0 ldrb r1, [r1] cmp r6, r1 - bne @0802670A + bne _0802670A mov r1, r12 ldr r0, [r1] adds r0, 0xA8 @@ -56670,9 +56670,9 @@ sub_8026634: ; 8026634 adds r1, r0 movs r0, 0x1 strb r0, [r1] -@0802670A: +_0802670A: movs r0, 0 -@0802670C: +_0802670C: pop {r4-r7} pop {r1} bx r1 @@ -56704,11 +56704,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 @@ -56716,9 +56716,9 @@ sub_802671C: ; 802671C 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 @@ -56729,7 +56729,7 @@ sub_802671C: ; 802671C adds r6, r0, r5 ldrb r0, [r6] cmp r0, 0x9 - bls @080267FC + bls _080267FC movs r7, 0 movs r0, 0xA strb r0, [r6] @@ -56747,7 +56747,7 @@ sub_802671C: ; 802671C adds r1, r0, r5 ldrb r0, [r1] cmp r0, 0 - bne @080267AC + bne _080267AC strb r2, [r1] ldr r2, =0x000032e0 adds r0, r4, r2 @@ -56755,19 +56755,19 @@ sub_802671C: ; 802671C 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 @@ -56779,19 +56779,19 @@ sub_802671C: ; 802671C 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 .pool -@080267FC: +_080267FC: adds r0, r5, 0 bl sub_8026D8C mov r2, r8 @@ -56807,9 +56807,9 @@ sub_802671C: ; 802671C lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls @08026822 + bls _08026822 movs r3, 0x2 -@08026822: +_08026822: ldr r2, =gUnknown_082F7A88 ldr r0, =0x000032e0 adds r1, r4, r0 @@ -56830,7 +56830,7 @@ sub_802671C: ; 802671C lsls r0, 24 lsrs r0, 24 cmp r0, r2 - bcc @0802685C + bcc _0802685C ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] @@ -56839,13 +56839,13 @@ sub_802671C: ; 802671C adds r0, 0xD0 adds r0, r5 strb r3, [r0] -@0802685C: +_0802685C: bl sub_8026324 - b @08026964 + b _08026964 .pool -@0802686C: +_0802686C: cmp r0, 0x2 - bne @080268F4 + bne _080268F4 movs r2, 0x90 lsls r2, 1 adds r0, r4, r2 @@ -56861,7 +56861,7 @@ sub_802671C: ; 802671C lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bls @08026964 + bls _08026964 mov r0, r8 ldr r2, [r0] adds r0, r2, 0 @@ -56902,11 +56902,11 @@ sub_802671C: ; 802671C adds r1, r4, r2 adds r1, r5 strb r0, [r1] - b @08026964 + b _08026964 .pool -@080268F4: +_080268F4: cmp r0, 0x3 - bne @08026964 + bne _08026964 adds r1, r4, 0 adds r1, 0xDC adds r1, r5 @@ -56917,14 +56917,14 @@ sub_802671C: ; 802671C 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 @@ -56959,16 +56959,16 @@ sub_802671C: ; 802671C 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 @@ -56994,10 +56994,10 @@ sub_8026988: ; 8026988 mov r8, r0 ldrb r6, [r1] cmp r6, r8 - bcs @08026A7A + bcs _08026A7A ldr r0, =gUnknown_082F449C mov r9, r0 -@080269A8: +_080269A8: ldr r0, =0x02022c98 ldr r3, [r0] adds r0, r3, 0 @@ -57028,23 +57028,23 @@ sub_8026988: ; 8026988 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 .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 @@ -57059,14 +57059,14 @@ sub_8026988: ; 8026988 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 @@ -57077,12 +57077,12 @@ sub_8026988: ; 8026988 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 @@ -57091,13 +57091,13 @@ sub_8026988: ; 8026988 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 @@ -57115,9 +57115,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 @@ -57132,8 +57132,8 @@ sub_8026A88: ; 8026A88 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc @08026A9A -@08026ABA: + bcc _08026A9A +_08026ABA: pop {r4-r6} pop {r0} bx r0 @@ -57149,8 +57149,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 @@ -57158,8 +57158,8 @@ sub_8026AC8: ; 8026AC8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc @08026AD8 -@08026AEA: + bcc _08026AD8 +_08026AEA: pop {r4,r5} pop {r0} bx r0 @@ -57175,13 +57175,13 @@ sub_8026AF4: ; 8026AF4 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls @08026B10 + bls _08026B10 bl sub_8026AC8 - b @08026B14 + b _08026B14 .pool -@08026B10: +_08026B10: bl sub_8026A88 -@08026B14: +_08026B14: ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 @@ -57201,13 +57201,13 @@ sub_8026B28: ; 8026B28 adds r0, 0x40 ldrb r0, [r0] cmp r0, 0x9 - bls @08026B44 + bls _08026B44 bl sub_8026AC8 - b @08026B48 + b _08026B48 .pool -@08026B44: +_08026B44: bl sub_8026A88 -@08026B48: +_08026B48: ldr r0, =0x02022c98 ldr r0, [r0] adds r0, 0x40 @@ -57226,47 +57226,47 @@ sub_8026B5C: ; 8026B5C 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 .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 @@ -57280,9 +57280,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 @@ -57290,7 +57290,7 @@ sub_8026BB8: ; 8026BB8 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne @08026BEC + bne _08026BEC adds r0, r4, 0 bl sub_8027DFC ldr r1, [r6] @@ -57299,36 +57299,36 @@ sub_8026BB8: ; 8026BB8 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 .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 @@ -57342,7 +57342,7 @@ sub_8026C28: ; 8026C28 movs r3, 0xAC lsls r3, 1 movs r2, 0 -@08026C34: +_08026C34: ldr r0, [r4] adds r0, r3 adds r0, r1 @@ -57351,7 +57351,7 @@ sub_8026C28: ; 8026C28 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x4 - bls @08026C34 + bls _08026C34 pop {r4} pop {r0} bx r0 @@ -57367,13 +57367,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] @@ -57382,13 +57382,13 @@ sub_8026C50: ; 8026C50 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq @08026C88 + beq _08026C88 movs r0, 0x1 - b @08026C8A + b _08026C8A .pool -@08026C88: +_08026C88: movs r0, 0 -@08026C8A: +_08026C8A: pop {r4} pop {r1} bx r1 @@ -57403,7 +57403,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] @@ -57418,10 +57418,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] @@ -57441,7 +57441,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 @@ -57449,19 +57449,19 @@ sub_8026C90: ; 8026C90 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 .pool -@08026D14: +_08026D14: movs r0, 0 -@08026D16: +_08026D16: pop {r4-r6} pop {r1} bx r1 @@ -57508,11 +57508,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 @@ -57580,14 +57580,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 @@ -57595,8 +57595,8 @@ sub_8026DB0: ; 8026DB0 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @08026DFE -@08026E18: + bne _08026DFE +_08026E18: ldr r0, [r4] adds r0, 0x90 mov r1, r12 @@ -57605,30 +57605,30 @@ sub_8026DB0: ; 8026DB0 ldrb r0, [r2] ldrb r3, [r1] cmp r0, r3 - bls @08026E46 + bls _08026E46 adds r1, r0, 0 - b @08026E48 + b _08026E48 .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 @@ -57657,49 +57657,49 @@ 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 .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 @@ -57711,25 +57711,25 @@ sub_8026EEC: ; 8026EEC 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 @@ -57750,16 +57750,16 @@ 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 .pool -@08026F48: +_08026F48: ldr r3, =0x000031b4 adds r0, r1, r3 adds r0, r4 @@ -57778,59 +57778,59 @@ sub_8026F1C: ; 8026F1C ldr r1, [r6] adds r1, 0x4A adds r1, r4 - b @0802722A + b _0802722A .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 .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 @@ -57839,15 +57839,15 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x74 - b @08027226 + b _08027226 .pool -@08026FF8: +_08026FF8: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x74 - b @08027226 + b _08027226 .pool -@08027004: +_08027004: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -57856,15 +57856,15 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x80 - b @08027226 + b _08027226 .pool -@0802701C: +_0802701C: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x80 - b @08027226 + b _08027226 .pool -@08027028: +_08027028: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -57873,15 +57873,15 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x50 - b @08027226 + b _08027226 .pool -@08027040: +_08027040: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 - b @08027226 + b _08027226 .pool -@0802704C: +_0802704C: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -57889,14 +57889,14 @@ sub_8026F1C: ; 8026F1C ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b @08027224 + b _08027224 .pool -@08027060: +_08027060: ldr r0, =0x02022c98 ldr r1, [r0] - b @08027224 + b _08027224 .pool -@0802706C: +_0802706C: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -57905,37 +57905,37 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x68 - b @08027226 + b _08027226 .pool -@08027084: +_08027084: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 - b @08027226 + b _08027226 .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 .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 @@ -57944,15 +57944,15 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x74 - b @08027226 + b _08027226 .pool -@080270E0: +_080270E0: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x74 - b @08027226 + b _08027226 .pool -@080270EC: +_080270EC: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -57961,15 +57961,15 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x50 - b @08027226 + b _08027226 .pool -@08027104: +_08027104: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 - b @08027226 + b _08027226 .pool -@08027110: +_08027110: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -57977,14 +57977,14 @@ sub_8026F1C: ; 8026F1C ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b @08027224 + b _08027224 .pool -@08027124: +_08027124: ldr r0, =0x02022c98 ldr r1, [r0] - b @08027224 + b _08027224 .pool -@08027130: +_08027130: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -57993,33 +57993,33 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x68 - b @08027226 + b _08027226 .pool -@08027148: +_08027148: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 - b @08027226 + b _08027226 .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 .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 @@ -58028,15 +58028,15 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x68 - b @08027226 + b _08027226 .pool -@08027198: +_08027198: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x68 - b @08027226 + b _08027226 .pool -@080271A4: +_080271A4: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -58045,15 +58045,15 @@ sub_8026F1C: ; 8026F1C adds r0, 0x1 strh r0, [r2] adds r1, 0x50 - b @08027226 + b _08027226 .pool -@080271BC: +_080271BC: ldr r0, =0x02022c98 ldr r1, [r0] adds r1, 0x50 - b @08027226 + b _08027226 .pool -@080271C8: +_080271C8: ldr r0, =0x02022c98 ldr r1, [r0] adds r2, r1, 0 @@ -58061,57 +58061,57 @@ sub_8026F1C: ; 8026F1C ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b @08027224 + b _08027224 .pool -@080271DC: +_080271DC: ldr r0, =0x02022c98 ldr r1, [r0] - b @08027224 + b _08027224 .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 @@ -58127,9 +58127,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 @@ -58143,19 +58143,19 @@ 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 .pool -@08027280: +_08027280: movs r2, 0x89 lsls r2, 1 adds r0, r3, r2 @@ -58165,14 +58165,14 @@ sub_8027234: ; 8027234 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 @@ -58187,11 +58187,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 @@ -58208,8 +58208,8 @@ sub_80272A4: ; 80272A4 adds r2, 0x24 ldrb r2, [r2] cmp r3, r2 - bcc @080272BA -@080272DC: + bcc _080272BA +_080272DC: pop {r4,r5} pop {r0} bx r0 @@ -58228,7 +58228,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 @@ -58239,7 +58239,7 @@ sub_80272E8: ; 80272E8 mov r9, r1 subs r0, r6, r5 lsls r3, r0, 2 -@08027310: +_08027310: ldr r0, [r7] adds r1, r2, r3 add r0, r10 @@ -58249,7 +58249,7 @@ sub_80272E8: ; 80272E8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xA - bls @08027310 + bls _08027310 ldr r0, [r7] subs r1, r6, r5 lsls r1, 2 @@ -58311,7 +58311,7 @@ sub_80272E8: ; 80272E8 lsls r0, r1, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls @080272FC + bls _080272FC ldr r2, =0x02022c98 ldr r0, [r2] movs r1, 0xAA @@ -58349,17 +58349,17 @@ 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 .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 @@ -58376,7 +58376,7 @@ sub_80273F0: ; 80273F0 adds r0, r1 adds r0, r2 ldrb r2, [r0] -@08027436: +_08027436: ldr r1, [r5] lsls r0, r3, 1 adds r0, r3 @@ -58388,7 +58388,7 @@ sub_80273F0: ; 80273F0 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x4 - bls @08027436 + bls _08027436 pop {r4,r5} pop {r0} bx r0 @@ -58420,9 +58420,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 .pool @@ -58453,18 +58453,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 @@ -58475,9 +58475,9 @@ sub_802749C: ; 802749C 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 @@ -58496,7 +58496,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 @@ -58507,7 +58507,7 @@ sub_8027518: ; 8027518 lsls r1, 24 lsrs r3, r1, 24 cmp r3, 0 - bne @0802752C + bne _0802752C ldr r0, [r5] adds r0, 0x98 strb r7, [r0] @@ -58530,13 +58530,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 @@ -58544,13 +58544,13 @@ sub_8027554: ; 8027554 ldr r1, =0x000031cc adds r0, r1 movs r1, 0x2 - b @080275CA + b _080275CA .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 @@ -58558,15 +58558,15 @@ sub_8027554: ; 8027554 ldr r1, =0x000031cc adds r0, r1 movs r1, 0x3 - b @080275CA + b _080275CA .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 @@ -58574,7 +58574,7 @@ sub_8027554: ; 8027554 ldr r1, =0x000031cc adds r0, r1 movs r1, 0x1 -@080275CA: +_080275CA: strb r1, [r0] ldr r0, [r4] adds r1, r0, 0 @@ -58586,9 +58586,9 @@ sub_8027554: ; 8027554 strb r1, [r0] movs r0, 0xD4 bl audio_play - b @08027600 + b _08027600 .pool -@080275E8: +_080275E8: lsls r0, r1, 4 subs r0, r1 lsls r0, 2 @@ -58596,12 +58596,12 @@ sub_8027554: ; 8027554 ldr r1, =0x000031cc adds r0, r1 strb r2, [r0] - b @08027600 + b _08027600 .pool -@080275FC: +_080275FC: subs r0, 0x1 strb r0, [r2] -@08027600: +_08027600: pop {r4} pop {r0} bx r0 @@ -58664,7 +58664,7 @@ sub_8027660: ; 8027660 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @0802768C + bne _0802768C ldr r0, =0x02022c98 lsls r1, r2, 4 subs r1, r2 @@ -58672,14 +58672,14 @@ sub_8027660: ; 8027660 ldr r2, =0x000031a0 adds r1, r2 ldr r0, [r0] - b @08027694 + b _08027694 .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 @@ -58730,7 +58730,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 @@ -58745,7 +58745,7 @@ sub_80276C0: ; 80276C0 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x2 - bls @080276EE + bls _080276EE mov r0, r9 ldr r1, [r0] mov r2, r12 @@ -58759,13 +58759,13 @@ sub_80276C0: ; 80276C0 ldrsh r0, [r3, r7] muls r0, r1 cmp r5, r0 - bls @08027734 + bls _08027734 subs r0, r5, r0 - b @08027736 + b _08027736 .pool -@08027734: +_08027734: movs r0, 0 -@08027736: +_08027736: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -58788,20 +58788,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 @@ -58826,8 +58826,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 @@ -58835,15 +58835,15 @@ sub_802778C: ; 802778C 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} @@ -58864,8 +58864,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 @@ -58875,20 +58875,20 @@ sub_80277D0: ; 80277D0 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 @@ -58898,19 +58898,19 @@ sub_80277D0: ; 80277D0 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] @@ -58939,17 +58939,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 @@ -58963,12 +58963,12 @@ sub_802784C: ; 802784C 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 @@ -58984,18 +58984,18 @@ sub_802784C: ; 802784C 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 @@ -59004,7 +59004,7 @@ sub_802784C: ; 802784C adds r0, r1 ldr r0, [r0] cmp r6, r0 - bne @0802790C + bne _0802790C adds r0, r2, r1 ldr r1, =0x00003308 adds r0, r1 @@ -59019,16 +59019,16 @@ sub_802784C: ; 802784C 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 @@ -59074,8 +59074,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 @@ -59085,29 +59085,29 @@ sub_802795C: ; 802795C 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} @@ -59132,20 +59132,20 @@ sub_80279C8: ; 80279C8 adds r4, r0, 0 bl sub_8027748 cmp r4, r0 - beq @080279F4 + beq _080279F4 movs r0, 0x3 - b @08027A22 + b _08027A22 .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 @@ -59154,12 +59154,12 @@ sub_80279C8: ; 80279C8 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 @@ -59171,9 +59171,9 @@ sub_8027A28: ; 8027A28 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 @@ -59184,9 +59184,9 @@ sub_8027A38: ; 8027A38 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 @@ -59209,7 +59209,7 @@ 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 @@ -59219,24 +59219,24 @@ sub_8027A5C: ; 8027A5C 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 .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 @@ -59273,20 +59273,20 @@ 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 .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, =gUnknown_082F7B2C ldr r1, [r0, 0x4] ldr r0, [r0] @@ -59299,32 +59299,32 @@ sub_8027ACC: ; 8027ACC adds r4, r0, 0 movs r6, 0 ldr r5, =gUnknown_082F7B34 -@08027B18: +_08027B18: ldr r1, [r5] movs r0, 0x1 movs r2, 0 bl GetStringWidth 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 @@ -59350,44 +59350,44 @@ sub_8027ACC: ; 8027ACC bl sub_8027BEC ldrb r0, [r7, 0x2] movs r1, 0x3 - b @08027BB6 + b _08027BB6 .pool -@08027B94: +_08027B94: bl IsDma3ManagerBusyWithBgCopy 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 CopyWindowToVram -@08027BBA: +_08027BBA: ldrh r0, [r7] adds r0, 0x1 strh r0, [r7] - b @08027BE2 + b _08027BE2 .pool -@08027BC8: +_08027BC8: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @08027BE2 + bne _08027BE2 ldrb r0, [r7, 0x2] bl RemoveWindow 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} @@ -59460,7 +59460,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} @@ -59512,7 +59512,7 @@ sub_8027BEC: ; 8027BEC bl Print adds r6, 0x1 cmp r6, 0x2 - ble @08027C76 + ble _08027C76 adds r0, r7, 0 bl PutWindowTilemap add sp, 0x20 @@ -59547,9 +59547,9 @@ sub_8027D38: ; 8027D38 adds r0, 0x24 ldrb r4, [r0] cmp r4, 0x4 - bhi @08027D66 + bhi _08027D66 ldr r5, =gUnknown_082F7B90 -@08027D48: +_08027D48: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -59563,8 +59563,8 @@ sub_8027D38: ; 8027D38 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 @@ -59572,7 +59572,7 @@ sub_8027D38: ; 8027D38 strb r2, [r1] movs r1, 0 mov r12, r0 -@08027D74: +_08027D74: movs r4, 0 mov r2, r12 ldr r0, [r2] @@ -59580,11 +59580,11 @@ sub_8027D38: ; 8027D38 adds r5, r1, 0x1 ldrb r0, [r0] cmp r4, r0 - bcs @08027DB2 + bcs _08027DB2 ldr r7, =0x02022c98 lsls r3, r1, 1 ldr r6, =gUnknown_082F7B50 -@08027D8A: +_08027D8A: ldr r2, [r7] lsls r0, r4, 1 adds r0, r4 @@ -59604,12 +59604,12 @@ sub_8027D38: ; 8027D38 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 @@ -59652,20 +59652,20 @@ 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 .pool -@08027E28: +_08027E28: ldrb r0, [r1, 0x4] -@08027E2A: +_08027E2A: pop {r1} bx r1 thumb_func_end sub_8027DFC @@ -60108,16 +60108,16 @@ 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 .pool -@080281A4: +_080281A4: ldrb r0, [r3, 0x1] lsls r0, 28 lsrs r0, 28 @@ -60275,7 +60275,7 @@ sub_8028164: ; 8028164 ldr r1, [sp, 0x30] str r0, [r1] movs r0, 0x1 -@080282DE: +_080282DE: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -60321,22 +60321,22 @@ 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 .pool -@08028344: +_08028344: ldrb r0, [r1, 0x4] strb r0, [r4] movs r0, 0x1 -@0802834A: +_0802834A: pop {r4} pop {r1} bx r1 @@ -60373,20 +60373,20 @@ 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 .pool -@080283A0: +_080283A0: ldr r0, [r1, 0x4] -@080283A2: +_080283A2: pop {r1} bx r1 thumb_func_end sub_8028374 @@ -60414,14 +60414,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 LoadObjectPic adds r0, r4, 0 bl Free -@080283E8: +_080283E8: add r0, sp, 0x8 bl LoadTaggedObjectPalette add r0, sp, 0x10 @@ -60508,18 +60508,18 @@ sub_80284A8: ; 80284A8 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 @@ -60592,26 +60592,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] @@ -60623,7 +60623,7 @@ sub_802853C: ; 802853C lsls r0, 16 asrs r0, 16 cmp r0, 0x27 - ble @080285A2 + ble _080285A2 movs r0, 0 strh r0, [r4, 0x2E] bl sub_8027650 @@ -60633,7 +60633,7 @@ sub_802853C: ; 802853C movs r0, 0 bl sub_8028F14 strh r0, [r4, 0x20] -@080285A2: +_080285A2: movs r0, 0 pop {r4} pop {r1} @@ -60655,9 +60655,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 @@ -60669,20 +60669,20 @@ sub_80285AC: ; 80285AC 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 @@ -60701,9 +60701,9 @@ sub_8028614: ; 8028614 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] @@ -60714,15 +60714,15 @@ sub_8028614: ; 8028614 ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq @0802863C + beq _0802863C bl RemoveObjectAndFreeResources -@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 @@ -60767,8 +60767,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 @@ -60776,8 +60776,8 @@ sub_802868C: ; 802868C lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc @0802869C -@080286AE: + bcc _0802869C +_080286AE: pop {r4-r6} pop {r0} bx r0 @@ -60818,7 +60818,7 @@ sub_80286E4: ; 80286E4 mov r12, r0 movs r6, 0 ldr r5, =0x02022cf4 -@080286F0: +_080286F0: ldr r3, [r5] lsls r1, r4, 1 adds r0, r3, 0 @@ -60845,7 +60845,7 @@ sub_80286E4: ; 80286E4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls @080286F0 + bls _080286F0 pop {r4-r7} pop {r0} bx r0 @@ -60870,7 +60870,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 @@ -60892,7 +60892,7 @@ sub_8028734: ; 8028734 add r0, sp, 0x20 bl LoadTaggedObjectPalette movs r4, 0 -@0802878A: +_0802878A: lsls r1, r4, 20 movs r0, 0xC0 lsls r0, 14 @@ -60920,8 +60920,8 @@ sub_8028734: ; 8028734 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 @@ -60935,7 +60935,7 @@ sub_8028734: ; 8028734 sub_80287E4: ; 80287E4 push {r4,r5,lr} movs r4, 0 -@080287E8: +_080287E8: ldr r5, =0x02022cf4 ldr r0, [r5] lsls r1, r4, 1 @@ -60948,14 +60948,14 @@ sub_80287E4: ; 80287E4 ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq @08028806 + beq _08028806 bl RemoveObjectAndFreeResources -@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 @@ -60977,7 +60977,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 @@ -61000,19 +61000,19 @@ sub_8028828: ; 8028828 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] @@ -61024,7 +61024,7 @@ sub_8028828: ; 8028828 str r3, [sp] bl audio_play ldr r3, [sp] -@08028896: +_08028896: mov r7, r9 ldr r0, [r7] adds r0, 0x16 @@ -61033,20 +61033,20 @@ sub_8028828: ; 8028828 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 .pool -@080288C4: +_080288C4: movs r0, 0 -@080288C6: +_080288C6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -61062,9 +61062,9 @@ sub_80288D4: ; 80288D4 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 @@ -61082,19 +61082,19 @@ sub_80288D4: ; 80288D4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls @080288E0 - b @080289DA + bls _080288E0 + b _080289DA .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 @@ -61107,13 +61107,13 @@ sub_80288D4: ; 80288D4 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bls @0802894C + bls _0802894C strh r1, [r2, 0x3E] - b @0802899E + b _0802899E .pool -@0802894C: +_0802894C: cmp r0, 0xA - bls @0802896A + bls _0802896A lsls r1, r4, 1 adds r0, r2, 0 adds r0, 0x2A @@ -61125,8 +61125,8 @@ sub_80288D4: ; 80288D4 adds r0, r6 movs r1, 0x2 bl StartObjectImageAnim - b @0802899E -@0802896A: + b _0802899E +_0802896A: lsls r1, r4, 1 adds r0, r2, 0 adds r0, 0x2A @@ -61138,8 +61138,8 @@ sub_80288D4: ; 80288D4 adds r0, r6 movs r1, 0 bl StartObjectImageAnim - b @0802899E -@08028984: + b _0802899E +_08028984: ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 @@ -61152,17 +61152,17 @@ sub_80288D4: ; 80288D4 adds r0, r6 movs r1, 0 bl StartObjectImageAnim -@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 .pool -@080289B4: +_080289B4: ldr r0, =0x02022cf4 ldr r0, [r0] lsls r1, r4, 1 @@ -61179,10 +61179,10 @@ sub_80288D4: ; 80288D4 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 @@ -61202,7 +61202,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 @@ -61222,7 +61222,7 @@ sub_80289E8: ; 80289E8 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x9 - bls @080289FE + bls _080289FE pop {r4-r7} pop {r0} bx r0 @@ -61247,7 +61247,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 @@ -61255,7 +61255,7 @@ sub_8028A34: ; 8028A34 str r0, [sp, 0x4] mov r0, sp bl LoadObjectPic -@08028A6A: +_08028A6A: add r0, sp, 0x8 bl LoadTaggedObjectPalette adds r0, r4, 0 @@ -61289,7 +61289,7 @@ sub_8028A88: ; 8028A88 stm r1!, {r3-r5} movs r5, 0 mov r9, r2 -@08028AB0: +_08028AB0: movs r0, 0x4 bl AllocZeroed ldr r1, =0x02022cb8 @@ -61314,12 +61314,12 @@ sub_8028A88: ; 8028A88 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xA - bls @08028AB0 + bls _08028AB0 movs r5, 0 ldr r7, =0x02022ce4 ldr r4, =gUnknown_082FB31C mov r8, r4 -@08028AF0: +_08028AF0: movs r0, 0x4 bl AllocZeroed lsls r1, r5, 2 @@ -61327,7 +61327,7 @@ sub_8028A88: ; 8028A88 str r0, [r4] adds r6, r1, 0 cmp r5, 0x3 - bne @08028B2C + bne _08028B2C mov r0, r8 movs r2, 0x6 ldrsh r1, [r0, r2] @@ -61336,9 +61336,9 @@ sub_8028A88: ; 8028A88 movs r3, 0 bl AddObjectToFront ldr r1, [r7, 0xC] - b @08028B40 + b _08028B40 .pool -@08028B2C: +_08028B2C: lsls r0, r5, 1 add r0, r8 movs r3, 0 @@ -61348,7 +61348,7 @@ sub_8028A88: ; 8028A88 movs r3, 0 bl AddObjectToFront ldr r1, [r4] -@08028B40: +_08028B40: lsls r0, 24 lsrs r0, 24 strh r0, [r1] @@ -61366,7 +61366,7 @@ sub_8028A88: ; 8028A88 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @08028AF0 + bls _08028AF0 movs r0, 0x1 bl sub_8028C30 add sp, 0x30 @@ -61384,7 +61384,7 @@ 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] @@ -61395,9 +61395,9 @@ sub_8028B80: ; 8028B80 ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq @08028BA0 + beq _08028BA0 bl RemoveObjectAndFreeTiles -@08028BA0: +_08028BA0: ldr r0, [r4] bl Free movs r0, 0 @@ -61406,10 +61406,10 @@ sub_8028B80: ; 8028B80 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] @@ -61420,9 +61420,9 @@ sub_8028B80: ; 8028B80 ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq @08028BD2 + beq _08028BD2 bl RemoveObjectAndFreeTiles -@08028BD2: +_08028BD2: ldr r0, [r4] bl Free movs r0, 0 @@ -61431,7 +61431,7 @@ sub_8028B80: ; 8028B80 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @08028BB8 + bls _08028BB8 pop {r4-r6} pop {r0} bx r0 @@ -61480,7 +61480,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] @@ -61499,7 +61499,7 @@ sub_8028C30: ; 8028C30 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls @08028C46 + bls _08028C46 pop {r4-r7} pop {r0} bx r0 @@ -61576,12 +61576,12 @@ sub_8028CF4: ; 8028CF4 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 - beq @08028D36 + beq _08028D36 movs r3, 0 ldr r7, =gUnknown_082FB354 ldr r6, =0x02022cb0 movs r5, 0 -@08028D0A: +_08028D0A: lsls r0, r3, 2 adds r2, r0, r6 ldr r1, [r2] @@ -61593,19 +61593,19 @@ sub_8028CF4: ; 8028CF4 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 @@ -61633,7 +61633,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 @@ -61655,7 +61655,7 @@ sub_8028D44: ; 8028D44 mov r9, r0 ldr r1, =0x02022cb0 mov r8, r1 -@08028D9E: +_08028D9E: movs r0, 0x4 bl AllocZeroed lsls r2, r5, 2 @@ -61679,8 +61679,8 @@ sub_8028D44: ; 8028D44 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 @@ -61703,7 +61703,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 @@ -61726,7 +61726,7 @@ sub_8028DFC: ; 8028DFC lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls @08028E0C + bls _08028E0C pop {r4-r7} pop {r0} bx r0 @@ -61740,7 +61740,7 @@ sub_8028E4C: ; 8028E4C ldr r5, =0x02022cb0 ldr r4, =0x02020630 movs r3, 0 -@08028E56: +_08028E56: lsls r0, r2, 2 adds r0, r5 ldr r0, [r0] @@ -61755,7 +61755,7 @@ sub_8028E4C: ; 8028E4C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1 - bls @08028E56 + bls _08028E56 pop {r4,r5} pop {r0} bx r0 @@ -61767,7 +61767,7 @@ 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] @@ -61778,9 +61778,9 @@ sub_8028E84: ; 8028E84 ldr r1, =0x02020630 adds r0, r1 cmp r0, 0 - beq @08028EA4 + beq _08028EA4 bl RemoveObjectAndFreeTiles -@08028EA4: +_08028EA4: ldr r0, [r4] bl Free movs r0, 0 @@ -61789,7 +61789,7 @@ sub_8028E84: ; 8028E84 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls @08028E8A + bls _08028E8A pop {r4-r6} pop {r0} bx r0 @@ -61809,7 +61809,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] @@ -61828,7 +61828,7 @@ sub_8028EC8: ; 8028EC8 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1 - bls @08028EDE + bls _08028EDE pop {r4-r7} pop {r0} bx r0 @@ -61845,95 +61845,95 @@ 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 .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 .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 @@ -61943,7 +61943,7 @@ sub_8028F14: ; 8028F14 sub_8028FCC: ; 8028FCC push {r4,lr} movs r4, 0 -@08028FD0: +_08028FD0: adds r0, r4, 0 movs r1, 0x1 bl sub_8028BF8 @@ -61954,7 +61954,7 @@ sub_8028FCC: ; 8028FCC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xA - bls @08028FD0 + bls _08028FD0 movs r0, 0 bl sub_80289E8 pop {r4} @@ -62327,21 +62327,21 @@ sub_80292E0: ; 80292E0 movs r4, 0 ldr r5, =gUnknown_082FB40C 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 @@ -62358,10 +62358,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 .pool @@ -62376,34 +62376,34 @@ 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 .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 .pool -@08029394: +_08029394: ldr r1, =gUnknown_082FAAD8 movs r0, 0x3 movs r2, 0 @@ -62425,9 +62425,9 @@ sub_8029338: ; 8029338 bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @08029414 + b _08029414 .pool -@080293D8: +_080293D8: movs r0, 0 bl ShowBg movs r0, 0x3 @@ -62440,33 +62440,33 @@ sub_8029338: ; 8029338 ldr r1, [r0] ldr r2, =0x00003014 adds r1, r2 - b @0802941C + b _0802941C .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 .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 @@ -62485,30 +62485,30 @@ 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 .pool -@08029488: +_08029488: bl sub_8027650 lsls r0, 24 lsrs r7, r0, 24 @@ -62543,14 +62543,14 @@ sub_8029440: ; 8029440 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 @@ -62604,10 +62604,10 @@ sub_8029440: ; 8029440 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 @@ -62650,26 +62650,26 @@ sub_8029440: ; 8029440 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 .pool -@080295EC: +_080295EC: bl IsDma3ManagerBusyWithBgCopy 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 @@ -62680,21 +62680,21 @@ sub_8029440: ; 8029440 lsls r0, 24 lsrs r6, r0, 24 cmp r6, r7 - bcc @08029604 -@0802961C: + bcc _08029604 +_0802961C: movs r0, 0 bl CopyBgTilemapBufferToVram 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 .pool -@08029640: +_08029640: ldr r5, =0x02022cf8 ldr r0, [r5] ldr r4, =0x00003008 @@ -62711,8 +62711,8 @@ sub_8029440: ; 8029440 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 @@ -62731,7 +62731,7 @@ sub_8029440: ; 8029440 adds r0, r3 movs r1, 0x1 str r1, [r0] -@0802968E: +_0802968E: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -62763,9 +62763,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 @@ -62783,61 +62783,61 @@ sub_80296A8: ; 80296A8 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, =gUnknown_085EDE5D 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 @@ -62847,13 +62847,13 @@ sub_80296A8: ; 80296A8 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 @@ -62893,10 +62893,10 @@ sub_80296A8: ; 80296A8 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 @@ -62964,8 +62964,8 @@ sub_80296A8: ; 80296A8 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 @@ -62995,30 +62995,30 @@ 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 .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] @@ -63026,9 +63026,9 @@ sub_802988C: ; 802988C adds r2, r1, r0 movs r0, 0 strh r0, [r2] - b @08029F8A + b _08029F8A .pool -@08029914: +_08029914: ldr r6, =gUnknown_082F7BBC adds r0, r6, 0 bl AddWindow @@ -63058,9 +63058,9 @@ sub_802988C: ; 802988C bl sub_8029174 mov r0, r9 bl sub_8029174 - b @08029F88 + b _08029F88 .pool -@0802996C: +_0802996C: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r5, =0x00003008 @@ -63113,17 +63113,17 @@ sub_802988C: ; 802988C 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 @@ -63156,7 +63156,7 @@ sub_802988C: ; 802988C str r0, [sp, 0x10] ldr r1, =0x02021fc4 mov r10, r1 -@08029A36: +_08029A36: mov r0, r9 adds r1, r7, 0 bl sub_80276A0 @@ -63185,9 +63185,9 @@ sub_802988C: ; 802988C bl GetStringWidth 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 @@ -63212,9 +63212,9 @@ sub_802988C: ; 802988C str r1, [sp, 0x8] movs r1, 0x1 bl box_print - b @08029B10 + b _08029B10 .pool -@08029AE0: +_08029AE0: ldr r0, =0x02022cf8 ldr r0, [r0] ldr r2, =0x00003009 @@ -63238,21 +63238,21 @@ sub_802988C: ; 802988C 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 @@ -63269,13 +63269,13 @@ sub_802988C: ; 802988C ldr r1, [r4] ldr r0, =0x00003014 adds r1, r0 - b @08029F8E + b _08029F8E .pool -@08029B6C: +_08029B6C: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @08029B90 + bne _08029B90 ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -63287,7 +63287,7 @@ sub_802988C: ; 802988C adds r0, r2 ldrb r0, [r0] bl PutWindowTilemap -@08029B90: +_08029B90: movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0 @@ -63296,9 +63296,9 @@ sub_802988C: ; 802988C ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 - b @08029F8E + b _08029F8E .pool -@08029BB8: +_08029BB8: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x0000301c @@ -63309,26 +63309,26 @@ sub_802988C: ; 802988C 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 .pool -@08029BFC: +_08029BFC: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r5, =0x00003008 @@ -63366,9 +63366,9 @@ sub_802988C: ; 802988C movs r1, 0x1 adds r2, r6, 0 bl Print - b @08029F88 + b _08029F88 .pool -@08029C60: +_08029C60: ldr r0, [sp, 0xC] bl sub_80296A8 ldr r4, =0x02022cf8 @@ -63387,13 +63387,13 @@ sub_802988C: ; 802988C ldr r1, [r4] ldr r0, =0x00003014 adds r1, r0 - b @08029F8E + b _08029F8E .pool -@08029C9C: +_08029C9C: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @08029CC0 + bne _08029CC0 ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -63405,16 +63405,16 @@ sub_802988C: ; 802988C adds r0, r2 ldrb r0, [r0] bl PutWindowTilemap -@08029CC0: +_08029CC0: movs r0, 0 bl CopyBgTilemapBufferToVram ldr r0, =0x02022cf8 ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 - b @08029F8E + b _08029F8E .pool -@08029CE0: +_08029CE0: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x0000301c @@ -63425,17 +63425,17 @@ sub_802988C: ; 802988C 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 @@ -63443,15 +63443,15 @@ sub_802988C: ; 802988C 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 .pool -@08029D3C: +_08029D3C: bl sub_80A2F30 ldr r1, [r4] ldr r0, =0x00003014 @@ -63459,7 +63459,7 @@ sub_802988C: ; 802988C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@08029D4C: +_08029D4C: movs r0, 0x1E str r0, [sp] movs r0, 0xF @@ -63487,9 +63487,9 @@ sub_802988C: ; 802988C bl ClearWindowTilemap adds r0, r6, 0 bl sub_8029174 - b @08029FF8 + b _08029FF8 .pool -@08029DA0: +_08029DA0: ldr r0, =0x0000016f bl current_map_music_set ldr r4, =0x02022cf8 @@ -63563,9 +63563,9 @@ sub_802988C: ; 802988C 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 @@ -63576,19 +63576,19 @@ sub_802988C: ; 802988C adds r1, r5, 0 bl sub_81AFC0C cmp r4, 0x2 - bne @08029E9C + bne _08029E9C ldr r1, =gUnknown_085EDDE2 adds r0, r7, 0 bl sub_81AFC28 - b @08029EA8 + b _08029EA8 .pool -@08029E9C: +_08029E9C: cmp r6, 0x1 - bne @08029EA8 + bne _08029EA8 ldr r1, =gUnknown_085EDDFB adds r0, r7, 0 bl sub_81AFC28 -@08029EA8: +_08029EA8: ldr r0, =0x02022cf8 ldr r0, [r0] ldr r2, =0x00003009 @@ -63604,7 +63604,7 @@ sub_802988C: ; 802988C movs r1, 0x1 movs r3, 0 bl Print -@08029EC8: +_08029EC8: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -63621,13 +63621,13 @@ sub_802988C: ; 802988C ldr r1, [r4] ldr r0, =0x00003014 adds r1, r0 - b @08029F8E + b _08029F8E .pool -@08029F08: +_08029F08: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @08029F2C + bne _08029F2C ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x00003008 @@ -63639,7 +63639,7 @@ sub_802988C: ; 802988C adds r0, r2 ldrb r0, [r0] bl PutWindowTilemap -@08029F2C: +_08029F2C: movs r0, 0 bl CopyBgTilemapBufferToVram ldr r0, =0x0000020b @@ -63650,9 +63650,9 @@ sub_802988C: ; 802988C ldr r1, [r0] ldr r0, =0x00003014 adds r1, r0 - b @08029F8E + b _08029F8E .pool -@08029F5C: +_08029F5C: ldr r4, =0x02022cf8 ldr r0, [r4] ldr r1, =0x0000301c @@ -63663,29 +63663,29 @@ sub_802988C: ; 802988C 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 .pool -@08029FA8: +_08029FA8: ldr r5, =0x00003008 adds r0, r1, r5 ldrb r0, [r0] @@ -63720,7 +63720,7 @@ sub_802988C: ; 802988C adds r0, r1 movs r1, 0x1 str r1, [r0] -@08029FF8: +_08029FF8: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -63747,24 +63747,24 @@ 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 .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, =gUnknown_082F7BD4 mov r9, r0 bl AddWindow @@ -63808,9 +63808,9 @@ sub_802A010: ; 802A010 ldr r2, =0x00003024 adds r0, r2 strb r6, [r0] - b @0802A35E + b _0802A35E .pool -@0802A0CC: +_0802A0CC: ldr r3, =0x00003008 mov r8, r3 adds r0, r2, r3 @@ -63888,13 +63888,13 @@ sub_802A010: ; 802A010 ldr r1, [r7] ldr r2, =0x00003014 adds r1, r2 - b @0802A2EA + b _0802A2EA .pool -@0802A194: +_0802A194: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802A1B6 + bne _0802A1B6 ldr r0, [r7] ldr r3, =0x00003008 adds r0, r3 @@ -63905,22 +63905,22 @@ sub_802A010: ; 802A010 adds r0, r1 ldrb r0, [r0] bl PutWindowTilemap -@0802A1B6: +_0802A1B6: movs r0, 0 bl CopyBgTilemapBufferToVram ldr r1, [r7] ldr r2, =0x00003014 adds r1, r2 - b @0802A2EA + b _0802A2EA .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 @@ -63983,7 +63983,7 @@ sub_802A010: ; 802A010 movs r2, 0x1 ands r2, r1 cmp r2, 0 - beq @0802A294 + beq _0802A294 movs r0, 0x5 bl audio_play ldr r0, [r7] @@ -63991,15 +63991,15 @@ sub_802A010: ; 802A010 adds r1, r0, r3 ldrb r0, [r1] cmp r0, 0 - bne @0802A2E4 + bne _0802A2E4 strb r5, [r1] - b @0802A2E4 + b _0802A2E4 .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] @@ -64007,29 +64007,29 @@ sub_802A010: ; 802A010 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 .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] @@ -64037,17 +64037,17 @@ sub_802A010: ; 802A010 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 .pool -@0802A2FC: +_0802A2FC: ldr r0, [r7] ldr r2, =0x00003020 adds r1, r0, r2 @@ -64091,7 +64091,7 @@ sub_802A010: ; 802A010 adds r0, r3 movs r1, 0x1 str r1, [r0] -@0802A35E: +_0802A35E: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -64113,20 +64113,20 @@ 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 .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 @@ -64142,43 +64142,43 @@ sub_802A380: ; 802A380 movs r1, 0x1 movs r3, 0 bl AddTextPrinterParametrized - b @0802A410 + b _0802A410 .pool -@0802A3D8: +_0802A3D8: movs r0, 0 movs r1, 0x3 bl CopyWindowToVram ldr r1, [r5] ldr r0, =0x00003014 adds r1, r0 - b @0802A414 + b _0802A414 .pool -@0802A3EC: +_0802A3EC: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802A448 + bne _0802A448 ldr r0, =sub_8153688 movs r1, 0 bl AddTask - b @0802A410 + b _0802A410 .pool -@0802A404: +_0802A404: ldr r0, =sub_8153688 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 .pool -@0802A420: +_0802A420: movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -64197,7 +64197,7 @@ sub_802A380: ; 802A380 adds r0, r1 movs r1, 0x1 str r1, [r0] -@0802A448: +_0802A448: add sp, 0x10 pop {r4-r6} pop {r0} @@ -64216,18 +64216,18 @@ 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 .pool -@0802A47C: +_0802A47C: cmp r0, 0x2 - beq @0802A4F4 - b @0802A520 -@0802A482: + beq _0802A4F4 + b _0802A520 +_0802A482: ldr r4, =gUnknown_082F7BEC adds r0, r4, 0 bl AddWindow @@ -64241,9 +64241,9 @@ sub_802A454: ; 802A454 bl ClearWindowTilemap adds r0, r4, 0 bl sub_8029174 - b @0802A510 + b _0802A510 .pool -@0802A4AC: +_0802A4AC: ldr r4, =0x00003008 adds r0, r2, r4 ldrb r0, [r0] @@ -64270,38 +64270,38 @@ sub_802A454: ; 802A454 ldr r1, [r5] ldr r0, =0x00003014 adds r1, r0 - b @0802A514 + b _0802A514 .pool -@0802A4F4: +_0802A4F4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802A50A + bne _0802A50A ldr r0, [r5] ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl PutWindowTilemap -@0802A50A: +_0802A50A: movs r0, 0 bl CopyBgTilemapBufferToVram -@0802A510: +_0802A510: ldr r1, [r5] adds r1, r6 -@0802A514: +_0802A514: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0802A52C + b _0802A52C .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} @@ -64357,20 +64357,20 @@ 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 .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, =gUnknown_082F7BE4 adds r0, r4, 0 bl AddWindow @@ -64401,9 +64401,9 @@ sub_802A588: ; 802A588 adds r1, 0x4 adds r0, r1 strb r2, [r0] - b @0802A6EA + b _0802A6EA .pool -@0802A610: +_0802A610: ldr r4, =0x00003008 adds r0, r1, r4 ldrb r0, [r0] @@ -64430,30 +64430,30 @@ sub_802A588: ; 802A588 ldr r1, [r6] ldr r2, =0x00003014 adds r1, r2 - b @0802A678 + b _0802A678 .pool -@0802A658: +_0802A658: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802A66E + bne _0802A66E ldr r0, [r6] ldr r1, =0x00003008 adds r0, r1 ldrb r0, [r0] bl PutWindowTilemap -@0802A66E: +_0802A66E: movs r0, 0 bl CopyBgTilemapBufferToVram ldr r1, [r6] adds r1, r7 -@0802A678: +_0802A678: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0802A6EA + b _0802A6EA .pool -@0802A684: +_0802A684: ldr r0, =0x0000301c adds r1, r0 ldrh r0, [r1] @@ -64462,13 +64462,13 @@ sub_802A588: ; 802A588 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 .pool -@0802A6A4: +_0802A6A4: ldr r0, [r6] ldr r1, =0x00003024 adds r0, r1 @@ -64500,7 +64500,7 @@ sub_802A588: ; 802A588 adds r0, r2 movs r1, 0x1 str r1, [r0] -@0802A6EA: +_0802A6EA: add sp, 0xC pop {r4-r7} pop {r0} @@ -64578,13 +64578,13 @@ sub_802A770: ; 802A770 adds r0, r1 ldr r0, [r0] cmp r0, 0x1 - beq @0802A78C + beq _0802A78C movs r0, 0x1 - b @0802A78E + b _0802A78E .pool -@0802A78C: +_0802A78C: movs r0, 0 -@0802A78E: +_0802A78E: pop {r1} bx r1 thumb_func_end sub_802A770 @@ -64621,7 +64621,7 @@ sub_802A7A8: ; 802A7A8 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@0802A7CE: +_0802A7CE: strh r6, [r2] mov r0, sp str r0, [r1] @@ -64631,7 +64631,7 @@ sub_802A7A8: ; 802A7A8 adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @0802A7CE + bhi _0802A7CE strh r6, [r2] mov r2, sp str r2, [r1] @@ -64751,69 +64751,69 @@ 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 .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, =gUnknown_082F7DF0 movs r1, 0 movs r2, 0x40 bl gpu_pal_apply - b @0802A98A + b _0802A98A .pool -@0802A938: +_0802A938: bl reset_temp_tile_data_buffers - b @0802A98A -@0802A93E: + b _0802A98A +_0802A93E: ldr r1, =gUnknown_082F8084 movs r0, 0 str r0, [sp] movs r0, 0x3 - b @0802A954 + b _0802A954 .pool -@0802A94C: +_0802A94C: ldr r1, =gUnknown_082F8914 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 .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 @@ -64821,9 +64821,9 @@ sub_802A8E8: ; 802A8E8 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@0802A998: +_0802A998: movs r0, 0 -@0802A99A: +_0802A99A: add sp, 0x4 pop {r1} bx r1 @@ -64839,13 +64839,13 @@ sub_802A9A8: ; 802A9A8 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq @0802AA3C + beq _0802AA3C ldr r5, =0x02022cfc ldr r0, =0x000083b0 bl Alloc str r0, [r5] cmp r0, 0 - beq @0802AA3C + beq _0802AA3C bl clear_tasks ldr r0, =sub_802ACA0 movs r1, 0x1 @@ -64882,12 +64882,12 @@ sub_802A9A8: ; 802A9A8 bl set_word_task_arg ldr r0, =sub_802AC6C bl SetMainCallback2 - b @0802AA42 + b _0802AA42 .pool -@0802AA3C: +_0802AA3C: adds r0, r6, 0 bl SetMainCallback2 -@0802AA42: +_0802AA42: pop {r4-r7} pop {r0} bx r0 @@ -64924,9 +64924,9 @@ 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 @@ -64950,9 +64950,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] @@ -64992,14 +64992,14 @@ sub_802AA94: ; 802AA94 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 @@ -65016,7 +65016,7 @@ sub_802AB20: ; 802AB20 ldr r0, =gUnknown_082FB464 mov r8, r0 movs r4, 0x4 -@0802AB32: +_0802AB32: ldr r0, [r7] adds r0, r5 ldr r1, =0x000082a8 @@ -65036,7 +65036,7 @@ sub_802AB20: ; 802AB20 adds r5, 0xC subs r4, 0x1 cmp r4, 0 - bge @0802AB32 + bge _0802AB32 ldr r0, =0x02022cfc ldr r1, [r0] ldr r0, =0x000083ac @@ -65064,7 +65064,7 @@ sub_802AB98: ; 802AB98 ldr r6, =0x02022cfc movs r4, 0 movs r3, 0 -@0802ABA2: +_0802ABA2: ldr r2, [r6] adds r1, r2, r3 ldr r7, =0x000082f2 @@ -65096,7 +65096,7 @@ sub_802AB98: ; 802AB98 adds r3, 0x28 adds r5, 0x1 cmp r5, 0x4 - ble @0802ABA2 + ble _0802ABA2 pop {r4-r7} pop {r0} bx r0 @@ -65110,22 +65110,22 @@ sub_802AC00: ; 802AC00 lsrs r3, r0, 16 movs r1, 0 ldr r2, =gUnknown_082FB464 -@0802AC0A: +_0802AC0A: ldrh r0, [r2] cmp r0, r3 - bne @0802AC1C + bne _0802AC1C lsls r0, r1, 16 asrs r0, 16 - b @0802AC28 + b _0802AC28 .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 @@ -65200,24 +65200,24 @@ 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 .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 ResetAllObjectData @@ -65229,14 +65229,14 @@ sub_802ACA0: ; 802ACA0 bl sub_80A2F50 ldr r0, =0x02022cfc ldr r1, [r0] - b @0802ADC0 + b _0802ADC0 .pool -@0802AD0C: +_0802AD0C: ldr r0, =sub_802BD84 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 @@ -65246,29 +65246,29 @@ sub_802ACA0: ; 802ACA0 movs r1, 0 bl sub_800DFB4 ldr r1, [r4] - b @0802ADC0 + b _0802ADC0 .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 .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 @@ -65286,9 +65286,9 @@ sub_802ACA0: ; 802ACA0 bl SetVBlankCallback ldr r0, =0x02022cfc ldr r1, [r0] - b @0802ADC0 + b _0802ADC0 .pool -@0802ADA4: +_0802ADA4: bl fade_and_return_progress_probably ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] @@ -65297,18 +65297,18 @@ sub_802ACA0: ; 802ACA0 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 .pool -@0802ADD0: +_0802ADD0: ldr r0, [r2] ldrb r1, [r0, 0x7] adds r1, 0x1 @@ -65316,24 +65316,24 @@ sub_802ACA0: ; 802ACA0 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 bl sub_802AC84 - b @0802ADFE + b _0802ADFE .pool -@0802ADF8: +_0802ADF8: ldr r0, =sub_802B194 bl sub_802AC84 -@0802ADFE: +_0802ADFE: bl sub_802BE80 adds r0, r4, 0 bl remove_task -@0802AE08: +_0802AE08: add sp, 0x4 pop {r4} pop {r0} @@ -65346,16 +65346,16 @@ 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 .pool -@0802AE34: +_0802AE34: ldr r0, =0x02022cfc ldr r2, [r0] subs r1, 0x1 @@ -65365,7 +65365,7 @@ sub_802AE14: ; 802AE14 str r0, [r2, 0x30] movs r0, 0 str r0, [r2, 0x2C] -@0802AE46: +_0802AE46: pop {r0} bx r0 .pool @@ -65393,12 +65393,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 @@ -65407,8 +65407,8 @@ sub_802AE50: ; 802AE50 adds r3, 0x1 ldrb r1, [r1, 0x5] cmp r3, r1 - blt @0802AE82 -@0802AE94: + blt _0802AE82 +_0802AE94: pop {r4-r6} pop {r0} bx r0 @@ -65430,7 +65430,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 @@ -65439,7 +65439,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 @@ -65452,7 +65452,7 @@ sub_802AEA4: ; 802AEA4 mov r3, r8 bl sub_802E264 cmp r0, 0 - beq @0802AF10 + beq _0802AF10 ldr r2, [r7] lsls r1, r4, 1 adds r0, r2, 0 @@ -65471,7 +65471,7 @@ sub_802AEA4: ; 802AEA4 ldr r1, =0x000082f6 adds r0, r1 strh r5, [r0] -@0802AF10: +_0802AF10: mov r2, r10 ldr r1, [r2] ldr r3, =0x000082fc @@ -65479,7 +65479,7 @@ sub_802AEA4: ; 802AEA4 adds r0, r6 ldr r0, [r0] cmp r0, 0 - beq @0802AF36 + beq _0802AF36 adds r0, r1, 0 adds r0, 0x8B adds r0, r4 @@ -65487,11 +65487,11 @@ sub_802AEA4: ; 802AEA4 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 @@ -65500,19 +65500,19 @@ sub_802AEA4: ; 802AEA4 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 @@ -65535,26 +65535,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, =gUnknown_082FB5F4 adds r0, 0x28 ldrb r0, [r0] @@ -65564,7 +65564,7 @@ sub_802AF80: ; 802AF80 bl _call_via_r0 adds r1, r0, 0 cmp r1, 0 - bne @0802AFEE + bne _0802AFEE ldr r0, [r4] adds r0, 0x48 strb r1, [r0] @@ -65577,7 +65577,7 @@ sub_802AF80: ; 802AF80 adds r1, r2 adds r1, r0 str r5, [r1] -@0802AFEE: +_0802AFEE: bl sub_802C1DC bl sub_802B008 pop {r4,r5} @@ -65593,22 +65593,22 @@ sub_802B008: ; 802B008 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 @@ -65658,7 +65658,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 @@ -65669,24 +65669,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] @@ -65700,15 +65700,15 @@ sub_802B078: ; 802B078 adds r1, 0x71 ldrb r1, [r1] cmp r1, 0 - beq @0802B104 + beq _0802B104 adds r0, 0x4D strb r4, [r0] - b @0802B108 + b _0802B108 .pool -@0802B104: +_0802B104: adds r0, 0x4D strb r1, [r0] -@0802B108: +_0802B108: ldr r0, =0x02022cfc ldr r1, [r0] mov r0, sp @@ -65725,21 +65725,21 @@ sub_802B078: ; 802B078 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 @@ -65751,22 +65751,22 @@ sub_802B078: ; 802B078 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 @@ -65786,7 +65786,7 @@ sub_802B194: ; 802B194 adds r0, 0x48 ldrb r0, [r0] cmp r0, 0 - beq @0802B1E0 + beq _0802B1E0 ldr r1, =gUnknown_082FB618 adds r0, r2, 0 adds r0, 0x70 @@ -65797,7 +65797,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] @@ -65813,7 +65813,7 @@ sub_802B194: ; 802B194 str r0, [r1] movs r0, 0x3 bl sub_802AE14 -@0802B1E0: +_0802B1E0: bl sub_802C1DC bl sub_802B1FC pop {r4} @@ -65829,7 +65829,7 @@ sub_802B1FC: ; 802B1FC 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 @@ -65843,17 +65843,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 @@ -65867,22 +65867,22 @@ sub_802B248: ; 802B248 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 .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 @@ -65895,11 +65895,11 @@ sub_802B248: ; 802B248 movs r0, 0x1 strb r0, [r1] movs r0, 0 - b @0802B296 + b _0802B296 .pool -@0802B294: +_0802B294: movs r0, 0x1 -@0802B296: +_0802B296: pop {r4} pop {r1} bx r1 @@ -65912,13 +65912,13 @@ sub_802B29C: ; 802B29C 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 .pool -@0802B2B4: +_0802B2B4: movs r0, 0 bl sub_802AE14 ldr r1, [r4] @@ -65929,9 +65929,9 @@ sub_802B29C: ; 802B29C ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@0802B2CA: +_0802B2CA: bl sub_802B7E0 -@0802B2CE: +_0802B2CE: pop {r4} pop {r1} bx r1 @@ -65944,12 +65944,12 @@ sub_802B2D4: ; 802B2D4 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 .pool -@0802B2EC: +_0802B2EC: bl sub_802C0E8 movs r0, 0x5 bl sub_802AE14 @@ -65957,21 +65957,21 @@ sub_802B2D4: ; 802B2D4 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 @@ -65984,12 +65984,12 @@ sub_802B31C: ; 802B31C 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 .pool -@0802B334: +_0802B334: bl sub_802C0E8 movs r0, 0 bl sub_802AE14 @@ -66003,15 +66003,15 @@ sub_802B31C: ; 802B31C 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 @@ -66022,7 +66022,7 @@ 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 @@ -66034,24 +66034,24 @@ sub_802B368: ; 802B368 adds r1, 0x4C movs r0, 0x1 strb r0, [r1] - b @0802B3AA + b _0802B3AA .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 .pool @@ -66062,17 +66062,17 @@ 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 @@ -66084,34 +66084,34 @@ sub_802B3D4: ; 802B3D4 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 .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 @@ -66119,42 +66119,42 @@ sub_802B3D4: ; 802B3D4 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 .pool -@0802B468: +_0802B468: movs r0, 0x1 -@0802B46A: +_0802B46A: pop {r4} pop {r1} bx r1 @@ -66167,45 +66167,45 @@ sub_802B470: ; 802B470 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 .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 @@ -66218,30 +66218,30 @@ sub_802B4CC: ; 802B4CC 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 .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] @@ -66255,38 +66255,38 @@ sub_802B4CC: ; 802B4CC ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @0802B560 + b _0802B560 .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 .pool -@0802B560: +_0802B560: movs r0, 0x1 -@0802B562: +_0802B562: pop {r4} pop {r1} bx r1 @@ -66299,22 +66299,22 @@ sub_802B568: ; 802B568 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 .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] @@ -66331,11 +66331,11 @@ sub_802B568: ; 802B568 adds r0, 0x42 strh r1, [r0] movs r0, 0 - b @0802B5C2 + b _0802B5C2 .pool -@0802B5C0: +_0802B5C0: movs r0, 0x1 -@0802B5C2: +_0802B5C2: pop {r4} pop {r1} bx r1 @@ -66348,26 +66348,26 @@ sub_802B5C8: ; 802B5C8 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 .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 @@ -66382,10 +66382,10 @@ sub_802B5C8: ; 802B5C8 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 @@ -66398,27 +66398,27 @@ sub_802B628: ; 802B628 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 .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 @@ -66431,38 +66431,38 @@ sub_802B664: ; 802B664 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 .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 SetMainCallback2 bl sub_802AA48 -@0802B6B0: +_0802B6B0: movs r0, 0x1 pop {r4} pop {r1} @@ -66476,23 +66476,23 @@ sub_802B6B8: ; 802B6B8 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 .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 @@ -66502,10 +66502,10 @@ sub_802B6B8: ; 802B6B8 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 @@ -66518,12 +66518,12 @@ sub_802B704: ; 802B704 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 @@ -66536,21 +66536,21 @@ sub_802B720: ; 802B720 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 .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 @@ -66562,54 +66562,54 @@ sub_802B720: ; 802B720 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 movs r1, 0x6 bl AddTask - b @0802B7A8 + b _0802B7A8 .pool -@0802B798: +_0802B798: ldr r0, =sub_8153688 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 .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 .pool -@0802B7D8: +_0802B7D8: movs r0, 0x1 -@0802B7DA: +_0802B7DA: pop {r4} pop {r1} bx r1 @@ -66623,42 +66623,42 @@ sub_802B7E0: ; 802B7E0 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 .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 .pool -@0802B84C: +_0802B84C: ldr r1, [r4] ldrh r0, [r1, 0x3C] adds r0, 0x1 @@ -66666,42 +66666,42 @@ sub_802B7E0: ; 802B7E0 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 .pool -@0802B8A0: +_0802B8A0: bl sub_802D788 cmp r0, 0 - bne @0802B8C4 + bne _0802B8C4 bl sub_802C270 bl sub_802BEA0 ldr r0, =0x02022cfc @@ -66709,13 +66709,13 @@ sub_802B7E0: ; 802B7E0 ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -@0802B8BA: +_0802B8BA: movs r0, 0 - b @0802B8C6 + b _0802B8C6 .pool -@0802B8C4: +_0802B8C4: movs r0, 0x1 -@0802B8C6: +_0802B8C6: pop {r4,r5} pop {r1} bx r1 @@ -66729,70 +66729,70 @@ sub_802B8CC: ; 802B8CC 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 .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 .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 @@ -66806,74 +66806,74 @@ sub_802B964: ; 802B964 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 .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 .pool -@0802BA00: +_0802BA00: ldr r1, [r5] ldrh r0, [r1, 0x3C] adds r0, 0x1 @@ -66881,23 +66881,23 @@ sub_802B964: ; 802B964 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] @@ -66908,13 +66908,13 @@ sub_802B964: ; 802B964 ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -@0802BA46: +_0802BA46: movs r0, 0 - b @0802BA52 + b _0802BA52 .pool -@0802BA50: +_0802BA50: movs r0, 0x1 -@0802BA52: +_0802BA52: pop {r4-r6} pop {r1} bx r1 @@ -66928,25 +66928,25 @@ sub_802BA58: ; 802BA58 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 .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 @@ -66960,18 +66960,18 @@ sub_802BA58: ; 802BA58 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 .pool -@0802BAD0: +_0802BAD0: ldr r1, [r4] ldrh r0, [r1, 0x3C] adds r2, r0, 0x1 @@ -66981,25 +66981,25 @@ sub_802BA58: ; 802BA58 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 .pool -@0802BB00: +_0802BB00: bl sub_802DA44 cmp r0, 0 - bne @0802BB7C + bne _0802BB7C ldr r4, =0x02022cfc ldr r1, [r4] ldrh r0, [r1, 0x3E] @@ -67012,50 +67012,50 @@ sub_802BA58: ; 802BA58 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 .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 .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 @@ -67068,47 +67068,47 @@ sub_802BB84: ; 802BB84 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 .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 @@ -67117,9 +67117,9 @@ sub_802BB84: ; 802BB84 movs r0, 0x6 bl sub_802D0C8 ldr r1, [r4] - b @0802BC30 + b _0802BC30 .pool -@0802BC04: +_0802BC04: ldr r4, =0x02022cfc ldr r0, [r4] adds r0, 0x45 @@ -67128,42 +67128,42 @@ sub_802BB84: ; 802BB84 movs r0, 0x6 bl sub_802D0C8 ldr r1, [r4] - b @0802BC30 + b _0802BC30 .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 .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 .pool -@0802BC58: +_0802BC58: movs r0, 0x1 -@0802BC5A: +_0802BC5A: pop {r4} pop {r1} bx r1 @@ -67178,42 +67178,42 @@ 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 .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 .pool -@0802BCC8: +_0802BCC8: ldr r1, [r4] ldrh r0, [r1, 0x3C] adds r0, 0x1 @@ -67221,7 +67221,7 @@ sub_802BC60: ; 802BC60 lsls r0, 16 lsrs r0, 16 cmp r0, 0x78 - bls @0802BD24 + bls _0802BD24 movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -67231,35 +67231,35 @@ sub_802BC60: ; 802BC60 movs r3, 0x10 bl pal_fade_maybe 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 .pool -@0802BD14: +_0802BD14: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @0802BD24 + bne _0802BD24 movs r0, 0 - b @0802BD26 + b _0802BD26 .pool -@0802BD24: +_0802BD24: movs r0, 0x1 -@0802BD26: +_0802BD26: add sp, 0x4 pop {r4} pop {r1} @@ -67273,18 +67273,18 @@ sub_802BD30: ; 802BD30 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 .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 @@ -67292,21 +67292,21 @@ sub_802BD30: ; 802BD30 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 @@ -67335,29 +67335,29 @@ 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 .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 @@ -67374,18 +67374,18 @@ sub_802BD84: ; 802BD84 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 @@ -67401,8 +67401,8 @@ sub_802BD84: ; 802BD84 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 @@ -67410,8 +67410,8 @@ sub_802BD84: ; 802BD84 adds r4, 0xC adds r2, 0x1 cmp r2, 0x4 - ble @0802BDFE -@0802BE48: + ble _0802BDFE +_0802BE48: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -67501,7 +67501,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 @@ -67514,11 +67514,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] @@ -67526,14 +67526,14 @@ sub_802BEE4: ; 802BEE4 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 @@ -67547,24 +67547,24 @@ sub_802BF48: ; 802BF48 ldr r2, [r0] ldr r0, [r2, 0x10] cmp r0, 0 - beq @0802BF5C + beq _0802BF5C movs r0, 0 - b @0802BF72 + b _0802BF72 .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 .pool @@ -67581,38 +67581,38 @@ 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 .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, =gUnknown_082FB63C ldrb r1, [r2] lsls r1, 1 @@ -67641,25 +67641,25 @@ sub_802BF7C: ; 802BF7C ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b @0802C082 + b _0802C082 .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, =gUnknown_082FB63C ldr r4, =0x02022cfc ldr r0, [r4] @@ -67686,29 +67686,29 @@ sub_802BF7C: ; 802BF7C 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 @@ -67764,7 +67764,7 @@ sub_802C0E8: ; 802C0E8 movs r3, 0 movs r2, 0 movs r1, 0x4 -@0802C0F4: +_0802C0F4: ldr r0, [r5] adds r0, r4 adds r0, r2 @@ -67772,7 +67772,7 @@ sub_802C0E8: ; 802C0E8 adds r2, 0x28 subs r1, 0x1 cmp r1, 0 - bge @0802C0F4 + bge _0802C0F4 pop {r4,r5} pop {r0} bx r0 @@ -67810,13 +67810,13 @@ sub_802C130: ; 802C130 adds r2, r1 ldrh r1, [r2] cmp r1, r0 - beq @0802C15C + beq _0802C15C movs r0, 0 - b @0802C15E + b _0802C15E .pool -@0802C15C: +_0802C15C: movs r0, 0x1 -@0802C15E: +_0802C15E: pop {r1} bx r1 thumb_func_end sub_802C130 @@ -67889,7 +67889,7 @@ sub_802C1DC: ; 802C1DC ldr r1, [r4] ldr r0, [r1, 0x5C] cmp r0, 0 - beq @0802C21C + beq _0802C21C ldr r0, [r1, 0x78] bl sub_802DD64 ldr r1, [r4] @@ -67899,7 +67899,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] @@ -67913,7 +67913,7 @@ sub_802C1DC: ; 802C1DC ldr r0, [r4] adds r0, 0x4D strb r5, [r0] -@0802C21C: +_0802C21C: ldr r0, =0x02022cfc ldr r0, [r0] adds r0, 0x74 @@ -67936,10 +67936,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 .pool @@ -67982,11 +67982,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 @@ -67994,28 +67994,28 @@ sub_802C280: ; 802C280 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 .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 @@ -68027,13 +68027,13 @@ sub_802C280: ; 802C280 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] @@ -68050,51 +68050,51 @@ sub_802C280: ; 802C280 adds r2, r0 ldrh r0, [r2] strh r0, [r1] -@0802C31E: +_0802C31E: adds r0, r5, 0 bl sub_802C398 - b @0802C354 + b _0802C354 .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 .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 @@ -68113,7 +68113,7 @@ sub_802C398: ; 802C398 ldr r2, [r0] ldr r0, [r2, 0x68] cmp r0, 0 - bne @0802C432 + bne _0802C432 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -68123,13 +68123,13 @@ 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 .pool -@0802C3D0: +_0802C3D0: adds r0, r2, 0 adds r0, 0x4A ldrh r1, [r0] @@ -68137,18 +68137,18 @@ sub_802C398: ; 802C398 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, =gUnknown_082FB65C ldrh r1, [r5, 0xC] lsls r0, r1, 1 @@ -68158,25 +68158,25 @@ sub_802C398: ; 802C398 adds r0, r2 movs r4, 0 ldrsb r4, [r0, r4] - b @0802C416 + b _0802C416 .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 @@ -68190,13 +68190,13 @@ sub_802C43C: ; 802C43C 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] @@ -68204,27 +68204,27 @@ sub_802C43C: ; 802C43C str r1, [r0, 0x58] adds r0, 0x71 strb r4, [r0] - b @0802C4CE + b _0802C4CE .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 @@ -68232,7 +68232,7 @@ sub_802C43C: ; 802C43C adds r1, 0x81 movs r2, 0x5 bl memcpy -@0802C49E: +_0802C49E: bl sub_802C780 ldr r0, [r4] movs r2, 0 @@ -68247,28 +68247,28 @@ sub_802C43C: ; 802C43C 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 @@ -68279,25 +68279,25 @@ sub_802C43C: ; 802C43C 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 @@ -68311,73 +68311,73 @@ sub_802C538: ; 802C538 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 .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 @@ -68392,26 +68392,26 @@ sub_802C5DC: ; 802C5DC 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 @@ -68426,25 +68426,25 @@ sub_802C618: ; 802C618 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 .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 @@ -68459,29 +68459,29 @@ 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 .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 @@ -68498,10 +68498,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 .pool @@ -68516,40 +68516,40 @@ 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 .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} @@ -68565,14 +68565,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 @@ -68588,29 +68588,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} @@ -68648,9 +68648,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 .pool @@ -68665,13 +68665,13 @@ sub_802C7BC: ; 802C7BC ldr r2, [r0, 0x78] ldr r0, [r1] cmp r2, r0 - bcs @0802C7D8 + bcs _0802C7D8 movs r0, 0 - b @0802C7DA + b _0802C7DA .pool -@0802C7D8: +_0802C7D8: movs r0, 0x1 -@0802C7DA: +_0802C7DA: pop {r1} bx r1 thumb_func_end sub_802C7BC @@ -68736,25 +68736,25 @@ 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 .pool -@0802C874: +_0802C874: lsls r0, r5, 16 lsrs r0, 16 pop {r4-r6} @@ -68769,21 +68769,21 @@ sub_802C880: ; 802C880 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} @@ -68861,7 +68861,7 @@ sub_802C908: ; 802C908 sub_802C920: ; 802C920 push {r4,r5,lr} movs r5, 0 -@0802C924: +_0802C924: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -68871,7 +68871,7 @@ sub_802C920: ; 802C920 movs r1, 0x5 bl pokemon_getattr cmp r0, 0 - beq @0802C95C + beq _0802C95C adds r0, r4, 0 movs r1, 0x41 bl pokemon_getattr @@ -68879,18 +68879,18 @@ sub_802C920: ; 802C920 lsrs r0, 16 bl sub_802C908 cmp r0, 0 - beq @0802C95C + beq _0802C95C ldr r1, =0x020375f0 movs r0, 0x1 - b @0802C966 + b _0802C966 .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} @@ -68904,22 +68904,22 @@ sub_802C974: ; 802C974 adds r6, r0, 0 movs r4, 0 ldr r5, =gUnknown_082FBE08 -@0802C97C: +_0802C97C: adds r0, r5, 0 bl LoadCompressedObjectPic adds r5, 0x8 adds r4, 0x1 cmp r4, 0x4 - bls @0802C97C + bls _0802C97C movs r4, 0 ldr r5, =gUnknown_082FBE30 -@0802C98E: +_0802C98E: adds r0, r5, 0 bl LoadTaggedObjectPalette adds r5, 0x8 adds r4, 0x1 cmp r4, 0x1 - bls @0802C98E + bls _0802C98E movs r0, 0x5 bl IndexOfObjectPaletteTag strb r0, [r6, 0xE] @@ -68938,12 +68938,12 @@ sub_802C9BC: ; 802C9BC 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 @@ -68985,22 +68985,22 @@ sub_802C9D4: ; 802C9D4 lsls r0, 16 lsrs r0, 16 cmp r6, r0 - bne @0802CA2C + bne _0802CA2C movs r0, 0x3 - b @0802CA32 + b _0802CA32 .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, =gMonStillFrontPicTable @@ -69055,7 +69055,7 @@ sub_802C9D4: ; 802C9D4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @0802CAF4 + beq _0802CAF4 lsls r0, r6, 2 ldr r2, =0x000081a8 add r2, r9 @@ -69072,16 +69072,16 @@ sub_802C9D4: ; 802C9D4 add r1, sp, 0x30 ldrb r1, [r1] strb r1, [r0] - b @0802CB00 + b _0802CB00 .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 @@ -69147,26 +69147,26 @@ sub_802CB7C: ; 802CB7C 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] @@ -69176,22 +69176,22 @@ sub_802CB7C: ; 802CB7C 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] @@ -69200,7 +69200,7 @@ sub_802CB7C: ; 802CB7C strb r0, [r3] ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] -@0802CBE6: +_0802CBE6: pop {r0} bx r0 .pool @@ -69237,9 +69237,9 @@ sub_802CC18: ; 802CC18 ldr r1, [r0, 0x1C] ldr r0, =sub_802CC40 cmp r1, r0 - bne @0802CC30 + bne _0802CC30 movs r2, 0x1 -@0802CC30: +_0802CC30: adds r0, r2, 0 pop {r1} bx r1 @@ -69256,32 +69256,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, =DummyObjectCallback str r0, [r2, 0x1C] -@0802CC7C: +_0802CC7C: pop {r0} bx r0 .pool @@ -69314,7 +69314,7 @@ sub_802CCB0: ; 802CCB0 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq @0802CCF4 + beq _0802CCF4 movs r1, 0x5 negs r1, r1 mov r12, r1 @@ -69324,11 +69324,11 @@ sub_802CCB0: ; 802CCB0 ldr r6, =DummyObjectCallback 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 @@ -69338,12 +69338,12 @@ sub_802CCB0: ; 802CCB0 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 @@ -69360,7 +69360,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 @@ -69375,7 +69375,7 @@ sub_802CD08: ; 802CD08 ands r0, r2 orrs r0, r1 strb r0, [r3] -@0802CD36: +_0802CD36: pop {r0} bx r0 thumb_func_end sub_802CD08 @@ -69389,12 +69389,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] @@ -69402,8 +69402,8 @@ sub_802CD3C: ; 802CD3C strb r1, [r0] adds r2, 0x1 cmp r2, r3 - blt @0802CD56 -@0802CD66: + blt _0802CD56 +_0802CD66: pop {r4,r5} pop {r0} bx r0 @@ -69438,26 +69438,26 @@ sub_802CD98: ; 802CD98 lsrs r3, r0, 16 movs r2, 0 cmp r2, r3 - bge @0802CDCC + bge _0802CDCC ldr r5, =sub_802CDD4 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 .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 @@ -69470,28 +69470,28 @@ sub_802CDD4: ; 802CDD4 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, =gUnknown_08329F40 movs r2, 0x30 ldrsh r0, [r5, r2] @@ -69505,21 +69505,21 @@ sub_802CDD4: ; 802CDD4 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 .pool -@0802CE38: +_0802CE38: ldr r0, =DummyObjectCallback str r0, [r5, 0x1C] -@0802CE3C: +_0802CE3C: pop {r4,r5} pop {r0} bx r0 @@ -69542,7 +69542,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 @@ -69559,7 +69559,7 @@ sub_802CE48: ; 802CE48 adds r0, r5, r3 adds r0, r2 str r1, [r0] -@0802CE88: +_0802CE88: pop {r4,r5} pop {r0} bx r0 @@ -69573,7 +69573,7 @@ sub_802CE9C: ; 802CE9C movs r5, 0 movs r4, 0 ldr r6, =gUnknown_082FBE58 -@0802CEA6: +_0802CEA6: ldr r1, =gUnknown_082FBEB8 lsls r0, r4, 2 adds r0, r1 @@ -69603,10 +69603,10 @@ sub_802CE9C: ; 802CE9C adds r6, 0x14 adds r4, 0x1 cmp r4, 0x3 - ble @0802CEA6 + ble _0802CEA6 movs r4, 0x3 movs r6, 0x3C -@0802CEE8: +_0802CEE8: ldr r1, =gUnknown_082FBEB8 lsls r0, r4, 2 adds r0, r1 @@ -69643,7 +69643,7 @@ sub_802CE9C: ; 802CE9C subs r6, 0x14 subs r4, 0x1 cmp r4, 0 - bge @0802CEE8 + bge _0802CEE8 pop {r4-r7} pop {r0} bx r0 @@ -69660,20 +69660,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] @@ -69687,7 +69687,7 @@ sub_802CF50: ; 802CF50 lsls r3, 2 mov r10, r3 movs r5, 0x3 -@0802CF92: +_0802CF92: lsls r0, r6, 2 ldr r7, [sp, 0x8] ldr r1, =0x000081d0 @@ -69720,7 +69720,7 @@ sub_802CF50: ; 802CF50 adds r4, 0x14 subs r5, 0x1 cmp r5, 0 - bge @0802CF92 + bge _0802CF92 movs r5, 0x3 ldr r0, =gUnknown_082FBE58 ldr r3, [sp, 0x4] @@ -69730,7 +69730,7 @@ sub_802CF50: ; 802CF50 ldr r7, [sp] lsls r7, 2 mov r10, r7 -@0802CFE8: +_0802CFE8: lsls r0, r6, 2 ldr r1, [sp, 0x8] ldr r3, =0x000081d0 @@ -69763,7 +69763,7 @@ sub_802CF50: ; 802CF50 subs r4, 0x14 subs r5, 0x1 cmp r5, 0 - bge @0802CFE8 + bge _0802CFE8 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -69851,17 +69851,17 @@ sub_802D0C8: ; 802D0C8 adds r6, r0, 0 movs r5, 0 ldr r4, =gUnknown_082FE18C -@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 @@ -69910,12 +69910,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 .pool @@ -69929,22 +69929,22 @@ sub_802D150: ; 802D150 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 .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 ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_082FE164 @@ -70038,13 +70038,13 @@ sub_802D150: ; 802D150 movs r0, 0x1 bl CopyBgTilemapBufferToVram bl sub_8199D98 - b @0802D2CC + b _0802D2CC .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 @@ -70059,16 +70059,16 @@ sub_802D150: ; 802D150 bl ShowBg movs r0, 0x1 bl HideBg -@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} @@ -70082,51 +70082,51 @@ sub_802D2E4: ; 802D2E4 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802D34A + bne _0802D34A movs r0, 0 bl sub_802DF70 - b @0802D330 -@0802D322: + b _0802D330 +_0802D322: bl IsDma3ManagerBusyWithBgCopy 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 IsDma3ManagerBusyWithBgCopy 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 @@ -70139,51 +70139,51 @@ sub_802D350: ; 802D350 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802D3B6 + bne _0802D3B6 movs r0, 0x1 bl sub_802DF70 - b @0802D39C -@0802D38E: + b _0802D39C +_0802D38E: bl IsDma3ManagerBusyWithBgCopy 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 IsDma3ManagerBusyWithBgCopy 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 @@ -70199,16 +70199,16 @@ 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 .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 @@ -70218,8 +70218,8 @@ sub_802D3BC: ; 802D3BC bl ClearWindowTilemap adds r4, 0x1 cmp r4, r5 - blt @0802D3E2 -@0802D3F8: + blt _0802D3E2 +_0802D3F8: movs r0, 0 bl CopyBgTilemapBufferToVram ldr r0, =0x02022d00 @@ -70227,17 +70227,17 @@ sub_802D3BC: ; 802D3BC ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b @0802D43E + b _0802D43E .pool -@0802D410: +_0802D410: bl IsDma3ManagerBusyWithBgCopy 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 @@ -70247,13 +70247,13 @@ sub_802D3BC: ; 802D3BC bl RemoveWindow 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 @@ -70268,18 +70268,18 @@ sub_802D448: ; 802D448 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 .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 @@ -70302,13 +70302,13 @@ sub_802D448: ; 802D448 ldrb r0, [r0, 0x12] movs r1, 0x2 bl CopyWindowToVram - b @0802D4D2 + b _0802D4D2 .pool -@0802D4A4: +_0802D4A4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802D4EC + bne _0802D4EC ldr r0, [r5] ldrb r0, [r0, 0x12] bl PutWindowTilemap @@ -70323,21 +70323,21 @@ sub_802D448: ; 802D448 bl sub_802DB18 movs r0, 0 bl CopyBgTilemapBufferToVram -@0802D4D2: +_0802D4D2: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b @0802D4EC -@0802D4DC: + b _0802D4EC +_0802D4DC: bl IsDma3ManagerBusyWithBgCopy 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} @@ -70352,18 +70352,18 @@ sub_802D4F4: ; 802D4F4 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 .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 @@ -70386,13 +70386,13 @@ sub_802D4F4: ; 802D4F4 ldrb r0, [r0, 0x12] movs r1, 0x2 bl CopyWindowToVram - b @0802D574 + b _0802D574 .pool -@0802D550: +_0802D550: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802D58E + bne _0802D58E ldr r0, [r5] ldrb r0, [r0, 0x12] bl PutWindowTilemap @@ -70403,21 +70403,21 @@ sub_802D4F4: ; 802D4F4 bl sub_8098858 movs r0, 0 bl CopyBgTilemapBufferToVram -@0802D574: +_0802D574: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b @0802D58E -@0802D57E: + b _0802D58E +_0802D57E: bl IsDma3ManagerBusyWithBgCopy 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} @@ -70431,12 +70431,12 @@ sub_802D598: ; 802D598 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 .pool -@0802D5B0: +_0802D5B0: bl sub_802DA14 bl sub_8198C78 movs r0, 0 @@ -70445,18 +70445,18 @@ sub_802D598: ; 802D598 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 IsDma3ManagerBusyWithBgCopy 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 @@ -70470,18 +70470,18 @@ sub_802D5E4: ; 802D5E4 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 .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 @@ -70504,13 +70504,13 @@ sub_802D5E4: ; 802D5E4 ldrb r0, [r0, 0x12] movs r1, 0x2 bl CopyWindowToVram - b @0802D664 + b _0802D664 .pool -@0802D640: +_0802D640: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802D67E + bne _0802D67E ldr r0, [r5] ldrb r0, [r0, 0x12] bl PutWindowTilemap @@ -70521,21 +70521,21 @@ sub_802D5E4: ; 802D5E4 bl sub_8098858 movs r0, 0 bl CopyBgTilemapBufferToVram -@0802D664: +_0802D664: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b @0802D67E -@0802D66E: + b _0802D67E +_0802D66E: bl IsDma3ManagerBusyWithBgCopy 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} @@ -70550,18 +70550,18 @@ sub_802D688: ; 802D688 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 .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 @@ -70584,13 +70584,13 @@ sub_802D688: ; 802D688 ldrb r0, [r0, 0x12] movs r1, 0x2 bl CopyWindowToVram - b @0802D708 + b _0802D708 .pool -@0802D6E4: +_0802D6E4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802D722 + bne _0802D722 ldr r0, [r5] ldrb r0, [r0, 0x12] bl PutWindowTilemap @@ -70601,21 +70601,21 @@ sub_802D688: ; 802D688 bl sub_8098858 movs r0, 0 bl CopyBgTilemapBufferToVram -@0802D708: +_0802D708: ldr r1, [r5] ldrh r0, [r1, 0x4] adds r0, 0x1 strh r0, [r1, 0x4] - b @0802D722 -@0802D712: + b _0802D722 +_0802D712: bl IsDma3ManagerBusyWithBgCopy 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} @@ -70629,25 +70629,25 @@ sub_802D72C: ; 802D72C 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 .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 @@ -70681,19 +70681,19 @@ sub_802D788: ; 802D788 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 .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] @@ -70702,26 +70702,26 @@ sub_802D788: ; 802D788 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 @@ -70907,24 +70907,24 @@ sub_802D974: ; 802D974 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 .pool -@0802D990: +_0802D990: cmp r0, 0x2 - beq @0802D9EE + beq _0802D9EE cmp r0, 0x3 - beq @0802DA02 - b @0802DA0C -@0802D99A: + beq _0802DA02 + b _0802DA0C +_0802D99A: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802DA0C + bne _0802DA0C ldr r0, [r4] ldrb r0, [r0, 0x12] bl PutWindowTilemap @@ -70939,44 +70939,44 @@ sub_802D974: ; 802D974 ldrb r0, [r1, 0xD] adds r0, 0x1 strb r0, [r1, 0xD] - b @0802DA0C -@0802D9C8: + b _0802DA0C +_0802D9C8: bl IsDma3ManagerBusyWithBgCopy 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 .pool -@0802DA0C: +_0802DA0C: movs r0, 0x1 -@0802DA0E: +_0802DA0E: pop {r4} pop {r1} bx r1 @@ -70989,7 +70989,7 @@ sub_802DA14: ; 802DA14 ldr r0, [r4] ldrh r0, [r0, 0x12] cmp r0, 0xFF - beq @0802DA38 + beq _0802DA38 lsls r0, 24 lsrs r0, 24 bl rbox_fill_rectangle @@ -71000,7 +71000,7 @@ sub_802DA14: ; 802DA14 ldr r1, [r4] movs r0, 0 strb r0, [r1, 0xD] -@0802DA38: +_0802DA38: pop {r4} pop {r0} bx r0 @@ -71014,19 +71014,19 @@ sub_802DA44: ; 802DA44 ldr r1, [r4] ldrh r0, [r1, 0x12] cmp r0, 0xFF - bne @0802DA58 -@0802DA50: + bne _0802DA58 +_0802DA50: movs r0, 0 - b @0802DA84 + b _0802DA84 .pool -@0802DA58: +_0802DA58: ldrb r0, [r1, 0xD] cmp r0, 0 - bne @0802DA7E + bne _0802DA7E bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802DA82 + bne _0802DA82 ldr r0, [r4] ldrb r0, [r0, 0x12] bl RemoveWindow @@ -71036,13 +71036,13 @@ sub_802DA44: ; 802DA44 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 @@ -71228,12 +71228,12 @@ sub_802DBF8: ; 802DBF8 ldr r5, [r0] movs r6, 0 cmp r6, r10 - bge @0802DC62 + bge _0802DC62 ldr r0, =gUnknown_08300D38 mov r9, r0 ldr r1, =0x02022d00 mov r8, r1 -@0802DC26: +_0802DC26: lsls r4, r6, 24 lsrs r4, 24 adds r0, r4, 0 @@ -71260,8 +71260,8 @@ sub_802DBF8: ; 802DBF8 adds r5, 0x2 adds r6, 0x1 cmp r6, r10 - blt @0802DC26 -@0802DC62: + blt _0802DC26 +_0802DC62: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -71317,21 +71317,21 @@ sub_802DCCC: ; 802DCCC 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 @@ -71531,9 +71531,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 @@ -71564,8 +71564,8 @@ sub_802DE1C: ; 802DE1C adds r4, 0x4 adds r5, 0x1 cmp r5, r7 - blt @0802DE6A -@0802DEAC: + blt _0802DE6A +_0802DEAC: movs r0, 0 bl CopyBgTilemapBufferToVram add sp, 0x8 @@ -71655,11 +71655,11 @@ sub_802DF70: ; 802DF70 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 @@ -71667,35 +71667,35 @@ sub_802DF70: ; 802DF70 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 @@ -71709,8 +71709,8 @@ sub_802DFD4: ; 802DFD4 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 @@ -71720,8 +71720,8 @@ sub_802DFD4: ; 802DFD4 bl PutWindowTilemap adds r4, 0x1 cmp r4, r5 - blt @0802DFE4 -@0802DFFA: + blt _0802DFE4 +_0802DFFA: movs r0, 0 bl CopyBgTilemapBufferToVram pop {r4,r5} @@ -71771,11 +71771,11 @@ sub_802E058: ; 802E058 ldr r0, [r4] ldr r0, [r0, 0x18] cmp r0, 0x1F - bls @0802E06C + bls _0802E06C movs r0, 0 - b @0802E08A + b _0802E08A .pool -@0802E06C: +_0802E06C: movs r0, 0x1 movs r1, 0x80 movs r2, 0x1 @@ -71785,12 +71785,12 @@ sub_802E058: ; 802E058 adds r0, 0x1 str r0, [r1, 0x18] cmp r0, 0x1F - bls @0802E088 + bls _0802E088 movs r0, 0x1 bl HideBg -@0802E088: +_0802E088: movs r0, 0x1 -@0802E08A: +_0802E08A: pop {r4} pop {r1} bx r1 @@ -71803,10 +71803,10 @@ sub_802E090: ; 802E090 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 @@ -71847,7 +71847,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 @@ -71856,12 +71856,12 @@ 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 .pool -@0802E108: +_0802E108: mov r0, sp ldrh r0, [r0, 0x2] strh r0, [r4] @@ -71870,7 +71870,7 @@ sub_802E0D0: ; 802E0D0 ldr r0, [sp, 0x4] str r0, [r4, 0x8] movs r0, 0x1 -@0802E118: +_0802E118: add sp, 0xC pop {r4} pop {r1} @@ -71972,7 +71972,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 @@ -71980,7 +71980,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] @@ -72010,11 +72010,11 @@ sub_802E1BC: ; 802E1BC ldrh r0, [r0, 0x4] strh r0, [r5, 0xE] movs r0, 0x1 - b @0802E22A + b _0802E22A .pool -@0802E228: +_0802E228: movs r0, 0 -@0802E22A: +_0802E22A: add sp, 0xC pop {r4,r5} pop {r1} @@ -72064,7 +72064,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 @@ -72073,7 +72073,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] @@ -72093,11 +72093,11 @@ sub_802E264: ; 802E264 ldrh r0, [r0, 0x8] strh r0, [r6] movs r0, 0x1 - b @0802E2C6 + b _0802E2C6 .pool -@0802E2C4: +_0802E2C4: movs r0, 0 -@0802E2C6: +_0802E2C6: add sp, 0xC pop {r4-r6} pop {r1} @@ -72119,7 +72119,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 @@ -72128,7 +72128,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] @@ -72142,11 +72142,11 @@ sub_802E2D0: ; 802E2D0 ldrh r0, [r0, 0x4] strh r0, [r4, 0xE] movs r0, 0x1 - b @0802E322 + b _0802E322 .pool -@0802E320: +_0802E320: movs r0, 0 -@0802E322: +_0802E322: add sp, 0xC pop {r4} pop {r1} @@ -72192,31 +72192,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} @@ -72232,10 +72232,10 @@ sub_802E3A8: ; 802E3A8 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 .pool @@ -72271,20 +72271,20 @@ 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 .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, =gUnknown_082FE270 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -72297,32 +72297,32 @@ sub_802E3E4: ; 802E3E4 adds r4, r0, 0 movs r6, 0 ldr r5, =gUnknown_082FE278 -@0802E430: +_0802E430: ldr r1, [r5] movs r0, 0x1 movs r2, 0 bl GetStringWidth 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 @@ -72347,44 +72347,44 @@ sub_802E3E4: ; 802E3E4 bl sub_802E500 ldrb r0, [r7, 0x2] movs r1, 0x3 - b @0802E4CA + b _0802E4CA .pool -@0802E4A8: +_0802E4A8: bl IsDma3ManagerBusyWithBgCopy 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 CopyWindowToVram -@0802E4CE: +_0802E4CE: ldrh r0, [r7] adds r0, 0x1 strh r0, [r7] - b @0802E4F6 + b _0802E4F6 .pool -@0802E4DC: +_0802E4DC: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0802E4F6 + bne _0802E4F6 ldrb r0, [r7, 0x2] bl RemoveWindow 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} @@ -72456,7 +72456,7 @@ sub_802E500: ; 802E500 lsls r0, 21 mov r8, r0 ldr r5, =0x02021cc4 -@0802E58A: +_0802E58A: ldr r1, =gUnknown_082FE278 lsls r0, r6, 2 adds r0, r1 @@ -72506,7 +72506,7 @@ sub_802E500: ; 802E500 ldr r1, [sp, 0x18] lsls r0, r1, 24 cmp r6, 0x2 - bls @0802E58A + bls _0802E58A lsrs r0, 24 bl PutWindowTilemap add sp, 0x24 @@ -72524,18 +72524,18 @@ sub_802E500: ; 802E500 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 @@ -72582,7 +72582,7 @@ sub_802E688: ; 802E688 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @0802E6B4 + beq _0802E6B4 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -72591,11 +72591,11 @@ sub_802E688: ; 802E688 movs r0, 0x2 strh r0, [r1, 0x8] movs r0, 0x1 - b @0802E6B6 + b _0802E6B6 .pool -@0802E6B4: +_0802E6B4: movs r0, 0 -@0802E6B6: +_0802E6B6: pop {r1} bx r1 thumb_func_end sub_802E688 @@ -72625,18 +72625,18 @@ 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 .pool -@0802E6F8: +_0802E6F8: cmp r0, 0x4 - beq @0802E738 - b @0802E752 -@0802E6FE: + beq _0802E738 + b _0802E752 +_0802E6FE: ldr r1, =gUnknown_082FE748 movs r2, 0x2 ldrsh r0, [r4, r2] @@ -72648,9 +72648,9 @@ sub_802E6D0: ; 802E6D0 bl _call_via_r1 movs r0, 0x3 strh r0, [r4] - b @0802E752 + b _0802E752 .pool -@0802E71C: +_0802E71C: ldr r0, =gUnknown_082FE748 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -72660,9 +72660,9 @@ sub_802E6D0: ; 802E6D0 ldr r1, [r1] adds r0, r5, 0 bl _call_via_r1 - b @0802E752 + b _0802E752 .pool -@0802E738: +_0802E738: ldr r0, =gUnknown_082FE748 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -72674,7 +72674,7 @@ sub_802E6D0: ; 802E6D0 bl _call_via_r1 adds r0, r5, 0 bl remove_task -@0802E752: +_0802E752: pop {r4,r5} pop {r0} bx r0 @@ -72706,8 +72706,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 @@ -72732,19 +72732,19 @@ sub_802E75C: ; 802E75C 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 @@ -72780,8 +72780,8 @@ sub_802E75C: ; 802E75C movs r1, 0x10 ldrsh r0, [r4, r1] cmp r5, r0 - blt @0802E7D8 -@0802E820: + blt _0802E7D8 +_0802E820: pop {r3} mov r8, r3 pop {r4-r7} @@ -72866,9 +72866,9 @@ sub_802E8C8: ; 802E8C8 lsls r1, 3 ldr r0, =0x03005e08 adds r4, r1, r0 - b @0802E8FC + b _0802E8FC .pool -@0802E8E0: +_0802E8E0: lsls r0, r5, 1 adds r0, r4 movs r2, 0x1A @@ -72882,11 +72882,11 @@ sub_802E8C8: ; 802E8C8 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, =gUnknown_082FE6C8 movs r2, 0x6 ldrsh r0, [r4, r2] @@ -72924,33 +72924,33 @@ 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 .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] @@ -72958,7 +72958,7 @@ sub_802E938: ; 802E938 negs r0, r0 ands r0, r1 strb r0, [r2] -@0802E9A6: +_0802E9A6: movs r0, 0x38 bl audio_play ldrh r1, [r6, 0x32] @@ -72966,8 +72966,8 @@ sub_802E938: ; 802E938 lsrs r1, 24 adds r0, r6, 0 bl StartObjectImageAnim - b @0802EA44 -@0802E9BA: + b _0802EA44 +_0802E9BA: movs r0, 0x15 bl audio_play ldrh r1, [r6, 0x32] @@ -72999,9 +72999,9 @@ sub_802E938: ; 802E938 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - b @0802EA44 + b _0802EA44 .pool -@0802EA04: +_0802EA04: adds r1, r6, 0 adds r1, 0x3E ldrb r0, [r1] @@ -73031,13 +73031,13 @@ sub_802E938: ; 802E938 strb r1, [r0] movs r0, 0x4 strh r0, [r5] - b @0802EA4A + b _0802EA4A .pool -@0802EA44: +_0802EA44: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] -@0802EA4A: +_0802EA4A: pop {r4-r6} pop {r0} bx r0 @@ -73102,19 +73102,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] @@ -73129,13 +73129,13 @@ sub_802EAB0: ; 802EAB0 strh r0, [r1, 0x2] mov r0, sp bl sub_800FE50 - b @0802EB1A + b _0802EB1A .pool -@0802EB14: +_0802EB14: ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] -@0802EB1A: +_0802EB1A: add sp, 0xC pop {r4,r5} pop {r0} @@ -73216,18 +73216,18 @@ 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 .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 @@ -73257,12 +73257,12 @@ sub_802EB98: ; 802EB98 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] @@ -73282,17 +73282,17 @@ sub_802EB98: ; 802EB98 lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeTiles -@0802EC3E: +_0802EC3E: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b @0802EC8A + b _0802EC8A .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 @@ -73314,7 +73314,7 @@ sub_802EB98: ; 802EB98 bl FreeObjectPaletteByTag adds r0, r6, 0 bl remove_task -@0802EC8A: +_0802EC8A: add sp, 0xC pop {r4-r6} pop {r0} @@ -73335,26 +73335,26 @@ 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 .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 @@ -73363,43 +73363,43 @@ sub_802EC98: ; 802EC98 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] @@ -73408,8 +73408,8 @@ sub_802EC98: ; 802EC98 adds r0, r4, 0 movs r1, 0x2 bl StartObjectRotScalAnim - b @0802EDC4 -@0802ED4E: + b _0802EDC4 +_0802ED4E: ldrh r0, [r4, 0x22] subs r0, 0x4 strh r0, [r4, 0x22] @@ -73419,12 +73419,12 @@ sub_802EC98: ; 802EC98 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 @@ -73432,14 +73432,14 @@ sub_802EC98: ; 802EC98 bl StartObjectImageAnim 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] @@ -73449,34 +73449,34 @@ sub_802EC98: ; 802EC98 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 StartObjectRotScalAnim -@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 @@ -73546,9 +73546,9 @@ sub_802EE30: ; 802EE30 ldr r1, [r1] ldr r0, =sub_802EE5C cmp r1, r0 - bne @0802EE4E + bne _0802EE4E movs r3, 0x1 -@0802EE4E: +_0802EE4E: adds r0, r3, 0 pop {r1} bx r1 @@ -73564,21 +73564,21 @@ 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 .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] @@ -73587,7 +73587,7 @@ sub_802EE5C: ; 802EE5C ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -@0802EEA0: +_0802EEA0: ldrh r1, [r4, 0x8] ldrh r2, [r4, 0xA] adds r0, r1, r2 @@ -73598,7 +73598,7 @@ sub_802EE5C: ; 802EE5C asrs r0, 20 strh r0, [r5, 0x26] cmp r0, 0 - blt @0802EF46 + blt _0802EF46 movs r0, 0x39 bl audio_play movs r0, 0 @@ -73606,15 +73606,15 @@ sub_802EE5C: ; 802EE5C 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 @@ -73622,7 +73622,7 @@ sub_802EE5C: ; 802EE5C ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -@0802EEE6: +_0802EEE6: ldr r0, =gUnknown_08329F40 movs r2, 0x2 ldrsh r1, [r4, r2] @@ -73631,16 +73631,16 @@ sub_802EE5C: ; 802EE5C movs r2, 0 ldrsh r0, [r1, r2] asrs r0, 4 - b @0802EF2A + b _0802EF2A .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 @@ -73648,7 +73648,7 @@ sub_802EE5C: ; 802EE5C ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -@0802EF1A: +_0802EF1A: ldr r1, =gUnknown_08329F40 movs r2, 0x2 ldrsh r0, [r4, r2] @@ -73657,22 +73657,22 @@ sub_802EE5C: ; 802EE5C ldrh r0, [r0] lsls r0, 16 asrs r0, 21 -@0802EF2A: +_0802EF2A: negs r0, r0 strh r0, [r5, 0x26] - b @0802EF46 + b _0802EF46 .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, =DummyObjectCallback str r0, [r5, 0x1C] -@0802EF46: +_0802EF46: pop {r4,r5} pop {r0} bx r0 @@ -73873,24 +73873,24 @@ battle_wireless_setup_if_required_maybe: ; 8032654 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 movs r1, 0 bl AddTask bl sub_8033244 -@08032686: +_08032686: pop {r0} bx r0 .pool @@ -73912,7 +73912,7 @@ sub_803269C: ; 803269C ldr r5, =0x020244b0 ldr r4, =nullsub_21 ldr r3, =0x02024076 -@080326B8: +_080326B8: lsls r0, r1, 2 adds r0, r7 str r4, [r0] @@ -73930,7 +73930,7 @@ sub_803269C: ; 803269C 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 @@ -73944,7 +73944,7 @@ sub_803269C: ; 803269C movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq @08032728 + beq _08032728 bl zero_enemy_party_data ldr r4, =0x02024744 movs r1, 0x90 @@ -73962,7 +73962,7 @@ sub_803269C: ; 803269C movs r1, 0xC add r2, sp, 0x10 bl pokemon_setattr -@08032728: +_08032728: ldr r0, =0x02022ff4 str r5, [r0] ldr r0, =0x0202428c @@ -73983,49 +73983,49 @@ 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 .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 .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 @@ -74033,34 +74033,34 @@ sub_8032768: ; 8032768 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 @@ -74080,7 +74080,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 str r0, [r1] @@ -74088,22 +74088,22 @@ b_setup_bx: ; 8032824 lsls r4, 17 ands r4, r3 cmp r4, 0 - beq @08032874 + beq _08032874 ldr r2, =0x03005d60 ldr r0, =sub_818994C str r0, [r2] ldr r1, =0x02024076 movs r0, 0 strb r0, [r1] - b @0803287E + b _0803287E .pool -@08032874: +_08032874: ldr r2, =0x03005d60 ldr r0, =sub_805745C str r0, [r2] ldr r1, =0x02024076 strb r4, [r1] -@0803287E: +_0803287E: ldr r3, =sub_805F164 str r3, [r2, 0x4] movs r0, 0x1 @@ -74135,16 +74135,16 @@ b_setup_bx: ; 8032824 strh r1, [r0] strh r1, [r0, 0x2] movs r1, 0x3 - b @08032A76 + b _08032A76 .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 str r2, [r0] @@ -74152,25 +74152,25 @@ b_setup_bx: ; 8032824 ands r1, r3 mov r12, r2 cmp r1, 0 - beq @08032918 + beq _08032918 ldr r1, =0x03005d60 ldr r0, =sub_815936C - b @08032934 + b _08032934 .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 - b @08032934 + b _08032934 .pool -@08032930: +_08032930: ldr r1, =0x03005d60 ldr r0, =sub_805745C -@08032934: +_08032934: str r0, [r1] mov r10, r1 ldr r4, =0x02024076 @@ -74193,19 +74193,19 @@ b_setup_bx: ; 8032824 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] @@ -74217,9 +74217,9 @@ b_setup_bx: ; 8032824 str r0, [r5, 0x4] strb r6, [r4, 0x1] strb r7, [r2] - b @08032CB2 + b _08032CB2 .pool -@080329B4: +_080329B4: ldr r0, =sub_818994C str r0, [r5, 0x4] strb r1, [r4, 0x1] @@ -74227,9 +74227,9 @@ b_setup_bx: ; 8032824 str r0, [r5] strb r6, [r4] strb r7, [r2] - b @08032CB2 + b _08032CB2 .pool -@080329CC: +_080329CC: ldr r0, =sub_818994C mov r2, r10 str r0, [r2] @@ -74237,9 +74237,9 @@ b_setup_bx: ; 8032824 mov r0, r8 str r0, [r2, 0x4] strb r6, [r4, 0x1] - b @08032CB2 + b _08032CB2 .pool -@080329E0: +_080329E0: ldr r1, =sub_8039ECC ldr r2, =0x03005d04 str r1, [r2] @@ -74270,15 +74270,15 @@ b_setup_bx: ; 8032824 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 ldr r1, =0x03005d04 str r0, [r1] @@ -74312,18 +74312,18 @@ b_setup_bx: ; 8032824 strh r5, [r0] strh r5, [r0, 0x2] mov r1, r8 -@08032A76: +_08032A76: strh r1, [r0, 0x4] strh r1, [r0, 0x6] - b @08032CB2 + b _08032CB2 .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 @@ -74336,37 +74336,37 @@ b_setup_bx: ; 8032824 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 .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 .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] @@ -74378,17 +74378,17 @@ b_setup_bx: ; 8032824 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 .pool -@08032B38: +_08032B38: cmp r1, 0x3 - bne @08032C2C -@08032B3C: + bne _08032C2C +_08032B3C: mov r1, r12 adds r0, r4, r1 ldrh r1, [r0, 0x18] @@ -74396,14 +74396,14 @@ b_setup_bx: ; 8032824 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] @@ -74412,7 +74412,7 @@ b_setup_bx: ; 8032824 ands r0, r1 mov r12, r2 cmp r0, 0 - bne @08032B80 + bne _08032B80 lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -74421,10 +74421,10 @@ b_setup_bx: ; 8032824 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq @08032B92 - b @08032BD8 + beq _08032B92 + b _08032BD8 .pool -@08032B80: +_08032B80: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -74433,8 +74433,8 @@ b_setup_bx: ; 8032824 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] @@ -74445,17 +74445,17 @@ b_setup_bx: ; 8032824 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 .pool -@08032BBC: +_08032BBC: cmp r1, 0x3 - bne @08032C2C -@08032BC0: + bne _08032C2C +_08032BC0: mov r2, r12 adds r0, r4, r2 ldrh r1, [r0, 0x18] @@ -74463,13 +74463,13 @@ b_setup_bx: ; 8032824 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] @@ -74480,17 +74480,17 @@ b_setup_bx: ; 8032824 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 .pool -@08032C00: +_08032C00: cmp r0, 0x3 - bne @08032C2C -@08032C04: + bne _08032C2C +_08032C04: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -74498,38 +74498,38 @@ b_setup_bx: ; 8032824 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 str r0, [r2] strb r5, [r4] @@ -74540,23 +74540,23 @@ b_setup_bx: ; 8032824 lsls r0, 18 ands r3, r0 cmp r3, 0 - beq @08032C70 + beq _08032C70 ldr r0, =sub_81864EC str r0, [r2, 0x4] strb r7, [r4, 0x1] str r0, [r2, 0xC] mov r1, r8 strb r1, [r4, 0x3] - b @08032CB2 + b _08032CB2 .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 str r0, [r2, 0x4] strb r1, [r4, 0x1] @@ -74567,22 +74567,22 @@ b_setup_bx: ; 8032824 lsls r0, 18 ands r3, r0 cmp r3, 0 - beq @08032CA8 + beq _08032CA8 ldr r0, =sub_81864EC str r0, [r2] strb r7, [r4] str r0, [r2, 0x8] mov r1, r8 strb r1, [r4, 0x2] - b @08032CB2 + b _08032CB2 .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 @@ -74605,11 +74605,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 str r0, [r1] @@ -74623,9 +74623,9 @@ b_setup_bx_link: ; 8032CC0 strb r5, [r1, 0x1] ldr r1, =0x0202406c movs r0, 0x2 - b @0803303A + b _0803303A .pool -@08032D1C: +_08032D1C: ldr r2, =0x03005d60 ldr r0, =sub_805745C str r0, [r2, 0x4] @@ -74636,18 +74636,18 @@ b_setup_bx_link: ; 8032CC0 strb r5, [r1] ldr r1, =0x0202406c movs r0, 0x2 - b @0803303A + b _0803303A .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 str r0, [r1] @@ -74666,9 +74666,9 @@ b_setup_bx_link: ; 8032CC0 str r3, [r2, 0xC] movs r0, 0x3 strb r0, [r1, 0x3] - b @08032DB4 + b _08032DB4 .pool -@08032D98: +_08032D98: ldr r2, =0x03005d60 ldr r0, =sub_805745C str r0, [r2, 0x4] @@ -74683,22 +74683,22 @@ b_setup_bx_link: ; 8032CC0 str r3, [r2, 0x8] movs r0, 0x3 strb r0, [r1, 0x2] -@08032DB4: +_08032DB4: ldr r0, =0x0202406c strb r6, [r0] - b @0803303C + b _0803303C .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 str r0, [r1] @@ -74712,9 +74712,9 @@ b_setup_bx_link: ; 8032CC0 str r3, [r2, 0x4] strb r5, [r1, 0x1] ldr r0, =sub_814AEB0 - b @08032E2E + b _08032E2E .pool -@08032E1C: +_08032E1C: ldr r2, =0x03005d60 ldr r0, =sub_814AEB0 str r0, [r2] @@ -74724,7 +74724,7 @@ b_setup_bx_link: ; 8032CC0 str r3, [r2, 0x4] strb r5, [r1, 0x1] ldr r0, =sub_805745C -@08032E2E: +_08032E2E: str r0, [r2, 0x8] movs r0, 0x2 strb r0, [r1, 0x2] @@ -74752,9 +74752,9 @@ b_setup_bx_link: ; 8032CC0 movs r1, 0x3 strh r1, [r0, 0x4] strh r1, [r0, 0x6] - b @0803303C + b _0803303C .pool -@08032E8C: +_08032E8C: bl link_get_multiplayer_id lsls r0, 24 lsrs r5, r0, 24 @@ -74762,11 +74762,11 @@ b_setup_bx_link: ; 8032CC0 movs r1, 0x4 ands r0, r1 cmp r0, 0 - beq @08032EA4 + beq _08032EA4 ldr r1, =0x03005d04 ldr r0, =sub_8039ECC str r0, [r1] -@08032EA4: +_08032EA4: movs r0, 0 mov r10, r0 ldr r1, =0x020229e8 @@ -74777,37 +74777,37 @@ b_setup_bx_link: ; 8032CC0 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 .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 .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] @@ -74819,17 +74819,17 @@ b_setup_bx_link: ; 8032CC0 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 .pool -@08032F34: +_08032F34: cmp r1, 0x3 - bne @08033028 -@08032F38: + bne _08033028 +_08032F38: mov r1, r12 adds r0, r4, r1 ldrh r1, [r0, 0x18] @@ -74837,14 +74837,14 @@ b_setup_bx_link: ; 8032CC0 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] @@ -74853,7 +74853,7 @@ b_setup_bx_link: ; 8032CC0 ands r0, r1 mov r12, r2 cmp r0, 0 - bne @08032F7C + bne _08032F7C lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -74862,10 +74862,10 @@ b_setup_bx_link: ; 8032CC0 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq @08032F8E - b @08032FD4 + beq _08032F8E + b _08032FD4 .pool -@08032F7C: +_08032F7C: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 @@ -74874,8 +74874,8 @@ b_setup_bx_link: ; 8032CC0 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] @@ -74886,17 +74886,17 @@ b_setup_bx_link: ; 8032CC0 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 .pool -@08032FB8: +_08032FB8: cmp r1, 0x3 - bne @08033028 -@08032FBC: + bne _08033028 +_08032FBC: mov r2, r12 adds r0, r4, r2 ldrh r1, [r0, 0x18] @@ -74904,13 +74904,13 @@ b_setup_bx_link: ; 8032CC0 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] @@ -74921,17 +74921,17 @@ b_setup_bx_link: ; 8032CC0 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 .pool -@08032FFC: +_08032FFC: cmp r0, 0x3 - bne @08033028 -@08033000: + bne _08033028 +_08033000: mov r0, r12 adds r2, r4, r0 ldrh r0, [r2, 0x18] @@ -74939,37 +74939,37 @@ b_setup_bx_link: ; 8032CC0 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 @@ -74992,14 +74992,14 @@ 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 .pool -@08033074: +_08033074: movs r5, 0 movs r0, 0x1 add r0, r8 @@ -75010,94 +75010,94 @@ sub_8033050: ; 8033050 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 .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 .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 .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 @@ -75105,38 +75105,38 @@ sub_8033050: ; 8033050 adds r0, r1 ldrh r0, [r0] cmp r0, r5 - beq @08033170 + beq _08033170 adds r0, r6, r1 strh r5, [r0] - b @08033178 + b _08033178 .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 @@ -75161,26 +75161,26 @@ 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 .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 @@ -75190,16 +75190,16 @@ dp01_prepare_buffer: ; 80331B8 adds r4, 0x1 adds r3, 0x1 cmp r3, r2 - blt @080331F8 - b @08033236 + blt _080331F8 + b _08033236 .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 @@ -75209,8 +75209,8 @@ dp01_prepare_buffer: ; 80331B8 adds r4, 0x1 adds r3, 0x1 cmp r3, r2 - blt @08033222 -@08033236: + blt _08033222 +_08033236: pop {r4-r6} pop {r0} bx r0 @@ -75328,7 +75328,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] @@ -75338,7 +75338,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 @@ -75438,10 +75438,10 @@ dp01_prepare_buffer_wireless_probably: ; 80332F4 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 @@ -75458,8 +75458,8 @@ dp01_prepare_buffer_wireless_probably: ; 80332F4 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 @@ -75493,32 +75493,32 @@ 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 .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 @@ -75528,59 +75528,59 @@ task00_wireless_something: ; 8033474 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 .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 .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 @@ -75589,9 +75589,9 @@ task00_wireless_something: ; 8033474 adds r1, r0 ldrh r0, [r1, 0x1E] adds r0, 0x1 - b @0803363E + b _0803363E .pool -@0803355C: +_0803355C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -75599,9 +75599,9 @@ task00_wireless_something: ; 8033474 adds r1, r0 ldrh r0, [r1, 0x1E] adds r0, 0x1 - b @0803363E + b _0803363E .pool -@08033570: +_08033570: lsls r1, r4, 2 adds r0, r1, r4 lsls r0, 3 @@ -75612,21 +75612,21 @@ task00_wireless_something: ; 8033474 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 @@ -75654,17 +75654,17 @@ task00_wireless_something: ; 8033474 ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] - b @08033640 + b _08033640 .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 @@ -75685,9 +75685,9 @@ task00_wireless_something: ; 8033474 adds r0, r6 adds r0, 0x8 strh r0, [r1, 0x26] - b @0803363C + b _0803363C .pool -@08033624: +_08033624: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -75697,14 +75697,14 @@ task00_wireless_something: ; 8033474 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 @@ -75720,20 +75720,20 @@ 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 .pool -@08033680: +_08033680: bl sub_800A550 lsls r0, 24 lsrs r0, 24 @@ -75745,7 +75745,7 @@ sub_8033648: ; 8033648 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 @@ -75770,7 +75770,7 @@ sub_8033648: ; 8033648 movs r0, 0x80 lsls r0, 5 cmp r1, r0 - ble @080336E0 + ble _080336E0 ldrh r0, [r2, 0x24] strh r0, [r2, 0x20] ldrb r1, [r4] @@ -75780,7 +75780,7 @@ sub_8033648: ; 8033648 adds r0, r7 movs r1, 0 strh r1, [r0, 0x24] -@080336E0: +_080336E0: ldr r2, =0x020244a4 mov r4, r12 ldrb r1, [r4] @@ -75799,16 +75799,16 @@ sub_8033648: ; 8033648 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 @@ -75818,17 +75818,17 @@ sub_8033648: ; 8033648 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 @@ -75857,19 +75857,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 @@ -75888,18 +75888,18 @@ sub_803375C: ; 803375C 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 .pool -@080337CC: +_080337CC: cmp r0, 0x2 - beq @08033874 - b @0803388A -@080337D2: + beq _08033874 + b _0803388A +_080337D2: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 lsls r0, r4, 2 @@ -75908,7 +75908,7 @@ sub_803375C: ; 803375C ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0803389C + bne _0803389C lsls r0, r4, 9 ldr r1, =0x02023064 adds r0, r1 @@ -75923,7 +75923,7 @@ sub_803375C: ; 803375C movs r1, 0x4 ands r0, r1 cmp r0, 0 - bne @0803388A + bne _0803388A ldr r2, =0x0202420b movs r4, 0x26 ldrsh r0, [r5, r4] @@ -75950,9 +75950,9 @@ sub_803375C: ; 803375C adds r0, r1 ldrb r0, [r0, 0x7] strb r0, [r2] - b @0803388A + b _0803388A .pool -@0803385C: +_0803385C: lsls r0, r4, 9 ldr r1, =0x02023864 adds r0, r1 @@ -75960,9 +75960,9 @@ sub_803375C: ; 803375C adds r1, 0x8 adds r2, r6, 0 bl memcpy - b @0803388A + b _0803388A .pool -@08033874: +_08033874: ldrb r2, [r3, 0x8] ldr r3, =0x02024068 ldr r1, =gUnknown_0832A328 @@ -75974,7 +75974,7 @@ sub_803375C: ; 803375C ldr r0, [r3] bics r0, r1 str r0, [r3] -@0803388A: +_0803388A: ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 @@ -75984,7 +75984,7 @@ sub_803375C: ; 803375C adds r0, r6, r0 adds r0, 0x8 strh r0, [r1, 0x26] -@0803389C: +_0803389C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -76050,18 +76050,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 @@ -76085,18 +76085,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 @@ -76301,18 +76301,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 @@ -76382,7 +76382,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 @@ -76391,7 +76391,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] @@ -76399,15 +76399,15 @@ 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 .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] @@ -76499,14 +76499,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 @@ -76515,7 +76515,7 @@ dp01_build_cmdbuf_x10_TODO: ; 8033BE4 ldr r6, =0x02022f68 mov r2, r12 adds r2, 0x30 -@08033C88: +_08033C88: adds r1, r5, r3 ldr r7, =0x02022f58 adds r0, r3, r7 @@ -76532,7 +76532,7 @@ dp01_build_cmdbuf_x10_TODO: ; 8033BE4 strb r0, [r1] adds r3, 0x1 cmp r3, 0xF - ble @08033C88 + ble _08033C88 mov r0, r10 mov r1, r9 movs r2, 0x44 @@ -76598,14 +76598,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 @@ -76614,7 +76614,7 @@ dp01_build_cmdbuf_x11_TODO: ; 8033CFC ldr r6, =0x02022f68 mov r2, r12 adds r2, 0x30 -@08033D7C: +_08033D7C: adds r1, r5, r3 ldr r7, =0x02022f58 adds r0, r3, r7 @@ -76631,7 +76631,7 @@ dp01_build_cmdbuf_x11_TODO: ; 8033CFC strb r0, [r1] adds r3, 0x1 cmp r3, 0xF - ble @08033D7C + ble _08033D7C mov r0, r10 mov r1, r9 movs r2, 0x44 @@ -76703,14 +76703,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 @@ -76731,14 +76731,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 @@ -76763,14 +76763,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 @@ -76962,18 +76962,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 @@ -77018,18 +77018,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 @@ -77056,18 +77056,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 @@ -77095,18 +77095,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 @@ -77154,14 +77154,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 @@ -77449,14 +77449,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 @@ -77556,17 +77556,17 @@ 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 .pool -@0803448C: +_0803448C: strb r2, [r4, 0x2] strb r2, [r4, 0x3] -@08034490: +_08034490: ldr r1, =0x02022d10 ldrb r2, [r1, 0x2] adds r2, 0x4 @@ -77761,17 +77761,17 @@ DecompressPicFromTable: ; 80345F0 movs r0, 0xCE lsls r0, 1 cmp r5, r0 - ble @08034610 + ble _08034610 ldr r0, =gMonFrontPicTable ldr r0, [r0] bl LZ77UnCompWram - b @08034618 + b _08034618 .pool -@08034610: +_08034610: ldr r0, [r3] adds r1, r4, 0 bl LZ77UnCompWram -@08034618: +_08034618: adds r0, r4, 0 adds r1, r5, 0 bl DuplicateDeoxysTiles @@ -77792,9 +77792,9 @@ DecompressMonPic_DetectFrontOrBack: ; 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 @@ -77821,7 +77821,7 @@ DecompressMonPic: ; 8034654 lsrs r0, 24 mov r8, r0 cmp r7, 0xC9 - bne @080346D0 + bne _080346D0 movs r0, 0xC0 lsls r0, 18 ands r0, r5 @@ -77844,49 +77844,49 @@ DecompressMonPic: ; 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, =gMonBackPicTable lsls r1, 3 adds r1, r0 ldr r0, [r1] - b @080346DC + b _080346DC .pool -@080346C0: +_080346C0: ldr r0, =gMonFrontPicTable lsls r1, 3 adds r1, r0 ldr r0, [r1] - b @080346DC + b _080346DC .pool -@080346D0: +_080346D0: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - ble @080346E8 + ble _080346E8 ldr r0, =gMonFrontPicTable ldr r0, [r0] -@080346DC: +_080346DC: adds r1, r4, 0 bl LZ77UnCompWram - b @080346F0 + b _080346F0 .pool -@080346E8: +_080346E8: ldr r0, [r6] adds r1, r4, 0 bl LZ77UnCompWram -@080346F0: +_080346F0: adds r0, r4, 0 adds r1, r7, 0 bl DuplicateDeoxysTiles @@ -77929,9 +77929,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 @@ -77940,19 +77940,19 @@ sub_803471C: ; 803471C 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] @@ -77962,7 +77962,7 @@ sub_803471C: ; 803471C movs r4, 0x8 subs r0, r4, r0 str r0, [sp, 0xC] -@08034774: +_08034774: movs r3, 0 asrs r0, r7, 1 adds r1, r7, 0 @@ -77972,7 +77972,7 @@ sub_803471C: ; 803471C lsls r0, 8 mov r8, r0 mov r12, r5 -@08034786: +_08034786: lsls r1, r3, 5 ldr r4, [sp, 0x18] adds r0, r5, r4 @@ -77982,16 +77982,16 @@ sub_803471C: ; 803471C 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 @@ -77999,30 +77999,30 @@ sub_803471C: ; 803471C 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 @@ -78033,37 +78033,37 @@ sub_803471C: ; 803471C 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] @@ -78076,7 +78076,7 @@ sub_803471C: ; 803471C ldr r2, [sp, 0x4] adds r3, r5, 0 movs r6, 0x3 -@08034840: +_08034840: ldrb r0, [r2] mov r1, r12 strb r0, [r1] @@ -78110,95 +78110,95 @@ sub_803471C: ; 803471C 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 .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] @@ -78207,41 +78207,41 @@ sub_803471C: ; 803471C 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 @@ -78339,17 +78339,17 @@ DecompressPicFromTable_2: ; 8034A08 movs r0, 0xCE lsls r0, 1 cmp r5, r0 - ble @08034A28 + ble _08034A28 ldr r0, =gMonFrontPicTable ldr r0, [r0] bl LZ77UnCompWram - b @08034A30 + b _08034A30 .pool -@08034A28: +_08034A28: ldr r0, [r3] adds r1, r4, 0 bl LZ77UnCompWram -@08034A30: +_08034A30: adds r0, r4, 0 adds r1, r5, 0 bl DuplicateDeoxysTiles @@ -78373,7 +78373,7 @@ DecompressMonPic_2: ; 8034A40 lsrs r0, 24 mov r8, r0 cmp r7, 0xC9 - bne @08034ABC + bne _08034ABC movs r0, 0xC0 lsls r0, 18 ands r0, r5 @@ -78396,49 +78396,49 @@ DecompressMonPic_2: ; 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, =gMonBackPicTable lsls r1, 3 adds r1, r0 ldr r0, [r1] - b @08034AC8 + b _08034AC8 .pool -@08034AAC: +_08034AAC: ldr r0, =gMonFrontPicTable lsls r1, 3 adds r1, r0 ldr r0, [r1] - b @08034AC8 + b _08034AC8 .pool -@08034ABC: +_08034ABC: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - ble @08034AD4 + ble _08034AD4 ldr r0, =gMonFrontPicTable ldr r0, [r0] -@08034AC8: +_08034AC8: adds r1, r4, 0 bl LZ77UnCompWram - b @08034ADC + b _08034ADC .pool -@08034AD4: +_08034AD4: ldr r0, [r6] adds r1, r4, 0 bl LZ77UnCompWram -@08034ADC: +_08034ADC: adds r0, r4, 0 adds r1, r7, 0 bl DuplicateDeoxysTiles @@ -78467,9 +78467,9 @@ DecompressMonPic_DetectFrontOrBack_2: ; 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 @@ -78488,16 +78488,16 @@ sub_8034B28: ; 8034B28 movs r0, 0xCE lsls r0, 1 cmp r2, r0 - ble @08034B44 + ble _08034B44 ldr r0, =gMonFrontPicTable ldr r0, [r0] bl LZ77UnCompWram - b @08034B4A + b _08034B4A .pool -@08034B44: +_08034B44: ldr r0, [r3] bl LZ77UnCompWram -@08034B4A: +_08034B4A: pop {r0} bx r0 thumb_func_end sub_8034B28 @@ -78514,9 +78514,9 @@ DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack: ; 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 @@ -78543,7 +78543,7 @@ DecompressMonPicWithoutDuplicatingDeoxysTiles: ; 8034B7C lsrs r0, 24 mov r8, r0 cmp r7, 0xC9 - bne @08034BF8 + bne _08034BF8 movs r0, 0xC0 lsls r0, 18 ands r0, r4 @@ -78566,49 +78566,49 @@ DecompressMonPicWithoutDuplicatingDeoxysTiles: ; 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, =gMonBackPicTable lsls r1, 3 adds r1, r0 ldr r0, [r1] - b @08034C04 + b _08034C04 .pool -@08034BE8: +_08034BE8: ldr r0, =gMonFrontPicTable lsls r1, 3 adds r1, r0 ldr r0, [r1] - b @08034C04 + b _08034C04 .pool -@08034BF8: +_08034BF8: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - ble @08034C10 + ble _08034C10 ldr r0, =gMonFrontPicTable ldr r0, [r0] -@08034C04: +_08034C04: adds r1, r5, 0 bl LZ77UnCompWram - b @08034C18 + b _08034C18 .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 @@ -78630,14 +78630,14 @@ DuplicateDeoxysTiles: ; 8034C30 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 .pool @@ -78650,18 +78650,18 @@ sub_8034C54: ; 8034C54 ldr r5, =0x02022e10 ldr r0, [r5] cmp r0, 0 - beq @08034C64 + beq _08034C64 bl sub_8034CC8 -@08034C64: +_08034C64: movs r0, 0x8 bl Alloc str r0, [r5] cmp r0, 0 - bne @08034C78 + bne _08034C78 movs r0, 0 - b @08034CC0 + b _08034CC0 .pool -@08034C78: +_08034C78: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 @@ -78669,20 +78669,20 @@ sub_8034C54: ; 8034C54 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 @@ -78696,10 +78696,10 @@ sub_8034C54: ; 8034C54 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 @@ -78711,35 +78711,35 @@ sub_8034CC8: ; 8034CC8 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 @@ -78760,7 +78760,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 @@ -78770,7 +78770,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] @@ -78782,7 +78782,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 GetObjectTileRangeStartByTag @@ -78796,17 +78796,17 @@ 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 LoadObjectPic - b @08034DB4 + b _08034DB4 .pool -@08034D94: +_08034D94: ldr r0, [r2] ldr r1, [r2, 0x4] str r0, [sp] @@ -78821,7 +78821,7 @@ sub_8034D14: ; 8034D14 str r1, [sp, 0x4] mov r0, sp bl LoadCompressedObjectPic -@08034DB4: +_08034DB4: ldr r1, [r6] ldr r1, [r1, 0x4] adds r1, r4, r1 @@ -78837,12 +78837,12 @@ sub_8034D14: ; 8034D14 ldrh r1, [r0, 0xA] ldr r0, =0x0000ffff cmp r1, r0 - bne @08034DE0 -@08034DD4: + bne _08034DE0 +_08034DD4: movs r0, 0 - b @08034EE8 + b _08034EE8 .pool -@08034DE0: +_08034DE0: ldr r0, [r5, 0xC] ldrh r0, [r0, 0x4] bl IndexOfObjectPaletteTag @@ -78860,14 +78860,14 @@ sub_8034D14: ; 8034D14 adds r0, r4, r0 ldrb r0, [r0, 0x4] cmp r0, 0xFF - bne @08034E14 + bne _08034E14 ldr r0, [r5, 0xC] bl LoadTaggedObjectPalette 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 @@ -78945,8 +78945,8 @@ sub_8034D14: ; 8034D14 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 @@ -78958,8 +78958,8 @@ sub_8034D14: ; 8034D14 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 @@ -78973,7 +78973,7 @@ sub_8034D14: ; 8034D14 mov r1, r10 bl sub_8035044 movs r0, 0x1 -@08034EE8: +_08034EE8: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -79017,13 +79017,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 @@ -79091,8 +79091,8 @@ sub_8034EFC: ; 8034EFC 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 @@ -79152,7 +79152,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 @@ -79161,17 +79161,17 @@ 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 .pool -@08035078: +_08035078: movs r2, 0 -@0803507A: +_0803507A: ldr r0, [r6] ldr r1, [r0, 0x4] subs r0, r5, r3 @@ -79179,23 +79179,23 @@ sub_8035044: ; 8035044 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 @@ -79217,12 +79217,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 @@ -79254,11 +79254,11 @@ sub_80350B0: ; 80350B0 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 @@ -79267,9 +79267,9 @@ sub_80350B0: ; 80350B0 negs r1, r1 ands r1, r2 strb r1, [r0] - b @08035154 + b _08035154 .pool -@08035140: +_08035140: lsls r2, r7, 3 add r2, r10 adds r2, 0x39 @@ -79280,7 +79280,7 @@ sub_80350B0: ; 80350B0 movs r1, 0x2 orrs r0, r1 strb r0, [r2] -@08035154: +_08035154: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -79317,8 +79317,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 @@ -79333,16 +79333,16 @@ sub_8035164: ; 8035164 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 @@ -79371,13 +79371,13 @@ sub_8035164: ; 8035164 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 .pool -@08035224: +_08035224: ldr r0, [r7] lsls r0, 3 add r0, r9 @@ -79389,7 +79389,7 @@ sub_8035164: ; 8035164 movs r2, 0x2 orrs r1, r2 strb r1, [r0] -@0803523A: +_0803523A: ldr r0, [r7] adds r0, 0x1 str r0, [r7] @@ -79398,11 +79398,11 @@ sub_8035164: ; 8035164 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 @@ -79431,9 +79431,9 @@ sub_8035164: ; 8035164 ands r0, r1 orrs r0, r2 strh r0, [r3, 0x3A] - b @080352AE + b _080352AE .pool -@08035298: +_08035298: ldr r0, [r7] lsls r0, 3 add r0, r9 @@ -79445,7 +79445,7 @@ sub_8035164: ; 8035164 movs r2, 0x2 orrs r1, r2 strb r1, [r0] -@080352AE: +_080352AE: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -79473,8 +79473,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 @@ -79482,7 +79482,7 @@ sub_80352C0: ; 80352C0 adds r7, r1, r2 adds r0, 0x3C adds r6, r0, r2 -@080352EE: +_080352EE: mov r0, r10 adds r1, r5, 0 str r3, [sp, 0x8] @@ -79499,13 +79499,13 @@ sub_80352C0: ; 80352C0 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 @@ -79535,12 +79535,12 @@ sub_80352C0: ; 80352C0 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 @@ -79548,7 +79548,7 @@ sub_80352C0: ; 80352C0 lsls r0, r3, 3 adds r0, 0x39 adds r2, r0, r1 -@08035370: +_08035370: ldrb r1, [r2] adds r0, r5, 0 ands r0, r1 @@ -79561,11 +79561,11 @@ sub_80352C0: ; 80352C0 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 @@ -79575,9 +79575,9 @@ sub_80352C0: ; 80352C0 negs r1, r1 ands r1, r2 strb r1, [r0] - b @080353C6 + b _080353C6 .pool -@080353B0: +_080353B0: lsls r2, r3, 3 ldr r4, =0x030022c0 adds r2, r4 @@ -79589,7 +79589,7 @@ sub_80352C0: ; 80352C0 movs r1, 0x2 orrs r0, r1 strb r0, [r2] -@080353C6: +_080353C6: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -79608,7 +79608,7 @@ sub_80353DC: ; 80353DC 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 @@ -79617,12 +79617,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 @@ -79631,7 +79631,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 @@ -79640,12 +79640,12 @@ sub_80353DC: ; 80353DC 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] @@ -79654,11 +79654,11 @@ sub_80353DC: ; 80353DC adds r0, r1 ldrh r0, [r0, 0x10] bl FreeObjectTilesByTag -@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] @@ -79667,7 +79667,7 @@ sub_80353DC: ; 80353DC adds r0, r1 ldrh r0, [r0, 0x12] bl FreeObjectPaletteByTag -@0803545E: +_0803545E: ldr r0, =0x02022e10 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -79676,7 +79676,7 @@ sub_80353DC: ; 80353DC adds r0, r1 movs r1, 0 strb r1, [r0] -@0803546E: +_0803546E: pop {r4-r7} pop {r0} bx r0 @@ -79692,7 +79692,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 @@ -79701,14 +79701,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 @@ -79717,7 +79717,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 @@ -79726,12 +79726,12 @@ sub_803547C: ; 803547C subs r3, 0x1 adds r2, 0x8 cmp r3, 0 - bne @080354BC - b @0803550C + bne _080354BC + b _0803550C .pool -@080354D8: +_080354D8: cmp r1, 0 - beq @080354FA + beq _080354FA ldr r1, =0x030022c0 movs r5, 0x4 negs r5, r5 @@ -79739,7 +79739,7 @@ sub_803547C: ; 803547C lsls r0, 3 adds r0, 0x39 adds r2, r0, r1 -@080354EA: +_080354EA: ldrb r1, [r2] adds r0, r5, 0 ands r0, r1 @@ -79747,8 +79747,8 @@ sub_803547C: ; 803547C 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 @@ -79757,7 +79757,7 @@ sub_803547C: ; 803547C ldr r1, [r0, 0x18] adds r0, r4, 0 bl sub_8035044 -@0803550C: +_0803550C: pop {r4-r7} pop {r0} bx r0 @@ -79775,43 +79775,43 @@ 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 .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 @@ -79826,33 +79826,33 @@ 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 .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 @@ -79867,33 +79867,33 @@ 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 .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 @@ -79962,7 +79962,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 @@ -79974,13 +79974,13 @@ trs_config: ; 8035658 ldr r1, [r4] movs r0, 0x2 bl SetBgTilemap - b @080356AA + b _080356AA .pool -@080356A4: +_080356A4: ldr r0, =0x02024474 adds r0, 0x24 strb r1, [r0] -@080356AA: +_080356AA: ldr r1, =gUnknown_0831ABA0 ldr r0, =0x02024474 adds r0, 0x24 @@ -80042,7 +80042,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 @@ -80056,7 +80056,7 @@ sub_803570C: ; 803570C ldr r1, =0x02037c00 movs r2, 0x1 bl CpuSet -@0803575A: +_0803575A: pop {r0} bx r0 .pool @@ -80070,7 +80070,7 @@ load_battle_oval_graphics: ; 8035770 ldr r0, =0x023f0902 ands r0, r1 cmp r0, 0 - beq @080357B0 + beq _080357B0 ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 bl LZDecompressVram @@ -80078,14 +80078,14 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7C9EC - b @08035A52 + b _08035A52 .pool -@080357B0: +_080357B0: movs r0, 0x80 lsls r0, 21 ands r0, r1 cmp r0, 0 - beq @080357E4 + beq _080357E4 ldr r0, =gUnknown_08D7BB14 ldr r1, =0x06008000 bl LZDecompressVram @@ -80093,14 +80093,14 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7DF30 - b @08035A52 + b _08035A52 .pool -@080357E4: +_080357E4: movs r0, 0x80 lsls r0, 22 ands r0, r1 cmp r0, 0 - beq @08035818 + beq _08035818 ldr r0, =gUnknown_08D7A108 ldr r1, =0x06008000 bl LZDecompressVram @@ -80108,14 +80108,14 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7DEF4 - b @08035A52 + b _08035A52 .pool -@08035818: +_08035818: movs r0, 0x80 lsls r0, 23 ands r0, r1 cmp r0, 0 - beq @0803584C + beq _0803584C ldr r0, =gUnknown_08D7D590 ldr r1, =0x06008000 bl LZDecompressVram @@ -80123,13 +80123,13 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E234 - b @08035A52 + b _08035A52 .pool -@0803584C: +_0803584C: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq @080358C4 + beq _080358C4 ldr r2, =gTrainers ldr r0, =0x02038bca ldrh r1, [r0] @@ -80139,7 +80139,7 @@ load_battle_oval_graphics: ; 8035770 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - bne @08035898 + bne _08035898 ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 bl LZDecompressVram @@ -80147,11 +80147,11 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7DFC4 - b @08035A52 + b _08035A52 .pool -@08035898: +_08035898: cmp r0, 0x26 - bne @080358C4 + bne _080358C4 ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 bl LZDecompressVram @@ -80159,32 +80159,32 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E1F8 - b @08035A52 + b _08035A52 .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 .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, =gUnknown_0831ABA8 ldr r5, =0x02022ff0 ldrb r1, [r5] @@ -80211,9 +80211,9 @@ load_battle_oval_graphics: ; 8035770 adds r4, 0x10 adds r0, r4 ldr r0, [r0] - b @08035A52 + b _08035A52 .pool -@08035950: +_08035950: ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 bl LZDecompressVram @@ -80221,9 +80221,9 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7DF88 - b @08035A52 + b _08035A52 .pool -@08035978: +_08035978: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 bl LZDecompressVram @@ -80231,9 +80231,9 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E060 - b @08035A52 + b _08035A52 .pool -@080359A0: +_080359A0: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 bl LZDecompressVram @@ -80241,9 +80241,9 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E000 - b @08035A52 + b _08035A52 .pool -@080359C8: +_080359C8: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 bl LZDecompressVram @@ -80251,9 +80251,9 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E0CC - b @08035A52 + b _08035A52 .pool -@080359F0: +_080359F0: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 bl LZDecompressVram @@ -80261,9 +80261,9 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E11C - b @08035A52 + b _08035A52 .pool -@08035A18: +_08035A18: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 bl LZDecompressVram @@ -80271,9 +80271,9 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E164 - b @08035A52 + b _08035A52 .pool -@08035A40: +_08035A40: ldr r0, =gUnknown_08D7CCD8 ldr r1, =0x06008000 bl LZDecompressVram @@ -80281,13 +80281,13 @@ load_battle_oval_graphics: ; 8035770 ldr r1, =0x0600d000 bl LZDecompressVram ldr r0, =gUnknown_08D7E1A8 -@08035A52: +_08035A52: movs r1, 0x20 movs r2, 0x60 bl decompress_palette - b @08035A8A + b _08035A8A .pool -@08035A70: +_08035A70: ldr r0, =gUnknown_08D7C440 ldr r1, =0x06008000 bl LZDecompressVram @@ -80298,7 +80298,7 @@ load_battle_oval_graphics: ; 8035770 movs r1, 0x20 movs r2, 0x60 bl decompress_palette -@08035A8A: +_08035A8A: pop {r4,r5} pop {r0} bx r0 @@ -80358,7 +80358,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 @@ -80367,67 +80367,67 @@ 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 .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 @@ -80438,7 +80438,7 @@ sub_8035AE4: ; 8035AE4 adds r3, 0x2 adds r2, 0x1 cmp r2, 0x2 - ble @08035B92 + ble _08035B92 movs r0, 0x3 str r0, [sp] movs r0, 0x1 @@ -80452,36 +80452,36 @@ sub_8035AE4: ; 8035AE4 bl CopyToBgTilemapBufferRect_ChangePalette mov r0, r8 bl CopyBgTilemapBufferToVram - b @08035C36 + b _08035C36 .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 .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 @@ -80492,7 +80492,7 @@ sub_8035AE4: ; 8035AE4 adds r3, 0x2 adds r2, 0x1 cmp r2, 0x5 - ble @08035C02 + ble _08035C02 movs r0, 0x6 str r0, [sp] movs r0, 0x1 @@ -80506,7 +80506,7 @@ sub_8035AE4: ; 8035AE4 bl CopyToBgTilemapBufferRect_ChangePalette mov r0, r8 bl CopyBgTilemapBufferToVram -@08035C36: +_08035C36: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -80523,21 +80523,21 @@ sub_8035C4C: ; 8035C4C ldr r0, =0x0202433a ldrb r2, [r0] cmp r2, 0x3 - bne @08035C68 + bne _08035C68 ldr r0, =gUnknown_085CCBAD movs r1, 0x15 bl battle_show_message_maybe - b @08035D68 + b _08035D68 .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 @@ -80548,20 +80548,20 @@ sub_8035C4C: ; 8035C4C 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 .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 @@ -80572,22 +80572,22 @@ sub_8035C4C: ; 8035C4C 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 .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 @@ -80598,17 +80598,17 @@ sub_8035C4C: ; 8035C4C adds r0, r2 ldrh r0, [r0, 0x18] cmp r0, 0 - beq @08035D36 -@08035CFC: + beq _08035D36 +_08035CFC: ldr r0, =gUnknown_085CCB9E movs r1, 0x17 bl battle_show_message_maybe ldr r0, =gUnknown_085CCBA5 movs r1, 0x16 bl battle_show_message_maybe - b @08035D68 + b _08035D68 .pool -@08035D20: +_08035D20: ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -80619,24 +80619,24 @@ sub_8035C4C: ; 8035C4C adds r0, r2 ldrh r0, [r0, 0x18] cmp r0, 0 - beq @08035D58 -@08035D36: + beq _08035D58 +_08035D36: ldr r0, =gUnknown_085CCB9E movs r1, 0x16 bl battle_show_message_maybe ldr r0, =gUnknown_085CCBA5 movs r1, 0x17 bl battle_show_message_maybe - b @08035D68 + b _08035D68 .pool -@08035D58: +_08035D58: ldr r0, =gUnknown_085CCB9E movs r1, 0x17 bl battle_show_message_maybe ldr r0, =gUnknown_085CCBA5 movs r1, 0x16 bl battle_show_message_maybe -@08035D68: +_08035D68: pop {r0} bx r0 .pool @@ -80659,58 +80659,58 @@ 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 .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 .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 @@ -80719,22 +80719,22 @@ task00_0800F6FC: ; 8035D74 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 @@ -80745,13 +80745,13 @@ task00_0800F6FC: ; 8035D74 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] @@ -80766,10 +80766,10 @@ task00_0800F6FC: ; 8035D74 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 @@ -80798,7 +80798,7 @@ task00_0800F6FC: ; 8035D74 movs r2, 0x2 movs r3, 0x2 bl sub_8035AE4 -@08035EA6: +_08035EA6: ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -80807,9 +80807,9 @@ task00_0800F6FC: ; 8035D74 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @08036138 + b _08036138 .pool -@08035EC4: +_08035EC4: ldr r0, =0x00002710 bl AllocObjectPalette lsls r0, 24 @@ -80867,22 +80867,22 @@ task00_0800F6FC: ; 8035D74 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b @08036138 + b _08036138 .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 @@ -80895,9 +80895,9 @@ task00_0800F6FC: ; 8035D74 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 @@ -80910,18 +80910,18 @@ task00_0800F6FC: ; 8035D74 strh r1, [r0] ldr r0, =0x02022e1e strh r1, [r0] - b @08036038 + b _08036038 .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 @@ -80934,9 +80934,9 @@ task00_0800F6FC: ; 8035D74 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] @@ -80946,9 +80946,9 @@ task00_0800F6FC: ; 8035D74 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 @@ -80961,13 +80961,13 @@ task00_0800F6FC: ; 8035D74 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 @@ -80978,21 +80978,21 @@ task00_0800F6FC: ; 8035D74 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 .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 @@ -81085,7 +81085,7 @@ task00_0800F6FC: ; 8035D74 lsls r0, 2 adds r0, r4 strh r2, [r0, 0x32] -@08036138: +_08036138: add sp, 0x4 pop {r3} mov r8, r3 @@ -81103,7 +81103,7 @@ sub_8036154: ; 8036154 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @08036208 + beq _08036208 ldr r0, =gUnknown_08D778F0 ldr r1, =0x06004000 bl LZDecompressVram @@ -81150,31 +81150,31 @@ sub_8036154: ; 8036154 strh r1, [r0] ldr r0, =gUnknown_0831AA00 bl LoadCompressedObjectPicUsingHeap - b @080363AC + b _080363AC .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, =gUnknown_08D820D4 ldr r1, =0x06004000 bl LZDecompressVram ldr r0, =gUnknown_08D824E4 - b @08036382 + b _08036382 .pool -@08036248: +_08036248: movs r0, 0x1 movs r1, 0x1 movs r2, 0x2 @@ -81197,49 +81197,49 @@ sub_8036154: ; 8036154 bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @080363AC + b _080363AC .pool -@0803628C: +_0803628C: movs r0, 0x80 lsls r0, 21 ands r0, r1 cmp r0, 0 - beq @080362B0 + beq _080362B0 ldr r0, =gUnknown_08D81610 ldr r1, =0x06004000 bl LZDecompressVram ldr r0, =gUnknown_08D81E2C - b @08036382 + b _08036382 .pool -@080362B0: +_080362B0: movs r0, 0x80 lsls r0, 22 ands r0, r1 cmp r0, 0 - beq @080362D4 + beq _080362D4 ldr r0, =gUnknown_08D7F9F8 ldr r1, =0x06004000 bl LZDecompressVram ldr r0, =gUnknown_08D7FEC4 - b @08036382 + b _08036382 .pool -@080362D4: +_080362D4: movs r0, 0x80 lsls r0, 23 ands r0, r1 cmp r0, 0 - beq @080362F8 + beq _080362F8 ldr r0, =gUnknown_08D82608 ldr r1, =0x06004000 bl LZDecompressVram ldr r0, =gUnknown_08D82C70 - b @08036382 + b _08036382 .pool -@080362F8: +_080362F8: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq @08036350 + beq _08036350 ldr r2, =gTrainers ldr r0, =0x02038bca ldrh r1, [r0] @@ -81249,27 +81249,27 @@ sub_8036154: ; 8036154 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - bne @08036334 + bne _08036334 ldr r0, =gUnknown_08D820D4 ldr r1, =0x06004000 bl LZDecompressVram ldr r0, =gUnknown_08D824E4 - b @08036382 + b _08036382 .pool -@08036334: +_08036334: cmp r0, 0x26 - bne @08036350 + bne _08036350 ldr r0, =gUnknown_08D820D4 ldr r1, =0x06004000 bl LZDecompressVram ldr r0, =gUnknown_08D824E4 - b @08036382 + b _08036382 .pool -@08036350: +_08036350: bl sav1_map_get_battletype lsls r0, 24 cmp r0, 0 - bne @0803639C + bne _0803639C ldr r4, =gUnknown_0831ABA8 ldr r5, =0x02022ff0 ldrb r1, [r5] @@ -81289,19 +81289,19 @@ sub_8036154: ; 8036154 adds r4, 0xC adds r0, r4 ldr r0, [r0] -@08036382: +_08036382: ldr r1, =0x0600e000 bl LZDecompressVram - b @080363AC + b _080363AC .pool -@0803639C: +_0803639C: ldr r0, =gUnknown_08D820D4 ldr r1, =0x06004000 bl LZDecompressVram ldr r0, =gUnknown_08D824E4 ldr r1, =0x0600e000 bl LZDecompressVram -@080363AC: +_080363AC: pop {r4,r5} pop {r0} bx r0 @@ -81315,32 +81315,32 @@ sub_80363C4: ; 80363C4 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 .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, =gUnknown_08C00000 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - b @08036758 + b _08036758 .pool -@0803640C: +_0803640C: ldr r1, =gUnknown_08C00524 movs r0, 0 movs r2, 0 @@ -81348,35 +81348,35 @@ sub_80363C4: ; 80363C4 bl CopyToBgTilemapBuffer movs r0, 0 bl CopyBgTilemapBufferToVram - b @08036758 + b _08036758 .pool -@08036424: +_08036424: ldr r0, =gUnknown_08C004E0 movs r1, 0 movs r2, 0x40 bl decompress_palette - b @08036758 + b _08036758 .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, =gUnknown_08D7BB14 - b @0803651A + b _0803651A .pool -@0803645C: +_0803645C: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq @0803648C + beq _0803648C ldr r2, =gTrainers ldr r0, =0x02038bca ldrh r1, [r0] @@ -81386,36 +81386,36 @@ sub_80363C4: ; 80363C4 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - beq @08036518 + beq _08036518 cmp r0, 0x26 - bne @0803648C + bne _0803648C ldr r0, =gUnknown_08D7CCD8 - b @0803651A + b _0803651A .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 .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, =gUnknown_0831ABA8 ldr r0, =0x02022ff0 ldrb r1, [r0] @@ -81424,69 +81424,69 @@ sub_80363C4: ; 80363C4 lsls r0, 2 adds r0, r2 ldr r0, [r0] - b @0803651A + b _0803651A .pool -@080364E8: +_080364E8: ldr r0, =gUnknown_08D7CCD8 - b @0803651A + b _0803651A .pool -@080364F0: +_080364F0: ldr r0, =gUnknown_08D7CCD8 - b @0803651A + b _0803651A .pool -@080364F8: +_080364F8: ldr r0, =gUnknown_08D7CCD8 - b @0803651A + b _0803651A .pool -@08036500: +_08036500: ldr r0, =gUnknown_08D7CCD8 - b @0803651A + b _0803651A .pool -@08036508: +_08036508: ldr r0, =gUnknown_08D7CCD8 - b @0803651A + b _0803651A .pool -@08036510: +_08036510: ldr r0, =gUnknown_08D7CCD8 - b @0803651A + b _0803651A .pool -@08036518: +_08036518: ldr r0, =gUnknown_08D7C440 -@0803651A: +_0803651A: ldr r1, =0x06008000 bl LZDecompressVram - b @08036758 + b _08036758 .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, =gUnknown_08D7C154 - b @08036626 + b _08036626 .pool -@08036560: +_08036560: ldr r0, =gUnknown_08D7A720 - b @08036626 + b _08036626 .pool -@08036568: +_08036568: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq @08036598 + beq _08036598 ldr r2, =gTrainers ldr r0, =0x02038bca ldrh r1, [r0] @@ -81496,36 +81496,36 @@ sub_80363C4: ; 80363C4 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - beq @08036624 + beq _08036624 cmp r0, 0x26 - bne @08036598 + bne _08036598 ldr r0, =gUnknown_08D7D2E0 - b @08036626 + b _08036626 .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 .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, =gUnknown_0831ABA8 ldr r0, =0x02022ff0 ldrb r1, [r0] @@ -81535,69 +81535,69 @@ sub_80363C4: ; 80363C4 adds r2, 0x4 adds r0, r2 ldr r0, [r0] - b @08036626 + b _08036626 .pool -@080365F4: +_080365F4: ldr r0, =gUnknown_08D7D2E0 - b @08036626 + b _08036626 .pool -@080365FC: +_080365FC: ldr r0, =gUnknown_08D7D2E0 - b @08036626 + b _08036626 .pool -@08036604: +_08036604: ldr r0, =gUnknown_08D7D2E0 - b @08036626 + b _08036626 .pool -@0803660C: +_0803660C: ldr r0, =gUnknown_08D7D2E0 - b @08036626 + b _08036626 .pool -@08036614: +_08036614: ldr r0, =gUnknown_08D7D2E0 - b @08036626 + b _08036626 .pool -@0803661C: +_0803661C: ldr r0, =gUnknown_08D7D2E0 - b @08036626 + b _08036626 .pool -@08036624: +_08036624: ldr r0, =gUnknown_08D7CA28 -@08036626: +_08036626: ldr r1, =0x0600d000 bl LZDecompressVram - b @08036758 + b _08036758 .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, =gUnknown_08D7DF30 - b @08036742 + b _08036742 .pool -@0803666C: +_0803666C: ldr r0, =gUnknown_08D7DEF4 - b @08036742 + b _08036742 .pool -@08036674: +_08036674: movs r0, 0x8 ands r1, r0 cmp r1, 0 - beq @080366AC + beq _080366AC ldr r2, =gTrainers ldr r0, =0x02038bca ldrh r1, [r0] @@ -81607,40 +81607,40 @@ sub_80363C4: ; 80363C4 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0x20 - bne @080366A0 + bne _080366A0 ldr r0, =gUnknown_08D7DFC4 - b @08036742 + b _08036742 .pool -@080366A0: +_080366A0: cmp r0, 0x26 - bne @080366AC + bne _080366AC ldr r0, =gUnknown_08D7E1F8 - b @08036742 + b _08036742 .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 .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, =gUnknown_0831ABA8 ldr r0, =0x02022ff0 ldrb r1, [r0] @@ -81650,50 +81650,50 @@ sub_80363C4: ; 80363C4 adds r2, 0x10 adds r0, r2 ldr r0, [r0] - b @08036742 + b _08036742 .pool -@08036708: +_08036708: ldr r0, =gUnknown_08D7DF88 - b @08036742 + b _08036742 .pool -@08036710: +_08036710: ldr r0, =gUnknown_08D7E060 - b @08036742 + b _08036742 .pool -@08036718: +_08036718: ldr r0, =gUnknown_08D7E000 - b @08036742 + b _08036742 .pool -@08036720: +_08036720: ldr r0, =gUnknown_08D7E0CC - b @08036742 + b _08036742 .pool -@08036728: +_08036728: ldr r0, =gUnknown_08D7E11C - b @08036742 + b _08036742 .pool -@08036730: +_08036730: ldr r0, =gUnknown_08D7E164 - b @08036742 + b _08036742 .pool -@08036738: +_08036738: ldr r0, =gUnknown_08D7E1A8 - b @08036742 + b _08036742 .pool -@08036740: +_08036740: ldr r0, =gUnknown_08D7C9EC -@08036742: +_08036742: movs r1, 0x20 movs r2, 0x60 bl decompress_palette - b @08036758 + b _08036758 .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} @@ -81713,38 +81713,38 @@ 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 .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 bl SetMainCallback2 - b @080367BA + b _080367BA .pool -@080367B4: +_080367B4: ldr r0, =intro_end bl SetMainCallback2 -@080367BA: +_080367BA: ldr r1, =0x02024332 movs r0, 0 strb r0, [r1] - b @080367D0 + b _080367D0 .pool -@080367CC: +_080367CC: bl sub_80367D4 -@080367D0: +_080367D0: pop {r0} bx r0 thumb_func_end sub_8036760 @@ -81788,12 +81788,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] @@ -81802,9 +81802,9 @@ sub_80367D4: ; 80367D4 ldr r1, =0x02022e2a movs r0, 0x20 strh r0, [r1] - b @080368BE + b _080368BE .pool -@08036870: +_08036870: ldr r0, =0x02022e26 ldr r2, =0x00005051 adds r1, r2, 0 @@ -81816,14 +81816,14 @@ sub_80367D4: ; 80367D4 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, =gUnknown_0831AC70 ldr r0, =0x02038c28 @@ -81832,19 +81832,19 @@ sub_80367D4: ; 80367D4 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 @@ -81872,10 +81872,10 @@ sub_80367D4: ; 80367D4 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 ResetAllObjectData @@ -81894,36 +81894,36 @@ sub_80367D4: ; 80367D4 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 bl SetMainCallback2 - b @080369AE + b _080369AE .pool -@08036994: +_08036994: movs r0, 0x40 ands r2, r0 cmp r2, 0 - beq @080369A8 + beq _080369A8 ldr r0, =sub_8037DF4 bl SetMainCallback2 - b @080369AE + b _080369AE .pool -@080369A8: +_080369A8: ldr r0, =sub_8036FAC bl SetMainCallback2 -@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] @@ -81935,7 +81935,7 @@ sub_80367D4: ; 80367D4 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @080369E4 + beq _080369E4 movs r1, 0x96 lsls r1, 1 adds r0, r4, r1 @@ -81943,9 +81943,9 @@ sub_80367D4: ; 80367D4 ldrh r1, [r1] movs r2, 0 bl LoadTrainerParty -@080369E4: +_080369E4: bl sub_806EA68 -@080369E8: +_080369E8: ldr r1, =0x030022c0 ldr r2, =0x00000439 adds r1, r2 @@ -81966,13 +81966,13 @@ sub_80367D4: ; 80367D4 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] @@ -81996,7 +81996,7 @@ sub_8036A5C: ; 8036A5C lsls r0, 1 mov r10, r0 mov r8, r6 -@08036A72: +_08036A72: movs r0, 0x64 mov r4, r9 muls r4, r0 @@ -82017,56 +82017,56 @@ sub_8036A5C: ; 8036A5C 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 @@ -82106,7 +82106,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 @@ -82114,7 +82114,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 @@ -82123,7 +82123,7 @@ sub_8036B44: ; 8036B44 strb r1, [r0] adds r2, 0x1 cmp r2, 0x5 - ble @08036B66 + ble _08036B66 adds r1, r4, r2 movs r0, 0xFF strb r0, [r1] @@ -82131,7 +82131,7 @@ sub_8036B44: ; 8036B44 adds r3, r5, 0 ldr r6, =0x03005d8c ldr r5, =0x00003214 -@08036B86: +_08036B86: adds r0, r3, r2 ldr r1, [r6] adds r1, r5 @@ -82140,7 +82140,7 @@ sub_8036B44: ; 8036B44 strb r1, [r0] adds r2, 0x1 cmp r2, 0x11 - ble @08036B86 + ble _08036B86 ldr r0, [r7] ldr r1, =0x00003226 adds r0, r1 @@ -82150,9 +82150,9 @@ sub_8036B44: ; 8036B44 adds r1, 0x1 adds r0, r1 ldrb r0, [r0] - b @08036C00 + b _08036C00 .pool -@08036BC0: +_08036BC0: movs r0, 0xAF bl ItemIdToBerryType lsls r0, 24 @@ -82163,14 +82163,14 @@ sub_8036B44: ; 8036B44 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] @@ -82178,14 +82178,14 @@ sub_8036B44: ; 8036B44 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} @@ -82204,12 +82204,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 @@ -82219,7 +82219,7 @@ berry_801017C: ; 8036C08 ldr r2, =0x000031f8 adds r7, r3, 0 adds r7, 0x38 -@08036C3A: +_08036C3A: adds r1, r5, r6 ldr r0, [r4] adds r0, r2 @@ -82234,7 +82234,7 @@ berry_801017C: ; 8036C08 strb r0, [r1] adds r5, 0x1 cmp r5, 0x5 - ble @08036C3A + ble _08036C3A adds r1, r5, r3 movs r0, 0xFF strb r0, [r1] @@ -82251,7 +82251,7 @@ berry_801017C: ; 8036C08 ldr r2, =0x00003214 adds r6, r3, 0 adds r6, 0x40 -@08036C78: +_08036C78: adds r1, r5, r7 ldr r0, [r4] adds r0, r2 @@ -82266,7 +82266,7 @@ berry_801017C: ; 8036C08 strb r0, [r1] adds r5, 0x1 cmp r5, 0x11 - ble @08036C78 + ble _08036C78 mov r1, r8 ldr r0, [r1] ldr r2, =0x00003226 @@ -82287,9 +82287,9 @@ berry_801017C: ; 8036C08 adds r0, r3, 0 adds r0, 0x52 strb r1, [r0] - b @08036EA0 + b _08036EA0 .pool -@08036CDC: +_08036CDC: movs r0, 0xAF bl ItemIdToBerryType lsls r0, 24 @@ -82301,7 +82301,7 @@ berry_801017C: ; 8036C08 adds r7, r4, 0 adds r7, 0x38 adds r3, r4, 0 -@08036CF6: +_08036CF6: adds r1, r5, r4 adds r2, r6, r5 ldrb r0, [r2] @@ -82311,7 +82311,7 @@ berry_801017C: ; 8036C08 strb r0, [r1] adds r5, 0x1 cmp r5, 0x5 - ble @08036CF6 + ble _08036CF6 adds r1, r5, r3 movs r0, 0xFF strb r0, [r1] @@ -82327,14 +82327,14 @@ berry_801017C: ; 8036C08 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 @@ -82343,28 +82343,28 @@ berry_801017C: ; 8036C08 strb r1, [r3, 0x1A] adds r0, 0x13 strb r1, [r0] - b @08036EA0 + b _08036EA0 .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 @@ -82372,7 +82372,7 @@ berry_801017C: ; 8036C08 movs r1, 0x8 adds r1, r6 mov r9, r1 -@08036D7C: +_08036D7C: lsls r1, r5, 8 ldr r0, =0x020223c8 adds r7, r1, r0 @@ -82389,14 +82389,14 @@ berry_801017C: ; 8036C08 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 @@ -82408,14 +82408,14 @@ berry_801017C: ; 8036C08 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 @@ -82425,14 +82425,14 @@ berry_801017C: ; 8036C08 strb r1, [r0, 0x1A] mov r5, r10 cmp r5, r8 - blt @08036D7C - b @08036EA0 + blt _08036D7C + b _08036EA0 .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 @@ -82452,7 +82452,7 @@ berry_801017C: ; 8036C08 adds r3, r0, r2 lsls r1, 2 adds r2, r1, r2 -@08036E1C: +_08036E1C: adds r0, r7, r4 ldrb r1, [r0] strb r1, [r2] @@ -82462,7 +82462,7 @@ berry_801017C: ; 8036C08 adds r2, 0x1 adds r4, 0x1 cmp r4, 0x5 - ble @08036E1C + ble _08036E1C mov r0, r8 subs r3, r0, r5 lsls r3, 2 @@ -82489,7 +82489,7 @@ berry_801017C: ; 8036C08 adds r3, r0 adds r6, r7, 0 adds r6, 0x8 -@08036E64: +_08036E64: adds r0, r6, r4 ldrb r1, [r0] strb r1, [r3] @@ -82499,7 +82499,7 @@ berry_801017C: ; 8036C08 adds r3, 0x1 adds r4, 0x1 cmp r4, 0x11 - ble @08036E64 + ble _08036E64 mov r0, r8 subs r2, r0, r5 lsls r2, 2 @@ -82519,8 +82519,8 @@ berry_801017C: ; 8036C08 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 @@ -82547,115 +82547,115 @@ 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 .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 .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 .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} @@ -82681,41 +82681,41 @@ 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @08037068 + bne _08037068 movs r0, 0 bl ShowBg movs r0, 0x1 @@ -82728,34 +82728,34 @@ sub_8036FAC: ; 8036FAC 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 .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 @@ -82775,13 +82775,13 @@ sub_8036FAC: ; 8036FAC 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 @@ -82791,42 +82791,42 @@ sub_8036FAC: ; 8036FAC 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 .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 .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 @@ -82875,15 +82875,15 @@ sub_8036FAC: ; 8036FAC bl sub_8185F90 bl sub_8068AA4 ldr r1, =0x02024332 - b @08037446 + b _08037446 .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 @@ -82891,16 +82891,16 @@ sub_8036FAC: ; 8036FAC movs r2, 0xC8 bl link_0800A448 ldr r1, =0x02024332 - b @08037446 + b _08037446 .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 @@ -82909,15 +82909,15 @@ sub_8036FAC: ; 8036FAC movs r2, 0xC8 bl memcpy ldr r1, =0x02024332 - b @08037446 + b _08037446 .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 @@ -82925,16 +82925,16 @@ sub_8036FAC: ; 8036FAC movs r2, 0xC8 bl link_0800A448 ldr r1, =0x02024332 - b @08037446 + b _08037446 .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 @@ -82943,15 +82943,15 @@ sub_8036FAC: ; 8036FAC movs r2, 0xC8 bl memcpy ldr r1, =0x02024332 - b @08037446 + b _08037446 .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 @@ -82959,16 +82959,16 @@ sub_8036FAC: ; 8036FAC movs r2, 0xC8 bl link_0800A448 ldr r1, =0x02024332 - b @08037446 + b _08037446 .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 @@ -82995,9 +82995,9 @@ sub_8036FAC: ; 8036FAC adds r0, 0x64 bl shedinja_something ldr r1, =0x02024332 - b @08037446 + b _08037446 .pool -@08037318: +_08037318: bl sub_8032768 bl sub_8184E58 ldr r2, =0x02024332 @@ -83009,45 +83009,45 @@ sub_8036FAC: ; 8036FAC 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 .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 @@ -83055,38 +83055,38 @@ sub_8036FAC: ; 8036FAC movs r2, 0x4 bl link_0800A448 ldr r1, =0x02024332 - b @08037446 + b _08037446 .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 .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] @@ -83100,32 +83100,32 @@ sub_8036FAC: ; 8036FAC 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 .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 @@ -83151,39 +83151,39 @@ 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0803750C + bne _0803750C movs r0, 0 bl ShowBg movs r0, 0x1 @@ -83196,26 +83196,26 @@ sub_8037458: ; 8037458 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] @@ -83256,7 +83256,7 @@ sub_8037458: ; 8037458 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq @080375C4 + beq _080375C4 ldr r4, =0x0202449c ldr r0, [r4] movs r5, 0xC0 @@ -83281,42 +83281,42 @@ sub_8037458: ; 8037458 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 .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 .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 @@ -83342,32 +83342,32 @@ sub_8037458: ; 8037458 adds r0, 0xEB strh r0, [r1, 0xE] strh r0, [r1, 0x10] - b @08037986 + b _08037986 .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 .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 @@ -83376,7 +83376,7 @@ sub_8037458: ; 8037458 adds r1, r0 ldrh r0, [r1, 0x18] cmp r0, 0 - beq @080376E8 + beq _080376E8 ldr r4, =0x020244ec lsls r1, r7, 8 ldr r5, =0x020223c4 @@ -83392,9 +83392,9 @@ sub_8037458: ; 8037458 adds r0, r4, 0 movs r2, 0xC8 bl memcpy - b @08037986 + b _08037986 .pool -@080376E8: +_080376E8: ldr r4, =0x020244ec lsls r1, r6, 8 ldr r5, =0x020223c4 @@ -83409,31 +83409,31 @@ sub_8037458: ; 8037458 adds r1, r5 adds r0, r4, 0 movs r2, 0xC8 - b @08037982 + b _08037982 .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 .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 @@ -83442,7 +83442,7 @@ sub_8037458: ; 8037458 adds r1, r0 ldrh r0, [r1, 0x18] cmp r0, 0 - beq @08037788 + beq _08037788 ldr r4, =0x020245b4 lsls r1, r7, 8 ldr r5, =0x020223c4 @@ -83458,9 +83458,9 @@ sub_8037458: ; 8037458 adds r0, r4, 0 movs r2, 0x64 bl memcpy - b @08037986 + b _08037986 .pool -@08037788: +_08037788: ldr r4, =0x020245b4 lsls r1, r6, 8 ldr r5, =0x020223c4 @@ -83475,105 +83475,105 @@ sub_8037458: ; 8037458 adds r1, r5 adds r0, r4, 0 movs r2, 0x64 - b @08037982 + b _08037982 .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 .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 .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 .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 .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 .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 @@ -83616,9 +83616,9 @@ sub_8037458: ; 8037458 lsls r2, 1 adds r0, r4, r2 bl shedinja_something - b @08037986 + b _08037986 .pool -@08037908: +_08037908: bl sub_8032768 bl sub_8184E58 ldr r2, =0x02024332 @@ -83630,62 +83630,62 @@ sub_8037458: ; 8037458 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq @08037934 + beq _08037934 movs r0, 0xE strb r0, [r2] - b @080379D6 + b _080379D6 .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 .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 .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 @@ -83700,11 +83700,11 @@ sub_8037458: ; 8037458 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} @@ -83727,7 +83727,7 @@ sub_80379F8: ; 80379F8 mov r8, r0 ldr r6, =0x02022ff8 mov r10, r6 -@08037A12: +_08037A12: ldr r1, [sp] add r1, r8 movs r0, 0x64 @@ -83785,17 +83785,17 @@ sub_80379F8: ; 80379F8 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 @@ -83830,11 +83830,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 @@ -83856,36 +83856,36 @@ sub_8037ADC: ; 8037ADC 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 .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 Alloc @@ -83901,31 +83901,31 @@ sub_8037ADC: ; 8037ADC ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b @08037D0A + b _08037D0A .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 @@ -83934,35 +83934,35 @@ sub_8037ADC: ; 8037ADC 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 .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 .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 @@ -83970,8 +83970,8 @@ sub_8037ADC: ; 8037ADC add r8, r0 adds r5, 0x1 cmp r5, r9 - blt @08037BC6 -@08037C2E: + blt _08037BC6 +_08037C2E: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 @@ -83987,41 +83987,41 @@ sub_8037ADC: ; 8037ADC ldr r0, =sub_8037ADC str r0, [r1, 0x8] bl sub_81B9150 - b @08037D0A + b _08037D0A .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 .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] @@ -84036,13 +84036,13 @@ sub_8037ADC: ; 8037ADC bl Free mov r0, r8 str r0, [r4] - b @08037D0A + b _08037D0A .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] @@ -84056,7 +84056,7 @@ sub_8037ADC: ; 8037ADC ldr r0, [r4] bl Free str r5, [r4] -@08037D0A: +_08037D0A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -84086,12 +84086,12 @@ 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 .pool -@08037D64: +_08037D64: ldr r4, =0x02023058 movs r0, 0x60 bl Alloc @@ -84111,9 +84111,9 @@ intro_end: ; 8037D2C ldr r0, =intro_end str r0, [r1, 0x8] bl sub_81B9150 - b @08037DD6 + b _08037DD6 .pool -@08037DA4: +_08037DA4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -84121,7 +84121,7 @@ intro_end: ; 8037D2C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne @08037DD6 + bne _08037DD6 movs r0, 0x2 strb r0, [r5] ldr r1, =0x02022fec @@ -84137,7 +84137,7 @@ intro_end: ; 8037D2C ldr r0, [r4] bl Free str r6, [r4] -@08037DD6: +_08037DD6: pop {r3} mov r8, r3 pop {r4-r7} @@ -84164,33 +84164,33 @@ 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @08037E90 + bne _08037E90 movs r0, 0 bl ShowBg movs r0, 0x1 @@ -84203,33 +84203,33 @@ sub_8037DF4: ; 8037DF4 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 .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 @@ -84255,42 +84255,42 @@ sub_8037DF4: ; 8037DF4 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 .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 .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 @@ -84321,7 +84321,7 @@ sub_8037DF4: ; 8037DF4 adds r5, r1, 0x2 movs r7, 0x3F movs r6, 0x3 -@08037FA4: +_08037FA4: ldrh r0, [r5] str r2, [sp] bl sub_8185F90 @@ -84330,84 +84330,84 @@ sub_8037DF4: ; 8037DF4 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 .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 .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 @@ -84416,32 +84416,32 @@ sub_8037DF4: ; 8037DF4 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 .pool -@0803808C: +_0803808C: cmp r0, 0x3 - bne @0803812A -@08038090: + bne _0803812A +_08038090: ldr r0, =0x020244ec - b @08038110 + b _08038110 .pool -@08038098: +_08038098: ldr r0, =0x02024618 - b @08038110 + b _08038110 .pool -@080380A0: +_080380A0: ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r1, [r0, 0x18] @@ -84449,104 +84449,104 @@ sub_8037DF4: ; 8037DF4 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 .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 .pool -@080380F0: +_080380F0: ldr r0, =0x02024618 - b @08038110 + b _08038110 .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 .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 .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 .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 @@ -84555,32 +84555,32 @@ sub_8037DF4: ; 8037DF4 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 .pool -@080381A4: +_080381A4: cmp r0, 0x3 - bne @08038242 -@080381A8: + bne _08038242 +_080381A8: ldr r0, =0x020245b4 - b @08038228 + b _08038228 .pool -@080381B0: +_080381B0: ldr r0, =0x020246e0 - b @08038228 + b _08038228 .pool -@080381B8: +_080381B8: ldr r2, =0x020229e8 adds r0, r5, r2 ldrh r1, [r0, 0x18] @@ -84588,79 +84588,79 @@ sub_8037DF4: ; 8037DF4 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 .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 .pool -@08038208: +_08038208: ldr r0, =0x020246e0 - b @08038228 + b _08038228 .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 .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 @@ -84703,9 +84703,9 @@ sub_8037DF4: ; 8037DF4 lsls r2, 1 adds r0, r4, r2 bl shedinja_something - b @080383A6 + b _080383A6 .pool -@080382CC: +_080382CC: bl sub_8032768 bl sub_8184E58 ldr r3, =0x02024332 @@ -84717,45 +84717,45 @@ sub_8037DF4: ; 8037DF4 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 .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 @@ -84773,24 +84773,24 @@ sub_8037DF4: ; 8037DF4 adds r1, r4, 0 movs r2, 0x8 bl link_0800A448 - b @080383A6 + b _080383A6 .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 @@ -84798,26 +84798,26 @@ sub_8037DF4: ; 8037DF4 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 .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] @@ -84831,7 +84831,7 @@ sub_8037DF4: ; 8037DF4 movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq @080383F8 + beq _080383F8 ldr r0, =0x02038bca movs r4, 0x80 lsls r4, 4 @@ -84840,7 +84840,7 @@ sub_8037DF4: ; 8037DF4 movs r0, 0x20 orrs r2, r0 str r2, [r3] -@080383F8: +_080383F8: add sp, 0x4 pop {r3} mov r8, r3 @@ -84864,18 +84864,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 @@ -84892,7 +84892,7 @@ sub_8038420: ; 8038420 bl pal_fade_maybe ldr r0, =sub_80384E4 bl SetMainCallback2 -@08038482: +_08038482: add sp, 0x4 pop {r0} bx r0 @@ -84936,7 +84936,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 @@ -84946,7 +84946,7 @@ sub_80384E4: ; 80384E4 ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 -@08038512: +_08038512: pop {r0} bx r0 .pool @@ -84970,18 +84970,18 @@ sub_8038538: ; 8038538 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 .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] @@ -84991,13 +84991,13 @@ sub_8038538: ; 8038538 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 @@ -85015,39 +85015,39 @@ sub_8038538: ; 8038538 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 .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 bl SetMainCallback2 -@080385DC: +_080385DC: pop {r4,r5} pop {r0} bx r0 @@ -85073,10 +85073,10 @@ LoadTrainerParty: ; 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 @@ -85085,19 +85085,19 @@ LoadTrainerParty: ; 80385E8 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, =gTrainers ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -85111,12 +85111,12 @@ LoadTrainerParty: ; 80385E8 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 .pool -@08038668: +_08038668: ldr r1, =gTrainers ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -85127,12 +85127,12 @@ LoadTrainerParty: ; 80385E8 ldrb r0, [r0] str r0, [sp, 0x1C] adds r4, r1, 0 -@0803867C: +_0803867C: movs r0, 0 str r0, [sp, 0x18] - b @080389B4 + b _080389B4 .pool -@08038688: +_08038688: ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] adds r0, r2, r3 @@ -85140,21 +85140,21 @@ LoadTrainerParty: ; 80385E8 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] @@ -85167,9 +85167,9 @@ LoadTrainerParty: ; 80385E8 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 @@ -85182,8 +85182,8 @@ LoadTrainerParty: ; 80385E8 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 @@ -85191,23 +85191,23 @@ LoadTrainerParty: ; 80385E8 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 @@ -85224,10 +85224,10 @@ LoadTrainerParty: ; 80385E8 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 @@ -85241,8 +85241,8 @@ LoadTrainerParty: ; 80385E8 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 @@ -85272,9 +85272,9 @@ LoadTrainerParty: ; 80385E8 str r3, [sp, 0xC] adds r3, r6, 0 bl create_pokemon_set_level - b @080389AC + b _080389AC .pool -@08038794: +_08038794: adds r0, r4, 0 adds r0, 0x24 adds r0, r1, r0 @@ -85291,10 +85291,10 @@ LoadTrainerParty: ; 80385E8 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 @@ -85308,8 +85308,8 @@ LoadTrainerParty: ; 80385E8 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 @@ -85345,7 +85345,7 @@ LoadTrainerParty: ; 80385E8 mov r0, r8 adds r0, 0x6 adds r4, r7, r0 -@08038820: +_08038820: adds r1, r6, 0 adds r1, 0xD adds r0, r5, 0 @@ -85364,10 +85364,10 @@ LoadTrainerParty: ; 80385E8 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @08038820 - b @080389AC + ble _08038820 + b _080389AC .pool -@08038854: +_08038854: adds r0, r4, 0 adds r0, 0x24 adds r0, r1, r0 @@ -85384,10 +85384,10 @@ LoadTrainerParty: ; 80385E8 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 @@ -85401,8 +85401,8 @@ LoadTrainerParty: ; 80385E8 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 @@ -85438,9 +85438,9 @@ LoadTrainerParty: ; 80385E8 movs r1, 0xC adds r2, r5, 0 bl pokemon_setattr - b @080389AC + b _080389AC .pool -@080388E8: +_080388E8: adds r0, r4, 0 adds r0, 0x24 adds r0, r1, r0 @@ -85457,10 +85457,10 @@ LoadTrainerParty: ; 80385E8 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 @@ -85474,8 +85474,8 @@ LoadTrainerParty: ; 80385E8 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 @@ -85517,7 +85517,7 @@ LoadTrainerParty: ; 80385E8 mov r0, r8 adds r0, 0x8 adds r4, r7, r0 -@08038982: +_08038982: adds r1, r6, 0 adds r1, 0xD adds r0, r5, 0 @@ -85536,18 +85536,18 @@ LoadTrainerParty: ; 80385E8 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, =gTrainers 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, =gTrainers ldr r3, [sp, 0x20] @@ -85559,7 +85559,7 @@ LoadTrainerParty: ; 80385E8 ldr r0, [r2] orrs r0, r1 str r0, [r2] -@080389D2: +_080389D2: ldr r0, =gTrainers ldr r2, [sp, 0x20] ldr r3, [sp, 0x14] @@ -85568,7 +85568,7 @@ LoadTrainerParty: ; 80385E8 adds r1, r0 adds r1, 0x20 ldrb r0, [r1] -@080389E2: +_080389E2: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -85589,12 +85589,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 SetGpuReg -@08038A1E: +_08038A1E: pop {r0} bx r0 .pool @@ -85608,9 +85608,9 @@ vblank_cb_08078BB4: ; 8038A28 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 @@ -85680,7 +85680,7 @@ sub_8038B04: ; 8038B04 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - beq @08038B24 + beq _08038B24 movs r1, 0x32 ldrsh r0, [r5, r1] movs r1, 0xFF @@ -85690,8 +85690,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 @@ -85701,7 +85701,7 @@ sub_8038B04: ; 8038B04 ldrh r1, [r5, 0x30] subs r1, r0 strh r1, [r5, 0x20] -@08038B36: +_08038B36: movs r1, 0xC0 lsls r1, 1 adds r0, r1, 0 @@ -85714,7 +85714,7 @@ sub_8038B04: ; 8038B04 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @08038B6A + beq _08038B6A ldr r4, =0x00002710 adds r0, r4, 0 bl FreeObjectTilesByTag @@ -85724,7 +85724,7 @@ sub_8038B04: ; 8038B04 bl obj_free_rotscale_entry adds r0, r5, 0 bl RemoveObjectAndFreeTiles -@08038B6A: +_08038B6A: pop {r4,r5} pop {r0} bx r0 @@ -85770,7 +85770,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 @@ -85778,31 +85778,31 @@ 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 .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 .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 @@ -85813,7 +85813,7 @@ sub_8038B94: ; 8038B94 lsls r2, 1 mov r10, r2 mov r9, r0 -@08038C20: +_08038C20: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -85834,50 +85834,50 @@ sub_8038B94: ; 8038B94 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] @@ -85892,7 +85892,7 @@ sub_8038B94: ; 8038B94 lsls r1, 1 mov r10, r1 mov r9, r0 -@08038CBA: +_08038CBA: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -85913,50 +85913,50 @@ sub_8038B94: ; 8038B94 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] @@ -85992,16 +85992,16 @@ sub_8038D64: ; 8038D64 ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq @08038DAC + beq _08038DAC ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 bl sub_8057028 bl dp11_free bl sub_805F094 - b @08038EB6 + b _08038EB6 .pool -@08038DAC: +_08038DAC: str r0, [sp] movs r1, 0xC0 lsls r1, 19 @@ -86036,14 +86036,14 @@ sub_8038D64: ; 8038D64 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 @@ -86051,14 +86051,14 @@ sub_8038D64: ; 8038D64 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 @@ -86117,7 +86117,7 @@ sub_8038D64: ; 8038D64 bl SetMainCallback2 ldr r0, =0x02024332 strb r4, [r0] -@08038EB6: +_08038EB6: add sp, 0x4 pop {r4} pop {r0} @@ -86146,28 +86146,28 @@ sub_8038F34: ; 8038F34 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 .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 ShowBg movs r0, 0x1 @@ -86177,18 +86177,18 @@ sub_8038F34: ; 8038F34 ldr r1, =0x02024332 movs r0, 0xFF strb r0, [r1, 0x1] - b @08039174 + b _08039174 .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] @@ -86196,16 +86196,16 @@ sub_8038F34: ; 8038F34 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 @@ -86225,30 +86225,30 @@ sub_8038F34: ; 8038F34 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 @@ -86256,20 +86256,20 @@ sub_8038F34: ; 8038F34 movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @080390AC + bne _080390AC cmp r4, r3 - bne @080390AC + bne _080390AC ldr r0, =0x000008d2 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08039074 + beq _08039074 bl FreeAllWindowBuffers ldr r0, =sub_80392A8 bl SetMainCallback2 - b @080391C6 + b _080391C6 .pool -@08039074: +_08039074: ldr r2, =0x030022c0 ldr r1, =0x00000439 adds r0, r2, r1 @@ -86277,31 +86277,31 @@ sub_8038F34: ; 8038F34 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne @08039090 + bne _08039090 ldr r0, [r2, 0x8] - b @080390B0 + b _080390B0 .pool -@08039090: +_08039090: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @08039172 + bne _08039172 ldr r0, =sub_80B3AF8 movs r1, 0x5 bl AddTask - b @08039172 + b _08039172 .pool -@080390AC: +_080390AC: ldr r0, =0x030022c0 ldr r0, [r0, 0x8] -@080390B0: +_080390B0: bl SetMainCallback2 bl sub_8057028 bl dp11_free bl sub_805F094 - b @080391C6 + b _080391C6 .pool -@080390C8: +_080390C8: movs r0, 0 str r0, [sp, 0x4] movs r1, 0xC0 @@ -86310,13 +86310,13 @@ sub_8038F34: ; 8038F34 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 @@ -86324,68 +86324,68 @@ sub_8038F34: ; 8038F34 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @08039172 + b _08039172 .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 .pool -@08039118: +_08039118: ldr r0, =sub_80B3AF8 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne @080391C6 - b @08039172 + bne _080391C6 + b _08039172 .pool -@0803912C: +_0803912C: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080391C6 + bne _080391C6 bl sub_800ADF8 ldr r0, =gUnknown_0824978D movs r1, 0 bl battle_show_message_maybe - b @08039172 + b _08039172 .pool -@0803914C: +_0803914C: movs r0, 0 bl IsTextPrinterActive 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 .pool -@08039184: +_08039184: ldr r2, =0x030022c0 ldr r1, =0x00000439 adds r0, r2, r1 @@ -86394,16 +86394,16 @@ sub_8038F34: ; 8038F34 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] @@ -86416,7 +86416,7 @@ sub_8038F34: ; 8038F34 bl sub_8057028 bl dp11_free bl sub_805F094 -@080391C6: +_080391C6: add sp, 0x8 pop {r4-r6} pop {r0} @@ -86433,84 +86433,84 @@ 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 .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, =gUnknown_0831AA08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1] lsls r0, 30 lsrs r0, 30 - b @080392A0 + b _080392A0 .pool -@08039230: +_08039230: ldr r0, =gUnknown_0831AA08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1] lsls r0, 28 lsrs r0, 30 - b @080392A0 + b _080392A0 .pool -@08039244: +_08039244: ldr r0, =gUnknown_0831AA08 lsls r1, r2, 2 adds r1, r0 ldrh r0, [r1] lsls r0, 23 lsrs r0, 27 - b @080392A0 + b _080392A0 .pool -@08039258: +_08039258: ldr r0, =gUnknown_0831AA08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 29 lsrs r0, 30 - b @080392A0 + b _080392A0 .pool -@0803926C: +_0803926C: ldr r0, =gUnknown_0831AA08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 28 lsrs r0, 31 - b @080392A0 + b _080392A0 .pool -@08039280: +_08039280: ldr r0, =gUnknown_0831AA08 lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] lsls r0, 26 lsrs r0, 30 - b @080392A0 + b _080392A0 .pool -@08039294: +_08039294: ldr r0, =gUnknown_0831AA08 lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] lsls r0, 8 lsrs r0, 22 -@080392A0: +_080392A0: pop {r1} bx r1 .pool @@ -86554,13 +86554,13 @@ sub_80392A8: ; 80392A8 movs r0, 0 bl SetGpuReg 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 ResetAllObjectData bl clear_tasks bl ResetObjectPaletteAllocator @@ -86609,31 +86609,31 @@ sub_803939C: ; 803939C 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 .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 ShowBg movs r0, 0x1 @@ -86643,9 +86643,9 @@ sub_803939C: ; 803939C ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b @0803975C + b _0803975C .pool -@08039414: +_08039414: ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -86653,59 +86653,59 @@ sub_803939C: ; 803939C 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 movs r1, 0x5 bl AddTask -@08039434: +_08039434: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b @0803975C + b _0803975C .pool -@08039450: +_08039450: ldr r0, =sub_80B3AF8 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 .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, =gUnknown_085CD28F movs r1, 0 bl battle_show_message_maybe ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b @0803975C + b _0803975C .pool -@0803949C: +_0803949C: movs r0, 0 bl IsTextPrinterActive 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 @@ -86719,60 +86719,60 @@ sub_803939C: ; 803939C movs r0, 0x1 strb r0, [r4, 0x1] bl sub_8056B74 - b @080396EA + b _080396EA .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 .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 @@ -86783,30 +86783,30 @@ sub_803939C: ; 803939C strb r0, [r4, 0x1] movs r0, 0xA strb r0, [r4] - b @0803975E + b _0803975E .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 .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 @@ -86820,26 +86820,26 @@ sub_803939C: ; 803939C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @080395B4 + beq _080395B4 bl sub_800ADF8 ldr r0, =gUnknown_0824978D movs r1, 0 bl battle_show_message_maybe -@080395B4: +_080395B4: ldr r1, =0x02024332 ldrb r0, [r1] adds r0, 0x1 - b @0803975C + b _0803975C .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 @@ -86847,19 +86847,19 @@ sub_803939C: ; 803939C 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 .pool -@08039610: +_08039610: ldr r2, =0x030022c0 ldr r1, =0x00000439 adds r0, r2, r1 @@ -86868,17 +86868,17 @@ sub_803939C: ; 803939C 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] @@ -86891,54 +86891,54 @@ sub_803939C: ; 803939C movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @08039650 - b @0803975E -@08039650: + beq _08039650 + b _0803975E +_08039650: ldr r0, [r3, 0x8] bl SetMainCallback2 bl sub_8057028 bl dp11_free bl sub_805F094 - b @0803975E + b _0803975E .pool -@08039678: +_08039678: ldrb r0, [r4, 0x1] cmp r0, 0x1 - bne @080396A0 + bne _080396A0 movs r0, 0x37 bl audio_play ldr r0, =gUnknown_085CD2CB -@08039686: +_08039686: bl get_battle_strings_ ldr r0, =0x02022e2c movs r1, 0 bl battle_show_message_maybe movs r0, 0x80 strb r0, [r4, 0x1] - b @080396EA + b _080396EA .pool -@080396A0: +_080396A0: ldr r0, =gUnknown_08242481 - b @08039686 + b _08039686 .pool -@080396A8: +_080396A8: bl sub_800A520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0803975E + bne _0803975E movs r0, 0 bl IsTextPrinterActive 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 @@ -86946,24 +86946,24 @@ sub_803939C: ; 803939C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @080396EA + beq _080396EA bl sub_800ADF8 ldr r0, =gUnknown_0824978D movs r1, 0 bl battle_show_message_maybe -@080396EA: +_080396EA: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @0803975E + b _0803975E .pool -@08039704: +_08039704: movs r0, 0 bl IsTextPrinterActive lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - bne @0803975E + bne _0803975E ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -86973,22 +86973,22 @@ sub_803939C: ; 803939C 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 .pool -@08039744: +_08039744: movs r0, 0x1 negs r0, r0 str r1, [sp] -@0803974A: +_0803974A: movs r1, 0 movs r2, 0 movs r3, 0x10 @@ -86997,9 +86997,9 @@ sub_803939C: ; 803939C 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} @@ -87020,13 +87020,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 @@ -87035,12 +87035,12 @@ shedinja_something: ; 803976C mov r0, sp bl CompareStringWithoutExtendedControlCodes 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} @@ -87093,16 +87093,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 str r0, [r2, 0x1C] -@0803982C: +_0803982C: pop {r0} bx r0 .pool @@ -87118,7 +87118,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 @@ -87142,7 +87142,7 @@ sub_8039838: ; 8039838 movs r2, 0xA movs r3, 0 bl pal_fade_maybe -@08039880: +_08039880: add sp, 0x4 pop {r4} pop {r0} @@ -87159,13 +87159,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 .pool @@ -87197,7 +87197,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 @@ -87222,7 +87222,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 @@ -87232,7 +87232,7 @@ sub_80398D0: ; 80398D0 str r0, [r3, 0x1C] ldr r0, =0x02022f88 str r2, [r0] -@08039924: +_08039924: pop {r4} pop {r0} bx r0 @@ -87256,14 +87256,14 @@ 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 .pool -@0803995C: +_0803995C: mov r0, r9 ldrh r4, [r0, 0x32] -@08039960: +_08039960: ldr r1, =0x0202406e lsls r0, r6, 1 adds r5, r0, r1 @@ -87278,7 +87278,7 @@ sub_8039934: ; 8039934 movs r1, 0 bl pokemon_getattr cmp r4, 0xC9 - bne @080399E4 + bne _080399E4 ldrh r0, [r5] mov r1, r8 muls r1, r0 @@ -87309,25 +87309,25 @@ sub_8039934: ; 8039934 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @080399D0 + bne _080399D0 movs r0, 0xC9 - b @080399DA + b _080399DA .pool -@080399D0: +_080399D0: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -@080399DA: +_080399DA: ldr r1, =gUnknown_08300D38 lsls r0, 2 - b @08039A1C + b _08039A1C .pool -@080399E4: +_080399E4: ldr r0, =0x00000181 cmp r4, r0 - bne @08039A08 + bne _08039A08 ldr r0, =gUnknown_08525F78 ldr r1, =0x020244e4 adds r1, r6, r1 @@ -87335,24 +87335,24 @@ sub_8039934: ; 8039934 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b @08039A20 + b _08039A20 .pool -@08039A08: +_08039A08: movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls @08039A18 + bls _08039A18 ldr r0, =gUnknown_08300D38 - b @08039A1E + b _08039A1E .pool -@08039A18: +_08039A18: ldr r1, =gUnknown_08300D38 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 @@ -87380,7 +87380,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] @@ -87391,13 +87391,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 RemoveObjectAndFreeTiles - b @08039AC8 -@08039A7C: + b _08039AC8 +_08039A7C: ldrh r0, [r4, 0x2E] lsls r0, 24 lsrs r0, 24 @@ -87422,12 +87422,12 @@ sub_8039A48: ; 8039A48 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] @@ -87435,7 +87435,7 @@ sub_8039A48: ; 8039A48 ldrb r1, [r1] adds r0, r4, 0 bl StartObjectImageAnim -@08039AC8: +_08039AC8: pop {r4} pop {r0} bx r0 @@ -87467,7 +87467,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 @@ -87485,7 +87485,7 @@ sub_8039AF4: ; 8039AF4 strb r0, [r1] movs r0, 0x8 strh r0, [r3, 0x34] -@08039B26: +_08039B26: pop {r0} bx r0 thumb_func_end sub_8039AF4 @@ -87524,35 +87524,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 StartObjectImageAnim -@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 @@ -87576,18 +87576,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 str r0, [r2, 0x1C] strh r1, [r2, 0x30] -@08039BE4: +_08039BE4: pop {r0} bx r0 .pool @@ -87615,7 +87615,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 @@ -87624,7 +87624,7 @@ sub_8039C00: ; 8039C00 ldrh r1, [r2, 0x26] adds r0, r1 strh r0, [r2, 0x26] -@08039C20: +_08039C20: pop {r0} bx r0 .pool @@ -87649,7 +87649,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] @@ -87659,9 +87659,9 @@ dp11b_obj_instanciate: ; 8039C28 adds r0, r1 ldrb r1, [r0] movs r0, 0x2 - b @08039C76 + b _08039C76 .pool -@08039C64: +_08039C64: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -87671,18 +87671,18 @@ dp11b_obj_instanciate: ; 8039C28 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 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] @@ -87706,9 +87706,9 @@ dp11b_obj_instanciate: ; 8039C28 lsls r0, 2 adds r0, r2 movs r1, 0x80 - b @08039CFE + b _08039CFE .pool -@08039CD0: +_08039CD0: ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r7, [r0] @@ -87732,7 +87732,7 @@ dp11b_obj_instanciate: ; 8039C28 lsls r0, 2 adds r0, r2 movs r1, 0xC0 -@08039CFE: +_08039CFE: strh r1, [r0, 0x2E] adds r4, r2, 0 adds r1, r3, r5 @@ -87756,7 +87756,7 @@ dp11b_obj_instanciate: ; 8039C28 adds r0, r4 strh r2, [r0, 0x24] strh r2, [r0, 0x26] -@08039D2C: +_08039D2C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -87775,7 +87775,7 @@ dp11b_obj_free: ; 8039D48 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - bne @08039D9C + bne _08039D9C ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -87787,7 +87787,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 @@ -87804,9 +87804,9 @@ dp11b_obj_free: ; 8039D48 ldrb r2, [r1] movs r0, 0x3 negs r0, r0 - b @08039DD6 + b _08039DD6 .pool -@08039D9C: +_08039D9C: ldr r6, =0x020244d0 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -87818,7 +87818,7 @@ dp11b_obj_free: ; 8039D48 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @08039DEA + beq _08039DEA ldr r2, =0x02020630 ldrb r1, [r3, 0x3] lsls r0, r1, 4 @@ -87835,7 +87835,7 @@ dp11b_obj_free: ; 8039D48 ldrb r2, [r1] movs r0, 0x5 negs r0, r0 -@08039DD6: +_08039DD6: ands r0, r2 strb r0, [r1] ldr r0, =0x02020630 @@ -87846,7 +87846,7 @@ dp11b_obj_free: ; 8039D48 movs r0, 0 strh r0, [r1, 0x24] strh r0, [r1, 0x26] -@08039DEA: +_08039DEA: pop {r4-r6} pop {r0} bx r0 @@ -87863,14 +87863,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 @@ -87903,11 +87903,11 @@ 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 @@ -87923,10 +87923,10 @@ sub_8039E60: ; 8039E60 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @08039E7A + beq _08039E7A ldr r0, =nullsub_19 str r0, [r4, 0x1C] -@08039E7A: +_08039E7A: pop {r4} pop {r0} bx r0 @@ -87956,7 +87956,7 @@ sub_8039E9C: ; 8039E9C movs r0, 0x3F ands r0, r1 cmp r0, 0 - bne @08039EBE + bne _08039EBE ldr r1, =gUnknown_0831ACE0 adds r0, r2, 0 adds r0, 0x2B @@ -87966,7 +87966,7 @@ sub_8039E9C: ; 8039E9C adds r0, r2, 0 adds r0, 0x28 strb r1, [r0] -@08039EBE: +_08039EBE: pop {r0} bx r0 .pool @@ -88004,10 +88004,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 @@ -88021,8 +88021,8 @@ sub_8039EF0: ; 8039EF0 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @08039F0C -@08039F2A: + bcc _08039F0C +_08039F2A: pop {r4,r5} pop {r0} bx r0 @@ -88053,17 +88053,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 @@ -88102,25 +88102,25 @@ sub_8039F40: ; 8039F40 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] @@ -88131,12 +88131,12 @@ sub_8039F40: ; 8039F40 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] @@ -88146,38 +88146,38 @@ sub_8039F40: ; 8039F40 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 .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] @@ -88216,11 +88216,11 @@ sub_8039F40: ; 8039F40 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 @@ -88271,7 +88271,7 @@ sub_8039F40: ; 8039F40 movs r2, 0 movs r1, 0 adds r6, r5, 0 -@0803A16A: +_0803A16A: ldr r0, [r5] adds r0, r2, r0 adds r0, 0x98 @@ -88306,20 +88306,20 @@ sub_8039F40: ; 8039F40 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 @@ -88333,12 +88333,12 @@ sub_8039F40: ; 8039F40 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 @@ -88407,14 +88407,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 @@ -88422,17 +88422,17 @@ sub_803A284: ; 803A284 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 @@ -88442,41 +88442,41 @@ sub_803A284: ; 803A284 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 @@ -88486,8 +88486,8 @@ sub_803A284: ; 803A284 adds r1, r2 ldrb r0, [r1] cmp r0, 0x7F - bne @0803A414 -@0803A35C: + bne _0803A414 +_0803A35C: mov r3, r9 ldrb r1, [r3] movs r0, 0x58 @@ -88511,10 +88511,10 @@ sub_803A284: ; 803A284 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 @@ -88524,7 +88524,7 @@ sub_803A284: ; 803A284 lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq @0803A3D0 + beq _0803A3D0 ldr r1, =0x020242ac lsls r0, r5, 2 adds r2, r0, r1 @@ -88532,33 +88532,33 @@ sub_803A284: ; 803A284 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 .pool -@0803A414: +_0803A414: mov r0, r9 ldrb r1, [r0] movs r0, 0x58 @@ -88573,7 +88573,7 @@ sub_803A284: ; 803A284 lsls r0, 2 add r0, r10 str r1, [r0] -@0803A430: +_0803A430: movs r5, 0 ldr r3, =0x0202449c mov r8, r3 @@ -88582,11 +88582,11 @@ sub_803A284: ; 803A284 ldr r7, =0x0202406c ldrb r7, [r7] cmp r5, r7 - bge @0803A490 + bge _0803A490 ldr r3, =0x020240d4 ldr r7, =gUnknown_0832A328 ldr r6, =0x02024064 -@0803A448: +_0803A448: movs r0, 0x58 muls r0, r5 adds r4, r0, r3 @@ -88599,33 +88599,33 @@ sub_803A284: ; 803A284 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 @@ -88644,12 +88644,12 @@ sub_803A284: ; 803A284 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 @@ -88659,7 +88659,7 @@ sub_803A284: ; 803A284 adds r1, r0 ldrb r0, [r1] cmp r0, 0x7F - bne @0803A540 + bne _0803A540 mov r2, r9 ldrb r1, [r2] lsls r0, r1, 3 @@ -88715,7 +88715,7 @@ sub_803A284: ; 803A284 mov r1, sp ldrb r1, [r1, 0x14] strb r1, [r0, 0x14] -@0803A540: +_0803A540: movs r0, 0 ldr r6, =0x0202427c strb r0, [r6] @@ -88851,14 +88851,14 @@ sub_803A284: ; 803A284 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] @@ -88871,7 +88871,7 @@ sub_803A284: ; 803A284 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 @@ -88881,7 +88881,7 @@ sub_803A284: ; 803A284 adds r1, r0 adds r1, 0x99 strb r6, [r1] -@0803A68C: +_0803A68C: ldrb r0, [r3] ldr r1, [r7] lsls r0, 1 @@ -88901,8 +88901,8 @@ sub_803A284: ; 803A284 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt @0803A656 -@0803A6B4: + blt _0803A656 +_0803A6B4: mov r1, r9 ldrb r0, [r1] mov r2, r8 @@ -88974,7 +88974,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 @@ -88982,7 +88982,7 @@ sub_803A75C: ; 803A75C strb r1, [r0] adds r5, 0x1 cmp r5, 0x7 - ble @0803A788 + ble _0803A788 ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 @@ -89001,29 +89001,29 @@ sub_803A75C: ; 803A75C ldr r6, =0x0202406c ldrb r6, [r6] cmp r5, r6 - bge @0803A830 + bge _0803A830 adds r3, r2, 0 movs r4, 0 ldr r0, =gUnknown_0832A328 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 @@ -89034,16 +89034,16 @@ sub_803A75C: ; 803A75C 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 @@ -89051,19 +89051,19 @@ sub_803A75C: ; 803A75C 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 @@ -89081,12 +89081,12 @@ sub_803A75C: ; 803A75C 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 @@ -89375,14 +89375,14 @@ sub_803A75C: ; 803A75C 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] @@ -89395,7 +89395,7 @@ sub_803A75C: ; 803A75C lsls r0, 24 ldr r3, [sp] cmp r4, r0 - beq @0803AADA + beq _0803AADA ldr r0, [r7] lsls r1, r5, 1 adds r0, r1, r0 @@ -89405,7 +89405,7 @@ sub_803A75C: ; 803A75C adds r1, r0 adds r1, 0x99 strb r6, [r1] -@0803AADA: +_0803AADA: ldrb r0, [r3] ldr r1, [r7] lsls r0, 1 @@ -89425,8 +89425,8 @@ sub_803A75C: ; 803A75C 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] @@ -89441,9 +89441,9 @@ sub_803A75C: ; 803A75C movs r3, 0x58 adds r2, r0, 0 muls r2, r3 - b @0803AB6C + b _0803AB6C .pool -@0803AB6C: +_0803AB6C: adds r2, r4 ldr r5, =gBaseStats ldrh r1, [r2] @@ -89488,12 +89488,12 @@ bc_8012FAC: ; 803ABC0 ldr r5, =0x02024332 ldrb r0, [r5] cmp r0, 0 - beq @0803ABD4 + beq _0803ABD4 cmp r0, 0x1 - beq @0803ABF8 - b @0803AC2E + beq _0803ABF8 + b _0803AC2E .pool -@0803ABD4: +_0803ABD4: ldr r4, =0x02024064 ldrb r0, [r5, 0x1] strb r0, [r4] @@ -89506,13 +89506,13 @@ bc_8012FAC: ; 803ABC0 ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b @0803AC2E + b _0803AC2E .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] @@ -89521,15 +89521,15 @@ bc_8012FAC: ; 803ABC0 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne @0803AC2C + bne _0803AC2C ldr r1, =0x03005d04 ldr r0, =bc_load_battlefield str r0, [r1] - b @0803AC2E + b _0803AC2E .pool -@0803AC2C: +_0803AC2C: strb r2, [r5] -@0803AC2E: +_0803AC2E: pop {r4,r5} pop {r0} bx r0 @@ -89541,7 +89541,7 @@ bc_load_battlefield: ; 803AC34 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 @@ -89558,7 +89558,7 @@ bc_load_battlefield: ; 803AC34 ldr r0, =0x02024332 strb r5, [r0] strb r5, [r0, 0x1] -@0803AC64: +_0803AC64: pop {r4,r5} pop {r0} bx r0 @@ -89575,17 +89575,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 @@ -89593,34 +89593,34 @@ sub_803AC84: ; 803AC84 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 .pool -@0803ACFC: +_0803ACFC: mov r1, r9 ldrb r0, [r1] muls r0, r7 @@ -89630,7 +89630,7 @@ sub_803AC84: ; 803AC84 ldr r6, =gBaseStats ldr r5, =0x02023864 ldr r4, =0x02024064 -@0803AD0E: +_0803AD0E: adds r0, r3, r2 ldrb r1, [r4] lsls r1, 9 @@ -89641,7 +89641,7 @@ sub_803AC84: ; 803AC84 strb r1, [r0] adds r2, 0x1 cmp r2, 0x57 - bls @0803AD0E + bls _0803AD0E mov r1, r9 ldrb r0, [r1] adds r2, r0, 0 @@ -89707,7 +89707,7 @@ sub_803AC84: ; 803AC84 adds r0, r1 mov r12, r0 movs r3, 0x6 -@0803ADAA: +_0803ADAA: ldrb r0, [r4] muls r0, r5 adds r0, r2, r0 @@ -89715,7 +89715,7 @@ sub_803AC84: ; 803AC84 strb r3, [r0] adds r2, 0x1 cmp r2, 0x7 - ble @0803ADAA + ble _0803ADAA ldrb r0, [r6] adds r1, r0, 0 muls r1, r7 @@ -89724,46 +89724,46 @@ sub_803AC84: ; 803AC84 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 @@ -89777,20 +89777,20 @@ sub_803AC84: ; 803AC84 ldr r2, [r1] movs r1, 0x2 bl SetPokedexFlag - b @0803AEC0 + b _0803AEC0 .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 @@ -89804,7 +89804,7 @@ sub_803AC84: ; 803AC84 ldr r2, [r1] movs r1, 0x2 bl SetPokedexFlag -@0803AE96: +_0803AE96: movs r0, 0 bl dp01_build_cmdbuf_x04_4_4_4 ldrb r0, [r4] @@ -89823,60 +89823,60 @@ sub_803AC84: ; 803AC84 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 @@ -89886,13 +89886,13 @@ sub_803AC84: ; 803AC84 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 str r0, [r1] -@0803AF4E: +_0803AF4E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -89912,23 +89912,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 @@ -89938,21 +89938,21 @@ bc_801333C: ; 803AF80 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 .pool -@0803AFE8: +_0803AFE8: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -89960,13 +89960,13 @@ bc_801333C: ; 803AF80 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 @@ -89980,7 +89980,7 @@ bc_801333C: ; 803AF80 movs r7, 0 mov r6, r8 mov r5, sp -@0803B026: +_0803B026: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -89990,21 +89990,21 @@ bc_801333C: ; 803AF80 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 .pool -@0803B060: +_0803B060: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -90012,13 +90012,13 @@ bc_801333C: ; 803AF80 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 @@ -90031,13 +90031,13 @@ bc_801333C: ; 803AF80 bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x03005d04 ldr r0, =bc_battle_begin_message - b @0803B10A + b _0803B10A .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 @@ -90047,21 +90047,21 @@ bc_801333C: ; 803AF80 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 .pool -@0803B0E8: +_0803B0E8: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -90069,18 +90069,18 @@ bc_801333C: ; 803AF80 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 -@0803B10A: +_0803B10A: str r0, [r1] -@0803B10C: +_0803B10C: add sp, 0x30 pop {r3} mov r8, r3 @@ -90096,7 +90096,7 @@ bc_battle_begin_message: ; 803B120 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 @@ -90107,7 +90107,7 @@ bc_battle_begin_message: ; 803B120 ldr r1, =0x03005d04 ldr r0, =sub_803B180 str r0, [r1] -@0803B142: +_0803B142: pop {r0} bx r0 .pool @@ -90119,14 +90119,14 @@ bc_8013568: ; 803B158 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0803B170 + bne _0803B170 ldr r1, =0x03005d04 ldr r0, =sub_803B3CC str r0, [r1] movs r0, 0 movs r1, 0 bl b_std_message -@0803B170: +_0803B170: pop {r0} bx r0 .pool @@ -90138,30 +90138,30 @@ sub_803B180: ; 803B180 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 .pool -@0803B1B8: +_0803B1B8: movs r0, 0x1 -@0803B1BA: +_0803B1BA: bl battle_get_side_with_given_state adds r1, r0, 0 lsls r1, 24 @@ -90171,7 +90171,7 @@ sub_803B180: ; 803B180 ldr r1, =0x03005d04 ldr r0, =sub_803B25C str r0, [r1] -@0803B1D0: +_0803B1D0: pop {r0} bx r0 .pool @@ -90186,38 +90186,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] @@ -90226,8 +90226,8 @@ sub_803B1DC: ; 803B1DC lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @0803B20E -@0803B23A: + bcc _0803B20E +_0803B23A: ldr r1, =0x03005d04 ldr r0, =bc_801362C str r0, [r1] @@ -90246,47 +90246,47 @@ 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 .pool -@0803B288: +_0803B288: ldr r1, =0x03005d04 ldr r0, =sub_803B1DC - b @0803B2F0 + b _0803B2F0 .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] @@ -90296,8 +90296,8 @@ sub_803B25C: ; 803B25C ldr r1, =0x00008040 ands r0, r1 cmp r0, 0 - bne @0803B288 -@0803B2D8: + bne _0803B288 +_0803B2D8: ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] @@ -90307,13 +90307,13 @@ sub_803B25C: ; 803B25C ldr r4, =0x02024064 ldrb r1, [r1] cmp r0, r1 - bcc @0803B2B2 -@0803B2EC: + bcc _0803B2B2 +_0803B2EC: ldr r1, =0x03005d04 ldr r0, =bc_801362C -@0803B2F0: +_0803B2F0: str r0, [r1] -@0803B2F2: +_0803B2F2: pop {r4-r6} pop {r0} bx r0 @@ -90326,31 +90326,31 @@ bc_801362C: ; 803B314 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 @@ -90364,7 +90364,7 @@ bc_801362C: ; 803B314 ldr r2, [r1] movs r1, 0x2 bl SetPokedexFlag -@0803B36C: +_0803B36C: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -90373,12 +90373,12 @@ bc_801362C: ; 803B314 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @0803B334 -@0803B37E: + bcc _0803B334 +_0803B37E: ldr r1, =0x03005d04 ldr r0, =sub_803B3CC str r0, [r1] -@0803B384: +_0803B384: pop {r4-r7} pop {r0} bx r0 @@ -90391,11 +90391,11 @@ sub_803B3AC: ; 803B3AC ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0803B3BC + bne _0803B3BC ldr r1, =0x03005d04 ldr r0, =sub_803B3CC str r0, [r1] -@0803B3BC: +_0803B3BC: pop {r0} bx r0 .pool @@ -90407,30 +90407,30 @@ sub_803B3CC: ; 803B3CC 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 @@ -90438,11 +90438,11 @@ sub_803B3CC: ; 803B3CC lsrs r1, 24 movs r0, 0x1 bl b_std_message -@0803B412: +_0803B412: ldr r1, =0x03005d04 ldr r0, =sub_803B4C8 str r0, [r1] -@0803B418: +_0803B418: pop {r0} bx r0 .pool @@ -90457,38 +90457,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] @@ -90497,8 +90497,8 @@ sub_803B42C: ; 803B42C lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @0803B45E -@0803B48A: + bcc _0803B45E +_0803B48A: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -90530,44 +90530,44 @@ 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 .pool -@0803B4F0: +_0803B4F0: ldr r1, =0x03005d04 ldr r0, =sub_803B42C - b @0803B572 + b _0803B572 .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] @@ -90577,8 +90577,8 @@ sub_803B4C8: ; 803B4C8 movs r1, 0x40 ands r0, r1 cmp r0, 0 - bne @0803B4F0 -@0803B540: + bne _0803B4F0 +_0803B540: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -90588,8 +90588,8 @@ sub_803B4C8: ; 803B4C8 ldr r4, =0x02024064 ldrb r1, [r1] cmp r0, r1 - bcc @0803B51A -@0803B554: + bcc _0803B51A +_0803B554: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -90605,9 +90605,9 @@ sub_803B4C8: ; 803B4C8 strb r1, [r0] ldr r1, =0x03005d04 ldr r0, =sub_803B628 -@0803B572: +_0803B572: str r0, [r1] -@0803B574: +_0803B574: pop {r4-r6} pop {r0} bx r0 @@ -90620,21 +90620,21 @@ sub_803B598: ; 803B598 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 @@ -90644,7 +90644,7 @@ sub_803B598: ; 803B598 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] @@ -90653,8 +90653,8 @@ sub_803B598: ; 803B598 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @0803B5B2 -@0803B5E6: + bcc _0803B5B2 +_0803B5E6: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -90671,7 +90671,7 @@ sub_803B598: ; 803B598 ldr r1, =0x03005d04 ldr r0, =sub_803B628 str r0, [r1] -@0803B606: +_0803B606: pop {r4,r5} pop {r0} bx r0 @@ -90691,44 +90691,44 @@ 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 .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 @@ -90737,26 +90737,26 @@ sub_803B628: ; 803B628 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 @@ -90764,7 +90764,7 @@ sub_803B628: ; 803B628 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne @0803B6FC + bne _0803B6FC str r0, [sp] movs r0, 0 movs r1, 0 @@ -90773,14 +90773,14 @@ sub_803B628: ; 803B628 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 .pool -@0803B6FC: +_0803B6FC: ldr r2, =0x0202449c ldr r0, [r2] adds r0, 0x4C @@ -90788,10 +90788,10 @@ sub_803B628: ; 803B628 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] @@ -90804,13 +90804,13 @@ sub_803B628: ; 803B628 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] @@ -90818,17 +90818,17 @@ sub_803B628: ; 803B628 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 @@ -90839,9 +90839,9 @@ sub_803B628: ; 803B628 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 @@ -90850,9 +90850,9 @@ sub_803B628: ; 803B628 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 @@ -90860,10 +90860,10 @@ sub_803B628: ; 803B628 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] @@ -90874,13 +90874,13 @@ sub_803B628: ; 803B628 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] @@ -90888,15 +90888,15 @@ sub_803B628: ; 803B628 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 @@ -90905,7 +90905,7 @@ sub_803B628: ; 803B628 ldr r2, =0x02024274 movs r4, 0xFF movs r3, 0 -@0803B7EA: +_0803B7EA: mov r1, r8 ldr r0, [r1] adds r0, r5, r0 @@ -90919,7 +90919,7 @@ sub_803B628: ; 803B628 adds r2, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @0803B7EA + ble _0803B7EA movs r0, 0 bl sub_803D580 bl sub_803D6A0 @@ -90939,11 +90939,11 @@ sub_803B628: ; 803B628 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 @@ -90951,13 +90951,13 @@ sub_803B628: ; 803B628 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] @@ -90965,8 +90965,8 @@ sub_803B628: ; 803B628 adds r5, 0x1 ldrb r0, [r3] cmp r5, r0 - blt @0803B856 -@0803B866: + blt _0803B856 +_0803B866: ldr r0, [r2] movs r1, 0 strb r1, [r0] @@ -90998,11 +90998,11 @@ sub_803B628: ; 803B628 lsls r1, 11 ands r0, r1 cmp r0, 0 - beq @0803B8B2 + beq _0803B8B2 bl sub_80A369C ldr r0, =gUnknown_082DB8BE bl b_call_bc_move_exec -@0803B8B2: +_0803B8B2: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -91020,7 +91020,7 @@ bc_8013B1C: ; 803B904 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0803B994 + bne _0803B994 ldr r1, =0x03005d04 ldr r0, =sub_803B9BC str r0, [r1] @@ -91028,19 +91028,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 @@ -91056,22 +91056,22 @@ bc_8013B1C: ; 803B904 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 @@ -91091,7 +91091,7 @@ bc_8013B1C: ; 803B904 strb r1, [r0, 0x3] ldr r0, =0x0202427c strb r1, [r0] -@0803B994: +_0803B994: pop {r4-r6} pop {r0} bx r0 @@ -91109,26 +91109,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 @@ -91137,9 +91137,9 @@ sub_803B9BC: ; 803B9BC 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 @@ -91164,30 +91164,30 @@ sub_803B9BC: ; 803B9BC 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 str r0, [r1] - b @0803BB78 + b _0803BB78 .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] @@ -91195,7 +91195,7 @@ sub_803B9BC: ; 803B9BC ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@0803BAB2: +_0803BAB2: movs r2, 0 ldr r4, =0x0202406c ldr r0, =0x02024210 @@ -91204,12 +91204,12 @@ sub_803B9BC: ; 803B9BC 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 @@ -91219,19 +91219,19 @@ sub_803B9BC: ; 803B9BC 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 @@ -91253,26 +91253,26 @@ sub_803B9BC: ; 803B9BC lsls r0, 10 ands r0, r1 cmp r0, 0 - beq @0803BB5C + beq _0803BB5C ldr r0, =gUnknown_082DB881 bl b_call_bc_move_exec - b @0803BB78 + b _0803BB78 .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, =gUnknown_082DB8BE bl b_call_bc_move_exec -@0803BB78: +_0803BB78: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -91294,37 +91294,37 @@ 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 .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 @@ -91333,9 +91333,9 @@ sub_803BB88: ; 803BB88 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 @@ -91344,16 +91344,16 @@ sub_803BB88: ; 803BB88 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 @@ -91362,15 +91362,15 @@ sub_803BB88: ; 803BB88 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] @@ -91381,17 +91381,17 @@ sub_803BB88: ; 803BB88 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 @@ -91399,9 +91399,9 @@ sub_803BB88: ; 803BB88 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 @@ -91409,8 +91409,8 @@ sub_803BB88: ; 803BB88 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - blt @0803BC08 -@0803BC86: + blt _0803BC08 +_0803BC86: ldr r4, =0x02024064 ldrb r1, [r4] movs r0, 0 @@ -91422,7 +91422,7 @@ sub_803BB88: ; 803BB88 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq @0803BCF8 + beq _0803BCF8 ldr r6, =0x02024084 ldrb r0, [r4] movs r3, 0x58 @@ -91432,13 +91432,13 @@ sub_803BB88: ; 803BB88 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] @@ -91451,9 +91451,9 @@ sub_803BB88: ; 803BB88 strb r0, [r2] ldr r1, =0x02024332 movs r0, 0x2 - b @0803BD90 + b _0803BD90 .pool -@0803BCF8: +_0803BCF8: ldr r1, =0x02024084 ldr r0, =0x02024064 ldrb r2, [r0] @@ -91465,7 +91465,7 @@ sub_803BB88: ; 803BB88 ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 - bne @0803BD22 + bne _0803BD22 ldr r1, =0x020242ac lsls r0, r2, 2 adds r0, r1 @@ -91474,26 +91474,26 @@ sub_803BB88: ; 803BB88 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 .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 .pool -@0803BD54: +_0803BD54: ldr r0, =0x02024474 strb r5, [r0, 0x17] ldr r1, =0x0202420a @@ -91501,9 +91501,9 @@ sub_803BB88: ; 803BB88 strb r0, [r1] ldr r1, =0x02024332 movs r0, 0x2 - b @0803BD90 + b _0803BD90 .pool -@0803BD70: +_0803BD70: ldr r0, =0x02024474 strb r5, [r0, 0x17] ldr r1, =0x0202420a @@ -91511,14 +91511,14 @@ sub_803BB88: ; 803BB88 strb r0, [r1] ldr r1, =0x02024332 movs r0, 0x2 - b @0803BD90 + b _0803BD90 .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} @@ -91542,7 +91542,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] @@ -91553,7 +91553,7 @@ sub_803BDA0: ; 803BDA0 strb r0, [r2] adds r3, 0x1 cmp r3, 0x2 - ble @0803BDBC + ble _0803BDBC mov r1, r8 adds r0, r6, r1 ldrb r0, [r0] @@ -91577,7 +91577,7 @@ sub_803BDA0: ; 803BDA0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @0803BE4C + beq _0803BE4C movs r3, 0 adds r4, r7, 0 adds r6, r5 @@ -91587,7 +91587,7 @@ sub_803BDA0: ; 803BDA0 ldr r7, =0x0203cf00 lsls r0, r1, 1 adds r5, r0, r1 -@0803BE1A: +_0803BE1A: ldr r0, [r4] adds r1, r6, r3 adds r1, r0 @@ -91603,14 +91603,14 @@ sub_803BDA0: ; 803BDA0 strb r1, [r0] adds r3, 0x1 cmp r3, 0x2 - ble @0803BE1A - b @0803BE66 + ble _0803BE1A + b _0803BE66 .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 @@ -91620,8 +91620,8 @@ sub_803BDA0: ; 803BDA0 strb r0, [r1] adds r3, 0x1 cmp r3, 0x2 - ble @0803BE52 -@0803BE66: + ble _0803BE52 +_0803BE66: pop {r3} mov r8, r3 pop {r4-r7} @@ -91644,9 +91644,9 @@ sub_803BE74: ; 803BE74 ldr r0, =0x02024064 strb r1, [r0] ldr r0, =0x0202406c - bl @0803CD12 + bl _0803CD12 .pool -@0803BE9C: +_0803BE9C: ldr r4, =0x02024064 ldrb r0, [r4] bl battle_get_per_side_status @@ -91657,35 +91657,35 @@ sub_803BE74: ; 803BE74 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 .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 .pool -@0803BF0C: +_0803BF0C: ldr r0, =0x02024064 ldrb r1, [r0] ldr r4, =0x0202449c @@ -91699,12 +91699,12 @@ sub_803BE74: ; 803BE74 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 @@ -91718,7 +91718,7 @@ sub_803BE74: ; 803BE74 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 @@ -91727,9 +91727,9 @@ sub_803BE74: ; 803BE74 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 @@ -91742,7 +91742,7 @@ sub_803BE74: ; 803BE74 ldr r0, [r0] ands r3, r0 cmp r3, 0 - beq @0803BFD0 + beq _0803BFD0 ldr r0, =0x0202421c adds r0, r2, r0 movs r1, 0xD @@ -91752,23 +91752,23 @@ sub_803BE74: ; 803BE74 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 .pool -@0803BFBC: +_0803BFBC: ldr r0, =0x02024332 ldrb r1, [r4] adds r1, r0 movs r0, 0x4 strb r0, [r1] - bl @0803CD04 + bl _0803CD04 .pool -@0803BFD0: +_0803BFD0: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -91779,21 +91779,21 @@ sub_803BE74: ; 803BE74 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 .pool -@0803C00C: +_0803C00C: ldr r0, =0x0202421c ldrb r1, [r0] ldr r0, =0x02023864 @@ -91803,9 +91803,9 @@ sub_803BE74: ; 803BE74 orrs r2, r0 movs r0, 0 bl dp01_build_cmdbuf_x12_a_bb - bl @0803CB68 + bl _0803CB68 .pool -@0803C02C: +_0803C02C: ldr r3, =0x02024068 ldr r1, =gUnknown_0832A328 ldr r6, =0x02024064 @@ -91825,9 +91825,9 @@ sub_803BE74: ; 803BE74 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 @@ -91847,35 +91847,35 @@ sub_803BE74: ; 803BE74 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 .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] @@ -91904,9 +91904,9 @@ sub_803BE74: ; 803BE74 adds r1, r0 ldrb r0, [r1] strb r0, [r2, 0xC] - bl @0803CD70 + bl _0803CD70 .pool -@0803C134: +_0803C134: ldr r3, =0x020242bc ldr r5, =0x02024064 ldrb r4, [r5] @@ -91916,7 +91916,7 @@ sub_803BE74: ; 803BE74 adds r0, r3 ldrh r2, [r0, 0x6] cmp r2, 0 - beq @0803C188 + beq _0803C188 ldr r1, =0x02024274 lsls r0, r4, 1 adds r0, r1 @@ -91937,9 +91937,9 @@ sub_803BE74: ; 803BE74 adds r0, r1 movs r1, 0x4 strb r1, [r0] - bl @0803CD70 + bl _0803CD70 .pool -@0803C188: +_0803C188: add r2, sp, 0x4 ldr r3, =0x02024084 movs r1, 0x58 @@ -91973,7 +91973,7 @@ sub_803BE74: ; 803BE74 add r0, r8 mov r9, r0 add r5, sp, 0x4 -@0803C1CA: +_0803C1CA: lsls r2, r4, 1 ldrb r0, [r7] muls r0, r6 @@ -92009,7 +92009,7 @@ sub_803BE74: ; 803BE74 adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble @0803C1CA + ble _0803C1CA ldr r0, =0x02022fec ldr r1, [r0] movs r0, 0x1 @@ -92018,17 +92018,17 @@ sub_803BE74: ; 803BE74 movs r2, 0 add r3, sp, 0x4 bl sub_8033E30 - b @0803C42E + b _0803C42E .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 @@ -92038,9 +92038,9 @@ sub_803BE74: ; 803BE74 lsls r0, 2 adds r0, r1 ldr r1, =gUnknown_082DB879 - b @0803C784 + b _0803C784 .pool -@0803C268: +_0803C268: ldr r5, =0x02024064 ldrb r0, [r5] ldr r3, =0x0202449c @@ -92064,14 +92064,14 @@ sub_803BE74: ; 803BE74 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 @@ -92080,8 +92080,8 @@ sub_803BE74: ; 803BE74 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 @@ -92093,9 +92093,9 @@ sub_803BE74: ; 803BE74 movs r0, 0 movs r1, 0x2 movs r2, 0x6 - b @0803C400 + b _0803C400 .pool -@0803C2EC: +_0803C2EC: str r1, [sp] movs r0, 0xC adds r1, r2, 0 @@ -92105,7 +92105,7 @@ sub_803BE74: ; 803BE74 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @0803C374 + bne _0803C374 ldrb r1, [r5] str r4, [sp] movs r0, 0xC @@ -92115,7 +92115,7 @@ sub_803BE74: ; 803BE74 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq @0803C33C + beq _0803C33C ldrb r0, [r5] muls r0, r6 adds r1, r0, r7 @@ -92123,18 +92123,18 @@ sub_803BE74: ; 803BE74 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 @@ -92146,7 +92146,7 @@ sub_803BE74: ; 803BE74 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq @0803C3B0 + beq _0803C3B0 ldr r2, =0x02024084 ldrb r1, [r5] movs r0, 0x58 @@ -92156,13 +92156,13 @@ sub_803BE74: ; 803BE74 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 @@ -92183,37 +92183,37 @@ sub_803BE74: ; 803BE74 movs r0, 0 movs r2, 0x6 bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f - b @0803C42E + b _0803C42E .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 .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 @@ -92223,12 +92223,12 @@ sub_803BE74: ; 803BE74 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 .pool -@0803C410: +_0803C410: ldr r2, =0x0202449c ldr r0, =0x02024064 ldrb r0, [r0] @@ -92243,19 +92243,19 @@ sub_803BE74: ; 803BE74 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 .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] @@ -92276,9 +92276,9 @@ sub_803BE74: ; 803BE74 adds r1, 0x54 strb r4, [r1] ldrb r1, [r3] - b @0803C7A0 + b _0803C7A0 .pool -@0803C48C: +_0803C48C: ldr r2, =0x0202449c ldr r4, =0x02024064 ldrb r1, [r4] @@ -92291,9 +92291,9 @@ sub_803BE74: ; 803BE74 bl sub_8033E6C ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0803C6C4 + b _0803C6C4 .pool -@0803C4B4: +_0803C4B4: ldr r4, =0x02024332 ldr r5, =0x02024064 ldrb r0, [r5] @@ -92333,7 +92333,7 @@ sub_803BE74: ; 803BE74 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 @@ -92349,15 +92349,15 @@ sub_803BE74: ; 803BE74 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 .pool -@0803C550: +_0803C550: ldr r4, =0x0202421c ldrb r0, [r5] bl battle_get_per_side_status @@ -92370,7 +92370,7 @@ sub_803BE74: ; 803BE74 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 @@ -92381,9 +92381,9 @@ sub_803BE74: ; 803BE74 lsrs r0, 24 movs r1, 0x2 bl sub_8185008 - b @0803C6AE + b _0803C6AE .pool -@0803C590: +_0803C590: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r6 @@ -92395,12 +92395,12 @@ sub_803BE74: ; 803BE74 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 @@ -92412,7 +92412,7 @@ sub_803BE74: ; 803BE74 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 @@ -92426,7 +92426,7 @@ sub_803BE74: ; 803BE74 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 @@ -92442,21 +92442,21 @@ sub_803BE74: ; 803BE74 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 .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] @@ -92471,7 +92471,7 @@ sub_803BE74: ; 803BE74 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne @0803C690 + bne _0803C690 ldr r1, =0x03005d80 ldr r0, =0x0203bd30 ldr r0, [r0] @@ -92479,7 +92479,7 @@ sub_803BE74: ; 803BE74 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 @@ -92487,9 +92487,9 @@ sub_803BE74: ; 803BE74 lsrs r0, 24 movs r1, 0x1 bl sub_8185008 - b @0803C6AE + b _0803C6AE .pool -@0803C690: +_0803C690: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -92502,15 +92502,15 @@ sub_803BE74: ; 803BE74 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 .pool -@0803C6C4: +_0803C6C4: ldr r1, =0x02022fec ldr r2, [r1] movs r5, 0x8 @@ -92518,11 +92518,11 @@ sub_803BE74: ; 803BE74 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] @@ -92531,7 +92531,7 @@ sub_803BE74: ; 803BE74 adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 - bne @0803C720 + bne _0803C720 ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 @@ -92542,14 +92542,14 @@ sub_803BE74: ; 803BE74 adds r0, r1 movs r3, 0 strb r5, [r0] - b @0803C792 + b _0803C792 .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] @@ -92558,19 +92558,19 @@ sub_803BE74: ; 803BE74 adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 - bne @0803C760 + bne _0803C760 ldr r0, =gUnknown_082DAAFE bl b_call_bc_move_exec ldr r1, =0x02024332 ldrb r0, [r4] adds r0, r1 - b @0803CC20 + b _0803CC20 .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] @@ -92579,12 +92579,12 @@ sub_803BE74: ; 803BE74 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, =gUnknown_082DAB0B -@0803C784: +_0803C784: str r1, [r0] ldr r0, =0x02024332 ldrb r1, [r4] @@ -92592,7 +92592,7 @@ sub_803BE74: ; 803BE74 movs r3, 0 movs r0, 0x6 strb r0, [r1] -@0803C792: +_0803C792: ldrb r1, [r4] ldr r2, =0x0202449c ldr r0, [r2] @@ -92600,22 +92600,22 @@ sub_803BE74: ; 803BE74 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 .pool -@0803C7C4: +_0803C7C4: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b @0803CB74 + b _0803CB74 .pool -@0803C7D8: +_0803C7D8: ldr r4, =0x02024068 ldr r1, =gUnknown_0832A328 ldr r3, =0x02024064 @@ -92636,36 +92636,36 @@ sub_803BE74: ; 803BE74 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 .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 @@ -92673,24 +92673,24 @@ sub_803BE74: ; 803BE74 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 .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 @@ -92707,20 +92707,20 @@ sub_803BE74: ; 803BE74 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 .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 @@ -92747,16 +92747,16 @@ sub_803BE74: ; 803BE74 adds r1, 0x84 movs r0, 0x2 strb r0, [r1] - b @0803CD70 + b _0803CD70 .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 @@ -92767,7 +92767,7 @@ sub_803BE74: ; 803BE74 adds r1, r7 ldrb r1, [r1] bl sub_8184FBC -@0803C942: +_0803C942: ldrb r0, [r6] ldr r4, =0x0202449c ldr r1, [r4] @@ -92802,9 +92802,9 @@ sub_803BE74: ; 803BE74 strb r0, [r4, 0xC] ldr r0, =0x02024332 ldrb r1, [r6] - b @0803CB72 + b _0803CB72 .pool -@0803C99C: +_0803C99C: ldr r2, =0x02023864 ldr r5, =0x02024064 ldrb r4, [r5] @@ -92818,16 +92818,16 @@ sub_803BE74: ; 803BE74 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 .pool -@0803C9D4: +_0803C9D4: ldr r0, =0x02023864 ldr r4, =0x02024064 ldrb r2, [r4] @@ -92836,19 +92836,19 @@ sub_803BE74: ; 803BE74 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 .pool -@0803CA04: +_0803CA04: bl sub_803CDF8 - b @0803CB6E -@0803CA0A: + b _0803CB6E +_0803CA0A: ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 @@ -92859,23 +92859,23 @@ sub_803BE74: ; 803BE74 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b @0803CB74 + b _0803CB74 .pool -@0803CA2C: +_0803CA2C: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b @0803CB74 + b _0803CB74 .pool -@0803CA40: +_0803CA40: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b @0803CB74 + b _0803CB74 .pool -@0803CA54: +_0803CA54: ldr r3, =0x02023864 ldr r0, =0x02024064 ldrb r4, [r0] @@ -92889,21 +92889,21 @@ sub_803BE74: ; 803BE74 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 .pool -@0803CA84: +_0803CA84: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b @0803CB74 + b _0803CB74 .pool -@0803CA98: +_0803CA98: ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 @@ -92914,16 +92914,16 @@ sub_803BE74: ; 803BE74 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b @0803CB74 + b _0803CB74 .pool -@0803CABC: +_0803CABC: ldr r2, =0x02024332 ldr r0, =0x02024064 ldrb r1, [r0] adds r1, r2 - b @0803CB74 + b _0803CB74 .pool -@0803CAD0: +_0803CAD0: ldr r3, =0x02024068 ldr r6, =gUnknown_0832A328 ldr r0, =0x02024064 @@ -92943,9 +92943,9 @@ sub_803BE74: ; 803BE74 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 @@ -92957,12 +92957,12 @@ sub_803BE74: ; 803BE74 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 @@ -92976,36 +92976,36 @@ sub_803BE74: ; 803BE74 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 .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 .pool -@0803CB84: +_0803CB84: ldr r3, =0x02024068 ldr r1, =gUnknown_0832A328 ldr r0, =0x02024064 @@ -93025,16 +93025,16 @@ sub_803BE74: ; 803BE74 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 .pool -@0803CBC8: +_0803CBC8: ldr r5, =0x02024064 ldrb r2, [r5] ldr r0, =0x0202449c @@ -93044,15 +93044,15 @@ sub_803BE74: ; 803BE74 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 .pool -@0803CBF4: +_0803CBF4: ldr r3, =0x02024068 ldr r1, =gUnknown_0832A328 ldr r0, =0x02024064 @@ -93072,16 +93072,16 @@ sub_803BE74: ; 803BE74 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 .pool -@0803CC38: +_0803CC38: ldr r5, =0x02024064 ldrb r2, [r5] ldr r4, =0x0202449c @@ -93090,14 +93090,14 @@ sub_803BE74: ; 803BE74 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 @@ -93111,13 +93111,13 @@ sub_803BE74: ; 803BE74 strb r1, [r0] ldr r1, =0x02024332 ldrb r0, [r5] -@0803CC72: +_0803CC72: adds r0, r1 movs r1, 0x4 strb r1, [r0] - b @0803CD04 + b _0803CD04 .pool -@0803CC94: +_0803CC94: adds r0, r2, 0 movs r1, 0x1 bl sub_8185008 @@ -93129,9 +93129,9 @@ sub_803BE74: ; 803BE74 adds r0, 0x84 ldrb r0, [r0] strb r0, [r2] - b @0803CD04 + b _0803CD04 .pool -@0803CCB4: +_0803CCB4: ldr r0, =0x0202420b strb r2, [r0] ldr r7, =0x02024214 @@ -93159,20 +93159,20 @@ sub_803BE74: ; 803BE74 ldr r0, [r3] ands r0, r1 cmp r0, 0 - bne @0803CCFA + bne _0803CCFA ldr r0, =gUnknown_0831BD10 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 @@ -93180,18 +93180,18 @@ sub_803BE74: ; 803BE74 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 @@ -93203,17 +93203,17 @@ sub_803BE74: ; 803BE74 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 @@ -93222,13 +93222,13 @@ sub_803BE74: ; 803BE74 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 @@ -93249,29 +93249,29 @@ 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 .pool -@0803CDF0: +_0803CDF0: movs r0, 0x1 -@0803CDF2: +_0803CDF2: pop {r4,r5} pop {r1} bx r1 @@ -93302,7 +93302,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 @@ -93381,7 +93381,7 @@ sub_803CDF8: ; 803CDF8 add r0, r12 ldrb r0, [r0] strb r0, [r1] -@0803CEC6: +_0803CEC6: pop {r4-r7} pop {r0} bx r0 @@ -93442,7 +93442,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 @@ -93452,7 +93452,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 @@ -93462,29 +93462,29 @@ 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 .pool -@0803CF98: +_0803CF98: movs r3, 0x1 -@0803CF9A: +_0803CF9A: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -93494,31 +93494,31 @@ b_first_side: ; 803CF10 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 .pool -@0803CFD8: +_0803CFD8: movs r3, 0x1 -@0803CFDA: +_0803CFDA: movs r7, 0x1 -@0803CFDC: +_0803CFDC: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 @@ -93541,7 +93541,7 @@ b_first_side: ; 803CF10 mov r8, r0 ldrh r0, [r4, 0x2E] cmp r0, 0xAF - bne @0803D02C + bne _0803D02C ldr r1, =0x02024404 mov r3, r9 lsls r0, r3, 3 @@ -93550,9 +93550,9 @@ b_first_side: ; 803CF10 adds r0, r1 ldrb r6, [r0, 0x7] ldrb r5, [r0, 0x1A] - b @0803D040 + b _0803D040 .pool -@0803D02C: +_0803D02C: ldrh r0, [r4, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -93561,23 +93561,23 @@ b_first_side: ; 803CF10 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 FlagGet 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 @@ -93585,13 +93585,13 @@ b_first_side: ; 803CF10 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 @@ -93603,13 +93603,13 @@ b_first_side: ; 803CF10 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 @@ -93617,11 +93617,11 @@ b_first_side: ; 803CF10 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 @@ -93645,7 +93645,7 @@ b_first_side: ; 803CF10 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 @@ -93654,9 +93654,9 @@ b_first_side: ; 803CF10 adds r0, r1 ldrb r6, [r0, 0x7] ldrb r5, [r0, 0x1A] - b @0803D12C + b _0803D12C .pool -@0803D118: +_0803D118: ldrh r0, [r4, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -93665,33 +93665,33 @@ b_first_side: ; 803CF10 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 FlagGet 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 @@ -93704,11 +93704,11 @@ b_first_side: ; 803CF10 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 @@ -93716,35 +93716,35 @@ b_first_side: ; 803CF10 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 .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 .pool -@0803D1E0: +_0803D1E0: ldr r0, =0x0202449c ldr r0, [r0] add r0, r9 @@ -93760,27 +93760,27 @@ b_first_side: ; 803CF10 adds r1, 0xC adds r0, r1 ldrh r3, [r0] - b @0803D20A + b _0803D20A .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 .pool -@0803D22C: +_0803D22C: ldr r0, =0x0202449c ldr r0, [r0] add r0, r10 @@ -93796,11 +93796,11 @@ b_first_side: ; 803CF10 adds r1, 0xC adds r0, r1 ldrh r2, [r0] - b @0803D256 + b _0803D256 .pool -@0803D254: +_0803D254: movs r2, 0 -@0803D256: +_0803D256: ldr r4, =gBattleMoves lsls r0, r3, 1 adds r0, r3 @@ -93810,7 +93810,7 @@ b_first_side: ; 803CF10 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 @@ -93818,8 +93818,8 @@ b_first_side: ; 803CF10 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 @@ -93827,47 +93827,47 @@ b_first_side: ; 803CF10 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 .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} @@ -93892,21 +93892,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 @@ -93923,14 +93923,14 @@ sub_803D2E8: ; 803D2E8 lsrs r0, 24 ldrb r1, [r4] cmp r0, r1 - bcc @0803D318 - b @0803D54A + bcc _0803D318 + b _0803D54A .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 @@ -93938,13 +93938,13 @@ sub_803D2E8: ; 803D2E8 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 @@ -93954,34 +93954,34 @@ sub_803D2E8: ; 803D2E8 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 .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 @@ -94005,16 +94005,16 @@ sub_803D2E8: ; 803D2E8 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] @@ -94022,32 +94022,32 @@ sub_803D2E8: ; 803D2E8 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 .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] @@ -94055,7 +94055,7 @@ sub_803D2E8: ; 803D2E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi @0803D47C + bhi _0803D47C adds r0, r3, r5 strb r1, [r0] adds r1, r3, r4 @@ -94063,7 +94063,7 @@ sub_803D2E8: ; 803D2E8 ldrb r0, [r7] strb r0, [r1] adds r3, 0x1 -@0803D47C: +_0803D47C: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] @@ -94072,19 +94072,19 @@ sub_803D2E8: ; 803D2E8 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] @@ -94092,7 +94092,7 @@ sub_803D2E8: ; 803D2E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls @0803D4C0 + bls _0803D4C0 adds r0, r3, r5 strb r1, [r0] adds r1, r3, r4 @@ -94100,7 +94100,7 @@ sub_803D2E8: ; 803D2E8 ldrb r0, [r7] strb r0, [r1] adds r3, 0x1 -@0803D4C0: +_0803D4C0: ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] @@ -94109,21 +94109,21 @@ sub_803D2E8: ; 803D2E8 ldr r1, =0x0202406c ldrb r1, [r1] cmp r0, r1 - bcc @0803D4A2 -@0803D4D2: + bcc _0803D4A2 +_0803D4D2: movs r5, 0 - b @0803D540 + b _0803D540 .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] @@ -94132,47 +94132,47 @@ sub_803D2E8: ; 803D2E8 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 str r0, [r1] ldr r0, =0x0202449c ldr r0, [r0] -@0803D554: +_0803D554: adds r0, 0x48 movs r1, 0 strb r1, [r0] @@ -94203,7 +94203,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 @@ -94211,10 +94211,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 @@ -94231,21 +94231,21 @@ sub_803D580: ; 803D580 negs r0, r0 ands r0, r2 strb r0, [r1] - b @0803D648 + b _0803D648 .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 @@ -94253,10 +94253,10 @@ sub_803D580: ; 803D580 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 @@ -94264,7 +94264,7 @@ sub_803D580: ; 803D580 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] @@ -94274,7 +94274,7 @@ sub_803D580: ; 803D580 adds r0, r4 ldrb r0, [r0, 0x19] cmp r0, 0 - bne @0803D648 + bne _0803D648 movs r0, 0x58 muls r2, r0 add r2, r12 @@ -94282,7 +94282,7 @@ sub_803D580: ; 803D580 ldr r1, =0xffbfffff ands r0, r1 str r0, [r2] -@0803D648: +_0803D648: ldrb r2, [r5] lsls r0, r2, 3 subs r0, r2 @@ -94290,7 +94290,7 @@ sub_803D580: ; 803D580 add r0, r8 ldrb r0, [r0, 0xA] cmp r0, 0 - bne @0803D666 + bne _0803D666 movs r0, 0x58 muls r2, r0 add r2, r12 @@ -94298,7 +94298,7 @@ sub_803D580: ; 803D580 ldr r1, =0xfeffffff ands r0, r1 str r0, [r2] -@0803D666: +_0803D666: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -94307,8 +94307,8 @@ sub_803D580: ; 803D580 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] @@ -94333,23 +94333,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] @@ -94357,8 +94357,8 @@ sub_803D6A0: ; 803D6A0 lsrs r0, 24 ldrb r1, [r6] cmp r0, r1 - bcc @0803D6B8 -@0803D6DE: + bcc _0803D6B8 +_0803D6DE: pop {r4-r6} pop {r0} bx r0 @@ -94374,7 +94374,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 @@ -94384,12 +94384,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] @@ -94404,7 +94404,7 @@ bc_80154A0: ; 803D6F0 adds r0, r1 ldrh r0, [r0] cmp r0, r7 - bne @0803D7A0 + bne _0803D7A0 ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 @@ -94414,7 +94414,7 @@ bc_80154A0: ; 803D6F0 movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne @0803D7A0 + bne _0803D7A0 ldr r2, =0x020242bc ldrb r1, [r4] lsls r0, r1, 3 @@ -94424,27 +94424,27 @@ bc_80154A0: ; 803D6F0 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, =gUnknown_082DB1FF bl b_call_bc_move_exec - b @0803D7E8 + b _0803D7E8 .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 @@ -94473,7 +94473,7 @@ bc_80154A0: ; 803D6F0 ldr r0, [r0, 0x8] adds r0, 0x20 strb r2, [r0] -@0803D7E8: +_0803D7E8: pop {r4-r7} pop {r0} bx r0 @@ -94487,10 +94487,10 @@ bc_bs_exec: ; 803D818 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 @@ -94507,7 +94507,7 @@ bc_bs_exec: ; 803D818 ldrb r1, [r4] ldrb r0, [r0] cmp r1, r0 - bcc @0803D894 + bcc _0803D894 ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xffefffff @@ -94522,14 +94522,14 @@ bc_bs_exec: ; 803D818 adds r0, r2 ldr r0, [r0] str r0, [r3] - b @0803D8AC + b _0803D8AC .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 @@ -94537,7 +94537,7 @@ bc_bs_exec: ; 803D818 ldr r1, =0xfff7ffff ands r0, r1 str r0, [r2] -@0803D8AC: +_0803D8AC: pop {r4-r6} pop {r0} bx r0 @@ -94555,7 +94555,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] @@ -94574,17 +94574,17 @@ sub_803D8C0: ; 803D8C0 movs r0, 0x7F ands r0, r1 strb r0, [r4] - b @0803DAA4 + b _0803DAA4 .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, =gUnknown_082DAA87 @@ -94593,19 +94593,19 @@ sub_803D8C0: ; 803D8C0 ldrh r1, [r0] ldr r0, =0x000003fe cmp r1, r0 - bne @0803D946 - b @0803DA8A -@0803D946: - b @0803DA94 + bne _0803D946 + b _0803DA8A +_0803D946: + b _0803DA94 .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, =gUnknown_082DA92D @@ -94620,93 +94620,93 @@ sub_803D8C0: ; 803D8C0 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 .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 .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, =gUnknown_082DA96A str r0, [r1] -@0803DAA4: +_0803DAA4: ldr r1, =0x03005d04 ldr r0, =sub_803DCD8 str r0, [r1] @@ -94727,17 +94727,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, =gUnknown_082DB9C8 str r0, [r1] @@ -94752,18 +94752,18 @@ sub_803DAC0: ; 803DAC0 movs r2, 0x8 orrs r0, r2 strb r0, [r1] - b @0803DB82 + b _0803DB82 .pool -@0803DB2C: +_0803DB2C: ldr r1, =0x02024214 ldr r0, =gUnknown_082DAA0B str r0, [r1] movs r0, 0x7F ands r0, r2 strb r0, [r3] - b @0803DB82 + b _0803DB82 .pool -@0803DB44: +_0803DB44: ldr r1, =0x02022f58 ldr r4, =0x0202433a ldrb r0, [r4] @@ -94779,13 +94779,13 @@ sub_803DAC0: ; 803DAC0 movs r0, 0x7F ands r0, r1 strb r0, [r4] - b @0803DB82 + b _0803DB82 .pool -@0803DB7C: +_0803DB7C: ldr r1, =0x02024214 ldr r0, =gUnknown_082DA96D str r0, [r1] -@0803DB82: +_0803DB82: ldr r1, =0x03005d04 ldr r0, =sub_803DCD8 str r0, [r1] @@ -94806,11 +94806,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, =gUnknown_082DB9C1 str r0, [r1] @@ -94825,24 +94825,24 @@ sub_803DBA0: ; 803DBA0 movs r2, 0x8 orrs r0, r2 strb r0, [r1] - b @0803DC6A + b _0803DC6A .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, =gUnknown_082DB9C1 str r0, [r1] ldr r1, =0x0202433a movs r0, 0x9 strb r0, [r1] - b @0803DC6A + b _0803DC6A .pool -@0803DC24: +_0803DC24: ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -94852,24 +94852,24 @@ sub_803DBA0: ; 803DBA0 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, =gUnknown_082DAAF0 - b @0803DC68 + b _0803DC68 .pool -@0803DC54: +_0803DC54: ldr r1, =0x02024214 ldr r0, =gUnknown_082DAADB - b @0803DC68 + b _0803DC68 .pool -@0803DC64: +_0803DC64: ldr r1, =0x02024214 ldr r0, =gUnknown_082DAAE9 -@0803DC68: +_0803DC68: str r0, [r1] -@0803DC6A: +_0803DC6A: ldr r1, =0x03005d04 ldr r0, =sub_803DCD8 str r0, [r1] @@ -94920,36 +94920,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 @@ -94970,9 +94970,9 @@ sub_803DCD8: ; 803DCD8 adds r2, r4, 0 adds r2, 0x8 bl pokemon_getattr - b @0803DDA0 + b _0803DDA0 .pool -@0803DD74: +_0803DD74: ldrb r0, [r5] lsls r0, 1 add r0, r8 @@ -94993,7 +94993,7 @@ sub_803DCD8: ; 803DCD8 adds r2, r4, 0 adds r2, 0x14 bl pokemon_getattr -@0803DDA0: +_0803DDA0: ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -95002,24 +95002,24 @@ sub_803DCD8: ; 803DCD8 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 @@ -95031,13 +95031,13 @@ sub_803DCD8: ; 803DCD8 ldr r1, =0x030061e8 ldr r0, =sub_8038420 str r0, [r1] - b @0803DE2A + b _0803DE2A .pool -@0803DE10: +_0803DE10: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0803DE2A + bne _0803DE2A ldr r1, =gUnknown_0831BD10 ldr r0, =0x02024214 ldr r0, [r0] @@ -95046,7 +95046,7 @@ sub_803DCD8: ; 803DCD8 adds r0, r1 ldr r0, [r0] bl _call_via_r0 -@0803DE2A: +_0803DE2A: pop {r3} mov r8, r3 pop {r4-r7} @@ -95063,38 +95063,38 @@ sub_803DE40: ; 803DE40 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0803DE86 + bne _0803DE86 bl ResetAllObjectData 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 str r0, [r1] - b @0803DEA2 + b _0803DEA2 .pool -@0803DE80: +_0803DE80: ldr r1, =0x03005d04 ldr r0, =bc_evolution_cutscene str r0, [r1] -@0803DE86: +_0803DE86: bl FreeAllWindowBuffers 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 .pool @@ -95107,10 +95107,10 @@ bc_evolution_cutscene: ; 803DEB4 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, =gUnknown_0832A328 lsls r1, r6, 2 @@ -95119,7 +95119,7 @@ bc_evolution_cutscene: ; 803DEB4 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq @0803DF20 + beq _0803DF20 bics r2, r1 strb r2, [r3] movs r0, 0x64 @@ -95133,7 +95133,7 @@ bc_evolution_cutscene: ; 803DEB4 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @0803DF20 + beq _0803DF20 bl FreeAllWindowBuffers ldr r0, =0x03005d04 ldr r1, =sub_803DF48 @@ -95144,21 +95144,21 @@ bc_evolution_cutscene: ; 803DEB4 adds r1, r4, 0 movs r2, 0x1 bl evolution_cutscene - b @0803DF34 + b _0803DF34 .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 str r0, [r1] -@0803DF34: +_0803DF34: pop {r4-r6} pop {r0} bx r0 @@ -95172,11 +95172,11 @@ sub_803DF48: ; 803DF48 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 cmp r1, r0 - bne @0803DF5A + bne _0803DF5A ldr r1, =0x03005d04 ldr r0, =bc_evolution_cutscene str r0, [r1] -@0803DF5A: +_0803DF5A: pop {r0} bx r0 .pool @@ -95190,23 +95190,23 @@ c4_overworld: ; 803DF70 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 sub_806DEC4 -@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] @@ -95226,25 +95226,25 @@ c4_overworld: ; 803DF70 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 SetMainCallback2 -@0803DFEC: +_0803DFEC: pop {r4-r6} pop {r0} bx r0 @@ -95260,7 +95260,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] @@ -95268,10 +95268,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] @@ -95282,13 +95282,13 @@ bc_move_exec_returning: ; 803E018 adds r1, r0 ldr r0, [r1] str r0, [r2] - b @0803E07A + b _0803E07A .pool -@0803E060: +_0803E060: ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0803E07A + bne _0803E07A ldr r1, =gUnknown_0831BD10 ldr r0, =0x02024214 ldr r0, [r0] @@ -95297,7 +95297,7 @@ bc_move_exec_returning: ; 803E018 adds r0, r1 ldr r0, [r0] bl _call_via_r0 -@0803E07A: +_0803E07A: pop {r0} bx r0 .pool @@ -95309,7 +95309,7 @@ sub_803E08C: ; 803E08C ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0803E0A8 + bne _0803E0A8 ldr r1, =gUnknown_0831BD10 ldr r0, =0x02024214 ldr r0, [r0] @@ -95318,7 +95318,7 @@ sub_803E08C: ; 803E08C adds r0, r1 ldr r0, [r0] bl _call_via_r0 -@0803E0A8: +_0803E0A8: pop {r0} bx r0 .pool @@ -95353,12 +95353,12 @@ 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 .pool -@0803E110: +_0803E110: ldr r1, =0x02024211 movs r0, 0x1 strb r0, [r1] @@ -95394,7 +95394,7 @@ sub_803E0B8: ; 803E0B8 lsls r0, r1, 29 mov r8, r2 cmp r0, 0 - bge @0803E1BC + bge _0803E1BC movs r0, 0x5 negs r0, r0 ands r0, r1 @@ -95416,9 +95416,9 @@ sub_803E0B8: ; 803E0B8 ldrb r1, [r6] ldr r3, =0x0202449c ldr r2, [r3] - b @0803E316 + b _0803E316 .pool -@0803E1BC: +_0803E1BC: ldr r5, =0x02024084 mov r10, r5 movs r0, 0x58 @@ -95432,13 +95432,13 @@ sub_803E0B8: ; 803E0B8 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 @@ -95447,9 +95447,9 @@ sub_803E0B8: ; 803E0B8 ldrh r0, [r0] strh r0, [r2] strh r0, [r3] - b @0803E33C + b _0803E33C .pool -@0803E204: +_0803E204: ldr r1, =0x020242bc mov r12, r1 lsls r0, r4, 3 @@ -95459,7 +95459,7 @@ sub_803E0B8: ; 803E0B8 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 @@ -95468,7 +95468,7 @@ sub_803E0B8: ; 803E0B8 adds r0, r4 ldrh r0, [r0] cmp r1, r0 - bne @0803E268 + bne _0803E268 ldr r2, =0x020241ea ldr r0, =0x020241ec strh r3, [r0] @@ -95489,13 +95489,13 @@ sub_803E0B8: ; 803E0B8 ldrb r1, [r6] ldr r3, =0x0202449c ldr r2, [r3] - b @0803E316 + b _0803E316 .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 @@ -95541,9 +95541,9 @@ sub_803E0B8: ; 803E0B8 ldrb r1, [r6] ldr r3, =0x0202449c ldr r2, [r3] - b @0803E316 + b _0803E316 .pool -@0803E2DC: +_0803E2DC: ldr r3, =0x02024084 mov r5, r8 ldrb r0, [r5] @@ -95561,7 +95561,7 @@ sub_803E0B8: ; 803E0B8 ldrh r3, [r0] ldrh r2, [r2] cmp r3, r2 - beq @0803E334 + beq _0803E334 ldr r1, =0x020241ea ldr r0, =0x020241ec strh r3, [r0] @@ -95572,17 +95572,17 @@ sub_803E0B8: ; 803E0B8 ldrb r1, [r4] ldr r2, =0x0202449c ldr r2, [r2] -@0803E316: +_0803E316: adds r1, r2 strb r0, [r1, 0xC] - b @0803E33C + b _0803E33C .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] @@ -95592,24 +95592,24 @@ sub_803E0B8: ; 803E0B8 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 .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 @@ -95624,7 +95624,7 @@ sub_803E0B8: ; 803E0B8 adds r5, r0, r1 ldrb r0, [r5, 0x8] cmp r0, 0 - beq @0803E400 + beq _0803E400 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -95634,7 +95634,7 @@ sub_803E0B8: ; 803E0B8 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 @@ -95644,7 +95644,7 @@ sub_803E0B8: ; 803E0B8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq @0803E400 + beq _0803E400 ldr r1, =0x02024084 ldrb r2, [r5, 0x9] movs r0, 0x58 @@ -95652,12 +95652,12 @@ sub_803E0B8: ; 803E0B8 adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq @0803E400 + beq _0803E400 ldr r0, =0x0202420c strb r2, [r0] - b @0803E76A + b _0803E76A .pool -@0803E400: +_0803E400: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x1 @@ -95665,9 +95665,9 @@ sub_803E0B8: ; 803E0B8 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 @@ -95675,9 +95675,9 @@ sub_803E0B8: ; 803E0B8 adds r0, r1 ldrb r5, [r0, 0x8] cmp r5, 0 - beq @0803E424 - b @0803E630 -@0803E424: + beq _0803E424 + b _0803E630 +_0803E424: ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -95687,12 +95687,12 @@ sub_803E0B8: ; 803E0B8 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] @@ -95707,14 +95707,14 @@ sub_803E0B8: ; 803E0B8 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 @@ -95724,15 +95724,15 @@ sub_803E0B8: ; 803E0B8 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 @@ -95741,7 +95741,7 @@ sub_803E0B8: ; 803E0B8 ldrb r0, [r1, 0xC] ldrb r1, [r4] cmp r0, r1 - beq @0803E4CE + beq _0803E4CE ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 @@ -95750,20 +95750,20 @@ sub_803E0B8: ; 803E0B8 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] @@ -95772,13 +95772,13 @@ sub_803E0B8: ; 803E0B8 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, =gBattleMoves ldr r0, =0x020241ec ldrh r1, [r0] @@ -95789,41 +95789,41 @@ sub_803E0B8: ; 803E0B8 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 .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 .pool -@0803E568: +_0803E568: ldr r2, =0x0202420c ldr r0, =0x0202420b ldrb r0, [r0] @@ -95832,7 +95832,7 @@ sub_803E0B8: ; 803E0B8 adds r0, r1 ldrb r0, [r0, 0xC] strb r0, [r2] -@0803E578: +_0803E578: ldr r7, =0x02024210 ldrb r0, [r7] ldr r1, =gUnknown_0832A328 @@ -95844,9 +95844,9 @@ sub_803E0B8: ; 803E0B8 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 @@ -95856,11 +95856,11 @@ sub_803E0B8: ; 803E0B8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq @0803E5C4 + beq _0803E5C4 ldrb r0, [r5] - b @0803E758 + b _0803E758 .pool -@0803E5C4: +_0803E5C4: ldrb r0, [r6] bl battle_get_per_side_status movs r1, 0x1 @@ -95873,8 +95873,8 @@ sub_803E0B8: ; 803E0B8 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] @@ -95902,15 +95902,15 @@ sub_803E0B8: ; 803E0B8 ldr r1, =0x0202420c ldrb r0, [r4] strb r0, [r1] - b @0803E76A + b _0803E76A .pool -@0803E630: +_0803E630: ldr r0, =0x02022fec ldr r0, [r0] movs r4, 0x1 ands r0, r4 cmp r0, 0 - beq @0803E6E0 + beq _0803E6E0 ldr r2, =gBattleMoves ldr r0, =0x020241ec ldrh r1, [r0] @@ -95922,35 +95922,35 @@ sub_803E0B8: ; 803E0B8 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 .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] @@ -95964,7 +95964,7 @@ sub_803E0B8: ; 803E0B8 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @0803E76A + beq _0803E76A ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner @@ -95974,11 +95974,11 @@ sub_803E0B8: ; 803E0B8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq @0803E76A + beq _0803E76A ldrb r0, [r5] - b @0803E758 + b _0803E758 .pool -@0803E6E0: +_0803E6E0: ldr r5, =0x0202420c mov r2, r8 ldrb r0, [r2] @@ -95996,7 +95996,7 @@ sub_803E0B8: ; 803E0B8 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 @@ -96005,11 +96005,11 @@ sub_803E0B8: ; 803E0B8 lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq @0803E730 + beq _0803E730 ldrb r0, [r5] - b @0803E758 + b _0803E758 .pool -@0803E730: +_0803E730: mov r1, r8 ldrb r0, [r1] bl battle_get_per_side_status @@ -96023,13 +96023,13 @@ sub_803E0B8: ; 803E0B8 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 @@ -96037,7 +96037,7 @@ sub_803E0B8: ; 803E0B8 lsrs r0, 24 bl battle_get_side_with_given_state strb r0, [r5] -@0803E76A: +_0803E76A: ldr r0, =0x02022fec ldr r1, [r0] movs r2, 0x80 @@ -96045,7 +96045,7 @@ sub_803E0B8: ; 803E0B8 ands r1, r2 adds r5, r0, 0 cmp r1, 0 - beq @0803E808 + beq _0803E808 ldr r0, =0x0202433c ldr r4, =0x0202420b ldrb r2, [r4] @@ -96054,25 +96054,25 @@ sub_803E0B8: ; 803E0B8 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 .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 @@ -96087,18 +96087,18 @@ sub_803E0B8: ; 803E0B8 lsls r0, 2 adds r0, r3 str r2, [r0] - b @0803E824 + b _0803E824 .pool -@0803E7EC: +_0803E7EC: ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] ldr r1, =0x02024214 ldr r0, =gUnknown_082DB6AD str r0, [r1] - b @0803E824 + b _0803E824 .pool -@0803E808: +_0803E808: ldr r4, =0x02024214 ldr r3, =gUnknown_082D86A8 ldr r2, =gBattleMoves @@ -96113,20 +96113,20 @@ sub_803E0B8: ; 803E0B8 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} @@ -96189,10 +96189,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 @@ -96236,7 +96236,7 @@ sub_803E90C: ; 803E90C orrs r3, r0 strh r3, [r5] cmp r3, 0xC - bhi @0803E998 + bhi _0803E998 ldr r2, =0x02024214 ldr r1, =gUnknown_082DBD08 ldrh r0, [r5] @@ -96246,38 +96246,38 @@ sub_803E90C: ; 803E90C str r0, [r2] ldr r0, =0x02024083 mov r10, r0 - b @0803EBF6 + b _0803EBF6 .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, =gUnknown_082DBD54 ldr r1, [r1] str r1, [r0] ldr r1, =0x02024083 mov r10, r1 - b @0803EBF6 + b _0803EBF6 .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, =gUnknown_082DBD3C ldr r1, [r1] str r1, [r0] ldr r2, =0x02024083 mov r10, r2 - b @0803EBF6 + b _0803EBF6 .pool -@0803E9E8: +_0803E9E8: ldr r3, =0x02024474 ldrb r0, [r4] strb r0, [r3, 0x17] @@ -96298,23 +96298,23 @@ sub_803E90C: ; 803E90C 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 .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] @@ -96329,7 +96329,7 @@ sub_803E90C: ; 803E90C ands r0, r1 mov r8, r2 cmp r0, 0 - beq @0803EA98 + beq _0803EA98 movs r0, 0x3E ands r0, r1 ldr r1, =0x02024214 @@ -96338,14 +96338,14 @@ sub_803E90C: ; 803E90C 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 .pool -@0803EA98: +_0803EA98: ldr r0, =0x02024214 mov r9, r0 ldr r6, =gUnknown_082DBD3C @@ -96354,7 +96354,7 @@ sub_803E90C: ; 803E90C mov r4, r8 adds r3, r7, 0 adds r2, r5, 0 -@0803EAA8: +_0803EAA8: ldrb r1, [r4] lsrs r1, 1 ldr r0, [r3] @@ -96375,10 +96375,10 @@ sub_803E90C: ; 803E90C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0803EAA8 - b @0803EBDE + beq _0803EAA8 + b _0803EBDE .pool -@0803EAE0: +_0803EAE0: ldr r3, =0x02024332 movs r0, 0x4 strb r0, [r3, 0x5] @@ -96396,7 +96396,7 @@ sub_803E90C: ; 803E90C lsrs r5, r0, 24 mov r8, r2 cmp r5, 0 - beq @0803EB28 + beq _0803EB28 movs r0, 0x5 strb r0, [r3, 0x5] ldr r2, =0x02024214 @@ -96404,9 +96404,9 @@ sub_803E90C: ; 803E90C ldr r6, =gUnknown_082DBD3C ldr r0, =0x02024083 mov r10, r0 - b @0803EBDE + b _0803EBDE .pool -@0803EB28: +_0803EB28: ldr r3, =0x02022f58 movs r4, 0xFD strb r4, [r3] @@ -96432,11 +96432,11 @@ sub_803E90C: ; 803E90C 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] @@ -96457,32 +96457,32 @@ sub_803E90C: ; 803E90C 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 .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 .pool -@0803EBCC: +_0803EBCC: ldr r0, =0x02024332 strb r1, [r0, 0x5] -@0803EBD0: +_0803EBD0: ldr r0, =0x0202420b mov r8, r0 ldr r1, =0x02024214 @@ -96490,7 +96490,7 @@ sub_803E90C: ; 803E90C ldr r6, =gUnknown_082DBD3C ldr r2, =0x02024083 mov r10, r2 -@0803EBDE: +_0803EBDE: mov r1, r8 ldrb r0, [r1] lsrs r0, 1 @@ -96503,7 +96503,7 @@ sub_803E90C: ; 803E90C ldr r0, [r0] mov r2, r9 str r0, [r2] -@0803EBF6: +_0803EBF6: movs r0, 0xA mov r1, r10 strb r0, [r1] @@ -96533,25 +96533,25 @@ 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 .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 @@ -96569,9 +96569,9 @@ sub_803EC20: ; 803EC20 movs r1, 0x8 orrs r0, r1 strb r0, [r2, 0x1] - b @0803ED70 + b _0803ED70 .pool -@0803EC9C: +_0803EC9C: ldr r0, =0x02024084 mov r10, r0 movs r2, 0x58 @@ -96583,11 +96583,11 @@ sub_803EC20: ; 803EC20 adds r0, 0x20 ldrb r6, [r0] cmp r6, 0x32 - bne @0803ED5C + bne _0803ED5C bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0803ED38 + beq _0803ED38 ldr r4, =0x0202449c ldr r1, [r4] adds r1, 0x6C @@ -96622,9 +96622,9 @@ sub_803EC20: ; 803EC20 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 @@ -96637,9 +96637,9 @@ sub_803EC20: ; 803EC20 movs r1, 0x10 orrs r0, r1 strb r0, [r2, 0x1] - b @0803ED70 + b _0803ED70 .pool -@0803ED38: +_0803ED38: ldr r0, =0x0202420a strb r6, [r0] ldr r0, =0x0202433c @@ -96652,35 +96652,35 @@ sub_803EC20: ; 803EC20 movs r1, 0x10 orrs r0, r1 strb r0, [r2, 0x1] - b @0803ED70 + b _0803ED70 .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 .pool -@0803ED80: +_0803ED80: ldr r0, [r1] movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne @0803EE06 + bne _0803EE06 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0803EDBC + beq _0803EDBC bl sub_81A9E28 lsls r0, 24 lsrs r1, r0, 24 @@ -96696,9 +96696,9 @@ sub_803EC20: ; 803EC20 eors r1, r2 muls r1, r3 adds r1, r4 - b @0803EDDA + b _0803EDDA .pool -@0803EDBC: +_0803EDBC: ldr r3, =0x02024084 movs r2, 0x58 adds r0, r5, 0 @@ -96712,9 +96712,9 @@ sub_803EC20: ; 803EC20 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 @@ -96731,21 +96731,21 @@ sub_803EC20: ; 803EC20 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] @@ -96753,7 +96753,7 @@ sub_803EC20: ; 803EC20 ldr r1, =0x0202433a movs r0, 0x4 strb r0, [r1] -@0803EE24: +_0803EE24: adds r0, r7, 0 pop {r3-r5} mov r8, r3 @@ -96780,7 +96780,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] @@ -96789,37 +96789,37 @@ 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 .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] @@ -96828,8 +96828,8 @@ sub_803EE48: ; 803EE48 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @0803EE7C -@0803EEE0: + bcc _0803EE7C +_0803EEE0: ldr r2, =0x0202433a ldrb r0, [r2] movs r1, 0x80 @@ -96842,19 +96842,19 @@ sub_803EE48: ; 803EE48 ldrb r0, [r1] movs r2, 0x8 orrs r0, r2 - b @0803EF96 + b _0803EF96 .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 @@ -96865,9 +96865,9 @@ sub_803EE48: ; 803EE48 str r0, [r1] ldr r1, =0x02024083 movs r0, 0xA - b @0803EF96 + b _0803EF96 .pool -@0803EF4C: +_0803EF4C: ldr r1, =0x02024084 ldrb r2, [r4] movs r0, 0x58 @@ -96878,7 +96878,7 @@ sub_803EE48: ; 803EE48 ldr r1, =0x0400e000 ands r0, r1 cmp r0, 0 - beq @0803EF8C + beq _0803EF8C ldr r1, =0x02024332 movs r0, 0x4 strb r0, [r1, 0x5] @@ -96887,17 +96887,17 @@ sub_803EE48: ; 803EE48 str r0, [r1] ldr r1, =0x02024083 movs r0, 0xA - b @0803EF96 + b _0803EF96 .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 @@ -96995,27 +96995,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, =gUnknown_0831BCE0 adds r0, 0x7A ldrb r1, [r0] @@ -97026,15 +97026,15 @@ sub_803F050: ; 803F050 adds r0, r2 ldrb r0, [r0] cmp r4, r0 - bcs @0803F0FC + bcs _0803F0FC movs r0, 0x1 - b @0803F0FE + b _0803F0FE .pool -@0803F0FC: +_0803F0FC: subs r0, r5, r0 -@0803F0FE: +_0803F0FE: strb r0, [r3] -@0803F100: +_0803F100: ldr r1, =0x02024214 ldr r0, =gUnknown_082DBD58 ldr r0, [r0, 0x8] @@ -97080,10 +97080,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 @@ -97100,27 +97100,27 @@ sub_803F120: ; 803F120 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 .pool -@0803F1C4: +_0803F1C4: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -@0803F1CA: +_0803F1CA: ldr r1, =0x02024214 ldr r0, =gUnknown_082DBD58 ldr r0, [r0, 0x4] @@ -97207,7 +97207,7 @@ bsB_exit_by_move: ; 803F2A4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @0803F2C0 + bne _0803F2C0 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x4D @@ -97215,7 +97215,7 @@ bsB_exit_by_move: ; 803F2A4 ldr r1, =0x02024083 movs r0, 0xC strb r0, [r1] -@0803F2C0: +_0803F2C0: pop {r0} bx r0 .pool @@ -97320,74 +97320,74 @@ get_battle_side_of_something: ; 803F3CC 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 .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 .pool -@0803F430: +_0803F430: ldr r0, =0x0202420b ldrb r0, [r0] - b @0803F47A + b _0803F47A .pool -@0803F43C: +_0803F43C: ldr r0, =0x0202420e ldrb r0, [r0] - b @0803F47A + b _0803F47A .pool -@0803F448: +_0803F448: movs r0, 0 - b @0803F47A -@0803F44C: + b _0803F47A +_0803F44C: ldr r0, =0x02024474 ldrb r0, [r0, 0x17] - b @0803F47A + b _0803F47A .pool -@0803F458: +_0803F458: ldr r0, =0x0202420d ldrb r0, [r0] - b @0803F47A + b _0803F47A .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 @@ -97410,26 +97410,26 @@ 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 .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 @@ -97439,10 +97439,10 @@ sub_803F480: ; 803F480 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 @@ -97451,7 +97451,7 @@ sub_803F480: ; 803F480 lsls r1, 14 ands r0, r1 cmp r0, 0 - bne @0803F532 + bne _0803F532 ldr r1, =0x020242bc lsls r0, r5, 3 subs r0, r5 @@ -97465,7 +97465,7 @@ sub_803F480: ; 803F480 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0803F532 + bne _0803F532 ldr r4, =0x02024064 strb r5, [r4] adds r1, r3, 0 @@ -97483,7 +97483,7 @@ sub_803F480: ; 803F480 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} @@ -97512,14 +97512,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 @@ -97527,7 +97527,7 @@ sub_803F548: ; 803F548 lsrs r0, 24 adds r6, r4, 0x1 cmp r9, r0 - beq @0803F5E6 + beq _0803F5E6 ldr r0, =0x02024084 movs r3, 0x58 adds r1, r4, 0 @@ -97537,7 +97537,7 @@ sub_803F548: ; 803F548 ldrb r1, [r1] adds r4, r0, 0 cmp r1, 0x2E - bne @0803F5E6 + bne _0803F5E6 movs r2, 0 adds r0, r5, 0 muls r0, r3 @@ -97548,21 +97548,21 @@ sub_803F548: ; 803F548 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 @@ -97570,19 +97570,19 @@ sub_803F548: ; 803F548 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 @@ -97595,7 +97595,7 @@ sub_803F548: ; 803F548 lsls r1, 14 ands r0, r1 cmp r0, 0 - bne @0803F658 + bne _0803F658 ldr r1, =0x020242bc lsls r0, r5, 3 subs r0, r5 @@ -97610,7 +97610,7 @@ sub_803F548: ; 803F548 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0803F658 + bne _0803F658 ldr r4, =0x02024064 strb r5, [r4] mov r1, r8 @@ -97630,7 +97630,7 @@ sub_803F548: ; 803F548 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 @@ -97658,7 +97658,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 @@ -97669,7 +97669,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 @@ -97677,45 +97677,45 @@ sub_803F67C: ; 803F67C 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 @@ -97728,7 +97728,7 @@ sub_803F67C: ; 803F67C lsls r1, 14 ands r0, r1 cmp r0, 0 - bne @0803F762 + bne _0803F762 ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 @@ -97742,7 +97742,7 @@ sub_803F67C: ; 803F67C ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0803F762 + bne _0803F762 ldr r4, =0x02024064 strb r3, [r4] adds r1, r6, 0 @@ -97762,7 +97762,7 @@ sub_803F67C: ; 803F67C 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 @@ -97782,15 +97782,15 @@ sub_803F790: ; 803F790 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, =gUnknown_0832A328 -@0803F7AC: +_0803F7AC: ldm r5!, {r1} lsls r1, 28 ldr r0, [r3] @@ -97799,18 +97799,18 @@ sub_803F790: ; 803F790 adds r2, 0x1 ldrb r0, [r4] cmp r2, r0 - blt @0803F7AC - b @0803F7EE + blt _0803F7AC + b _0803F7EE .pool -@0803F7D0: +_0803F7D0: movs r2, 0 ldr r4, =0x0202406c ldrb r0, [r4] cmp r2, r0 - bge @0803F7EE + bge _0803F7EE ldr r3, =0x02024068 ldr r5, =gUnknown_0832A328 -@0803F7DE: +_0803F7DE: ldr r0, [r3] ldm r5!, {r1} orrs r0, r1 @@ -97818,8 +97818,8 @@ sub_803F790: ; 803F790 adds r2, 0x1 ldrb r0, [r4] cmp r2, r0 - blt @0803F7DE -@0803F7EE: + blt _0803F7DE +_0803F7EE: pop {r4,r5} pop {r0} bx r0 @@ -97836,7 +97836,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, =gUnknown_0832A328 lsls r0, r3, 2 @@ -97846,9 +97846,9 @@ dp01_battle_side_mark_buffer_for_execution: ; 803F800 ldr r0, [r2] orrs r0, r1 str r0, [r2] - b @0803F844 + b _0803F844 .pool -@0803F834: +_0803F834: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 lsls r0, r3, 2 @@ -97857,7 +97857,7 @@ dp01_battle_side_mark_buffer_for_execution: ; 803F800 ldr r0, [r0] orrs r1, r0 str r1, [r2] -@0803F844: +_0803F844: pop {r0} bx r0 .pool @@ -97873,9 +97873,9 @@ sub_803F850: ; 803F850 ldr r1, =gUnknown_0832A328 lsls r0, r7, 2 adds r6, r0, r1 - b @0803F87A + b _0803F87A .pool -@0803F86C: +_0803F86C: lsls r0, r4, 2 ldr r1, [r6] lsls r1, r0 @@ -97883,12 +97883,12 @@ sub_803F850: ; 803F850 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 @@ -97956,40 +97956,40 @@ 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 .pool -@0803F95C: +_0803F95C: movs r0, 0 -@0803F95E: +_0803F95E: pop {r1} bx r1 thumb_func_end sub_803F90C @@ -98025,11 +98025,11 @@ sub_803F988: ; 803F988 ldrb r2, [r0] adds r6, r0, 0 cmp r1, r2 - bge @0803F9B6 + bge _0803F9B6 ldr r5, =gUnknown_0832A328 adds r4, r2, 0 ldr r2, =0x0202406e -@0803F9A4: +_0803F9A4: ldrh r0, [r2] lsls r0, 2 adds r0, r5 @@ -98038,16 +98038,16 @@ sub_803F988: ; 803F988 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 @@ -98056,8 +98056,8 @@ sub_803F988: ; 803F988 adds r1, 0x2 ldrb r0, [r2] cmp r1, r0 - blt @0803F9C4 -@0803F9D6: + blt _0803F9C4 +_0803F9D6: pop {r4-r6} pop {r0} bx r0 @@ -98077,7 +98077,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 @@ -98091,34 +98091,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, =gUnknown_0832A328 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} @@ -98137,16 +98137,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 @@ -98154,7 +98154,7 @@ sub_803FA70: ; 803FA70 ldr r1, =0x0202406e lsls r0, r4, 1 adds r4, r0, r1 -@0803FAA4: +_0803FAA4: adds r2, r3, 0 ands r2, r7 asrs r2, 1 @@ -98169,8 +98169,8 @@ sub_803FA70: ; 803FA70 adds r3, 0x1 ldrb r0, [r5] cmp r3, r0 - blt @0803FAA4 -@0803FAC2: + blt _0803FAA4 +_0803FAC2: pop {r4-r7} pop {r0} bx r0 @@ -98274,9 +98274,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 @@ -98287,7 +98287,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 @@ -98302,9 +98302,9 @@ sub_803FB4C: ; 803FB4C movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b @0803FC06 + b _0803FC06 .pool -@0803FBF8: +_0803FBF8: ldr r0, =0x02024220 ldrb r1, [r7] lsls r1, 2 @@ -98312,16 +98312,16 @@ sub_803FB4C: ; 803FB4C ldr r0, =gUnknown_082DAE1F 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 @@ -98329,7 +98329,7 @@ sub_803FB4C: ; 803FB4C 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 @@ -98338,7 +98338,7 @@ sub_803FB4C: ; 803FB4C lsls r1, 10 ands r0, r1 cmp r0, 0 - beq @0803FC7C + beq _0803FC7C ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 @@ -98353,9 +98353,9 @@ sub_803FB4C: ; 803FB4C movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b @0803FC8E + b _0803FC8E .pool -@0803FC7C: +_0803FC7C: ldr r1, =0x02024220 ldrb r0, [r7] lsls r0, 2 @@ -98365,9 +98365,9 @@ sub_803FB4C: ; 803FB4C 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 @@ -98376,7 +98376,7 @@ sub_803FB4C: ; 803FB4C ldrb r0, [r1, 0x13] lsls r0, 28 cmp r0, 0 - beq @0803FD1A + beq _0803FD1A ldr r0, =gBattleMoves lsls r1, r5, 1 adds r1, r5 @@ -98384,7 +98384,7 @@ sub_803FB4C: ; 803FB4C adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0 - bne @0803FD1A + bne _0803FD1A ldr r0, =0x020241ea strh r5, [r0] ldr r0, =0x02022fec @@ -98393,7 +98393,7 @@ sub_803FB4C: ; 803FB4C lsls r1, 10 ands r0, r1 cmp r0, 0 - beq @0803FD08 + beq _0803FD08 ldr r1, =0x02024230 ldrb r0, [r7] lsls r0, 2 @@ -98408,9 +98408,9 @@ sub_803FB4C: ; 803FB4C movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b @0803FD1A + b _0803FD1A .pool -@0803FD08: +_0803FD08: ldr r1, =0x02024220 ldrb r0, [r7] lsls r0, 2 @@ -98420,14 +98420,14 @@ sub_803FB4C: ; 803FB4C 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 @@ -98436,7 +98436,7 @@ sub_803FB4C: ; 803FB4C lsls r1, 10 ands r0, r1 cmp r0, 0 - beq @0803FD7C + beq _0803FD7C ldr r1, =0x02024230 ldrb r0, [r4] lsls r0, 2 @@ -98451,9 +98451,9 @@ sub_803FB4C: ; 803FB4C movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b @0803FD8E + b _0803FD8E .pool -@0803FD7C: +_0803FD7C: ldr r1, =0x02024220 ldrb r0, [r4] lsls r0, 2 @@ -98463,7 +98463,7 @@ sub_803FB4C: ; 803FB4C adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -@0803FD8E: +_0803FD8E: ldr r1, =0x02024084 ldr r0, =0x02024064 ldrb r2, [r0] @@ -98472,21 +98472,21 @@ sub_803FB4C: ; 803FB4C 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 .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] @@ -98495,17 +98495,17 @@ sub_803FB4C: ; 803FB4C 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 @@ -98522,7 +98522,7 @@ sub_803FB4C: ; 803FB4C ands r1, r0 ldrb r2, [r7] cmp r1, 0 - beq @0803FE48 + beq _0803FE48 ldr r0, =0x0202433c lsls r1, r2, 4 adds r1, r0 @@ -98530,9 +98530,9 @@ sub_803FB4C: ; 803FB4C movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b @0803FE58 + b _0803FE58 .pool -@0803FE48: +_0803FE48: ldr r1, =0x02024220 lsls r0, r2, 2 adds r0, r1 @@ -98541,7 +98541,7 @@ sub_803FB4C: ; 803FB4C adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -@0803FE58: +_0803FE58: ldr r0, =0x02023864 ldrb r3, [r7] lsls r1, r3, 9 @@ -98556,14 +98556,14 @@ sub_803FB4C: ; 803FB4C 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 @@ -98571,9 +98571,9 @@ sub_803FB4C: ; 803FB4C movs r2, 0x10 orrs r0, r2 strb r0, [r1, 0x2] - b @0803FEB8 + b _0803FEB8 .pool -@0803FEA8: +_0803FEA8: ldr r1, =0x02024220 lsls r0, r3, 2 adds r0, r1 @@ -98582,7 +98582,7 @@ sub_803FB4C: ; 803FB4C adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -@0803FEB8: +_0803FEB8: adds r0, r6, 0 pop {r3} mov r8, r3 @@ -98618,7 +98618,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 @@ -98626,9 +98626,9 @@ sub_803FECC: ; 803FECC adds r0, r2 ldrb r0, [r0, 0x7] str r0, [sp] - b @0803FF2E + b _0803FF2E .pool -@0803FF1C: +_0803FF1C: ldrh r0, [r1, 0x2E] str r3, [sp, 0x14] bl itemid_get_x12 @@ -98637,7 +98637,7 @@ sub_803FECC: ; 803FECC str r0, [sp] lsls r1, r7, 3 ldr r3, [sp, 0x14] -@0803FF2E: +_0803FF2E: ldr r0, =0x0202420f strb r7, [r0] movs r0, 0 @@ -98660,19 +98660,19 @@ sub_803FECC: ; 803FECC lsls r0, 2 mov r8, r0 ldr r6, =gUnknown_0832A328 -@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 @@ -98680,31 +98680,31 @@ sub_803FECC: ; 803FECC 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 @@ -98723,32 +98723,32 @@ sub_803FECC: ; 803FECC 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, =gBattleMoves ldrh r1, [r5] lsls r0, r1, 1 @@ -98757,12 +98757,12 @@ sub_803FECC: ; 803FECC 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] @@ -98770,16 +98770,16 @@ sub_803FECC: ; 803FECC 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 @@ -98787,34 +98787,34 @@ sub_803FECC: ; 803FECC 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] @@ -98824,9 +98824,9 @@ sub_803FECC: ; 803FECC 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} @@ -98850,7 +98850,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 @@ -98865,9 +98865,9 @@ sub_80400C8: ; 80400C8 adds r0, r1 ldr r1, =gUnknown_082DB072 str r1, [r0] - b @0804011E + b _0804011E .pool -@0804010C: +_0804010C: ldr r0, =0x0202433c ldrb r1, [r4] lsls r1, 4 @@ -98877,12 +98877,12 @@ sub_80400C8: ; 80400C8 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 @@ -98908,10 +98908,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 @@ -98919,7 +98919,7 @@ sub_8040130: ; 8040130 lsrs r0, 24 adds r3, r4, 0x1 cmp r9, r0 - beq @080401AA + beq _080401AA ldr r1, =0x020242ac lsls r0, r4, 2 adds r0, r1 @@ -98928,7 +98928,7 @@ sub_8040130: ; 8040130 lsls r1, 6 ands r0, r1 cmp r0, 0 - beq @080401AA + beq _080401AA movs r2, 0 movs r0, 0x58 adds r1, r4, 0 @@ -98936,30 +98936,30 @@ sub_8040130: ; 8040130 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 @@ -98990,23 +98990,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, =gUnknown_0832A328 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 @@ -99014,30 +99014,30 @@ sub_80401D0: ; 80401D0 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, =gUnknown_0832A328 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 @@ -99045,65 +99045,65 @@ sub_80401D0: ; 80401D0 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 .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 .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 @@ -99112,26 +99112,26 @@ sub_80401D0: ; 80401D0 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] @@ -99142,21 +99142,21 @@ sub_80401D0: ; 80401D0 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] @@ -99175,14 +99175,14 @@ sub_80401D0: ; 80401D0 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 @@ -99205,7 +99205,7 @@ sub_80401D0: ; 80401D0 lsls r0, 24 lsrs r0, 24 mov r9, r0 -@080403BC: +_080403BC: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -99215,33 +99215,33 @@ sub_80401D0: ; 80401D0 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 .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] @@ -99260,14 +99260,14 @@ sub_80401D0: ; 80401D0 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 @@ -99293,7 +99293,7 @@ sub_80401D0: ; 80401D0 lsls r0, 24 lsrs r0, 24 mov r9, r0 -@0804048A: +_0804048A: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -99303,31 +99303,31 @@ sub_80401D0: ; 80401D0 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 .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] @@ -99342,13 +99342,13 @@ sub_80401D0: ; 80401D0 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] @@ -99376,7 +99376,7 @@ sub_80401D0: ; 80401D0 lsls r0, 24 lsrs r0, 24 mov r9, r0 -@0804054E: +_0804054E: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -99386,21 +99386,21 @@ sub_80401D0: ; 80401D0 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] @@ -99409,18 +99409,18 @@ sub_80401D0: ; 80401D0 ldr r0, [r3] adds r0, 0xDB strb r2, [r0] - b @080408F6 + b _080408F6 .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] @@ -99438,13 +99438,13 @@ sub_80401D0: ; 80401D0 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 @@ -99457,7 +99457,7 @@ sub_80401D0: ; 80401D0 lsls r0, 24 lsrs r0, 24 mov r9, r0 -@0804060A: +_0804060A: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -99467,21 +99467,21 @@ sub_80401D0: ; 80401D0 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] @@ -99492,9 +99492,9 @@ sub_80401D0: ; 80401D0 adds r0, 0xDB mov r3, r9 strb r3, [r0] - b @080408F6 + b _080408F6 .pool -@08040668: +_08040668: mov r2, r12 ldr r0, [r2] adds r0, 0xDB @@ -99502,10 +99502,10 @@ sub_80401D0: ; 80401D0 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] @@ -99518,12 +99518,12 @@ sub_80401D0: ; 80401D0 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 @@ -99531,7 +99531,7 @@ sub_80401D0: ; 80401D0 adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq @080406C4 + beq _080406C4 ldr r0, =0x0202420c strb r2, [r0] ldr r0, =gUnknown_082DB0B7 @@ -99541,7 +99541,7 @@ sub_80401D0: ; 80401D0 lsls r0, 24 lsrs r0, 24 mov r9, r0 -@080406C4: +_080406C4: ldr r2, =0x0202449c ldr r1, [r2] adds r1, 0xDB @@ -99551,42 +99551,42 @@ sub_80401D0: ; 80401D0 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 .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] @@ -99594,7 +99594,7 @@ sub_80401D0: ; 80401D0 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne @08040768 + bne _08040768 ldr r0, =0x0000fffe ands r0, r2 ldr r1, =0x0000fffd @@ -99603,49 +99603,49 @@ sub_80401D0: ; 80401D0 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b @08040794 + b _08040794 .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 .pool -@08040790: +_08040790: ldr r0, =0x02024332 strb r1, [r0, 0x5] -@08040794: +_08040794: ldr r0, =gUnknown_082DAC2C - b @080408BA + b _080408BA .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] @@ -99653,18 +99653,18 @@ sub_80401D0: ; 80401D0 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, =gUnknown_082DACC9 - b @080407EC + b _080407EC .pool -@080407E8: +_080407E8: ldr r1, =0x02024214 ldr r0, =gUnknown_082DAC47 -@080407EC: +_080407EC: str r0, [r1] adds r3, r1, 0 ldr r1, =0x02024474 @@ -99673,19 +99673,19 @@ sub_80401D0: ; 80401D0 strb r0, [r1, 0x10] ldr r0, =0x02024332 strb r2, [r0, 0x5] - b @080408B8 + b _080408B8 .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] @@ -99693,29 +99693,29 @@ sub_80401D0: ; 80401D0 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, =gUnknown_082DACE0 - b @08040858 + b _08040858 .pool -@08040854: +_08040854: ldr r1, =0x02024214 ldr r0, =gUnknown_082DACD2 -@08040858: +_08040858: str r0, [r1] adds r3, r1, 0 - b @080408B8 + b _080408B8 .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] @@ -99723,18 +99723,18 @@ sub_80401D0: ; 80401D0 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, =gUnknown_082DACC9 - b @080408A8 + b _080408A8 .pool -@080408A4: +_080408A4: ldr r1, =0x02024214 ldr r0, =gUnknown_082DAC47 -@080408A8: +_080408A8: str r0, [r1] adds r3, r1, 0 ldr r1, =0x02024474 @@ -99743,36 +99743,36 @@ sub_80401D0: ; 80401D0 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 .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 @@ -99813,12 +99813,12 @@ 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 .pool -@08040968: +_08040968: ldr r3, =0x02024064 ldr r4, =0x0202420b ldr r1, =0x0202407e @@ -99838,47 +99838,47 @@ sub_8040924: ; 8040924 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 .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 .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 @@ -99888,9 +99888,9 @@ sub_8040924: ; 8040924 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 @@ -99898,29 +99898,29 @@ sub_8040924: ; 8040924 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, =gUnknown_082DB0EE - bl @080412D0 + bl _080412D0 .pool -@08040A78: +_08040A78: ldrb r1, [r6] movs r0, 0 str r0, [sp] @@ -99930,33 +99930,33 @@ sub_8040924: ; 8040924 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 @@ -99965,9 +99965,9 @@ sub_8040924: ; 8040924 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 @@ -99977,17 +99977,17 @@ sub_8040924: ; 8040924 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 @@ -99998,18 +99998,18 @@ sub_8040924: ; 8040924 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, =gUnknown_082DAD15 - b @080412D0 + b _080412D0 .pool -@08040B44: +_08040B44: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -100022,28 +100022,28 @@ sub_8040924: ; 8040924 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, =gUnknown_082DB23D - b @080412D0 + b _080412D0 .pool -@08040B8C: +_08040B8C: ldr r4, =0x02024084 ldrb r0, [r6] movs r7, 0x58 @@ -100057,24 +100057,24 @@ sub_8040924: ; 8040924 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 @@ -100086,12 +100086,12 @@ sub_8040924: ; 8040924 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 @@ -100104,9 +100104,9 @@ sub_8040924: ; 8040924 muls r0, r1 str r0, [r5] ldr r0, =gUnknown_082DB23D - b @080412D0 + b _080412D0 .pool -@08040C0C: +_08040C0C: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -100119,28 +100119,28 @@ sub_8040924: ; 8040924 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, =gUnknown_082DB25F - b @080412D0 + b _080412D0 .pool -@08040C54: +_08040C54: ldr r4, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -100153,15 +100153,15 @@ sub_8040924: ; 8040924 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 @@ -100169,26 +100169,26 @@ sub_8040924: ; 8040924 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, =gUnknown_082DB33F - b @080412D0 + b _080412D0 .pool -@08040CAC: +_08040CAC: ldr r0, =0xf7ffffff ands r2, r0 str r2, [r5] - b @080412DE + b _080412DE .pool -@08040CB8: +_08040CB8: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -100202,28 +100202,28 @@ sub_8040924: ; 8040924 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, =gUnknown_082DB350 - b @080412D0 + b _080412D0 .pool -@08040D00: +_08040D00: ldr r3, =0x02024084 mov r8, r3 ldrb r0, [r6] @@ -100240,16 +100240,16 @@ sub_8040924: ; 8040924 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] @@ -100260,7 +100260,7 @@ sub_8040924: ; 8040924 ldr r0, [r0] ands r0, r5 cmp r0, 0 - beq @08040DC0 + beq _08040DC0 ldr r1, =0x02024474 ldr r0, =0x0202449c ldr r2, [r0] @@ -100301,12 +100301,12 @@ sub_8040924: ; 8040924 lsrs r0, 4 str r0, [r2] cmp r0, 0 - bne @08040DEC + bne _08040DEC movs r0, 0x1 str r0, [r2] - b @08040DEC + b _08040DEC .pool -@08040DC0: +_08040DC0: ldr r2, =0x02022f58 movs r0, 0xFD strb r0, [r2] @@ -100329,11 +100329,11 @@ sub_8040924: ; 8040924 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB320 str r0, [r1] -@08040DEC: +_08040DEC: ldr r0, [r1] - b @080412D0 + b _080412D0 .pool -@08040E00: +_08040E00: movs r0, 0x8 negs r0, r0 ands r3, r0 @@ -100369,9 +100369,9 @@ sub_8040924: ; 8040924 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @08040EC8 + b _08040EC8 .pool -@08040E60: +_08040E60: ldr r2, =0x02024084 ldrb r1, [r6] movs r0, 0x58 @@ -100384,13 +100384,13 @@ sub_8040924: ; 8040924 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 @@ -100401,7 +100401,7 @@ sub_8040924: ; 8040924 str r0, [sp, 0x4] movs r5, 0x7 mov r12, r5 -@08040E9A: +_08040E9A: ldrb r4, [r6] mov r1, r8 muls r1, r4 @@ -100412,32 +100412,32 @@ sub_8040924: ; 8040924 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 .pool -@08040EE8: +_08040EE8: ldr r5, =0x02024064 ldrb r0, [r5] strb r0, [r2] @@ -100457,15 +100457,15 @@ sub_8040924: ; 8040924 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 .pool -@08040F2C: +_08040F2C: ldrb r3, [r5] adds r0, r3, 0 muls r0, r7 @@ -100474,7 +100474,7 @@ sub_8040924: ; 8040924 movs r1, 0x70 ands r0, r1 cmp r0, 0 - beq @08040F54 + beq _08040F54 ldr r0, =0x02024332 strb r4, [r0, 0x5] ldr r0, [r2] @@ -100482,28 +100482,28 @@ sub_8040924: ; 8040924 lsls r1, 5 orrs r0, r1 str r0, [r2] - b @08040F60 + b _08040F60 .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, =gUnknown_082DB2A6 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 .pool -@08040F7C: +_08040F7C: ldr r1, =0x02024084 ldrb r0, [r6] movs r7, 0x58 @@ -100517,9 +100517,9 @@ sub_8040924: ; 8040924 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] @@ -100527,12 +100527,12 @@ sub_8040924: ; 8040924 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 .pool -@08040FBC: +_08040FBC: ldrb r0, [r6] muls r0, r7 adds r2, r0, r5 @@ -100540,16 +100540,16 @@ sub_8040924: ; 8040924 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] @@ -100560,9 +100560,9 @@ sub_8040924: ; 8040924 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] @@ -100575,14 +100575,14 @@ sub_8040924: ; 8040924 ldr r0, [r0] ands r0, r4 cmp r0, 0 - bne @08041010 - b @080412D4 -@08041010: + bne _08041010 + b _080412D4 +_08041010: ldr r0, =gUnknown_082DB2AF bl b_call_bc_move_exec - b @080412D4 + b _080412D4 .pool -@08041024: +_08041024: ldr r0, =0x020242bc ldrb r3, [r6] lsls r1, r3, 3 @@ -100593,9 +100593,9 @@ sub_8040924: ; 8040924 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 @@ -100606,15 +100606,15 @@ sub_8040924: ; 8040924 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 @@ -100627,10 +100627,10 @@ sub_8040924: ; 8040924 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 @@ -100648,9 +100648,9 @@ sub_8040924: ; 8040924 negs r0, r0 ands r0, r2 strb r0, [r1, 0xB] - b @080412DE + b _080412DE .pool -@080410AC: +_080410AC: ldrb r0, [r6] lsls r2, r0, 3 subs r2, r0 @@ -100669,9 +100669,9 @@ sub_8040924: ; 8040924 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 @@ -100679,9 +100679,9 @@ sub_8040924: ; 8040924 adds r0, r7 strh r2, [r0, 0x4] ldr r0, =gUnknown_082DAE23 - b @080412D0 + b _080412D0 .pool -@080410E8: +_080410E8: ldr r3, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 @@ -100691,9 +100691,9 @@ sub_8040924: ; 8040924 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] @@ -100707,7 +100707,7 @@ sub_8040924: ; 8040924 ldrh r0, [r0] ldrh r1, [r2, 0x6] cmp r0, r1 - beq @0804113C + beq _0804113C movs r0, 0 strh r0, [r2, 0x6] ldrb r0, [r6] @@ -100720,9 +100720,9 @@ sub_8040924: ; 8040924 negs r0, r0 ands r0, r2 strb r0, [r1, 0xE] - b @080412DE + b _080412DE .pool -@0804113C: +_0804113C: lsrs r1, r4, 28 subs r1, 0x1 movs r0, 0xF @@ -100734,7 +100734,7 @@ sub_8040924: ; 8040924 orrs r0, r1 strb r0, [r2, 0xE] cmp r1, 0 - beq @08041172 + beq _08041172 ldrb r1, [r6] lsls r0, r1, 3 subs r0, r1 @@ -100748,9 +100748,9 @@ sub_8040924: ; 8040924 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 @@ -100768,9 +100768,9 @@ sub_8040924: ; 8040924 ands r0, r2 strb r0, [r1, 0xE] ldr r0, =gUnknown_082DAE37 - b @080412D0 + b _080412D0 .pool -@0804119C: +_0804119C: ldr r0, =0x020242ac ldrb r1, [r6] lsls r1, 2 @@ -100779,15 +100779,15 @@ sub_8040924: ; 8040924 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 .pool -@080411BC: +_080411BC: ldr r2, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 @@ -100797,7 +100797,7 @@ sub_8040924: ; 8040924 ldrb r2, [r3, 0x12] lsls r1, r2, 28 cmp r1, 0 - beq @080411F6 + beq _080411F6 lsrs r1, 28 subs r1, 0x1 movs r0, 0xF @@ -100808,7 +100808,7 @@ sub_8040924: ; 8040924 orrs r0, r1 strb r0, [r3, 0x12] cmp r1, 0 - bne @080411F6 + bne _080411F6 ldr r0, =0x020242ac ldrb r2, [r6] lsls r2, 2 @@ -100817,11 +100817,11 @@ sub_8040924: ; 8040924 ldr r1, =0xfffffdff ands r0, r1 str r0, [r2] -@080411F6: +_080411F6: ldr r1, [r7] - b @080412E2 + b _080412E2 .pool -@08041208: +_08041208: ldr r2, =0x020242bc ldrb r1, [r6] lsls r0, r1, 3 @@ -100831,7 +100831,7 @@ sub_8040924: ; 8040924 ldrb r2, [r3, 0x13] lsls r1, r2, 28 cmp r1, 0 - beq @0804122E + beq _0804122E lsrs r1, 28 subs r1, 0x1 movs r0, 0xF @@ -100841,11 +100841,11 @@ sub_8040924: ; 8040924 ands r0, r2 orrs r0, r1 strb r0, [r3, 0x13] -@0804122E: +_0804122E: ldr r1, [r7] - b @080412E2 + b _080412E2 .pool -@08041238: +_08041238: ldr r4, =0x020242ac ldrb r0, [r6] lsls r0, 2 @@ -100856,7 +100856,7 @@ sub_8040924: ; 8040924 adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq @080412DE + beq _080412DE ldr r5, =0xfffff800 adds r0, r1, r5 str r0, [r2] @@ -100866,7 +100866,7 @@ sub_8040924: ; 8040924 ldr r0, [r0] ands r0, r3 cmp r0, 0 - bne @080412DE + bne _080412DE ldr r3, =0x02024084 movs r5, 0x58 adds r1, r2, 0 @@ -100876,19 +100876,19 @@ sub_8040924: ; 8040924 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 @@ -100917,24 +100917,24 @@ sub_8040924: ; 8040924 ldrb r0, [r6] strb r0, [r1] ldr r0, =gUnknown_082DB378 -@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 .pool -@08041304: +_08041304: ldr r1, [r7] movs r0, 0 strb r0, [r1] @@ -100942,14 +100942,14 @@ sub_8040924: ; 8040924 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 @@ -100958,20 +100958,20 @@ sub_8040924: ; 8040924 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 @@ -101004,22 +101004,22 @@ 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 .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 @@ -101027,16 +101027,16 @@ sub_8041364: ; 8041364 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] @@ -101050,13 +101050,13 @@ sub_8041364: ; 8041364 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 .pool -@0804140C: +_0804140C: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -101066,15 +101066,15 @@ sub_8041364: ; 8041364 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 @@ -101082,21 +101082,21 @@ sub_8041364: ; 8041364 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 .pool -@0804145C: +_0804145C: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -@08041462: +_08041462: movs r0, 0xFD strb r0, [r5] movs r6, 0x2 @@ -101147,17 +101147,17 @@ sub_8041364: ; 8041364 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 @@ -101172,9 +101172,9 @@ sub_8041364: ; 8041364 adds r2, r4, 0 ands r1, r2 strh r1, [r0] - b @08041664 + b _08041664 .pool -@08041520: +_08041520: ldr r0, [r6] ldr r2, =0x000001a1 adds r0, r2 @@ -101182,9 +101182,9 @@ sub_8041364: ; 8041364 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 @@ -101196,7 +101196,7 @@ sub_8041364: ; 8041364 adds r1, r0, r3 movs r0, 0 strb r0, [r1] -@08041548: +_08041548: adds r3, r6, 0 ldr r0, [r6] ldr r2, =0x000001a1 @@ -101206,16 +101206,16 @@ sub_8041364: ; 8041364 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 @@ -101234,13 +101234,13 @@ sub_8041364: ; 8041364 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 .pool -@080415BC: +_080415BC: ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -101252,7 +101252,7 @@ sub_8041364: ; 8041364 movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq @08041670 + beq _08041670 movs r0, 0xFD strb r0, [r4] movs r0, 0x1 @@ -101279,7 +101279,7 @@ sub_8041364: ; 8041364 ldrb r3, [r4, 0xF] lsls r1, r3, 28 cmp r1, 0 - bne @08041644 + bne _08041644 lsls r2, 2 adds r2, r7 ldr r0, [r2] @@ -101297,9 +101297,9 @@ sub_8041364: ; 8041364 str r0, [r3] ldr r1, =0x02024214 ldr r0, =gUnknown_082DAF05 - b @0804165C + b _0804165C .pool -@08041644: +_08041644: lsrs r1, 28 subs r1, 0x1 movs r0, 0xF @@ -101312,15 +101312,15 @@ sub_8041364: ; 8041364 strb r0, [r4, 0xF] ldr r1, =0x02024214 ldr r0, =gUnknown_082DAF20 -@0804165C: +_0804165C: str r0, [r1] ldr r0, [r1] bl b_call_bc_move_exec -@08041664: +_08041664: movs r0, 0x1 - b @08041714 + b _08041714 .pool -@08041670: +_08041670: adds r3, r6, 0 ldr r0, [r6] ldr r2, =0x000001a1 @@ -101329,9 +101329,9 @@ sub_8041364: ; 8041364 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 @@ -101343,36 +101343,36 @@ sub_8041364: ; 8041364 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, =gUnknown_082DB8F3 str r0, [r1] @@ -101385,16 +101385,16 @@ sub_8041364: ; 8041364 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08041664 + b _08041664 .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 @@ -101416,58 +101416,58 @@ sub_8041728: ; 8041728 movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq @08041770 - b @08041A0A + beq _08041770 + b _08041A0A .pool -@08041744: +_08041744: ldr r0, =gUnknown_082DA7C4 bl b_call_bc_move_exec ldr r0, [r5] adds r0, 0x4D movs r1, 0x2 - b @08041764 + b _08041764 .pool -@08041758: +_08041758: ldr r0, =gUnknown_082DA7CD 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 .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 .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 @@ -101482,9 +101482,9 @@ sub_8041728: ; 8041728 ldr r0, =0x0202406c ldrb r0, [r0] cmp r5, r0 - bge @08041806 + bge _08041806 ldr r6, =0x02024210 -@080417D4: +_080417D4: ldrb r0, [r6] ldr r2, =gUnknown_0832A328 lsls r1, r5, 2 @@ -101492,7 +101492,7 @@ sub_8041728: ; 8041728 ldr r4, [r1] ands r0, r4 cmp r0, 0 - beq @080417FC + beq _080417FC lsls r0, r5, 24 lsrs r0, 24 movs r1, 0x6 @@ -101500,17 +101500,17 @@ sub_8041728: ; 8041728 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 @@ -101519,7 +101519,7 @@ sub_8041728: ; 8041728 mov r5, r8 ldr r7, =0x02024084 ldr r6, =0x0202406e -@08041816: +_08041816: ldr r3, [r5] adds r1, r3, 0 adds r1, 0x4E @@ -101533,7 +101533,7 @@ sub_8041728: ; 8041728 adds r0, r7 ldrh r0, [r0, 0x28] cmp r0, 0 - bne @0804185E + bne _0804185E adds r0, r3, 0 adds r0, 0xDF ldrb r1, [r0] @@ -101546,7 +101546,7 @@ sub_8041728: ; 8041728 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0804185E + bne _0804185E ldr r0, =0x02024210 ldrb r1, [r0] lsls r0, r4, 2 @@ -101554,9 +101554,9 @@ sub_8041728: ; 8041728 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] @@ -101567,15 +101567,15 @@ sub_8041728: ; 8041728 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 .pool -@080418A0: +_080418A0: ldr r0, =0x0202420d ldrb r0, [r0] bl sub_803F9EC @@ -101590,20 +101590,20 @@ sub_8041728: ; 8041728 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 .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 @@ -101614,14 +101614,14 @@ sub_8041728: ; 8041728 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, =gUnknown_0832A328 -@08041902: +_08041902: ldr r0, [r5] adds r4, r0, 0 adds r4, 0x4E @@ -101635,7 +101635,7 @@ sub_8041728: ; 8041728 adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - bne @08041930 + bne _08041930 ldr r0, =0x02024210 ldrb r1, [r0] lsls r0, r3, 2 @@ -101643,9 +101643,9 @@ sub_8041728: ; 8041728 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 @@ -101653,10 +101653,10 @@ sub_8041728: ; 8041728 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne @08041902 - b @08041978 + bne _08041902 + b _08041978 .pool -@08041960: +_08041960: mov r1, r8 ldr r0, [r1] adds r0, 0x4E @@ -101668,23 +101668,23 @@ sub_8041728: ; 8041728 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 .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 @@ -101695,9 +101695,9 @@ sub_8041728: ; 8041728 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 @@ -101706,9 +101706,9 @@ sub_8041728: ; 8041728 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 @@ -101716,9 +101716,9 @@ sub_8041728: ; 8041728 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 @@ -101727,28 +101727,28 @@ sub_8041728: ; 8041728 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 @@ -101766,31 +101766,31 @@ b_clear_atk_up_if_hit_flag_unless_enraged: ; 8041A1C 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 @@ -101811,47 +101811,47 @@ sub_8041A6C: ; 8041A6C mov r10, r1 ldr r2, =0x0202449c mov r8, r2 - b @08041A9A + b _08041A9A .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 .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] @@ -101875,9 +101875,9 @@ sub_8041A6C: ; 8041A6C ldr r0, [r1] ldr r2, =0x000001a3 adds r1, r0, r2 - bl @08042370 + bl _08042370 .pool -@08041B48: +_08041B48: ldr r7, =0x02024084 ldr r4, =0x0202420b ldrb r1, [r4] @@ -101892,14 +101892,14 @@ sub_8041A6C: ; 8041A6C 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 @@ -101928,9 +101928,9 @@ sub_8041A6C: ; 8041A6C str r0, [r1] movs r4, 0x2 mov r9, r4 - b @08041C6E + b _08041C6E .pool -@08041BC8: +_08041BC8: ldrb r0, [r4] adds r1, r0, 0 muls r1, r5 @@ -101939,25 +101939,25 @@ sub_8041A6C: ; 8041A6C 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] @@ -101970,13 +101970,13 @@ sub_8041A6C: ; 8041A6C 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, =gUnknown_082DB213 str r0, [r1] @@ -101988,9 +101988,9 @@ sub_8041A6C: ; 8041A6C str r0, [r2] movs r0, 0x2 mov r9, r0 - b @08041C6E + b _08041C6E .pool -@08041C50: +_08041C50: adds r2, 0x50 adds r2, r1, r2 ldr r0, [r2] @@ -102005,14 +102005,14 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08041C90: +_08041C90: ldr r1, =0x02024084 ldr r7, =0x0202420b ldrb r0, [r7] @@ -102025,7 +102025,7 @@ sub_8041A6C: ; 8041A6C movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq @08041D30 + beq _08041D30 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -102034,7 +102034,7 @@ sub_8041A6C: ; 8041A6C lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @08041D08 + beq _08041D08 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -102044,9 +102044,9 @@ sub_8041A6C: ; 8041A6C adds r0, r2 ldrb r0, [r0] cmp r0, 0x7D - bne @08041CD6 - b @08042162 -@08041CD6: + bne _08041CD6 + b _08042162 +_08041CD6: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB26A str r0, [r1] @@ -102056,9 +102056,9 @@ sub_8041A6C: ; 8041A6C lsls r1, 2 orrs r0, r1 str r0, [r2] - b @08041D28 + b _08041D28 .pool -@08041D08: +_08041D08: ldrb r0, [r7] adds r2, r0, 0 muls r2, r6 @@ -102074,19 +102074,19 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08041D50: +_08041D50: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -102096,9 +102096,9 @@ sub_8041A6C: ; 8041A6C 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 @@ -102107,9 +102107,9 @@ sub_8041A6C: ; 8041A6C 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 @@ -102129,9 +102129,9 @@ sub_8041A6C: ; 8041A6C movs r1, 0x1 orrs r0, r1 strb r0, [r2] - b @0804215E + b _0804215E .pool -@08041DC4: +_08041DC4: ldr r1, =0x02024084 ldr r3, =0x0202420b ldrb r2, [r3] @@ -102144,7 +102144,7 @@ sub_8041A6C: ; 8041A6C lsls r0, 15 ands r0, r1 cmp r0, 0 - beq @08041E10 + beq _08041E10 ldr r0, =0xffbfffff ands r1, r0 str r1, [r2] @@ -102169,14 +102169,14 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08041E40: +_08041E40: ldr r1, =0x02024084 ldr r3, =0x0202420b ldrb r2, [r3] @@ -102188,7 +102188,7 @@ sub_8041A6C: ; 8041A6C movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq @08041E8C + beq _08041E8C movs r0, 0x9 negs r0, r0 ands r1, r0 @@ -102214,14 +102214,14 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08041EB8: +_08041EB8: ldr r0, =0x020242bc ldr r3, =0x0202420b ldrb r2, [r3] @@ -102233,9 +102233,9 @@ sub_8041A6C: ; 8041A6C 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 @@ -102259,14 +102259,14 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08041F38: +_08041F38: ldr r0, =0x020242bc ldr r4, =0x0202420b ldrb r3, [r4] @@ -102277,7 +102277,7 @@ sub_8041A6C: ; 8041A6C ldrb r0, [r1, 0x13] lsls r0, 28 cmp r0, 0 - beq @08041F8C + beq _08041F8C ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -102287,7 +102287,7 @@ sub_8041A6C: ; 8041A6C adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - bne @08041F8C + bne _08041F8C ldr r0, =0x0202433c lsls r2, r3, 4 adds r2, r0 @@ -102308,14 +102308,14 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08041FC0: +_08041FC0: ldr r4, =0x0202420b ldrb r0, [r4] ldr r1, =0x020241ea @@ -102323,7 +102323,7 @@ sub_8041A6C: ; 8041A6C bl sub_8040130 lsls r0, 24 cmp r0, 0 - beq @08041FFE + beq _08041FFE ldr r0, =0x0202433c ldrb r2, [r4] lsls r2, 4 @@ -102345,14 +102345,14 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08042028: +_08042028: ldr r7, =0x02024084 ldr r5, =0x0202420b ldrb r0, [r5] @@ -102366,7 +102366,7 @@ sub_8041A6C: ; 8041A6C adds r0, r1, 0 ands r0, r3 cmp r0, 0 - beq @080420FA + beq _080420FA subs r0, r1, 0x1 str r0, [r2] ldrb r0, [r5] @@ -102375,20 +102375,20 @@ sub_8041A6C: ; 8041A6C 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 .pool -@0804207C: +_0804207C: ldr r0, =0x02024332 movs r4, 0x1 strb r1, [r0, 0x5] @@ -102425,29 +102425,29 @@ sub_8041A6C: ; 8041A6C lsls r1, 12 orrs r0, r1 str r0, [r2] -@080420C6: +_080420C6: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB2BD - b @080420F0 + b _080420F0 .pool -@080420E8: +_080420E8: bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DB300 -@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 .pool -@08042114: +_08042114: ldr r1, =0x02024084 ldr r4, =0x0202420b ldrb r2, [r4] @@ -102459,14 +102459,14 @@ sub_8041A6C: ; 8041A6C 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 @@ -102484,22 +102484,22 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08042194: +_08042194: ldr r1, =0x02024084 ldr r4, =0x0202420b ldrb r2, [r4] @@ -102512,7 +102512,7 @@ sub_8041A6C: ; 8041A6C lsls r0, 12 ands r1, r0 cmp r1, 0 - beq @0804220E + beq _0804220E lsrs r0, r1, 16 bl sub_806F8A8 ldr r1, =0x02024474 @@ -102521,11 +102521,11 @@ sub_8041A6C: ; 8041A6C movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq @080421D8 + beq _080421D8 bl b_movescr_stack_push_cursor - b @08042200 + b _08042200 .pool -@080421D8: +_080421D8: ldr r0, =gUnknown_082DB334 bl b_movescr_stack_push ldr r2, =0x02024280 @@ -102544,7 +102544,7 @@ sub_8041A6C: ; 8041A6C strb r0, [r2, 0x1] ldrb r0, [r4] bl b_cancel_multi_turn_move_maybe -@08042200: +_08042200: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB327 str r0, [r1] @@ -102552,14 +102552,14 @@ sub_8041A6C: ; 8041A6C 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 .pool -@08042234: +_08042234: ldr r1, =0x02024084 ldr r6, =0x0202420b ldrb r0, [r6] @@ -102573,7 +102573,7 @@ sub_8041A6C: ; 8041A6C adds r0, r2, 0 ands r0, r4 cmp r0, 0 - beq @08042306 + beq _08042306 ldr r7, =0xffffff00 adds r0, r2, r7 str r0, [r3] @@ -102584,18 +102584,18 @@ sub_8041A6C: ; 8041A6C ldr r0, [r0] ands r0, r4 cmp r0, 0 - beq @08042280 + beq _08042280 ldr r1, =0x02024214 ldr r0, =gUnknown_082DAD71 - b @08042300 + b _08042300 .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] @@ -102621,35 +102621,35 @@ sub_8041A6C: ; 8041A6C 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, =gUnknown_082DAD7C str r0, [r1] ldr r2, =0x0202449c mov r8, r2 - b @08042302 + b _08042302 .pool -@080422FC: +_080422FC: ldr r1, =0x02024214 ldr r0, =gUnknown_082DADC4 -@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 .pool -@0804231C: +_0804231C: ldr r1, =0x02024084 ldr r0, =0x0202420b ldrb r2, [r0] @@ -102661,7 +102661,7 @@ sub_8041A6C: ; 8041A6C movs r0, 0x20 ands r0, r3 cmp r0, 0 - beq @08042368 + beq _08042368 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -102671,7 +102671,7 @@ sub_8041A6C: ; 8041A6C adds r0, r2 ldrb r0, [r0] cmp r0, 0x7D - bne @08042360 + bne _08042360 movs r0, 0x21 negs r0, r0 ands r3, r0 @@ -102683,33 +102683,33 @@ sub_8041A6C: ; 8041A6C 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] @@ -102727,7 +102727,7 @@ sub_8041A6C: ; 8041A6C 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} @@ -102760,26 +102760,26 @@ sub_80423F4: ; 80423F4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @08042424 + bne _08042424 movs r0, 0 - b @080426A0 + b _080426A0 .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 @@ -102788,9 +102788,9 @@ sub_80423F4: ; 80423F4 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 @@ -102799,53 +102799,53 @@ sub_80423F4: ; 80423F4 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 .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 .pool -@080424D0: +_080424D0: ldr r0, =0x02024744 mov r8, r0 movs r1, 0x1 @@ -102853,9 +102853,9 @@ sub_80423F4: ; 80423F4 negs r0, r1 orrs r0, r1 lsrs r6, r0, 31 - b @0804250C + b _0804250C .pool -@080424E4: +_080424E4: adds r0, r4, 0 bl sub_806D864 lsls r0, 24 @@ -102866,23 +102866,23 @@ sub_80423F4: ; 80423F4 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 @@ -102891,64 +102891,64 @@ sub_80423F4: ; 80423F4 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 .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 .pool -@0804259C: +_0804259C: adds r4, 0x1 -@0804259E: +_0804259E: cmp r4, r6 - bge @080425D2 + bge _080425D2 movs r0, 0x64 muls r0, r4 mov r1, r8 @@ -102957,31 +102957,31 @@ sub_80423F4: ; 80423F4 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 @@ -102992,9 +102992,9 @@ sub_80423F4: ; 80423F4 lsrs r6, r0, 24 ldr r2, =0x02024744 mov r8, r2 - b @08042620 + b _08042620 .pool -@08042608: +_08042608: movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -103005,27 +103005,27 @@ sub_80423F4: ; 80423F4 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 @@ -103034,46 +103034,46 @@ sub_80423F4: ; 80423F4 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 @@ -103098,15 +103098,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 @@ -103115,7 +103115,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 @@ -103124,24 +103124,24 @@ 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 .pool -@08042734: +_08042734: movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -103152,7 +103152,7 @@ castform_switch: ; 80426BC lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @08042760 + bne _08042760 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -103161,18 +103161,18 @@ castform_switch: ; 80426BC 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 @@ -103181,20 +103181,20 @@ castform_switch: ; 80426BC 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 @@ -103203,21 +103203,21 @@ castform_switch: ; 80426BC 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 @@ -103226,21 +103226,21 @@ castform_switch: ; 80426BC 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 @@ -103249,18 +103249,18 @@ castform_switch: ; 80426BC 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} @@ -103297,15 +103297,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 @@ -103314,9 +103314,9 @@ ability_something: ; 8042828 movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @080428A4 + b _080428A4 .pool -@08042894: +_08042894: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -103325,22 +103325,22 @@ ability_something: ; 8042828 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 @@ -103349,9 +103349,9 @@ ability_something: ; 8042828 movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @080428F8 + b _080428F8 .pool -@080428E8: +_080428E8: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -103360,7 +103360,7 @@ ability_something: ; 8042828 movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -@080428F8: +_080428F8: adds r5, r1, r0 adds r0, r7, 0 movs r1, 0xB @@ -103387,18 +103387,18 @@ ability_something: ; 8042828 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 .pool -@08042958: +_08042958: ldr r2, =0x0202420a ldr r1, =0x02024084 movs r0, 0x58 @@ -103410,167 +103410,167 @@ ability_something: ; 8042828 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 .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 .pool -@080429A0: +_080429A0: ldr r1, =gBattleMoves 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 .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 .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 .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 @@ -103578,66 +103578,66 @@ ability_something: ; 8042828 strb r0, [r1, 0x10] mov r2, r10 strb r2, [r1, 0x17] - b @08042B42 + b _08042B42 .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 .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, =gUnknown_082DACE7 bl b_push_move_exec - bl @0804441E + bl _0804441E .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, =gUnknown_082DB430 @@ -103645,17 +103645,17 @@ ability_something: ; 8042828 ldr r0, =0x02024474 mov r1, r10 strb r1, [r0, 0x17] - bl @080443D0 + bl _080443D0 .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, =gUnknown_082DB470 @@ -103663,17 +103663,17 @@ ability_something: ; 8042828 ldr r0, =0x02024474 mov r2, r10 strb r2, [r0, 0x17] - bl @080443D0 + bl _080443D0 .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, =gUnknown_082DB52A @@ -103681,9 +103681,9 @@ ability_something: ; 8042828 ldr r0, =0x02024474 mov r3, r10 strb r3, [r0, 0x17] - bl @080443D0 + bl _080443D0 .pool -@08042C08: +_08042C08: ldr r0, =0x0202437c mov r5, r10 lsls r2, r5, 2 @@ -103693,9 +103693,9 @@ ability_something: ; 8042828 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] @@ -103705,26 +103705,26 @@ ability_something: ; 8042828 str r0, [r1] ldrb r0, [r3] movs r1, 0x8 - b @08042C92 + b _08042C92 .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, =gUnknown_082DB4A9 bl b_push_move_exec ldr r0, =0x02024474 mov r1, r10 strb r1, [r0, 0x17] - bl @080442E2 + bl _080442E2 .pool -@08042C68: +_08042C68: ldr r0, =0x0202437c mov r3, r10 lsls r2, r3, 2 @@ -103734,9 +103734,9 @@ ability_something: ; 8042828 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] @@ -103746,37 +103746,37 @@ ability_something: ; 8042828 str r0, [r1] ldrb r0, [r3] movs r1, 0x10 -@08042C92: +_08042C92: orrs r0, r1 strb r0, [r3] - bl @0804441E + bl _0804441E .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 .pool -@08042CDC: +_08042CDC: ldr r5, =0x02024084 mov r8, r5 movs r0, 0x58 @@ -103785,32 +103785,32 @@ ability_something: ; 8042828 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 .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 @@ -103821,9 +103821,9 @@ ability_something: ; 8042828 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 @@ -103832,23 +103832,23 @@ ability_something: ; 8042828 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, =gUnknown_082DB45C bl b_push_move_exec @@ -103857,24 +103857,24 @@ ability_something: ; 8042828 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 .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 @@ -103883,54 +103883,54 @@ ability_something: ; 8042828 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, =gUnknown_0831BC70 bl CopyString -@08042DDC: +_08042DDC: ldr r0, [r5] movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq @08042DEE + beq _08042DEE ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC78 bl CopyString -@08042DEE: +_08042DEE: ldr r0, [r5] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq @08042E00 + beq _08042E00 ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC80 bl CopyString -@08042E00: +_08042E00: ldr r0, [r5] movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq @08042E12 + beq _08042E12 ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC88 bl CopyString -@08042E12: +_08042E12: ldr r0, [r5] movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq @08042E24 + beq _08042E24 ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC90 bl CopyString -@08042E24: +_08042E24: str r4, [r5] mov r1, r8 adds r1, 0x50 @@ -103954,16 +103954,16 @@ ability_something: ; 8042828 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - bl @080443D0 + bl _080443D0 .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 @@ -103972,9 +103972,9 @@ ability_something: ; 8042828 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] @@ -103985,9 +103985,9 @@ ability_something: ; 8042828 ldr r0, =gUnknown_082DB444 bl b_push_move_exec strb r5, [r4, 0x17] - bl @080443D0 + bl _080443D0 .pool -@08042ED0: +_08042ED0: ldr r2, =0x020242bc ldrb r0, [r0] lsls r1, r0, 3 @@ -104004,45 +104004,45 @@ ability_something: ; 8042828 ands r0, r3 orrs r0, r2 strb r0, [r1, 0x18] - bl @0804441E + bl _0804441E .pool -@08042EF8: +_08042EF8: ldrb r0, [r7] cmp r0, 0x2B - beq @08042F02 - bl @0804441E -@08042F02: + beq _08042F02 + bl _0804441E +_08042F02: movs r4, 0 ldr r0, =gUnknown_0831BCF8 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] @@ -104055,43 +104055,43 @@ ability_something: ; 8042828 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, =gUnknown_082DB61F str r0, [r1] movs r0, 0x1 mov r9, r0 - bl @08044424 + bl _08044424 .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, =gBattleMoves lsls r1, r5, 1 adds r1, r5 @@ -104099,9 +104099,9 @@ ability_something: ; 8042828 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] @@ -104110,24 +104110,24 @@ ability_something: ; 8042828 ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge @08042FF0 + bge _08042FF0 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB56F - b @08042FF4 + b _08042FF4 .pool -@08042FF0: +_08042FF0: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB56E -@08042FF4: +_08042FF4: str r0, [r1] movs r1, 0x1 - b @08043124 + b _08043124 .pool -@08043004: +_08043004: cmp r3, 0xB - beq @0804300A - b @08043126 -@0804300A: + beq _0804300A + b _08043126 +_0804300A: ldr r0, =gBattleMoves lsls r1, r5, 1 adds r1, r5 @@ -104135,9 +104135,9 @@ ability_something: ; 8042828 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] @@ -104146,23 +104146,23 @@ ability_something: ; 8042828 ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge @08043048 + bge _08043048 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB56F - b @0804304C + b _0804304C .pool -@08043048: +_08043048: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB56E -@0804304C: +_0804304C: str r0, [r1] movs r2, 0x1 mov r9, r2 - b @08043126 + b _08043126 .pool -@0804305C: +_0804305C: cmp r3, 0xA - bne @08043126 + bne _08043126 ldr r1, =0x02024084 movs r0, 0x58 mov r3, r10 @@ -104174,7 +104174,7 @@ ability_something: ; 8042828 movs r1, 0x20 ands r0, r1 cmp r0, 0 - bne @08043126 + bne _08043126 ldr r2, =0x020244a8 ldr r0, [r2] ldr r0, [r0, 0x4] @@ -104186,7 +104186,7 @@ ability_something: ; 8042828 ands r3, r4 adds r5, r1, 0 cmp r3, 0 - bne @080430EC + bne _080430EC ldr r0, =0x02024332 strb r3, [r0, 0x5] ldr r1, =0x0202433c @@ -104197,15 +104197,15 @@ ability_something: ; 8042828 ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge @080430C8 + bge _080430C8 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB5A8 - b @080430CC + b _080430CC .pool -@080430C8: +_080430C8: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB5A7 -@080430CC: +_080430CC: str r0, [r1] ldr r0, [r2] ldr r1, [r0, 0x4] @@ -104216,9 +104216,9 @@ ability_something: ; 8042828 str r0, [r1] movs r0, 0x2 mov r9, r0 - b @08043126 + b _08043126 .pool -@080430EC: +_080430EC: ldr r0, =0x02024332 strb r4, [r0, 0x5] ldr r1, =0x0202433c @@ -104229,25 +104229,25 @@ ability_something: ; 8042828 ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge @0804311C + bge _0804311C ldr r1, =0x02024214 ldr r0, =gUnknown_082DB5A8 - b @08043120 + b _08043120 .pool -@0804311C: +_0804311C: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB5A7 -@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 @@ -104257,7 +104257,7 @@ ability_something: ; 8042828 ldrh r0, [r1, 0x2C] ldrh r5, [r1, 0x28] cmp r0, r5 - bne @0804318C + bne _0804318C ldr r1, =0x0202433c ldr r0, =0x0202420b ldrb r0, [r0] @@ -104266,109 +104266,109 @@ ability_something: ; 8042828 ldrb r0, [r0, 0x2] lsls r0, 28 cmp r0, 0 - bge @08043178 + bge _08043178 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB592 str r0, [r1] - bl @0804441E + bl _0804441E .pool -@08043178: +_08043178: ldr r1, =0x02024214 ldr r0, =gUnknown_082DB591 str r0, [r1] - bl @0804441E + bl _0804441E .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 .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 .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, =gBattleMoves lsls r1, r5, 1 adds r1, r5 @@ -104376,9 +104376,9 @@ ability_something: ; 8042828 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] @@ -104390,15 +104390,15 @@ ability_something: ; 8042828 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 @@ -104409,21 +104409,21 @@ ability_something: ; 8042828 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 @@ -104438,17 +104438,17 @@ ability_something: ; 8042828 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB64D str r0, [r1] - bl @080443D0 + bl _080443D0 .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] @@ -104457,18 +104457,18 @@ ability_something: ; 8042828 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] @@ -104480,15 +104480,15 @@ ability_something: ; 8042828 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, =gBattleMoves lsls r0, r5, 1 adds r0, r5 @@ -104499,32 +104499,32 @@ ability_something: ; 8042828 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, =gUnknown_082DB654 str r0, [r1] - bl @080443D0 + bl _080443D0 .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] @@ -104533,18 +104533,18 @@ ability_something: ; 8042828 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] @@ -104556,15 +104556,15 @@ ability_something: ; 8042828 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, =gBattleMoves lsls r0, r5, 1 adds r0, r5 @@ -104574,9 +104574,9 @@ ability_something: ; 8042828 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 @@ -104584,24 +104584,24 @@ ability_something: ; 8042828 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] @@ -104615,17 +104615,17 @@ ability_something: ; 8042828 lsls r1, 6 orrs r0, r1 str r0, [r2] - bl @080443D0 + bl _080443D0 .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] @@ -104634,18 +104634,18 @@ ability_something: ; 8042828 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] @@ -104657,15 +104657,15 @@ ability_something: ; 8042828 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, =gBattleMoves lsls r0, r5, 1 adds r0, r5 @@ -104675,9 +104675,9 @@ ability_something: ; 8042828 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 @@ -104685,9 +104685,9 @@ ability_something: ; 8042828 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] @@ -104701,17 +104701,17 @@ ability_something: ; 8042828 lsls r1, 6 orrs r0, r1 str r0, [r2] - bl @080443D0 + bl _080443D0 .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] @@ -104720,18 +104720,18 @@ ability_something: ; 8042828 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] @@ -104743,15 +104743,15 @@ ability_something: ; 8042828 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, =gBattleMoves lsls r0, r5, 1 adds r0, r5 @@ -104761,9 +104761,9 @@ ability_something: ; 8042828 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 @@ -104771,9 +104771,9 @@ ability_something: ; 8042828 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] @@ -104787,17 +104787,17 @@ ability_something: ; 8042828 lsls r1, 6 orrs r0, r1 str r0, [r2] - bl @080443D0 + bl _080443D0 .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] @@ -104806,18 +104806,18 @@ ability_something: ; 8042828 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, =gBattleMoves lsls r0, r5, 1 adds r0, r5 @@ -104827,9 +104827,9 @@ ability_something: ; 8042828 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] @@ -104841,15 +104841,15 @@ ability_something: ; 8042828 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 @@ -104857,9 +104857,9 @@ ability_something: ; 8042828 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] @@ -104873,17 +104873,17 @@ ability_something: ; 8042828 lsls r1, 6 orrs r0, r1 str r0, [r2] - bl @080443D0 + bl _080443D0 .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 @@ -104894,18 +104894,18 @@ ability_something: ; 8042828 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, =gBattleMoves lsls r0, r5, 1 adds r0, r5 @@ -104915,9 +104915,9 @@ ability_something: ; 8042828 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] @@ -104929,23 +104929,23 @@ ability_something: ; 8042828 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 @@ -104953,9 +104953,9 @@ ability_something: ; 8042828 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 @@ -104963,9 +104963,9 @@ ability_something: ; 8042828 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 @@ -104976,9 +104976,9 @@ ability_something: ; 8042828 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 @@ -104990,27 +104990,27 @@ ability_something: ; 8042828 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 @@ -105029,17 +105029,17 @@ ability_something: ; 8042828 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB66F str r0, [r1] - bl @080443D0 + bl _080443D0 .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 @@ -105051,84 +105051,84 @@ ability_something: ; 8042828 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 .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 @@ -105140,14 +105140,14 @@ ability_something: ; 8042828 ldr r1, =0x00000f88 ands r0, r1 cmp r0, 0 - bne @08043A6A - b @08043B96 -@08043A6A: + bne _08043A6A + b _08043B96 +_08043A6A: ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC70 - b @08043B5C + b _08043B5C .pool -@08043A7C: +_08043A7C: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -105159,17 +105159,17 @@ ability_something: ; 8042828 movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne @08043A96 - b @08043B96 -@08043A96: + bne _08043A96 + b _08043B96 +_08043A96: ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC98 bl CopyString movs r2, 0x2 mov r9, r2 - b @08043B9C + b _08043B9C .pool -@08043AAC: +_08043AAC: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -105181,12 +105181,12 @@ ability_something: ; 8042828 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq @08043B96 + beq _08043B96 ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC80 - b @08043B5C + b _08043B5C .pool -@08043AD4: +_08043AD4: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -105197,7 +105197,7 @@ ability_something: ; 8042828 movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq @08043B96 + beq _08043B96 adds r2, 0x50 adds r2, r3, r2 ldr r0, [r2] @@ -105209,9 +105209,9 @@ ability_something: ; 8042828 bl CopyString movs r0, 0x1 mov r9, r0 - b @08043B9C + b _08043B9C .pool -@08043B10: +_08043B10: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -105223,15 +105223,15 @@ ability_something: ; 8042828 movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq @08043B96 + beq _08043B96 ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC88 bl CopyString movs r2, 0x1 mov r9, r2 - b @08043B9C + b _08043B9C .pool -@08043B40: +_08043B40: movs r0, 0x58 mov r3, r10 muls r3, r0 @@ -105243,16 +105243,16 @@ ability_something: ; 8042828 movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq @08043B96 + beq _08043B96 ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC90 -@08043B5C: +_08043B5C: bl CopyString movs r5, 0x1 mov r9, r5 - b @08043B9C + b _08043B9C .pool -@08043B70: +_08043B70: movs r0, 0x58 mov r1, r10 muls r1, r0 @@ -105265,32 +105265,32 @@ ability_something: ; 8042828 lsls r1, 12 ands r0, r1 cmp r0, 0 - beq @08043B96 + beq _08043B96 ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BCA0 bl CopyString 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 .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 @@ -105298,9 +105298,9 @@ ability_something: ; 8042828 adds r1, 0x4C adds r2, r1 movs r0, 0 - b @08043BFA + b _08043BFA .pool -@08043BD0: +_08043BD0: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -105310,9 +105310,9 @@ ability_something: ; 8042828 ldr r0, [r2] movs r1, 0x8 negs r1, r1 - b @08043BF8 + b _08043BF8 .pool -@08043BE8: +_08043BE8: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r10 @@ -105321,11 +105321,11 @@ ability_something: ; 8042828 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, =gUnknown_082DB68C @@ -105348,9 +105348,9 @@ ability_something: ; 8042828 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - bl @0804443A + bl _0804443A .pool -@08043C50: +_08043C50: mov r0, r10 adds r0, 0x1 lsls r0, 24 @@ -105359,22 +105359,22 @@ ability_something: ; 8042828 ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 - bcs @08043C64 - b @08043918 -@08043C64: - bl @0804441E + bcs _08043C64 + b _08043918 +_08043C64: + bl _0804441E .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 @@ -105383,16 +105383,16 @@ ability_something: ; 8042828 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 @@ -105401,24 +105401,24 @@ ability_something: ; 8042828 ldr r0, =0x0202406c ldrb r0, [r0] cmp r10, r0 - bcc @08043C7C - b @0804441E + bcc _08043C7C + b _0804441E .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] @@ -105434,10 +105434,10 @@ ability_something: ; 8042828 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] @@ -105458,23 +105458,23 @@ ability_something: ; 8042828 lsls r1, 6 orrs r0, r1 str r0, [r4] - b @080443D0 + b _080443D0 .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] @@ -105490,10 +105490,10 @@ ability_something: ; 8042828 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] @@ -105513,16 +105513,16 @@ ability_something: ; 8042828 lsls r1, 6 orrs r0, r1 str r0, [r4] - b @080443D0 + b _080443D0 .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 @@ -105530,31 +105530,31 @@ ability_something: ; 8042828 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 .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 @@ -105562,13 +105562,13 @@ ability_something: ; 8042828 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 @@ -105578,9 +105578,9 @@ ability_something: ; 8042828 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 @@ -105601,9 +105601,9 @@ ability_something: ; 8042828 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 @@ -105613,10 +105613,10 @@ ability_something: ; 8042828 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 @@ -105625,10 +105625,10 @@ ability_something: ; 8042828 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] @@ -105656,9 +105656,9 @@ ability_something: ; 8042828 ldrb r0, [r0] ldr r2, =0x0202420a strb r0, [r2] - b @08043FAC + b _08043FAC .pool -@08043EFC: +_08043EFC: ldr r3, =0x02024084 movs r2, 0x58 adds r0, r6, 0 @@ -105668,10 +105668,10 @@ ability_something: ; 8042828 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 @@ -105689,9 +105689,9 @@ ability_something: ; 8042828 adds r0, r3 adds r0, 0x20 ldrb r0, [r0] - b @08043FA8 + b _08043FA8 .pool -@08043F40: +_08043F40: ldr r3, =0x02024084 movs r2, 0x58 adds r0, r7, 0 @@ -105701,10 +105701,10 @@ ability_something: ; 8042828 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 @@ -105722,9 +105722,9 @@ ability_something: ; 8042828 adds r0, r3 adds r0, 0x20 ldrb r0, [r0] - b @08043FA8 + b _08043FA8 .pool -@08043F84: +_08043F84: mov r2, r8 strb r6, [r2] movs r3, 0x58 @@ -105736,28 +105736,28 @@ ability_something: ; 8042828 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] @@ -105768,19 +105768,19 @@ ability_something: ; 8042828 ldr r0, =0x0202406c ldrb r0, [r0] cmp r4, r0 - bge @08043FD6 - b @08043E22 -@08043FD6: - b @0804441E + bge _08043FD6 + b _08043E22 +_08043FD6: + b _0804441E .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 @@ -105788,24 +105788,24 @@ ability_something: ; 8042828 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 .pool -@08044028: +_08044028: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -105814,11 +105814,11 @@ ability_something: ; 8042828 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 @@ -105826,28 +105826,28 @@ ability_something: ; 8042828 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 .pool -@08044084: +_08044084: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -105856,11 +105856,11 @@ ability_something: ; 8042828 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 @@ -105868,103 +105868,103 @@ ability_something: ; 8042828 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 .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 .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 .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 .pool -@08044174: +_08044174: movs r0, 0x58 muls r0, r4 adds r0, r2 @@ -105972,30 +105972,30 @@ ability_something: ; 8042828 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 @@ -106005,33 +106005,33 @@ ability_something: ; 8042828 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 .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 @@ -106039,20 +106039,20 @@ ability_something: ; 8042828 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 .pool -@08044220: +_08044220: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -106061,25 +106061,25 @@ ability_something: ; 8042828 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 @@ -106087,15 +106087,15 @@ ability_something: ; 8042828 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 .pool -@0804427C: +_0804427C: mov r0, r10 bl battle_side_get_owner lsls r0, 24 @@ -106104,25 +106104,25 @@ ability_something: ; 8042828 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 @@ -106130,29 +106130,29 @@ ability_something: ; 8042828 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 .pool -@080442D8: +_080442D8: ldr r0, =gUnknown_082DB4A9 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 .pool -@080442FC: +_080442FC: ldr r0, =gUnknown_082DB4A9 bl b_push_move_exec ldr r0, =0x02024474 @@ -106164,9 +106164,9 @@ ability_something: ; 8042828 mov r1, r9 subs r1, 0x1 strb r1, [r0] - b @0804443A + b _0804443A .pool -@08044324: +_08044324: strb r1, [r7] ldr r0, [r2] ldr r1, =0xfff7ffff @@ -106174,9 +106174,9 @@ ability_something: ; 8042828 str r0, [r2] ldr r0, =gUnknown_082DB4B8 bl b_push_move_exec - b @080443C8 + b _080443C8 .pool -@08044340: +_08044340: ldr r0, =gUnknown_082DB452 bl b_push_move_exec ldr r1, =0x020242ac @@ -106214,9 +106214,9 @@ ability_something: ; 8042828 movs r0, 0x1 negs r0, r0 strb r0, [r1, 0x3] - b @0804441E + b _0804441E .pool -@080443B4: +_080443B4: strb r1, [r7] ldr r0, [r2] ldr r1, =0xfff7ffff @@ -106226,63 +106226,63 @@ ability_something: ; 8042828 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB4C1 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 .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} @@ -106382,7 +106382,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 @@ -106390,9 +106390,9 @@ berry_effects_maybe: ; 80444DC adds r0, r1 ldrb r5, [r0, 0x7] ldrb r0, [r0, 0x1A] - b @08044548 + b _08044548 .pool -@08044534: +_08044534: ldrh r0, [r4] bl itemid_get_x12 lsls r0, 24 @@ -106401,7 +106401,7 @@ berry_effects_maybe: ; 80444DC bl itemid_get_quality lsls r0, 24 lsrs r0, 24 -@08044548: +_08044548: mov r9, r0 ldr r1, =0x02024084 ldr r0, =0x0202420b @@ -106412,7 +106412,7 @@ berry_effects_maybe: ; 80444DC 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 @@ -106421,9 +106421,9 @@ berry_effects_maybe: ; 80444DC ldrb r3, [r0, 0x7] mov r8, r3 ldrb r0, [r0, 0x1A] - b @08044592 + b _08044592 .pool -@0804457C: +_0804457C: ldr r0, [sp, 0x14] bl itemid_get_x12 lsls r0, 24 @@ -106433,7 +106433,7 @@ berry_effects_maybe: ; 80444DC bl itemid_get_quality lsls r0, 24 lsrs r0, 24 -@08044592: +_08044592: str r0, [sp, 0x10] ldr r2, =0x02024084 ldr r0, =0x0202420c @@ -106443,52 +106443,52 @@ berry_effects_maybe: ; 80444DC 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 .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 .pool -@08044618: +_08044618: ldr r1, =0x02024084 mov r8, r1 movs r0, 0x58 @@ -106500,27 +106500,27 @@ berry_effects_maybe: ; 80444DC 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 @@ -106531,9 +106531,9 @@ berry_effects_maybe: ; 80444DC strb r7, [r1] ldr r0, =gUnknown_082DB7AE bl b_call_bc_move_exec - bl @0804582A + bl _0804582A .pool -@08044688: +_08044688: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -106541,66 +106541,66 @@ berry_effects_maybe: ; 80444DC 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 .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 @@ -106609,13 +106609,13 @@ berry_effects_maybe: ; 80444DC 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] @@ -106624,27 +106624,27 @@ berry_effects_maybe: ; 80444DC 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, =gUnknown_082DB7C4 bl b_call_bc_move_exec - b @08044B02 + b _08044B02 .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 @@ -106652,9 +106652,9 @@ berry_effects_maybe: ; 80444DC movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @080447EA + b _080447EA .pool -@080447DC: +_080447DC: ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -106662,12 +106662,12 @@ berry_effects_maybe: ; 80444DC 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 @@ -106685,22 +106685,22 @@ berry_effects_maybe: ; 80444DC 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 @@ -106712,15 +106712,15 @@ berry_effects_maybe: ; 80444DC 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 .pool -@08044860: +_08044860: add r0, sp, 0x4 strb r1, [r0] -@08044864: +_08044864: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -106748,9 +106748,9 @@ berry_effects_maybe: ; 80444DC bl dp01_battle_side_mark_buffer_for_execution movs r0, 0x3 str r0, [sp, 0xC] - bl @080451DE + bl _080451DE .pool -@080448B0: +_080448B0: ldr r0, =0x02024084 movs r1, 0x58 muls r1, r7 @@ -106759,29 +106759,29 @@ berry_effects_maybe: ; 80444DC 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 @@ -106792,9 +106792,9 @@ berry_effects_maybe: ; 80444DC strb r7, [r1] ldr r0, =gUnknown_082DB7AE bl b_call_bc_move_exec - bl @080451D6 + bl _080451D6 .pool -@0804491C: +_0804491C: movs r0, 0x58 muls r0, r7 mov r2, r8 @@ -106802,31 +106802,31 @@ berry_effects_maybe: ; 80444DC 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] @@ -106837,9 +106837,9 @@ berry_effects_maybe: ; 80444DC adds r0, r7, 0 adds r1, r5, 0 bl b_history__record_item_x12_of_player - bl @080451D6 + bl _080451D6 .pool -@0804497C: +_0804497C: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -106850,13 +106850,13 @@ berry_effects_maybe: ; 80444DC 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] @@ -106871,19 +106871,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -106896,12 +106896,12 @@ berry_effects_maybe: ; 80444DC bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge @080449F0 - b @08044B7C -@080449F0: - b @08044B90 + bge _080449F0 + b _08044B7C +_080449F0: + b _08044B90 .pool -@080449FC: +_080449FC: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -106911,13 +106911,13 @@ berry_effects_maybe: ; 80444DC 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] @@ -106933,18 +106933,18 @@ berry_effects_maybe: ; 80444DC 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] @@ -106957,12 +106957,12 @@ berry_effects_maybe: ; 80444DC bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge @08044A6E - b @08044C0E -@08044A6E: - b @08044C24 + bge _08044A6E + b _08044C0E +_08044A6E: + b _08044C24 .pool -@08044A78: +_08044A78: movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -106973,13 +106973,13 @@ berry_effects_maybe: ; 80444DC 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] @@ -106995,19 +106995,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107020,20 +107020,20 @@ berry_effects_maybe: ; 80444DC bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge @08044AFC + bge _08044AFC ldr r0, =gUnknown_082DB824 bl b_call_bc_move_exec - b @08044B02 + b _08044B02 .pool -@08044AFC: +_08044AFC: ldr r0, =gUnknown_082DB7C4 bl b_call_bc_move_exec -@08044B02: +_08044B02: movs r0, 0x4 str r0, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044B0C: +_08044B0C: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -107044,13 +107044,13 @@ berry_effects_maybe: ; 80444DC 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] @@ -107066,19 +107066,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107091,21 +107091,21 @@ berry_effects_maybe: ; 80444DC bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge @08044B90 -@08044B7C: + bge _08044B90 +_08044B7C: ldr r0, =gUnknown_082DB824 bl b_call_bc_move_exec - b @08044B96 + b _08044B96 .pool -@08044B90: +_08044B90: ldr r0, =gUnknown_082DB7C4 bl b_call_bc_move_exec -@08044B96: +_08044B96: movs r3, 0x4 str r3, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044BA0: +_08044BA0: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -107115,13 +107115,13 @@ berry_effects_maybe: ; 80444DC 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] @@ -107137,19 +107137,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107162,21 +107162,21 @@ berry_effects_maybe: ; 80444DC bl sub_806E880 lsls r0, 24 cmp r0, 0 - bge @08044C24 -@08044C0E: + bge _08044C24 +_08044C0E: ldr r0, =gUnknown_082DB824 bl b_call_bc_move_exec - b @08044C2A + b _08044C2A .pool -@08044C24: +_08044C24: ldr r0, =gUnknown_082DB7C4 bl b_call_bc_move_exec -@08044C2A: +_08044C2A: movs r2, 0x4 str r2, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044C34: +_08044C34: movs r0, 0x58 muls r0, r7 mov r3, r8 @@ -107186,19 +107186,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107222,9 +107222,9 @@ berry_effects_maybe: ; 80444DC movs r0, 0x11 strb r0, [r1, 0x1A] movs r0, 0xF - b @08044DF0 + b _08044DF0 .pool -@08044C9C: +_08044C9C: movs r0, 0x58 muls r0, r7 mov r1, r8 @@ -107234,19 +107234,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107262,9 +107262,9 @@ berry_effects_maybe: ; 80444DC movs r0, 0x12 strb r0, [r1, 0x1A] movs r0, 0x10 - b @08044D8A + b _08044D8A .pool -@08044CF0: +_08044CF0: movs r0, 0x58 muls r0, r7 mov r3, r8 @@ -107274,19 +107274,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107302,9 +107302,9 @@ berry_effects_maybe: ; 80444DC movs r0, 0x13 strb r0, [r1, 0x1A] movs r0, 0x11 - b @08044DF0 + b _08044DF0 .pool -@08044D44: +_08044D44: movs r0, 0x58 muls r0, r7 mov r1, r8 @@ -107314,19 +107314,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107342,16 +107342,16 @@ berry_effects_maybe: ; 80444DC movs r0, 0x14 strb r0, [r1, 0x1A] movs r0, 0x12 -@08044D8A: +_08044D8A: strb r0, [r1, 0x10] strb r6, [r1, 0x11] ldr r0, =gUnknown_082DB84E bl b_call_bc_move_exec movs r2, 0x5 str r2, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044DAC: +_08044DAC: movs r0, 0x58 muls r0, r7 mov r3, r8 @@ -107361,19 +107361,19 @@ berry_effects_maybe: ; 80444DC 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] @@ -107388,16 +107388,16 @@ berry_effects_maybe: ; 80444DC movs r0, 0x15 strb r0, [r1, 0x1A] movs r0, 0x13 -@08044DF0: +_08044DF0: strb r0, [r1, 0x10] strb r6, [r1, 0x11] ldr r0, =gUnknown_082DB84E bl b_call_bc_move_exec movs r5, 0x5 str r5, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044E10: +_08044E10: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -107408,13 +107408,13 @@ berry_effects_maybe: ; 80444DC 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 @@ -107424,22 +107424,22 @@ berry_effects_maybe: ; 80444DC 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, =gUnknown_082DB869 bl b_call_bc_move_exec movs r2, 0x2 str r2, [sp, 0xC] - b @080451DE + b _080451DE .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 @@ -107450,9 +107450,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107463,32 +107463,32 @@ berry_effects_maybe: ; 80444DC 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 @@ -107503,7 +107503,7 @@ berry_effects_maybe: ; 80444DC lsls r0, 24 asrs r0, 24 cmp r0, 0xC - beq @08044EBC + beq _08044EBC ldr r1, =0x02022f58 movs r2, 0 movs r3, 0xFD @@ -107540,9 +107540,9 @@ berry_effects_maybe: ; 80444DC bl b_call_bc_move_exec movs r0, 0x5 str r0, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044F44: +_08044F44: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -107553,9 +107553,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107564,9 +107564,9 @@ berry_effects_maybe: ; 80444DC bl b_call_bc_move_exec movs r1, 0x1 str r1, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044F74: +_08044F74: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -107577,9 +107577,9 @@ berry_effects_maybe: ; 80444DC 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] @@ -107587,9 +107587,9 @@ berry_effects_maybe: ; 80444DC bl b_call_bc_move_exec movs r2, 0x1 str r2, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044FA8: +_08044FA8: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -107600,9 +107600,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107611,9 +107611,9 @@ berry_effects_maybe: ; 80444DC bl b_call_bc_move_exec movs r3, 0x1 str r3, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08044FD8: +_08044FD8: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -107624,9 +107624,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107635,9 +107635,9 @@ berry_effects_maybe: ; 80444DC bl b_call_bc_move_exec movs r5, 0x1 str r5, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08045008: +_08045008: movs r0, 0x58 adds r3, r7, 0 muls r3, r0 @@ -107648,9 +107648,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107663,9 +107663,9 @@ berry_effects_maybe: ; 80444DC ands r0, r2 str r0, [r1] ldr r0, =gUnknown_082DB766 - b @0804518A + b _0804518A .pool -@08045044: +_08045044: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -107676,9 +107676,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107687,9 +107687,9 @@ berry_effects_maybe: ; 80444DC bl b_call_bc_move_exec movs r1, 0x2 str r1, [sp, 0xC] - b @080451DE + b _080451DE .pool -@08045074: +_08045074: movs r0, 0x58 adds r5, r7, 0 muls r5, r0 @@ -107699,7 +107699,7 @@ berry_effects_maybe: ; 80444DC ldr r2, [r4] ldrb r0, [r4] cmp r0, 0 - bne @0804509A + bne _0804509A mov r0, r8 adds r0, 0x50 adds r0, r5, r0 @@ -107707,21 +107707,21 @@ berry_effects_maybe: ; 80444DC 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, =gUnknown_0831BC70 bl CopyString movs r0, 0x1 mov r10, r0 -@080450B2: +_080450B2: ldr r0, [r4] movs r1, 0x7 mov r9, r1 @@ -107729,7 +107729,7 @@ berry_effects_maybe: ; 80444DC mov r6, r8 adds r6, 0x50 cmp r0, 0 - beq @080450D8 + beq _080450D8 adds r2, r5, r6 ldr r0, [r2] ldr r1, =0xf7ffffff @@ -107740,63 +107740,63 @@ berry_effects_maybe: ; 80444DC bl CopyString 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, =gUnknown_0831BC80 bl CopyString 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, =gUnknown_0831BC88 bl CopyString 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, =gUnknown_0831BC90 bl CopyString 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, =gUnknown_0831BC98 bl CopyString 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 .pool -@08045164: +_08045164: ldr r1, =0x02024332 movs r0, 0x1 -@08045168: +_08045168: strb r0, [r1, 0x5] ldr r2, =0x02024084 movs r0, 0x58 @@ -107814,13 +107814,13 @@ berry_effects_maybe: ; 80444DC ands r0, r1 str r0, [r3] ldr r0, =gUnknown_082DB794 -@0804518A: +_0804518A: bl b_call_bc_move_exec movs r0, 0x1 str r0, [sp, 0xC] - b @080451DE + b _080451DE .pool -@080451A0: +_080451A0: movs r0, 0x58 adds r1, r7, 0 muls r1, r0 @@ -107832,7 +107832,7 @@ berry_effects_maybe: ; 80444DC lsls r0, 12 ands r0, r2 cmp r0, 0 - beq @080451D6 + beq _080451D6 ldr r0, =0xfff0ffff ands r2, r0 str r2, [r1] @@ -107846,12 +107846,12 @@ berry_effects_maybe: ; 80444DC 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 @@ -107862,16 +107862,16 @@ berry_effects_maybe: ; 80444DC 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 .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 @@ -107884,9 +107884,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107901,9 +107901,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -107911,16 +107911,16 @@ berry_effects_maybe: ; 80444DC add r0, sp, 0x4 ldrb r0, [r0] strb r0, [r1] - b @0804582A + b _0804582A .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 @@ -107931,64 +107931,64 @@ berry_effects_maybe: ; 80444DC 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 .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 .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 @@ -107998,9 +107998,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -108011,9 +108011,9 @@ berry_effects_maybe: ; 80444DC str r0, [r1] movs r0, 0x1 str r0, [sp, 0xC] - b @0804567A + b _0804567A .pool -@08045390: +_08045390: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -108023,9 +108023,9 @@ berry_effects_maybe: ; 80444DC 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] @@ -108035,9 +108035,9 @@ berry_effects_maybe: ; 80444DC str r0, [r1] movs r1, 0x1 str r1, [sp, 0xC] - b @0804567A + b _0804567A .pool -@080453CC: +_080453CC: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -108047,9 +108047,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -108060,9 +108060,9 @@ berry_effects_maybe: ; 80444DC str r0, [r1] movs r2, 0x1 str r2, [sp, 0xC] - b @0804567A + b _0804567A .pool -@08045408: +_08045408: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -108072,9 +108072,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -108085,9 +108085,9 @@ berry_effects_maybe: ; 80444DC str r0, [r1] movs r3, 0x1 str r3, [sp, 0xC] - b @0804567A + b _0804567A .pool -@08045444: +_08045444: ldr r2, =0x02024084 movs r0, 0x58 adds r4, r7, 0 @@ -108099,9 +108099,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -108115,9 +108115,9 @@ berry_effects_maybe: ; 80444DC bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DB76C - b @080455DC + b _080455DC .pool -@0804548C: +_0804548C: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -108127,9 +108127,9 @@ berry_effects_maybe: ; 80444DC 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 @@ -108140,9 +108140,9 @@ berry_effects_maybe: ; 80444DC str r0, [r1] movs r0, 0x2 str r0, [sp, 0xC] - b @0804567A + b _0804567A .pool -@080454C8: +_080454C8: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r7 @@ -108153,9 +108153,9 @@ berry_effects_maybe: ; 80444DC 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] @@ -108171,9 +108171,9 @@ berry_effects_maybe: ; 80444DC str r0, [r1] movs r1, 0x2 str r1, [sp, 0xC] - b @0804567A + b _0804567A .pool -@08045520: +_08045520: ldr r4, =0x02024084 movs r0, 0x58 adds r5, r7, 0 @@ -108184,7 +108184,7 @@ berry_effects_maybe: ; 80444DC ldr r2, [r6] ldrb r0, [r6] cmp r0, 0 - bne @08045548 + bne _08045548 adds r0, r4, 0 adds r0, 0x50 adds r0, r5, r0 @@ -108192,24 +108192,24 @@ berry_effects_maybe: ; 80444DC 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, =gUnknown_0831BC70 bl CopyString -@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 @@ -108218,44 +108218,44 @@ berry_effects_maybe: ; 80444DC ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC78 bl CopyString -@08045578: +_08045578: ldr r0, [r6] movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq @0804558A + beq _0804558A ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC80 bl CopyString -@0804558A: +_0804558A: ldr r0, [r6] movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq @0804559C + beq _0804559C ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC88 bl CopyString -@0804559C: +_0804559C: ldr r0, [r6] movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq @080455AE + beq _080455AE ldr r0, =0x02022f58 ldr r1, =gUnknown_0831BC90 bl CopyString -@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, =gUnknown_0831BC98 bl CopyString -@080455C2: +_080455C2: movs r4, 0 str r4, [r6] ldr r0, [r5] @@ -108268,13 +108268,13 @@ berry_effects_maybe: ; 80444DC strb r4, [r0, 0x5] ldr r1, =0x02024214 ldr r0, =gUnknown_082DB79A -@080455DC: +_080455DC: str r0, [r1] movs r5, 0x1 str r5, [sp, 0xC] - b @0804567A + b _0804567A .pool -@08045614: +_08045614: ldr r0, =0x02024084 mov r8, r0 movs r0, 0x58 @@ -108286,25 +108286,25 @@ berry_effects_maybe: ; 80444DC 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 @@ -108313,13 +108313,13 @@ berry_effects_maybe: ; 80444DC ldr r1, =0x02024214 ldr r0, =gUnknown_082DB7B4 str r0, [r1] - b @0804582A + b _0804582A .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 @@ -108329,7 +108329,7 @@ berry_effects_maybe: ; 80444DC ldrb r1, [r4] movs r0, 0x58 muls r0, r1 -@0804568C: +_0804568C: ldr r1, =0x020240d0 adds r0, r1 str r0, [sp] @@ -108340,43 +108340,43 @@ berry_effects_maybe: ; 80444DC bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0804582A + b _0804582A .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 .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 .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] @@ -108388,15 +108388,15 @@ berry_effects_maybe: ; 80444DC 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 @@ -108406,7 +108406,7 @@ berry_effects_maybe: ; 80444DC lsrs r0, 16 ldr r2, [sp, 0x10] cmp r0, r2 - bcs @0804582A + bcs _0804582A ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -108418,7 +108418,7 @@ berry_effects_maybe: ; 80444DC movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @0804582A + beq _0804582A ldr r2, =0x02024084 ldrb r1, [r4] movs r0, 0x58 @@ -108426,7 +108426,7 @@ berry_effects_maybe: ; 80444DC adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - beq @0804582A + beq _0804582A ldr r1, =0x02024332 movs r0, 0x8 strb r0, [r1, 0x3] @@ -108435,15 +108435,15 @@ berry_effects_maybe: ; 80444DC movs r1, 0 bl sub_8048760 bl b_movescr_stack_pop_cursor - b @0804582A + b _0804582A .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] @@ -108454,14 +108454,14 @@ berry_effects_maybe: ; 80444DC 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 @@ -108470,9 +108470,9 @@ berry_effects_maybe: ; 80444DC 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] @@ -108493,11 +108493,11 @@ berry_effects_maybe: ; 80444DC 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 @@ -108512,7 +108512,7 @@ berry_effects_maybe: ; 80444DC lsls r0, 24 lsrs r0, 24 str r0, [sp, 0xC] -@0804582A: +_0804582A: ldr r0, [sp, 0xC] add sp, 0x2C pop {r3-r5} @@ -108563,7 +108563,7 @@ sub_80458B4: ; 80458B4 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @080458D0 + bne _080458D0 ldr r1, =gUnknown_0831BD10 ldr r0, =0x02024214 ldr r0, [r0] @@ -108572,7 +108572,7 @@ sub_80458B4: ; 80458B4 adds r0, r1 ldr r0, [r0] bl _call_via_r0 -@080458D0: +_080458D0: pop {r0} bx r0 .pool @@ -108590,97 +108590,97 @@ 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, =gBattleMoves 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 .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 @@ -108695,7 +108695,7 @@ sub_80458E0: ; 80458E0 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 @@ -108703,9 +108703,9 @@ sub_80458E0: ; 80458E0 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 @@ -108713,7 +108713,7 @@ sub_80458E0: ; 80458E0 lsrs r4, r0, 24 lsls r0, r7, 1 mov r8, r0 -@08045A6A: +_08045A6A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -108725,13 +108725,13 @@ sub_80458E0: ; 80458E0 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, =gUnknown_0832A328 @@ -108740,7 +108740,7 @@ sub_80458E0: ; 80458E0 ldr r0, [r0] ands r2, r0 cmp r2, 0 - bne @08045A6A + bne _08045A6A ldr r0, =gBattleMoves mov r3, r8 adds r1, r3, r7 @@ -108748,9 +108748,9 @@ sub_80458E0: ; 80458E0 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 @@ -108759,9 +108759,9 @@ sub_80458E0: ; 80458E0 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 @@ -108770,9 +108770,9 @@ sub_80458E0: ; 80458E0 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 @@ -108790,9 +108790,9 @@ sub_80458E0: ; 80458E0 ldrb r1, [r0] orrs r1, r4 strb r1, [r0] - b @08045C20 + b _08045C20 .pool -@08045B28: +_08045B28: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status @@ -108801,9 +108801,9 @@ sub_80458E0: ; 80458E0 movs r0, 0x1 ands r0, r1 eors r0, r2 - b @08045BD2 + b _08045BD2 .pool -@08045B40: +_08045B40: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_side_get_owner @@ -108818,7 +108818,7 @@ sub_80458E0: ; 80458E0 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 @@ -108826,50 +108826,50 @@ sub_80458E0: ; 80458E0 adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq @08045B80 -@08045B70: + beq _08045B80 +_08045B70: adds r5, r4, 0 - b @08045C20 + b _08045C20 .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 .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 @@ -108881,12 +108881,12 @@ sub_80458E0: ; 80458E0 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08045C20 + beq _08045C20 movs r0, 0x2 eors r5, r0 - b @08045C20 + b _08045C20 .pool -@08045BFC: +_08045BFC: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status @@ -108898,12 +108898,12 @@ sub_80458E0: ; 80458E0 bl battle_get_side_with_given_state lsls r0, 24 lsrs r5, r0, 24 - b @08045C20 + b _08045C20 .pool -@08045C1C: +_08045C1C: ldr r0, =0x0202420b ldrb r5, [r0] -@08045C20: +_08045C20: ldr r0, =0x0202420b ldrb r0, [r0] ldr r1, =0x0202449c @@ -108930,7 +108930,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 @@ -108945,7 +108945,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 @@ -108953,12 +108953,12 @@ 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 .pool -@08045C98: +_08045C98: ldr r0, =0x0202406e adds r0, r4, r0 ldrh r1, [r0] @@ -108969,7 +108969,7 @@ sub_8045C44: ; 8045C44 movs r1, 0x50 movs r2, 0 bl pokemon_getattr -@08045CAE: +_08045CAE: pop {r4-r7} pop {r1} bx r1 @@ -108989,42 +108989,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] @@ -109039,34 +109039,34 @@ sub_8045CBC: ; 8045CBC bl sub_806E8D4 lsls r0, 24 cmp r0, 0 - beq @08045DAC + beq _08045DAC ldr r0, =0x0000086e bl FlagGet lsls r0, 24 cmp r0, 0 - bne @08045DAC + bne _08045DAC movs r6, 0xA ldr r0, =0x00000868 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08045D5A + beq _08045D5A movs r6, 0x1E -@08045D5A: +_08045D5A: ldr r0, =0x0000086a bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08045D68 + beq _08045D68 movs r6, 0x32 -@08045D68: +_08045D68: ldr r0, =0x0000086c bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08045D76 + beq _08045D76 movs r6, 0x46 -@08045D76: +_08045D76: ldr r5, =0x02024084 ldr r0, =0x0202420b mov r8, r0 @@ -109077,7 +109077,7 @@ sub_8045CBC: ; 8045CBC adds r0, 0x2A ldrb r0, [r0] cmp r0, r6 - bls @08045DAC + bls _08045DAC bl GenerateRandomNumber movs r1, 0xFF ands r1, r0 @@ -109092,16 +109092,16 @@ sub_8045CBC: ; 8045CBC muls r0, r1 asrs r4, r0, 8 cmp r4, r6 - bge @08045DD4 -@08045DAC: + bge _08045DD4 +_08045DAC: movs r0, 0 - b @08045FD0 + b _08045FD0 .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 @@ -109109,7 +109109,7 @@ sub_8045CBC: ; 8045CBC ldr r2, =0xff7fffff ands r1, r2 str r1, [r0] -@08045DEA: +_08045DEA: mov r1, r8 ldrb r0, [r1] muls r0, r7 @@ -109120,18 +109120,18 @@ sub_8045CBC: ; 8045CBC 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, =gUnknown_082DB695 - b @08045F7A + b _08045F7A .pool -@08045E20: +_08045E20: bl GenerateRandomNumber movs r5, 0xFF adds r1, r5, 0 @@ -109151,7 +109151,7 @@ sub_8045CBC: ; 8045CBC muls r0, r1 asrs r4, r0, 8 cmp r4, r6 - bge @08045EE8 + bge _08045EE8 ldr r6, =gUnknown_0832A328 ldr r5, =0x020241e8 ldrb r0, [r5] @@ -109164,13 +109164,13 @@ sub_8045CBC: ; 8045CBC 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 @@ -109182,7 +109182,7 @@ sub_8045CBC: ; 8045CBC ldr r0, [r0] ands r0, r4 cmp r0, 0 - bne @08045E6E + bne _08045E6E ldr r4, =0x020241ee ldr r3, =0x02024084 ldr r0, =0x020241e8 @@ -109209,9 +109209,9 @@ sub_8045CBC: ; 8045CBC ldr r0, [r2] movs r1, 0x80 lsls r1, 14 - b @08045FCA + b _08045FCA .pool -@08045EE8: +_08045EE8: subs r0, r2, r6 lsls r0, 24 lsrs r6, r0, 24 @@ -109219,7 +109219,7 @@ sub_8045CBC: ; 8045CBC adds r4, r5, 0 ands r4, r0 cmp r4, r6 - bge @08045F64 + bge _08045F64 mov r1, r9 ldrb r0, [r1] mov r1, r8 @@ -109230,51 +109230,51 @@ sub_8045CBC: ; 8045CBC 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, =gUnknown_082DB6D9 - b @08045F7A + b _08045F7A .pool -@08045F64: +_08045F64: subs r4, r6 cmp r4, r6 - blt @08045F8C -@08045F6A: + blt _08045F8C +_08045F6A: bl GenerateRandomNumber ldr r2, =0x02024332 movs r1, 0x3 @@ -109282,12 +109282,12 @@ sub_8045CBC: ; 8045CBC strb r1, [r2, 0x5] ldr r1, =0x02024214 ldr r0, =gUnknown_082DB6AD -@08045F7A: +_08045F7A: str r0, [r1] movs r0, 0x1 - b @08045FD0 + b _08045FD0 .pool -@08045F8C: +_08045F8C: ldr r4, =0x0202420b ldrb r1, [r4] movs r0, 0x58 @@ -109318,11 +109318,11 @@ sub_8045CBC: ; 8045CBC 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 @@ -109343,13 +109343,13 @@ 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 .pool -@08046020: +_08046020: ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -109358,30 +109358,30 @@ atk00_attackcanceler: ; 8045FFC 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, =gUnknown_082D8A4E - b @08046396 + b _08046396 .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] @@ -109391,9 +109391,9 @@ atk00_attackcanceler: ; 8045FFC 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] @@ -109408,16 +109408,16 @@ atk00_attackcanceler: ; 8045FFC 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 @@ -109426,7 +109426,7 @@ atk00_attackcanceler: ; 8045FFC lsls r1, 5 ands r0, r1 cmp r0, 0 - bne @08046108 + bne _08046108 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB07A str r0, [r1] @@ -109435,9 +109435,9 @@ atk00_attackcanceler: ; 8045FFC movs r1, 0x1 orrs r0, r1 strb r0, [r2] - b @08046398 + b _08046398 .pool -@08046108: +_08046108: ldr r0, [r5] ldr r1, =0xff7fffff ands r0, r1 @@ -109446,7 +109446,7 @@ atk00_attackcanceler: ; 8045FFC lsls r6, 18 ands r0, r6 cmp r0, 0 - bne @08046160 + bne _08046160 ldrb r1, [r3] movs r0, 0x58 muls r0, r1 @@ -109458,28 +109458,28 @@ atk00_attackcanceler: ; 8045FFC 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 .pool -@08046150: +_08046150: ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b @08046398 + b _08046398 .pool -@08046160: +_08046160: ldr r2, =0x02024280 ldr r0, [r2] movs r1, 0x80 @@ -109496,7 +109496,7 @@ atk00_attackcanceler: ; 8045FFC mov r8, r1 mov r9, r2 cmp r0, 0 - bge @080461E8 + bge _080461E8 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -109508,7 +109508,7 @@ atk00_attackcanceler: ; 8045FFC movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @080461E8 + beq _080461E8 ldr r0, =0x0202420b ldrb r0, [r0] ldr r2, =0x00000115 @@ -109526,20 +109526,20 @@ atk00_attackcanceler: ; 8045FFC bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DB194 - b @08046396 + b _08046396 .pool -@080461E8: +_080461E8: movs r2, 0 ldr r0, =0x0202406c ldrb r0, [r0] cmp r2, r0 - bge @0804622A + bge _0804622A ldr r6, =0x0202433c ldr r1, =gBattleMoves mov r12, r1 adds r5, r0, 0 ldr r7, =0x0202407e -@080461FC: +_080461FC: adds r4, r2, r7 ldrb r3, [r4] lsls r0, r3, 4 @@ -109547,7 +109547,7 @@ atk00_attackcanceler: ; 8045FFC ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge @08046224 + bge _08046224 ldr r0, =0x020241ea ldrh r1, [r0] lsls r0, r1, 1 @@ -109558,13 +109558,13 @@ atk00_attackcanceler: ; 8045FFC 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] @@ -109575,7 +109575,7 @@ atk00_attackcanceler: ; 8045FFC ldrb r3, [r1] lsls r0, r3, 30 cmp r0, 0 - bge @08046288 + bge _08046288 movs r0, 0x3 negs r0, r0 ands r0, r3 @@ -109591,17 +109591,17 @@ atk00_attackcanceler: ; 8045FFC ldrb r0, [r1] ldrb r1, [r4] bl b_history__record_ability_usage_of_player - b @08046398 + b _08046398 .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, =gBattleMoves ldr r2, =0x020241ea ldrh r3, [r2] @@ -109614,9 +109614,9 @@ atk00_attackcanceler: ; 8045FFC 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] @@ -109627,18 +109627,18 @@ atk00_attackcanceler: ; 8045FFC 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] @@ -109651,8 +109651,8 @@ atk00_attackcanceler: ; 8045FFC 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 @@ -109676,9 +109676,9 @@ atk00_attackcanceler: ; 8045FFC ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x6] - b @08046390 + b _08046390 .pool -@08046350: +_08046350: ldr r0, =0x0202420b ldrb r0, [r0] ldr r2, =0x00000121 @@ -109698,15 +109698,15 @@ atk00_attackcanceler: ; 8045FFC bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DB1AC - b @08046396 + b _08046396 .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 @@ -109733,7 +109733,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] @@ -109756,9 +109756,9 @@ mcmd_jump_if_move_not_executed: ; 80463AC ldrb r0, [r5, 0x4] lsls r0, 24 orrs r4, r0 - b @08046426 + b _08046426 .pool -@0804640C: +_0804640C: bl b_feature_update_destiny_bond ldr r0, =0x0202420c ldrb r1, [r0] @@ -109769,11 +109769,11 @@ mcmd_jump_if_move_not_executed: ; 80463AC 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} @@ -109792,7 +109792,7 @@ atk40_801DBA0: ; 804643C ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq @0804649C + beq _0804649C ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -109804,7 +109804,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 @@ -109816,14 +109816,14 @@ atk40_801DBA0: ; 804643C ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x6] - b @080464A4 + b _080464A4 .pool -@0804649C: +_0804649C: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@080464A4: +_080464A4: pop {r0} bx r0 .pool @@ -109843,7 +109843,7 @@ sub_80464AC: ; 80464AC ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq @080464F8 + beq _080464F8 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -109855,7 +109855,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 @@ -109868,7 +109868,7 @@ sub_80464AC: ; 80464AC movs r0, 0x1 strb r0, [r1, 0x6] movs r4, 0x1 -@080464F8: +_080464F8: adds r0, r4, 0 pop {r4} pop {r1} @@ -109892,7 +109892,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 @@ -109902,8 +109902,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 @@ -109911,7 +109911,7 @@ sub_8046518: ; 8046518 ands r1, r2 adds r2, r0, 0 cmp r1, 0 - bne @08046590 + bne _08046590 ldrb r0, [r3] lsls r0, 2 adds r0, r6 @@ -109919,16 +109919,16 @@ sub_8046518: ; 8046518 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 .pool -@08046590: +_08046590: ldr r0, [r2] ldr r1, =0xfffeffff ands r0, r1 @@ -109937,7 +109937,7 @@ sub_8046518: ; 8046518 lsls r1, 10 ands r0, r1 cmp r0, 0 - bne @080465B2 + bne _080465B2 ldrb r0, [r3] lsls r0, 2 adds r0, r6 @@ -109945,8 +109945,8 @@ sub_8046518: ; 8046518 movs r1, 0x80 ands r0, r1 cmp r0, 0 - bne @0804656A -@080465B2: + bne _0804656A +_080465B2: ldr r0, [r2] ldr r1, =0xfffdffff ands r0, r1 @@ -109955,15 +109955,15 @@ sub_8046518: ; 8046518 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 @@ -109979,7 +109979,7 @@ sub_8046518: ; 8046518 lsrs r0, 24 lsls r4, r5, 1 cmp r0, 0 - bne @08046622 + bne _08046622 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -109988,40 +109988,40 @@ sub_8046518: ; 8046518 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, =gBattleMoves adds r1, r4, r5 lsls r1, 2 adds r1, r0 ldrb r0, [r1] cmp r0, 0x98 - beq @08046634 -@08046622: + beq _08046634 +_08046622: ldr r1, =gBattleMoves 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 .pool -@08046654: +_08046654: movs r0, 0 -@08046656: +_08046656: add sp, 0x4 pop {r4-r6} pop {r1} @@ -110047,7 +110047,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] @@ -110057,10 +110057,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 @@ -110070,12 +110070,12 @@ 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 .pool -@080466D0: +_080466D0: ldrb r0, [r3] lsls r0, 2 adds r0, r2 @@ -110083,7 +110083,7 @@ atk01_accuracycheck: ; 8046660 ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - beq @08046700 + beq _08046700 ldr r2, [r7] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -110096,41 +110096,41 @@ atk01_accuracycheck: ; 8046660 lsls r0, 24 orrs r1, r0 str r1, [r7] - b @080469D2 + b _080469D2 .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 .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 .pool -@08046744: +_08046744: ldr r1, =gBattleMoves lsls r0, r6, 1 adds r0, r6 @@ -110138,21 +110138,21 @@ atk01_accuracycheck: ; 8046660 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] @@ -110167,15 +110167,15 @@ atk01_accuracycheck: ; 8046660 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 .pool -@080467A8: +_080467A8: ldr r0, =0x0202420b ldrb r0, [r0] muls r0, r2 @@ -110187,18 +110187,18 @@ atk01_accuracycheck: ; 8046660 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, =gBattleMoves lsls r4, r6, 1 adds r0, r4, r6 @@ -110217,7 +110217,7 @@ atk01_accuracycheck: ; 8046660 lsrs r0, 24 str r4, [sp, 0x4] cmp r0, 0 - bne @08046822 + bne _08046822 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -110226,19 +110226,19 @@ atk01_accuracycheck: ; 8046660 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, =gUnknown_0831C0F4 lsls r0, r5, 24 asrs r0, 22 @@ -110260,7 +110260,7 @@ atk01_accuracycheck: ; 8046660 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0xE - bne @08046860 + bne _08046860 lsls r0, r4, 6 adds r0, r4 lsls r0, 1 @@ -110268,7 +110268,7 @@ atk01_accuracycheck: ; 8046660 bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -@08046860: +_08046860: movs r0, 0 str r0, [sp] movs r0, 0x13 @@ -110279,7 +110279,7 @@ atk01_accuracycheck: ; 8046660 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @080468B8 + bne _080468B8 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -110288,7 +110288,7 @@ atk01_accuracycheck: ; 8046660 bl ability_something lsls r0, 24 cmp r0, 0 - bne @080468B8 + bne _080468B8 ldr r0, =0x0202420c ldrb r0, [r0] muls r0, r5 @@ -110296,13 +110296,13 @@ atk01_accuracycheck: ; 8046660 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 @@ -110310,7 +110310,7 @@ atk01_accuracycheck: ; 8046660 bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -@080468B8: +_080468B8: ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -110321,10 +110321,10 @@ atk01_accuracycheck: ; 8046660 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 @@ -110332,7 +110332,7 @@ atk01_accuracycheck: ; 8046660 bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -@080468E4: +_080468E4: ldr r2, =0x0202420c mov r8, r2 ldrb r2, [r2] @@ -110343,7 +110343,7 @@ atk01_accuracycheck: ; 8046660 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 @@ -110351,9 +110351,9 @@ atk01_accuracycheck: ; 8046660 adds r0, r1 ldrb r5, [r0, 0x7] ldrb r2, [r0, 0x1A] - b @08046944 + b _08046944 .pool -@08046928: +_08046928: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -110366,13 +110366,13 @@ atk01_accuracycheck: ; 8046660 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 @@ -110380,7 +110380,7 @@ atk01_accuracycheck: ; 8046660 bl __divsi3 lsls r0, 16 lsrs r4, r0, 16 -@08046960: +_08046960: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -110390,7 +110390,7 @@ atk01_accuracycheck: ; 8046660 lsrs r0, 16 adds r0, 0x1 cmp r0, r4 - ble @080469CA + ble _080469CA ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -110401,7 +110401,7 @@ atk01_accuracycheck: ; 8046660 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @080469C0 + beq _080469C0 ldr r1, =gBattleMoves ldr r2, [sp, 0x4] adds r0, r2, r6 @@ -110409,25 +110409,25 @@ atk01_accuracycheck: ; 8046660 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 .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 @@ -110445,14 +110445,14 @@ atk02_attackstring: ; 80469E8 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 @@ -110462,14 +110462,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 @@ -110488,9 +110488,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] @@ -110503,7 +110503,7 @@ atk03_ppreduce: ; 8046A3C lsrs r4, r0, 31 mov r9, r2 cmp r4, 0 - bne @08046AF6 + bne _08046AF6 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -110513,18 +110513,18 @@ atk03_ppreduce: ; 8046A3C 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 .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 @@ -110534,8 +110534,8 @@ atk03_ppreduce: ; 8046A3C 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 @@ -110547,14 +110547,14 @@ atk03_ppreduce: ; 8046A3C 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 @@ -110563,16 +110563,16 @@ atk03_ppreduce: ; 8046A3C 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 @@ -110592,7 +110592,7 @@ atk03_ppreduce: ; 8046A3C mov r10, r2 adds r7, r3, 0 cmp r0, 0 - beq @08046BDC + beq _08046BDC ldr r0, =0x0202433c lsls r1, r5, 4 adds r1, r0 @@ -110611,14 +110611,14 @@ atk03_ppreduce: ; 8046A3C adds r2, r0, r1 ldrb r0, [r2] cmp r0, r6 - ble @08046B70 + ble _08046B70 subs r0, r6 strb r0, [r2] - b @08046B72 + b _08046B72 .pool -@08046B70: +_08046B70: strb r4, [r2] -@08046B72: +_08046B72: mov r2, r9 ldrb r3, [r2] movs r4, 0x58 @@ -110632,7 +110632,7 @@ atk03_ppreduce: ; 8046A3C lsls r1, 14 ands r0, r1 cmp r0, 0 - bne @08046BDC + bne _08046BDC ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 @@ -110647,7 +110647,7 @@ atk03_ppreduce: ; 8046A3C ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08046BDC + bne _08046BDC ldr r0, =0x02024064 strb r3, [r0] ldrb r1, [r7] @@ -110670,7 +110670,7 @@ atk03_ppreduce: ; 8046A3C 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 @@ -110680,7 +110680,7 @@ atk03_ppreduce: ; 8046A3C ldr r0, [r1] adds r0, 0x1 str r0, [r1] -@08046BEE: +_08046BEE: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -110703,20 +110703,20 @@ 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 .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] @@ -110747,36 +110747,36 @@ atk04_critcalc: ; 8046C18 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 @@ -110784,27 +110784,27 @@ atk04_critcalc: ; 8046C18 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 .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 @@ -110813,9 +110813,9 @@ atk04_critcalc: ; 8046C18 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] @@ -110826,14 +110826,14 @@ atk04_critcalc: ; 8046C18 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, =gUnknown_0831C128 lsls r1, r5, 1 @@ -110844,15 +110844,15 @@ atk04_critcalc: ; 8046C18 bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne @08046D70 + bne _08046D70 ldr r1, =0x02024211 movs r0, 0x2 - b @08046D74 + b _08046D74 .pool -@08046D70: +_08046D70: ldr r1, =0x02024211 movs r0, 0x1 -@08046D74: +_08046D74: strb r0, [r1] ldr r1, =0x02024214 ldr r0, [r1] @@ -110918,7 +110918,7 @@ atk05_cmd5: ; 8046D8C lsls r1, 2 ands r0, r1 cmp r0, 0 - beq @08046E10 + beq _08046E10 ldr r2, =gBattleMoves ldrh r1, [r7] lsls r0, r1, 1 @@ -110927,10 +110927,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] @@ -110939,7 +110939,7 @@ atk05_cmd5: ; 8046D8C ldrb r0, [r0] lsls r0, 28 cmp r0, 0 - bge @08046E32 + bge _08046E32 ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 @@ -110947,7 +110947,7 @@ atk05_cmd5: ; 8046D8C movs r1, 0xA bl __divsi3 str r0, [r4] -@08046E32: +_08046E32: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -111017,7 +111017,7 @@ sub_8046E7C: ; 8046E7C lsls r1, 2 ands r0, r1 cmp r0, 0 - beq @08046F0A + beq _08046F0A ldr r2, =gBattleMoves mov r0, r8 ldrh r1, [r0] @@ -111027,17 +111027,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 @@ -111045,7 +111045,7 @@ sub_8046E7C: ; 8046E7C movs r1, 0xA bl __divsi3 str r0, [r4] -@08046F28: +_08046F28: add sp, 0x10 pop {r3} mov r8, r3 @@ -111067,25 +111067,25 @@ 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 .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 @@ -111094,9 +111094,9 @@ battle_attack_damage_modulate_by_effectivity: ; 8046F60 ands r0, r1 movs r1, 0xFD ands r0, r1 - b @08047030 + b _08047030 .pool -@08046FB0: +_08046FB0: ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -111106,25 +111106,25 @@ battle_attack_damage_modulate_by_effectivity: ; 8046F60 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 .pool -@08046FEC: +_08046FEC: movs r0, 0x4 - b @0804702E -@08046FF0: + b _0804702E +_08046FF0: ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -111134,28 +111134,28 @@ battle_attack_damage_modulate_by_effectivity: ; 8046F60 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 .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 @@ -111171,21 +111171,21 @@ 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 .pool -@08047068: +_08047068: ldr r2, =gBattleMoves ldrh r1, [r1] lsls r0, r1, 1 @@ -111194,7 +111194,7 @@ sub_8047038: ; 8047038 adds r0, r2 ldrb r0, [r0, 0x2] mov r8, r0 -@08047078: +_08047078: ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -111206,13 +111206,13 @@ sub_8047038: ; 8047038 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 @@ -111223,7 +111223,7 @@ sub_8047038: ; 8047038 bl __divsi3 str r0, [r4] ldr r3, [sp, 0x4] -@080470B0: +_080470B0: ldr r2, =0x0202420c ldrb r1, [r2] movs r0, 0x58 @@ -111233,10 +111233,10 @@ sub_8047038: ; 8047038 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 @@ -111261,24 +111261,24 @@ sub_8047038: ; 8047038 ldrb r0, [r4] ldrb r1, [r3] bl b_history__record_ability_usage_of_player - b @080471C4 + b _080471C4 .pool -@08047128: +_08047128: ldr r1, =gUnknown_0831ACE8 adds r0, r3, r1 ldrb r0, [r0] adds r2, r1, 0 - b @080471A4 + b _080471A4 .pool -@08047138: +_08047138: adds r3, 0x3 - b @080471A0 -@0804713C: + b _080471A0 +_0804713C: ldr r5, =gUnknown_0831ACE8 adds r0, r3, r5 ldrb r0, [r0] cmp r0, r8 - bne @08047198 + bne _08047198 adds r1, r3, 0x1 adds r1, r5 ldr r2, =0x02024084 @@ -111291,7 +111291,7 @@ sub_8047038: ; 8047038 ldrb r4, [r1] ldrb r0, [r0] cmp r4, r0 - bne @08047172 + bne _08047172 adds r0, r3, 0x2 adds r0, r5 ldrb r0, [r0] @@ -111300,7 +111300,7 @@ sub_8047038: ; 8047038 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 @@ -111308,30 +111308,30 @@ sub_8047038: ; 8047038 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, =gUnknown_0831ACE8 -@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 @@ -111343,8 +111343,8 @@ sub_8047038: ; 8047038 lsls r1, 22 ands r0, r1 cmp r0, 0 - beq @08047138 -@080471C4: + beq _08047138 +_080471C4: ldr r2, =0x02024084 ldr r5, =0x0202420c ldrb r1, [r5] @@ -111354,7 +111354,7 @@ sub_8047038: ; 8047038 adds r0, 0x20 ldrb r6, [r0] cmp r6, 0x19 - bne @08047242 + bne _08047242 ldr r0, =0x0202420b ldrb r0, [r0] ldr r7, =0x020241ea @@ -111363,18 +111363,18 @@ sub_8047038: ; 8047038 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, =gBattleMoves ldrh r1, [r7] lsls r0, r1, 1 @@ -111383,7 +111383,7 @@ sub_8047038: ; 8047038 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq @08047242 + beq _08047242 ldr r3, =0x0202420a strb r6, [r3] movs r0, 0x1 @@ -111407,13 +111407,13 @@ sub_8047038: ; 8047038 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] @@ -111423,7 +111423,7 @@ sub_8047038: ; 8047038 movs r2, 0x2 orrs r0, r2 strb r0, [r1, 0x1] -@08047260: +_08047260: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -111449,9 +111449,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, =gBattleMoves lsls r0, r1, 1 adds r0, r1 @@ -111459,25 +111459,25 @@ b_wonderguard_and_levitate: ; 80472A8 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 .pool -@080472F4: +_080472F4: ldrb r1, [r1, 0x2] mov r12, r1 -@080472F8: +_080472F8: ldr r2, =0x02024084 ldr r3, =0x0202420c ldrb r1, [r3] @@ -111489,10 +111489,10 @@ b_wonderguard_and_levitate: ; 80472A8 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 @@ -111501,22 +111501,22 @@ b_wonderguard_and_levitate: ; 80472A8 ldrb r0, [r3] movs r1, 0x1A bl b_history__record_ability_usage_of_player - b @08047508 + b _08047508 .pool -@0804733C: +_0804733C: ldr r1, =gUnknown_0831ACE8 adds r0, r5, r1 ldrb r0, [r0] adds r4, r1, 0 - b @0804748E + b _0804748E .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 @@ -111529,12 +111529,12 @@ b_wonderguard_and_levitate: ; 80472A8 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 @@ -111549,7 +111549,7 @@ b_wonderguard_and_levitate: ; 80472A8 movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0x1] -@08047396: +_08047396: adds r2, r3, r4 mov r0, r8 ldrb r1, [r0] @@ -111561,16 +111561,16 @@ b_wonderguard_and_levitate: ; 80472A8 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 @@ -111585,7 +111585,7 @@ b_wonderguard_and_levitate: ; 80472A8 movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0x1] -@080473DC: +_080473DC: adds r2, r3, r4 mov r0, r8 ldrb r1, [r0] @@ -111596,15 +111596,15 @@ b_wonderguard_and_levitate: ; 80472A8 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] @@ -111616,19 +111616,19 @@ b_wonderguard_and_levitate: ; 80472A8 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] @@ -111639,17 +111639,17 @@ b_wonderguard_and_levitate: ; 80472A8 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] @@ -111661,31 +111661,31 @@ b_wonderguard_and_levitate: ; 80472A8 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 @@ -111698,8 +111698,8 @@ b_wonderguard_and_levitate: ; 80472A8 lsls r1, 22 ands r0, r1 cmp r0, 0 - beq @08047488 -@080474B2: + beq _08047488 +_080474B2: mov r0, r8 ldrb r1, [r0] movs r0, 0x58 @@ -111708,7 +111708,7 @@ b_wonderguard_and_levitate: ; 80472A8 adds r0, 0x20 ldrb r4, [r0] cmp r4, 0x19 - bne @08047508 + bne _08047508 ldr r0, =0x0202420b ldrb r0, [r0] mov r2, r9 @@ -111717,11 +111717,11 @@ b_wonderguard_and_levitate: ; 80472A8 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, =gBattleMoves mov r0, r9 ldrh r1, [r0] @@ -111731,7 +111731,7 @@ b_wonderguard_and_levitate: ; 80472A8 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq @08047508 + beq _08047508 ldr r0, =0x0202420a strb r4, [r0] ldr r1, =0x02024332 @@ -111741,7 +111741,7 @@ b_wonderguard_and_levitate: ; 80472A8 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 @@ -111766,25 +111766,25 @@ 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 .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 @@ -111792,8 +111792,8 @@ b_attack_effectivity_adapt: ; 804752C ands r0, r1 movs r1, 0xFD ands r0, r1 - b @080475DC -@0804757A: + b _080475DC +_0804757A: ldr r0, =gBattleMoves lsls r1, r5, 1 adds r1, r5 @@ -111801,24 +111801,24 @@ b_attack_effectivity_adapt: ; 804752C 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 .pool -@080475A8: +_080475A8: movs r0, 0x4 - b @080475DA -@080475AC: + b _080475DA +_080475AC: ldr r0, =gBattleMoves lsls r1, r5, 1 adds r1, r5 @@ -111826,27 +111826,27 @@ b_attack_effectivity_adapt: ; 804752C 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 .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 @@ -111876,10 +111876,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, =gBattleMoves mov r3, r10 lsls r2, r3, 1 @@ -111900,13 +111900,13 @@ move_effectiveness_something: ; 80475E4 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 @@ -111915,7 +111915,7 @@ move_effectiveness_something: ; 80475E4 movs r1, 0xA bl __divsi3 str r0, [r4] -@0804765C: +_0804765C: movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -111924,46 +111924,46 @@ move_effectiveness_something: ; 80475E4 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 .pool -@08047690: +_08047690: ldr r1, =gUnknown_0831ACE8 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 .pool -@080476B0: +_080476B0: movs r0, 0x3 add r8, r0 - b @08047718 -@080476B6: + b _08047718 +_080476B6: ldr r7, =gUnknown_0831ACE8 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 @@ -111977,7 +111977,7 @@ move_effectiveness_something: ; 80475E4 ldrb r4, [r1] ldrb r0, [r6] cmp r4, r0 - bne @080476F0 + bne _080476F0 mov r0, r8 adds r0, 0x2 adds r0, r7 @@ -111985,15 +111985,15 @@ move_effectiveness_something: ; 80475E4 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 @@ -112001,24 +112001,24 @@ move_effectiveness_something: ; 80475E4 mov r1, r10 mov r2, sp bl b_attack_effectivity_adapt -@08047710: +_08047710: movs r1, 0x3 add r8, r1 ldr r5, =0x02024084 ldr r2, =gUnknown_0831ACE8 -@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 @@ -112027,8 +112027,8 @@ move_effectiveness_something: ; 80475E4 lsls r1, 22 ands r0, r1 cmp r0, 0 - beq @080476B0 -@08047740: + beq _080476B0 +_08047740: movs r0, 0x58 mov r2, r9 muls r2, r0 @@ -112037,31 +112037,31 @@ move_effectiveness_something: ; 80475E4 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, =gBattleMoves ldr r1, [sp, 0xC] add r1, r10 @@ -112069,15 +112069,15 @@ move_effectiveness_something: ; 80475E4 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 @@ -112117,11 +112117,11 @@ 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 .pool -@080477FC: +_080477FC: ldr r2, =gBattleMoves lsls r1, r6, 1 adds r0, r1, r6 @@ -112132,66 +112132,66 @@ ai_rate_move: ; 80477BC 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 .pool -@08047824: +_08047824: ldr r0, =gUnknown_0831ACE8 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, =gUnknown_0831ACE8 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, =gBattleMoves ldr r3, [sp, 0x8] adds r1, r3, r6 @@ -112199,15 +112199,15 @@ ai_rate_move: ; 80477BC 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 @@ -112234,17 +112234,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 @@ -112266,17 +112266,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] @@ -112286,7 +112286,7 @@ atk07_cmd7: ; 80478F4 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 @@ -112294,9 +112294,9 @@ atk07_cmd7: ; 80478F4 adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b @08047976 + b _08047976 .pool -@0804795C: +_0804795C: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -112308,13 +112308,13 @@ atk07_cmd7: ; 80478F4 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 @@ -112323,7 +112323,7 @@ atk07_cmd7: ; 80478F4 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 @@ -112337,7 +112337,7 @@ atk07_cmd7: ; 80478F4 movs r2, 0x80 orrs r1, r2 strb r1, [r0] -@080479B4: +_080479B4: ldr r2, =0x02024084 ldr r3, =0x0202420c ldrb r4, [r3] @@ -112352,7 +112352,7 @@ atk07_cmd7: ; 80478F4 ands r1, r0 adds r5, r2, 0 cmp r1, 0 - bne @08047A84 + bne _08047A84 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -112362,14 +112362,14 @@ atk07_cmd7: ; 80478F4 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 @@ -112378,8 +112378,8 @@ atk07_cmd7: ; 80478F4 ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq @08047A84 -@08047A06: + beq _08047A84 +_08047A06: ldrb r0, [r3] movs r4, 0x58 muls r0, r4 @@ -112388,7 +112388,7 @@ atk07_cmd7: ; 80478F4 ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 - bgt @08047A84 + bgt _08047A84 subs r0, r1, 0x1 str r0, [r2] ldr r1, =0x0202433c @@ -112398,15 +112398,15 @@ atk07_cmd7: ; 80478F4 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 .pool -@08047A5C: +_08047A5C: ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 @@ -112415,7 +112415,7 @@ atk07_cmd7: ; 80478F4 ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq @08047A84 + beq _08047A84 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 @@ -112427,7 +112427,7 @@ atk07_cmd7: ; 80478F4 adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] -@08047A84: +_08047A84: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -112453,17 +112453,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] @@ -112473,7 +112473,7 @@ atk08_cmd8: ; 8047AA4 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 @@ -112481,9 +112481,9 @@ atk08_cmd8: ; 8047AA4 adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b @08047B26 + b _08047B26 .pool -@08047B0C: +_08047B0C: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -112495,13 +112495,13 @@ atk08_cmd8: ; 8047AA4 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 @@ -112510,7 +112510,7 @@ atk08_cmd8: ; 8047AA4 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 @@ -112524,7 +112524,7 @@ atk08_cmd8: ; 8047AA4 movs r2, 0x80 orrs r1, r2 strb r1, [r0] -@08047B64: +_08047B64: ldr r4, =0x02024084 ldr r6, =0x0202420c ldrb r2, [r6] @@ -112539,14 +112539,14 @@ atk08_cmd8: ; 8047AA4 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 @@ -112555,14 +112555,14 @@ atk08_cmd8: ; 8047AA4 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] @@ -112571,15 +112571,15 @@ atk08_cmd8: ; 8047AA4 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 .pool -@08047BE8: +_08047BE8: ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 @@ -112588,7 +112588,7 @@ atk08_cmd8: ; 8047AA4 ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq @08047C10 + beq _08047C10 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 @@ -112600,7 +112600,7 @@ atk08_cmd8: ; 8047AA4 adds r0, r4 ldrh r0, [r0, 0x2E] strh r0, [r1] -@08047C10: +_08047C10: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -112618,21 +112618,21 @@ atk09_attackanimation: ; 8047C30 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 @@ -112646,9 +112646,9 @@ atk09_attackanimation: ; 8047C30 ldrb r0, [r1, 0x19] adds r0, 0x1 strb r0, [r1, 0x19] - b @08047DB6 + b _08047DB6 .pool -@08047C8C: +_08047C8C: ldr r2, =gBattleMoves ldrh r1, [r5] lsls r0, r1, 1 @@ -112659,27 +112659,27 @@ atk09_attackanimation: ; 8047C30 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] @@ -112700,16 +112700,16 @@ atk09_attackanimation: ; 8047C30 adds r7, r3, 0 mov r12, r2 cmp r1, 0 - beq @08047D18 + beq _08047D18 ldr r0, =0x02024212 ldrb r6, [r0] - b @08047D42 + b _08047D42 .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] @@ -112718,15 +112718,15 @@ atk09_attackanimation: ; 8047C30 movs r6, 0x1 adds r4, r0, 0 cmp r2, r1 - ble @08047D44 + ble _08047D44 ldrb r6, [r3] - b @08047D44 + b _08047D44 .pool -@08047D40: +_08047D40: ldrb r6, [r3] -@08047D42: +_08047D42: ldr r4, =0x020241f0 -@08047D44: +_08047D44: ldrh r1, [r5] ldr r5, =0x02024474 ldrb r2, [r5, 0x18] @@ -112759,21 +112759,21 @@ atk09_attackanimation: ; 8047C30 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 .pool -@08047DA8: +_08047DA8: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DABB9 str r0, [r4] -@08047DB6: +_08047DB6: add sp, 0x10 pop {r4-r7} pop {r0} @@ -112787,12 +112787,12 @@ sub_8047DC8: ; 8047DC8 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 .pool @@ -112804,13 +112804,13 @@ atk0B_graphicalhpupdate: ; 8047DE8 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] @@ -112828,7 +112828,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 @@ -112836,28 +112836,28 @@ 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 .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 @@ -112867,22 +112867,22 @@ atk0B_graphicalhpupdate: ; 8047DE8 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 @@ -112896,23 +112896,23 @@ atk0C_datahpupdate: ; 8047EC4 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 .pool -@08047EF4: +_08047EF4: ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -112921,15 +112921,15 @@ atk0C_datahpupdate: ; 8047EC4 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] @@ -112947,7 +112947,7 @@ atk0C_datahpupdate: ; 8047EC4 lsls r1, 17 ands r0, r1 cmp r0, 0 - beq @08048028 + beq _08048028 ldr r0, =0x020242bc lsls r1, r2, 3 subs r1, r2 @@ -112956,19 +112956,19 @@ atk0C_datahpupdate: ; 8047EC4 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 @@ -112977,9 +112977,9 @@ atk0C_datahpupdate: ; 8047EC4 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 @@ -112992,9 +112992,9 @@ atk0C_datahpupdate: ; 8047EC4 ldr r1, =0x020241f4 ldr r0, [r6] str r0, [r1] - b @08047FEC + b _08047FEC .pool -@08047FBC: +_08047FBC: ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 @@ -113003,9 +113003,9 @@ atk0C_datahpupdate: ; 8047EC4 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 @@ -113020,7 +113020,7 @@ atk0C_datahpupdate: ; 8047EC4 lsls r0, 2 add r0, r12 strb r3, [r0, 0xA] -@08047FEC: +_08047FEC: ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 @@ -113029,9 +113029,9 @@ atk0C_datahpupdate: ; 8047EC4 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 @@ -113039,9 +113039,9 @@ atk0C_datahpupdate: ; 8047EC4 bl b_movescr_stack_push_cursor ldr r0, =gUnknown_082DB6FB str r0, [r4] - b @080482A2 + b _080482A2 .pool -@08048028: +_08048028: ldr r0, =0x02024280 ldr r2, [r0] ldr r1, =0xfffffeff @@ -113052,7 +113052,7 @@ atk0C_datahpupdate: ; 8047EC4 mov r12, r0 adds r7, r1, 0 cmp r5, 0 - bge @0804807C + bge _0804807C ldr r4, =0x02024084 ldr r2, =0x02024064 ldrb r0, [r2] @@ -113070,26 +113070,26 @@ atk0C_datahpupdate: ; 8047EC4 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 .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 .pool -@08048098: +_08048098: ldr r0, =0x020241f8 ldr r2, =0x02024064 ldrb r1, [r2] @@ -113103,22 +113103,22 @@ atk0C_datahpupdate: ; 8047EC4 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 .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 @@ -113127,15 +113127,15 @@ atk0C_datahpupdate: ; 8047EC4 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 .pool -@08048110: +_08048110: ldr r2, =0x020241f4 str r0, [r2] ldrb r0, [r5] @@ -113144,7 +113144,7 @@ atk0C_datahpupdate: ; 8047EC4 movs r1, 0 strh r1, [r0, 0x28] adds r7, r2, 0 -@08048120: +_08048120: ldr r2, =0x0202437c ldrb r1, [r5] lsls r0, r1, 2 @@ -113155,30 +113155,30 @@ atk0C_datahpupdate: ; 8047EC4 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 @@ -113198,19 +113198,19 @@ atk0C_datahpupdate: ; 8047EC4 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 .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] @@ -113220,19 +113220,19 @@ atk0C_datahpupdate: ; 8047EC4 adds r0, r4 ldrb r1, [r2] strb r1, [r0, 0x10] - b @0804823A + b _0804823A .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 @@ -113253,19 +113253,19 @@ atk0C_datahpupdate: ; 8047EC4 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 .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] @@ -113275,7 +113275,7 @@ atk0C_datahpupdate: ; 8047EC4 adds r0, r4 ldrb r1, [r2] strb r1, [r0, 0x11] -@0804823A: +_0804823A: mov r1, r12 ldr r0, [r1] ldr r1, =0xffefffff @@ -113295,9 +113295,9 @@ atk0C_datahpupdate: ; 8047EC4 bl dp01_build_cmdbuf_x02_a_b_varargs ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - b @0804829A + b _0804829A .pool -@08048274: +_08048274: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -113313,15 +113313,15 @@ atk0C_datahpupdate: ; 8047EC4 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} @@ -113335,17 +113335,17 @@ atk0D_critmessage: ; 80482BC 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 @@ -113353,12 +113353,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 .pool @@ -113370,7 +113370,7 @@ atk0E_missmessage: ; 8048310 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @080483D0 + bne _080483D0 ldr r4, =0x02024064 ldr r0, =0x0202420c ldrb r0, [r0] @@ -113380,85 +113380,85 @@ 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 .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 .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 @@ -113472,9 +113472,9 @@ atk0F_resultmessage: ; 80483E0 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 @@ -113483,71 +113483,71 @@ atk0F_resultmessage: ; 80483E0 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, =gUnknown_085CC834 ldrb r0, [r7, 0x6] lsls r0, 1 adds r0, r1 ldrh r3, [r0] strb r4, [r7, 0x7] - b @0804856A + b _0804856A .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 @@ -113566,23 +113566,23 @@ atk0F_resultmessage: ; 80483E0 bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DB816 - b @0804857E + b _0804857E .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 @@ -113593,26 +113593,26 @@ atk0F_resultmessage: ; 80483E0 bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DB1CE - b @0804857E + b _0804857E .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, =gUnknown_082DB1C7 - b @0804857E + b _0804857E .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 @@ -113631,35 +113631,35 @@ atk0F_resultmessage: ; 80483E0 bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DB816 - b @0804857E + b _0804857E .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 @@ -113672,7 +113672,7 @@ atk10_printstring: ; 8048590 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @080485BA + bne _080485BA ldr r4, =0x02024214 ldr r1, [r4] ldrb r0, [r1, 0x1] @@ -113688,7 +113688,7 @@ atk10_printstring: ; 8048590 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x7] -@080485BA: +_080485BA: pop {r4} pop {r0} bx r0 @@ -113730,18 +113730,18 @@ atk12_waitmessage: ; 8048614 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 .pool -@0804863C: +_0804863C: ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -113755,13 +113755,13 @@ atk12_waitmessage: ; 8048614 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 @@ -113774,7 +113774,7 @@ atk13_printfromtable: ; 8048670 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @080486AE + bne _080486AE ldr r4, =0x02024214 ldr r2, [r4] ldrb r1, [r2, 0x1] @@ -113800,7 +113800,7 @@ atk13_printfromtable: ; 8048670 str r0, [r4] movs r0, 0x1 strb r0, [r5, 0x7] -@080486AE: +_080486AE: pop {r4,r5} pop {r0} bx r0 @@ -113813,7 +113813,7 @@ atk14_printfromtable2: ; 80486C4 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0804870E + bne _0804870E ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -113844,7 +113844,7 @@ atk14_printfromtable2: ; 80486C4 str r0, [r5] movs r0, 0x1 strb r0, [r6, 0x7] -@0804870E: +_0804870E: pop {r4-r6} pop {r0} bx r0 @@ -113860,20 +113860,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} @@ -113904,7 +113904,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] @@ -113916,16 +113916,16 @@ sub_8048760: ; 8048760 movs r7, 0x40 ldr r1, =0x02024474 ldr r0, =0x0202420c - b @080487C4 + b _080487C4 .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 @@ -113938,29 +113938,29 @@ sub_8048760: ; 8048760 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 .pool -@08048828: +_08048828: mov r3, r9 ldrb r0, [r3] bl battle_get_per_side_status @@ -113973,29 +113973,29 @@ sub_8048760: ; 8048760 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 .pool -@08048880: +_08048880: ldr r3, =0x02024084 ldr r2, =0x0202420e ldrb r1, [r2] @@ -114006,22 +114006,22 @@ sub_8048760: ; 8048760 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 .pool -@080488C4: +_080488C4: mov r3, r9 ldrb r1, [r3] movs r0, 0x58 @@ -114034,9 +114034,9 @@ sub_8048760: ; 8048760 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 @@ -114044,15 +114044,15 @@ sub_8048760: ; 8048760 movs r0, 0 ldr r4, =0x02024332 strb r0, [r4, 0x3] - bl @080499B8 + bl _080499B8 .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, =gUnknown_0831C134 ldr r2, =0x02024332 ldrb r0, [r2, 0x3] @@ -114060,36 +114060,36 @@ sub_8048760: ; 8048760 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 .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 @@ -114098,7 +114098,7 @@ sub_8048760: ; 8048760 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x2B - beq @080489AC + beq _080489AC ldr r0, =0x02024064 movs r1, 0 strb r1, [r0] @@ -114107,43 +114107,43 @@ sub_8048760: ; 8048760 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 .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 @@ -114154,33 +114154,33 @@ sub_8048760: ; 8048760 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 .pool -@08048A00: +_08048A00: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -114189,12 +114189,12 @@ sub_8048760: ; 8048760 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 @@ -114213,19 +114213,19 @@ sub_8048760: ; 8048760 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 .pool -@08048A70: +_08048A70: mov r2, r9 ldrb r0, [r2] movs r1, 0x58 @@ -114235,31 +114235,31 @@ sub_8048760: ; 8048760 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 @@ -114270,41 +114270,41 @@ sub_8048760: ; 8048760 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 .pool -@08048AFC: +_08048AFC: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -114313,12 +114313,12 @@ sub_8048760: ; 8048760 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 @@ -114337,12 +114337,12 @@ sub_8048760: ; 8048760 lsls r0, 6 ands r0, r1 cmp r0, 0 - beq @08048B42 - b @08048A46 -@08048B42: - b @08048D20 + beq _08048B42 + b _08048A46 +_08048B42: + b _08048D20 .pool -@08048B54: +_08048B54: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -114353,33 +114353,33 @@ sub_8048760: ; 8048760 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, =gUnknown_082DB5D1 - b @08048D72 + b _08048D72 .pool -@08048BA4: +_08048BA4: mov r4, r9 ldrb r0, [r4] movs r1, 0x58 @@ -114391,35 +114391,35 @@ sub_8048760: ; 8048760 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 @@ -114430,7 +114430,7 @@ sub_8048760: ; 8048760 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @08048C26 + bne _08048C26 str r0, [sp] movs r0, 0x13 movs r1, 0 @@ -114439,16 +114439,16 @@ sub_8048760: ; 8048760 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] @@ -114460,41 +114460,41 @@ sub_8048760: ; 8048760 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 .pool -@08048C84: +_08048C84: mov r2, r9 ldrb r1, [r2] movs r0, 0x58 @@ -114504,13 +114504,13 @@ sub_8048760: ; 8048760 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 @@ -114529,26 +114529,26 @@ sub_8048760: ; 8048760 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 .pool -@08048CE8: +_08048CE8: ldr r4, =0x02024332 strb r0, [r4, 0x5] - bl @080499B2 + bl _080499B2 .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 @@ -114557,20 +114557,20 @@ sub_8048760: ; 8048760 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 .pool -@08048D2C: +_08048D2C: mov r2, r9 ldrb r0, [r2] movs r1, 0x58 @@ -114580,43 +114580,43 @@ sub_8048760: ; 8048760 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, =gUnknown_082DB5E9 -@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 .pool -@08048D94: +_08048D94: mov r3, r9 ldrb r0, [r3] movs r6, 0x58 @@ -114626,27 +114626,27 @@ sub_8048760: ; 8048760 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 @@ -114657,22 +114657,22 @@ sub_8048760: ; 8048760 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 @@ -114684,7 +114684,7 @@ sub_8048760: ; 8048760 adds r0, r1 ldr r3, [r0] cmp r3, 0x7 - bne @08048E50 + bne _08048E50 bl GenerateRandomNumber ldr r2, =0x02024084 ldr r1, =0x0202420e @@ -114699,9 +114699,9 @@ sub_8048760: ; 8048760 ldr r0, [r3] orrs r0, r1 str r0, [r3] - b @08048E64 + b _08048E64 .pool -@08048E50: +_08048E50: ldr r2, =0x02024084 ldr r0, =0x0202420e ldrb r1, [r0] @@ -114712,7 +114712,7 @@ sub_8048760: ; 8048760 ldr r0, [r1] orrs r0, r3 str r0, [r1] -@08048E64: +_08048E64: ldr r2, =0x02024214 ldr r1, =gUnknown_0831C224 ldr r5, =0x02024332 @@ -114744,29 +114744,29 @@ sub_8048760: ; 8048760 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 .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 @@ -114779,23 +114779,23 @@ sub_8048760: ; 8048760 lsls r1, 7 orrs r0, r1 str r0, [r2] - bl @080499B8 + bl _080499B8 .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 .pool -@08048F40: +_08048F40: mov r4, r9 ldrb r1, [r4] movs r0, 0x58 @@ -114812,76 +114812,76 @@ sub_8048760: ; 8048760 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 .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 @@ -114892,9 +114892,9 @@ sub_8048760: ; 8048760 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 @@ -114902,9 +114902,9 @@ sub_8048760: ; 8048760 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] @@ -114930,9 +114930,9 @@ sub_8048760: ; 8048760 lsls r0, 2 adds r0, r1 ldr r0, [r0] - bl @080499B0 + bl _080499B0 .pool -@080490D0: +_080490D0: mov r4, r9 ldrb r2, [r4] movs r4, 0x58 @@ -114942,13 +114942,13 @@ sub_8048760: ; 8048760 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 @@ -114958,9 +114958,9 @@ sub_8048760: ; 8048760 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB603 str r0, [r1] - bl @080499B2 + bl _080499B2 .pool -@08049114: +_08049114: adds r0, r2, 0 bl sub_8048728 ldr r1, =0x02024082 @@ -114968,9 +114968,9 @@ sub_8048760: ; 8048760 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 @@ -114987,9 +114987,9 @@ sub_8048760: ; 8048760 ldr r0, [r0] orrs r1, r0 str r1, [r2] - bl @08049994 + bl _08049994 .pool -@0804915C: +_0804915C: mov r3, r9 ldrb r0, [r3] movs r5, 0x58 @@ -115001,9 +115001,9 @@ sub_8048760: ; 8048760 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 @@ -115038,16 +115038,16 @@ sub_8048760: ; 8048760 lsls r0, 2 adds r0, r1 ldr r0, [r0] - bl @080499B0 + bl _080499B0 .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 @@ -115064,11 +115064,11 @@ sub_8048760: ; 8048760 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 @@ -115079,9 +115079,9 @@ sub_8048760: ; 8048760 lsls r0, 2 adds r0, r1 ldr r0, [r0] - b @080499B0 + b _080499B0 .pool -@08049244: +_08049244: mov r4, r9 ldrb r1, [r4] movs r0, 0x58 @@ -115091,9 +115091,9 @@ sub_8048760: ; 8048760 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 @@ -115105,9 +115105,9 @@ sub_8048760: ; 8048760 movs r0, 0 movs r1, 0 bl sub_8048760 - b @080499B2 + b _080499B2 .pool -@0804927C: +_0804927C: mov r0, r9 ldrb r1, [r0] movs r0, 0x58 @@ -115137,9 +115137,9 @@ sub_8048760: ; 8048760 movs r2, 0x4 orrs r0, r2 strb r0, [r1, 0x1] - b @08049994 + b _08049994 .pool -@080492C4: +_080492C4: mov r3, r9 ldrb r0, [r3] movs r6, 0x58 @@ -115152,9 +115152,9 @@ sub_8048760: ; 8048760 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] @@ -115206,45 +115206,45 @@ sub_8048760: ; 8048760 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 .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 @@ -115255,9 +115255,9 @@ sub_8048760: ; 8048760 lsls r0, 2 adds r0, r1 ldr r0, [r0] - b @080499B0 + b _080499B0 .pool -@080493D4: +_080493D4: ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xF2 @@ -115270,9 +115270,9 @@ sub_8048760: ; 8048760 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 @@ -115284,9 +115284,9 @@ sub_8048760: ; 8048760 adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082D8CD4 - b @080499B0 + b _080499B0 .pool -@0804941C: +_0804941C: movs r0, 0x70 negs r0, r0 ldr r4, =0x02024332 @@ -115300,9 +115300,9 @@ sub_8048760: ; 8048760 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 @@ -115314,9 +115314,9 @@ sub_8048760: ; 8048760 adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082D8D65 - b @080499B0 + b _080499B0 .pool -@08049468: +_08049468: ldr r4, =0x02024332 ldrb r1, [r4, 0x3] adds r1, 0xDA @@ -115329,9 +115329,9 @@ sub_8048760: ; 8048760 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 @@ -115343,9 +115343,9 @@ sub_8048760: ; 8048760 adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082D8CD4 - b @080499B0 + b _080499B0 .pool -@080494B0: +_080494B0: movs r0, 0x60 negs r0, r0 ldr r4, =0x02024332 @@ -115359,9 +115359,9 @@ sub_8048760: ; 8048760 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 @@ -115373,9 +115373,9 @@ sub_8048760: ; 8048760 adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082D8D65 - b @080499B0 + b _080499B0 .pool -@080494FC: +_080494FC: mov r0, r9 ldrb r1, [r0] movs r0, 0x58 @@ -115405,9 +115405,9 @@ sub_8048760: ; 8048760 ldr r1, =0x020241ea ldrh r1, [r1] strh r1, [r0] - b @08049994 + b _08049994 .pool -@08049544: +_08049544: ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0x58 @@ -115419,21 +115419,21 @@ sub_8048760: ; 8048760 ldr r0, [r2] movs r1, 0x80 lsls r1, 16 -@0804955A: +_0804955A: orrs r0, r1 str r0, [r2] - b @08049994 + b _08049994 .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 @@ -115444,20 +115444,20 @@ sub_8048760: ; 8048760 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 .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 @@ -115473,9 +115473,9 @@ sub_8048760: ; 8048760 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] @@ -115486,12 +115486,12 @@ sub_8048760: ; 8048760 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, =gUnknown_082DB682 @@ -115506,9 +115506,9 @@ sub_8048760: ; 8048760 ldrb r0, [r7] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b @080499B2 + b _080499B2 .pool -@0804963C: +_0804963C: ldr r4, =0x0202420b mov r10, r4 ldrb r2, [r4] @@ -115519,9 +115519,9 @@ sub_8048760: ; 8048760 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 @@ -115530,21 +115530,21 @@ sub_8048760: ; 8048760 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 @@ -115608,9 +115608,9 @@ sub_8048760: ; 8048760 adds r0, r1 adds r0, 0xC9 strb r6, [r0] - b @080499B2 + b _080499B2 .pool -@08049720: +_08049720: ldr r3, =0x0202420c ldrb r1, [r3] movs r0, 0x58 @@ -115633,9 +115633,9 @@ sub_8048760: ; 8048760 ldr r1, =0x0202420b ldrb r1, [r1] strb r1, [r0, 0x14] - b @08049994 + b _08049994 .pool -@0804975C: +_0804975C: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0x58 @@ -115647,25 +115647,25 @@ sub_8048760: ; 8048760 ldr r0, [r2] movs r1, 0x80 lsls r1, 20 - b @0804955A + b _0804955A .pool -@08049778: +_08049778: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DAF27 - b @080499B0 + b _080499B0 .pool -@08049790: +_08049790: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DAFC3 - b @080499B0 + b _080499B0 .pool -@080497A8: +_080497A8: ldr r6, =0x0202420c ldrb r0, [r6] movs r2, 0x58 @@ -115677,9 +115677,9 @@ sub_8048760: ; 8048760 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 @@ -115703,17 +115703,17 @@ sub_8048760: ; 8048760 adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DB361 - b @080499B0 + b _080499B0 .pool -@08049808: +_08049808: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DB117 - b @080499B0 + b _080499B0 .pool -@08049820: +_08049820: ldr r4, =0x020241f0 ldr r0, =0x020241f4 ldr r0, [r0] @@ -115721,10 +115721,10 @@ sub_8048760: ; 8048760 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 @@ -115735,9 +115735,9 @@ sub_8048760: ; 8048760 lsls r0, 2 adds r0, r1 ldr r0, [r0] - b @080499B0 + b _080499B0 .pool -@08049864: +_08049864: mov r4, r9 ldrb r0, [r4] movs r5, 0x58 @@ -115750,9 +115750,9 @@ sub_8048760: ; 8048760 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 @@ -115778,9 +115778,9 @@ sub_8048760: ; 8048760 ldr r0, [r2] orrs r0, r1 str r0, [r2] - b @080499B2 + b _080499B2 .pool -@080498C0: +_080498C0: mov r4, r9 ldrb r3, [r4] movs r5, 0x58 @@ -115792,10 +115792,10 @@ sub_8048760: ; 8048760 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 @@ -115804,12 +115804,12 @@ sub_8048760: ; 8048760 ldrb r0, [r4] movs r1, 0x3C bl b_history__record_ability_usage_of_player - b @080499B2 + b _080499B2 .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 @@ -115864,28 +115864,28 @@ sub_8048760: ; 8048760 adds r0, r1 adds r0, 0xC9 strb r5, [r0] - b @080499B2 + b _080499B2 .pool -@08049994: +_08049994: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] - b @080499B2 + b _080499B2 .pool -@080499A4: +_080499A4: ldr r4, =0x02024214 ldr r0, [r4] adds r0, 0x1 bl b_movescr_stack_push ldr r0, =gUnknown_082DB1D5 -@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 @@ -115909,7 +115909,7 @@ atk15_seteffectwithchancetarget: ; 80499D4 adds r0, 0x20 ldrb r0, [r0] cmp r0, 0x20 - bne @08049A10 + bne _08049A10 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -115919,9 +115919,9 @@ atk15_seteffectwithchancetarget: ; 80499D4 adds r0, r2 ldrb r0, [r0, 0x5] lsls r4, r0, 1 - b @08049A20 + b _08049A20 .pool -@08049A10: +_08049A10: ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -115930,25 +115930,25 @@ atk15_seteffectwithchancetarget: ; 80499D4 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 .pool -@08049A50: +_08049A50: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -115957,36 +115957,36 @@ atk15_seteffectwithchancetarget: ; 80499D4 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 .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] @@ -116030,21 +116030,21 @@ 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 .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, =gUnknown_0831C134 ldrb r0, [r3, 0x3] @@ -116080,7 +116080,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 @@ -116095,9 +116095,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] @@ -116121,12 +116121,12 @@ atk19_faintpokemon: ; 8049B5C ldr r1, =0x0000fdff ands r1, r2 strh r1, [r0] - b @08049E32 + b _08049E32 .pool -@08049BE0: +_08049BE0: ldrb r0, [r2, 0x1] cmp r0, 0x1 - bne @08049C08 + bne _08049C08 ldr r1, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -116135,9 +116135,9 @@ atk19_faintpokemon: ; 8049B5C ldrb r0, [r0] mov r9, r0 ldr r4, =gUnknown_082DA7AA - b @08049C18 + b _08049C18 .pool -@08049C08: +_08049C08: ldr r1, =0x02024064 ldr r0, =0x0202420c ldrb r0, [r0] @@ -116146,7 +116146,7 @@ atk19_faintpokemon: ; 8049B5C ldrb r0, [r0] mov r9, r0 ldr r4, =gUnknown_082DA7B7 -@08049C18: +_08049C18: mov r8, r1 ldr r0, =0x02024210 ldrb r1, [r0] @@ -116158,18 +116158,18 @@ atk19_faintpokemon: ; 8049B5C 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] @@ -116183,7 +116183,7 @@ atk19_faintpokemon: ; 8049B5C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne @08049CA4 + bne _08049CA4 ldr r0, [r5] movs r1, 0x80 lsls r1, 15 @@ -116192,22 +116192,22 @@ atk19_faintpokemon: ; 8049B5C 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 .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] @@ -116222,13 +116222,13 @@ atk19_faintpokemon: ; 8049B5C 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] @@ -116237,7 +116237,7 @@ atk19_faintpokemon: ; 8049B5C adds r0, r6 ldrh r0, [r0, 0x28] cmp r0, 0 - beq @08049D0C + beq _08049D0C movs r0, 0x41 negs r0, r0 ands r1, r0 @@ -116253,7 +116253,7 @@ atk19_faintpokemon: ; 8049B5C str r0, [r1] ldr r0, =gUnknown_082DAE3E str r0, [r4] -@08049D0C: +_08049D0C: ldr r1, =0x020242ac ldr r6, =0x0202420c ldrb r0, [r6] @@ -116264,18 +116264,18 @@ atk19_faintpokemon: ; 8049B5C 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] @@ -116286,7 +116286,7 @@ atk19_faintpokemon: ; 8049B5C lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq @08049E32 + beq _08049E32 ldr r0, =0x02024084 mov r9, r0 mov r2, r8 @@ -116297,11 +116297,11 @@ atk19_faintpokemon: ; 8049B5C 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 @@ -116361,13 +116361,13 @@ atk19_faintpokemon: ; 8049B5C strb r0, [r1, 0x3] movs r0, 0xFF strb r0, [r1, 0x4] - b @08049E32 + b _08049E32 .pool -@08049E2C: +_08049E2C: ldr r0, [r6] adds r0, 0x7 str r0, [r6] -@08049E32: +_08049E32: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -116383,7 +116383,7 @@ sub_8049E40: ; 8049E40 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @08049E6A + bne _08049E6A ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] @@ -116397,7 +116397,7 @@ sub_8049E40: ; 8049E40 ldr r0, [r5] adds r0, 0x2 str r0, [r5] -@08049E6A: +_08049E6A: pop {r4,r5} pop {r0} bx r0 @@ -116411,7 +116411,7 @@ sub_8049E7C: ; 8049E7C ldr r0, =0x02024068 ldr r5, [r0] cmp r5, 0 - bne @08049EE8 + bne _08049EE8 ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -116424,7 +116424,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 @@ -116432,8 +116432,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 @@ -116452,13 +116452,13 @@ sub_8049E7C: ; 8049E7C 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} @@ -116505,20 +116505,20 @@ 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 .pool -@08049F68: +_08049F68: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] -@08049F70: +_08049F70: pop {r4,r5} pop {r0} bx r0 @@ -116564,20 +116564,20 @@ 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 .pool -@08049FE0: +_08049FE0: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0xA str r0, [r1] -@08049FE8: +_08049FE8: pop {r4,r5} pop {r0} bx r0 @@ -116606,7 +116606,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 @@ -116618,7 +116618,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] @@ -116626,11 +116626,11 @@ atk1E_jumpifability: ; 8049FF4 lsls r0, r4, 24 lsrs r0, 24 ldrb r1, [r1] - b @0804A0B0 + b _0804A0B0 .pool -@0804A054: +_0804A054: cmp r0, 0x9 - bne @0804A08C + bne _0804A08C ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 @@ -116642,7 +116642,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] @@ -116650,9 +116650,9 @@ atk1E_jumpifability: ; 8049FF4 lsls r0, r4, 24 lsrs r0, 24 ldrb r1, [r1] - b @0804A0B0 + b _0804A0B0 .pool -@0804A08C: +_0804A08C: ldrb r0, [r2, 0x1] bl get_battle_side_of_something lsls r0, 24 @@ -116664,23 +116664,23 @@ atk1E_jumpifability: ; 8049FF4 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 .pool -@0804A0C8: +_0804A0C8: ldr r0, [r6] adds r0, 0x7 str r0, [r6] -@0804A0CE: +_0804A0CE: add sp, 0x4 pop {r3} mov r8, r3 @@ -116696,18 +116696,18 @@ sub_804A0DC: ; 804A0DC 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 .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] @@ -116731,15 +116731,15 @@ sub_804A0DC: ; 804A0DC ldrh r0, [r0] ands r2, r0 cmp r2, 0 - beq @0804A148 + beq _0804A148 str r5, [r6] - b @0804A14E + b _0804A14E .pool -@0804A148: +_0804A148: adds r0, r3, 0 adds r0, 0x8 str r0, [r6] -@0804A14E: +_0804A14E: pop {r4-r6} pop {r0} bx r0 @@ -116766,76 +116766,76 @@ 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 .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 .pool -@0804A1BC: +_0804A1BC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 - beq @0804A212 - b @0804A20C + beq _0804A212 + b _0804A20C .pool -@0804A1CC: +_0804A1CC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 - bls @0804A212 - b @0804A20C + bls _0804A212 + b _0804A20C .pool -@0804A1DC: +_0804A1DC: ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x4] cmp r2, r0 - bcs @0804A212 - b @0804A20C + bcs _0804A212 + b _0804A20C .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 .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] @@ -116849,14 +116849,14 @@ sub_804A154: ; 804A154 lsls r0, 24 adds r1, r0 str r1, [r3] - b @0804A240 + b _0804A240 .pool -@0804A238: +_0804A238: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x9 str r0, [r1] -@0804A240: +_0804A240: pop {r4,r5} pop {r0} bx r0 @@ -116895,7 +116895,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 @@ -116903,10 +116903,10 @@ atk21_jumpifspecialstatusflag: ; 804A24C ldr r0, [r1] ands r0, r6 cmp r0, 0 - bne @0804A2C4 - b @0804A2BC + bne _0804A2C4 + b _0804A2BC .pool -@0804A2AC: +_0804A2AC: ldr r0, =0x020242ac ldrb r1, [r5] lsls r1, 2 @@ -116914,16 +116914,16 @@ atk21_jumpifspecialstatusflag: ; 804A24C ldr r0, [r1] ands r0, r6 cmp r0, 0 - beq @0804A2C4 -@0804A2BC: + beq _0804A2C4 +_0804A2BC: str r3, [r4] - b @0804A2CA + b _0804A2CA .pool -@0804A2C4: +_0804A2C4: adds r0, r2, 0 adds r0, 0xB str r0, [r4] -@0804A2CA: +_0804A2CA: pop {r4-r6} pop {r0} bx r0 @@ -116958,20 +116958,20 @@ 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 .pool -@0804A320: +_0804A320: adds r0, r3, 0x7 str r0, [r4] -@0804A324: +_0804A324: pop {r4-r6} pop {r0} bx r0 @@ -117005,42 +117005,42 @@ 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 .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 @@ -117060,12 +117060,12 @@ sub_804A32C: ; 804A32C ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - bl @0804ACB2 + bl _0804ACB2 .pool -@0804A414: +_0804A414: movs r5, 0 movs r7, 0 -@0804A418: +_0804A418: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -117075,12 +117075,12 @@ sub_804A32C: ; 804A32C 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, =gUnknown_0832A328 lsls r1, r7, 2 adds r1, r0 @@ -117088,35 +117088,35 @@ sub_804A32C: ; 804A32C 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 .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, =gBaseStats ldr r2, =0x02024084 ldr r0, =0x0202420d @@ -117138,7 +117138,7 @@ sub_804A32C: ; 804A32C 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 @@ -117147,10 +117147,10 @@ sub_804A32C: ; 804A32C 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 @@ -117158,12 +117158,12 @@ sub_804A32C: ; 804A32C strh r0, [r5] lsls r0, 16 cmp r0, 0 - bne @0804A516 + bne _0804A516 movs r0, 0x1 strh r0, [r5] - b @0804A516 + b _0804A516 .pool -@0804A4FC: +_0804A4FC: adds r0, r1, 0 adds r1, r5, 0 bl __divsi3 @@ -117171,13 +117171,13 @@ sub_804A32C: ; 804A32C 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 @@ -117190,13 +117190,13 @@ sub_804A32C: ; 804A32C 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] @@ -117209,22 +117209,22 @@ sub_804A32C: ; 804A32C 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 .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 @@ -117232,13 +117232,13 @@ sub_804A32C: ; 804A32C 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 .pool -@0804A5AC: +_0804A5AC: ldr r0, [r5] ldrb r1, [r0, 0x10] movs r0, 0x64 @@ -117248,7 +117248,7 @@ sub_804A32C: ; 804A32C movs r1, 0x38 bl pokemon_getattr cmp r0, 0x64 - bne @0804A5E8 + bne _0804A5E8 ldr r1, [r5] adds r1, 0x53 ldrb r0, [r1] @@ -117256,28 +117256,28 @@ sub_804A32C: ; 804A32C 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 .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 @@ -117285,7 +117285,7 @@ sub_804A32C: ; 804A32C ldrb r0, [r1, 0x12] adds r0, 0x1 strb r0, [r1, 0x12] -@0804A616: +_0804A616: ldr r5, =0x0202449c ldr r0, [r5] ldrb r1, [r0, 0x10] @@ -117296,39 +117296,39 @@ sub_804A32C: ; 804A32C 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 .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 @@ -117336,13 +117336,13 @@ sub_804A32C: ; 804A32C 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 @@ -117350,7 +117350,7 @@ sub_804A32C: ; 804A32C movs r1, 0x64 bl __divsi3 str r0, [r4] -@0804A6AA: +_0804A6AA: ldr r4, =0x0202449c ldr r0, [r4] ldrb r1, [r0, 0x10] @@ -117361,23 +117361,23 @@ sub_804A32C: ; 804A32C 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 .pool -@0804A6F8: +_0804A6F8: ldr r4, =0x020241f0 ldr r1, [r4] movs r0, 0x96 @@ -117388,19 +117388,19 @@ sub_804A32C: ; 804A32C movs r7, 0xA5 lsls r7, 1 mov r9, r4 - b @0804A71A + b _0804A71A .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] @@ -117410,40 +117410,40 @@ sub_804A32C: ; 804A32C 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 .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 @@ -117517,22 +117517,22 @@ sub_804A32C: ; 804A32C 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 .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] @@ -117550,7 +117550,7 @@ sub_804A32C: ; 804A32C movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - beq @0804A92A + beq _0804A92A ldr r0, [r7] ldrb r0, [r0, 0x10] muls r0, r6 @@ -117558,7 +117558,7 @@ sub_804A32C: ; 804A32C movs r1, 0x38 bl pokemon_getattr cmp r0, 0x64 - beq @0804A92A + beq _0804A92A ldr r0, [r7] ldrb r0, [r0, 0x10] muls r0, r6 @@ -117627,20 +117627,20 @@ sub_804A32C: ; 804A32C 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 .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] @@ -117654,29 +117654,29 @@ sub_804A32C: ; 804A32C 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 @@ -117684,7 +117684,7 @@ sub_804A32C: ; 804A32C adds r0, r1 adds r1, r2, 0 bl sub_805E990 -@0804A9B2: +_0804A9B2: ldr r1, =0x02022f58 movs r3, 0xFD strb r3, [r1] @@ -117762,11 +117762,11 @@ sub_804A32C: ; 804A32C 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 @@ -117855,29 +117855,29 @@ sub_804A32C: ; 804A32C 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 @@ -117950,29 +117950,29 @@ sub_804A32C: ; 804A32C adds r1, r6, 0 adds r1, 0xB8 strh r0, [r1] - b @0804AC2E + b _0804AC2E .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 .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 .pool -@0804AC58: +_0804AC58: ldr r2, =0x0202449c ldr r1, [r2] ldrb r0, [r1, 0x10] @@ -117981,23 +117981,23 @@ sub_804A32C: ; 804A32C 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 .pool -@0804AC7C: +_0804AC7C: ldr r1, =0x02024474 movs r0, 0x6 strb r0, [r1, 0x1C] - b @0804ACB2 + b _0804ACB2 .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] @@ -118015,7 +118015,7 @@ sub_804A32C: ; 804A32C ldr r0, [r1] adds r0, 0x2 str r0, [r1] -@0804ACB2: +_0804ACB2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -118034,23 +118034,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 @@ -118060,27 +118060,27 @@ sub_804ACD0: ; 804ACD0 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 .pool -@0804AD48: +_0804AD48: movs r5, 0 -@0804AD4A: +_0804AD4A: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -118090,19 +118090,19 @@ sub_804ACD0: ; 804ACD0 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 @@ -118115,30 +118115,30 @@ sub_804ACD0: ; 804ACD0 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 @@ -118148,19 +118148,19 @@ sub_804ACD0: ; 804ACD0 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 @@ -118172,36 +118172,36 @@ sub_804ACD0: ; 804ACD0 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 @@ -118209,36 +118209,36 @@ sub_804ACD0: ; 804ACD0 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 @@ -118248,40 +118248,40 @@ sub_804ACD0: ; 804ACD0 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 .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] @@ -118294,18 +118294,18 @@ sub_804ACD0: ; 804ACD0 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} @@ -118374,14 +118374,14 @@ 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 .pool -@0804AFC4: +_0804AFC4: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -118395,7 +118395,7 @@ atk27_cmd27: ; 804AFA0 lsls r0, 24 adds r1, r0 str r1, [r3] -@0804AFDE: +_0804AFDE: pop {r0} bx r0 .pool @@ -118450,55 +118450,55 @@ 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 .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 @@ -118537,55 +118537,55 @@ 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 .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 @@ -118630,55 +118630,55 @@ 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 .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 @@ -118723,36 +118723,36 @@ 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 .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 @@ -118798,33 +118798,33 @@ 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 .pool -@0804B304: +_0804B304: ldr r0, [r3] adds r0, 0xE -@0804B308: +_0804B308: str r0, [r3] pop {r4-r7} pop {r0} @@ -118932,16 +118932,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] @@ -118989,8 +118989,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 @@ -118999,8 +118999,8 @@ atk32_memcpy_with_offset: ; 804B3E4 strb r1, [r0] adds r2, 0x1 cmp r2, r4 - blt @0804B42E -@0804B440: + blt _0804B42E +_0804B440: ldr r0, [r3] adds r0, 0xE str r0, [r3] @@ -119202,7 +119202,7 @@ atk39_pause: ; 804B5A0 ldr r0, =0x02024068 ldr r4, [r0] cmp r4, 0 - bne @0804B5CC + bne _0804B5CC ldr r5, =0x02024214 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -119216,11 +119216,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 @@ -119233,12 +119233,12 @@ sub_804B5E0: ; 804B5E0 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 .pool @@ -119251,15 +119251,15 @@ atk3B_8022C68: ; 804B600 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0 - bne @0804B620 + bne _0804B620 ldr r0, =0x02024064 ldr r1, =0x0202420c - b @0804B624 + b _0804B624 .pool -@0804B620: +_0804B620: ldr r0, =0x02024064 ldr r1, =0x0202420b -@0804B624: +_0804B624: ldrb r1, [r1] strb r1, [r0] ldr r0, =0x020241f0 @@ -119295,11 +119295,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] @@ -119336,10 +119336,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] @@ -119399,12 +119399,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 @@ -119416,12 +119416,12 @@ atk42_jumpiftype2: ; 804B728 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0804B77C + b _0804B77C .pool -@0804B778: +_0804B778: adds r0, r3, 0x7 str r0, [r4] -@0804B77C: +_0804B77C: pop {r4} pop {r0} bx r0 @@ -119442,7 +119442,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] @@ -119455,13 +119455,13 @@ sub_804B784: ; 804B784 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0804B7C6 + b _0804B7C6 .pool -@0804B7C0: +_0804B7C0: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -@0804B7C6: +_0804B7C6: add sp, 0x4 pop {r4} pop {r0} @@ -119505,12 +119505,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] @@ -119523,27 +119523,27 @@ atk46_cmd46: ; 804B7EC ldr r0, [r4] adds r0, 0x7 str r0, [r4] - b @0804B8AA + b _0804B8AA .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, =gUnknown_082DABB9 - b @0804B8A8 + b _0804B8A8 .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 @@ -119552,11 +119552,11 @@ atk46_cmd46: ; 804B7EC ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - beq @0804B894 + beq _0804B894 adds r0, r2, 0x7 - b @0804B8A8 + b _0804B8A8 .pool -@0804B894: +_0804B894: ldrb r1, [r2, 0x2] ldrh r2, [r3] movs r0, 0 @@ -119565,9 +119565,9 @@ atk46_cmd46: ; 804B7EC 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 @@ -119606,12 +119606,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 @@ -119623,25 +119623,25 @@ sub_804B8B0: ; 804B8B0 ldr r0, [r1] adds r0, 0xA str r0, [r1] - b @0804B976 + b _0804B976 .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 .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 @@ -119650,11 +119650,11 @@ sub_804B8B0: ; 804B8B0 ldr r1, =0x000400c0 ands r0, r1 cmp r0, 0 - beq @0804B960 + beq _0804B960 adds r0, r2, 0 - b @0804B972 + b _0804B972 .pool -@0804B960: +_0804B960: ldrb r1, [r3] ldrh r2, [r4] movs r0, 0 @@ -119662,10 +119662,10 @@ sub_804B8B0: ; 804B8B0 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 @@ -119681,31 +119681,31 @@ 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 .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 @@ -119750,42 +119750,42 @@ 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 .pool -@0804BA58: +_0804BA58: ldr r6, =0x02024064 ldrb r0, [r6] str r3, [sp] @@ -119800,7 +119800,7 @@ atk48_playstatchangeanimation: ; 804B9D8 ldrb r0, [r0, 0x4] ldr r3, [sp] cmp r0, 0 - bne @0804BAB2 + bne _0804BAB2 ldr r0, =0x02024084 ldrb r2, [r6] movs r1, 0x58 @@ -119809,43 +119809,43 @@ atk48_playstatchangeanimation: ; 804B9D8 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 @@ -119853,29 +119853,29 @@ atk48_playstatchangeanimation: ; 804B9D8 movs r1, 0x39 mov r8, r1 cmp r0, 0 - beq @0804BB4E + beq _0804BB4E movs r0, 0x3A - b @0804BB4C + b _0804BB4C .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 @@ -119885,21 +119885,21 @@ atk48_playstatchangeanimation: ; 804B9D8 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] @@ -119908,31 +119908,31 @@ atk48_playstatchangeanimation: ; 804B9D8 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 .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 @@ -119948,21 +119948,21 @@ atk48_playstatchangeanimation: ; 804B9D8 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 .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} @@ -119990,10 +119990,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] @@ -120008,21 +120008,21 @@ sub_804BBCC: ; 804BBCC 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 .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 @@ -120034,13 +120034,13 @@ sub_804BBCC: ; 804BBCC 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 .pool -@0804BC68: +_0804BC68: ldr r4, =0x02024064 strb r2, [r4] movs r0, 0 @@ -120048,9 +120048,9 @@ sub_804BBCC: ; 804BBCC bl dp01_build_cmdbuf_x33_a_33_33 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0804C15A + b _0804C15A .pool -@0804BC80: +_0804BC80: ldr r4, =0x02024064 strb r2, [r4] movs r0, 0 @@ -120065,9 +120065,9 @@ sub_804BBCC: ; 804BBCC ldr r2, =0xfffbff3f ands r0, r2 str r0, [r1] - b @0804C15A + b _0804C15A .pool -@0804BCAC: +_0804BCAC: strb r2, [r7] ldr r0, [r5] orrs r0, r6 @@ -120089,9 +120089,9 @@ sub_804BBCC: ; 804BBCC bl b_movescr_stack_push ldr r1, =0x02024214 ldr r0, =gUnknown_082DB87D - bl @0804C5B8 + bl _0804C5B8 .pool -@0804BCF0: +_0804BCF0: ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -120101,50 +120101,50 @@ sub_804BBCC: ; 804BBCC adds r0, r2 ldrb r0, [r0, 0x2] str r0, [sp, 0x4] -@0804BD02: +_0804BD02: ldr r1, =0x02024474 mov r12, r1 - b @0804BD1E + b _0804BD1E .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 .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] @@ -120159,21 +120159,21 @@ sub_804BBCC: ; 804BBCC 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 @@ -120182,17 +120182,17 @@ sub_804BBCC: ; 804BBCC 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 @@ -120203,15 +120203,15 @@ sub_804BBCC: ; 804BBCC 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, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -120221,9 +120221,9 @@ sub_804BBCC: ; 804BBCC 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 @@ -120231,18 +120231,18 @@ sub_804BBCC: ; 804BBCC 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, =gUnknown_082DAE0D str r0, [r1] - b @0804C0B8 + b _0804C0B8 .pool -@0804BE5C: +_0804BE5C: ldr r4, =0x02024084 ldr r6, =0x0202420c ldrb r2, [r6] @@ -120257,21 +120257,21 @@ sub_804BBCC: ; 804BBCC 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 @@ -120280,22 +120280,22 @@ sub_804BBCC: ; 804BBCC 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 @@ -120322,9 +120322,9 @@ sub_804BBCC: ; 804BBCC str r0, [r1] movs r2, 0x1 mov r10, r2 - b @0804C184 + b _0804C184 .pool -@0804BF18: +_0804BF18: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0 @@ -120335,14 +120335,14 @@ sub_804BBCC: ; 804BBCC 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 .pool -@0804BF3C: +_0804BF3C: ldr r0, =0x0202420c ldrb r1, [r0] movs r0, 0 @@ -120351,9 +120351,9 @@ sub_804BBCC: ; 804BBCC movs r2, 0 movs r3, 0 bl ability_something - b @0804C0B2 + b _0804C0B2 .pool -@0804BF54: +_0804BF54: movs r0, 0 str r0, [sp] movs r0, 0x5 @@ -120363,16 +120363,16 @@ sub_804BBCC: ; 804BBCC 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 .pool -@0804BF7C: +_0804BF7C: ldr r0, =0x0202420b ldrb r1, [r0] movs r0, 0 @@ -120383,51 +120383,51 @@ sub_804BBCC: ; 804BBCC 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 .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 @@ -120441,14 +120441,14 @@ sub_804BBCC: ; 804BBCC 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 @@ -120456,78 +120456,78 @@ sub_804BBCC: ; 804BBCC 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 .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 .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 .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] @@ -120537,26 +120537,26 @@ sub_804BBCC: ; 804BBCC 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 .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] @@ -120566,13 +120566,13 @@ sub_804BBCC: ; 804BBCC 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] @@ -120600,22 +120600,22 @@ sub_804BBCC: ; 804BBCC 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 .pool -@0804C184: +_0804C184: ldr r1, =0x02024474 ldrb r0, [r1, 0x14] adds r0, 0x1 strb r0, [r1, 0x14] mov r12, r1 - b @0804C570 + b _0804C570 .pool -@0804C194: +_0804C194: ldr r0, =0x0202437c ldr r6, =0x0202420c ldrb r2, [r6] @@ -120626,54 +120626,54 @@ sub_804BBCC: ; 804BBCC 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 .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 .pool -@0804C21C: +_0804C21C: ldr r1, =0x02024280 ldr r3, [r1] movs r0, 0x80 @@ -120683,7 +120683,7 @@ sub_804BBCC: ; 804BBCC mov r9, r2 adds r5, r1, 0 cmp r0, 0 - beq @0804C246 + beq _0804C246 ldr r0, =0x02024064 ldrb r2, [r2] strb r2, [r0] @@ -120695,13 +120695,13 @@ sub_804BBCC: ; 804BBCC 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] @@ -120710,7 +120710,7 @@ sub_804BBCC: ; 804BBCC ldr r0, =0x020241ec ldrh r0, [r0] strh r0, [r1] -@0804C262: +_0804C262: ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =gUnknown_0832A328 @@ -120722,9 +120722,9 @@ sub_804BBCC: ; 804BBCC 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 @@ -120732,9 +120732,9 @@ sub_804BBCC: ; 804BBCC ands r1, r3 adds r7, r0, 0 cmp r1, 0 - beq @0804C28E - b @0804C3E8 -@0804C28E: + beq _0804C28E + b _0804C3E8 +_0804C28E: ldr r0, =gBattleMoves ldr r2, [sp, 0x18] lsls r1, r2, 1 @@ -120744,15 +120744,15 @@ sub_804BBCC: ; 804BBCC 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 @@ -120767,9 +120767,9 @@ sub_804BBCC: ; 804BBCC ldr r0, =0x020241ea ldrh r0, [r0] strh r0, [r1] - b @0804C322 + b _0804C322 .pool -@0804C308: +_0804C308: ldr r1, =0x02024248 lsls r0, r4, 1 adds r0, r1 @@ -120783,7 +120783,7 @@ sub_804BBCC: ; 804BBCC movs r1, 0x1 negs r1, r1 strh r1, [r0] -@0804C322: +_0804C322: ldr r2, =0x0202420c ldrb r3, [r2] lsls r0, r3, 2 @@ -120793,38 +120793,38 @@ sub_804BBCC: ; 804BBCC 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 .pool -@0804C390: +_0804C390: ldr r0, =0x02024250 ldrb r1, [r2] lsls r1, 1 @@ -120835,16 +120835,16 @@ sub_804BBCC: ; 804BBCC 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 .pool -@0804C3C0: +_0804C3C0: ldr r0, =0x02024258 ldrb r2, [r2] lsls r2, 1 @@ -120856,24 +120856,24 @@ sub_804BBCC: ; 804BBCC add r0, r8 ldrb r0, [r0, 0x2] strh r0, [r2] - b @0804C3E8 + b _0804C3E8 .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 .pool -@0804C3FC: +_0804C3FC: ldr r0, =0x02024210 ldrb r1, [r0] ldr r7, =gUnknown_0832A328 @@ -120885,7 +120885,7 @@ sub_804BBCC: ; 804BBCC ands r1, r4 mov r9, r2 cmp r1, 0 - bne @0804C4B6 + bne _0804C4B6 ldr r6, =0x0202449c ldr r5, [r6] adds r0, r5, 0 @@ -120893,7 +120893,7 @@ sub_804BBCC: ; 804BBCC ldrb r0, [r0] ands r0, r4 cmp r0, 0 - bne @0804C4B6 + bne _0804C4B6 ldr r1, =gBattleMoves ldr r2, [sp, 0x18] lsls r0, r2, 1 @@ -120904,18 +120904,18 @@ sub_804BBCC: ; 804BBCC 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 @@ -120923,13 +120923,13 @@ sub_804BBCC: ; 804BBCC 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 @@ -120967,27 +120967,27 @@ sub_804BBCC: ; 804BBCC 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 .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] @@ -120996,7 +120996,7 @@ sub_804BBCC: ; 804BBCC ldrb r0, [r0, 0x1] lsls r0, 29 cmp r0, 0 - blt @0804C568 + blt _0804C568 ldr r0, =gBattleMoves mov r9, r0 ldr r1, =0x020241ea @@ -121008,13 +121008,13 @@ sub_804BBCC: ; 804BBCC 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 @@ -121031,61 +121031,61 @@ sub_804BBCC: ; 804BBCC 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 @@ -121124,10 +121124,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 @@ -121146,28 +121146,28 @@ atk4A_damagecalc2: ; 804C5F4 ldrb r0, [r7] ldrb r1, [r3] bl b_history__record_ability_usage_of_player - b @0804C76A + b _0804C76A .pool -@0804C678: +_0804C678: ldr r0, =0x0202427c ldrb r1, [r0] movs r2, 0x8 orrs r1, r2 strb r1, [r0] - b @0804C76A + b _0804C76A .pool -@0804C688: +_0804C688: ldr r1, =gUnknown_0831ACE8 adds r0, r5, r1 ldrb r0, [r0] adds r6, r1, 0 - b @0804C74A + b _0804C74A .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] @@ -121179,24 +121179,24 @@ atk4A_damagecalc2: ; 804C5F4 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 @@ -121207,29 +121207,29 @@ atk4A_damagecalc2: ; 804C5F4 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 @@ -121240,29 +121240,29 @@ atk4A_damagecalc2: ; 804C5F4 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 @@ -121274,8 +121274,8 @@ atk4A_damagecalc2: ; 804C5F4 lsls r1, 22 ands r0, r1 cmp r0, 0 - beq @0804C744 -@0804C76A: + beq _0804C744 +_0804C76A: ldr r2, =0x02024084 ldr r0, =0x0202420c mov r8, r0 @@ -121286,11 +121286,11 @@ atk4A_damagecalc2: ; 804C5F4 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 @@ -121299,16 +121299,16 @@ atk4A_damagecalc2: ; 804C5F4 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, =gBattleMoves ldrh r1, [r7] lsls r0, r1, 1 @@ -121317,7 +121317,7 @@ atk4A_damagecalc2: ; 804C5F4 adds r0, r2 ldrb r0, [r0, 0x1] cmp r0, 0 - beq @0804C7E6 + beq _0804C7E6 ldr r3, =0x0202420a strb r6, [r3] ldr r2, =0x0202427c @@ -121337,13 +121337,13 @@ atk4A_damagecalc2: ; 804C5F4 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] @@ -121353,7 +121353,7 @@ atk4A_damagecalc2: ; 804C5F4 movs r2, 0x2 orrs r0, r2 strb r0, [r1, 0x1] -@0804C804: +_0804C804: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -121383,13 +121383,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 @@ -121406,7 +121406,7 @@ atk4C_switch1: ; 804C894 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0804C8E4 + bne _0804C8E4 ldr r5, =0x02024214 ldr r0, [r5] ldrb r0, [r0, 0x1] @@ -121439,7 +121439,7 @@ atk4C_switch1: ; 804C894 ldr r0, [r5] adds r0, 0x2 str r0, [r5] -@0804C8E4: +_0804C8E4: pop {r4,r5} pop {r0} bx r0 @@ -121453,9 +121453,9 @@ sub_804C904: ; 804C904 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] @@ -121476,7 +121476,7 @@ sub_804C904: ; 804C904 adds r3, r0, r6 movs r2, 0 ldr r5, =0x02023864 -@0804C93E: +_0804C93E: adds r0, r3, r2 ldrb r1, [r4] lsls r1, 9 @@ -121487,7 +121487,7 @@ sub_804C904: ; 804C904 strb r1, [r0] adds r2, 0x1 cmp r2, 0x57 - bls @0804C93E + bls _0804C93E ldr r4, =0x02024084 ldr r6, =0x02024064 ldrb r0, [r6] @@ -121549,13 +121549,13 @@ sub_804C904: ; 804C904 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, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -121565,14 +121565,14 @@ sub_804C904: ; 804C904 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 @@ -121583,7 +121583,7 @@ sub_804C904: ; 804C904 strb r0, [r1] adds r2, 0x1 cmp r2, 0x7 - ble @0804C9FE + ble _0804C9FE ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 @@ -121593,7 +121593,7 @@ sub_804C904: ; 804C904 adds r0, r1 ldr r1, [sp, 0x50] str r1, [r0] -@0804CA26: +_0804CA26: bl sub_803A284 ldr r0, =0x02022fec ldr r0, [r0] @@ -121601,7 +121601,7 @@ sub_804C904: ; 804C904 lsls r1, 10 ands r0, r1 cmp r0, 0 - beq @0804CA78 + beq _0804CA78 ldr r4, =0x02024084 ldr r0, =0x02024064 ldrb r3, [r0] @@ -121613,9 +121613,9 @@ sub_804C904: ; 804C904 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 @@ -121623,7 +121623,7 @@ sub_804C904: ; 804C904 movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne @0804CA78 + bne _0804CA78 ldr r0, =0x0202449c ldr r2, [r0] adds r2, 0x92 @@ -121634,7 +121634,7 @@ sub_804C904: ; 804C904 ldrb r1, [r2] orrs r0, r1 strb r0, [r2] -@0804CA78: +_0804CA78: ldr r0, =0x02024474 ldr r3, =0x02024064 ldrb r2, [r3] @@ -121657,7 +121657,7 @@ sub_804C904: ; 804C904 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -@0804CAA4: +_0804CAA4: add sp, 0x58 pop {r4-r7} pop {r0} @@ -121671,7 +121671,7 @@ atk4E_switch3: ; 804CAE8 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0804CB86 + bne _0804CB86 ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -121683,13 +121683,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 @@ -121706,7 +121706,7 @@ atk4E_switch3: ; 804CAE8 ldr r2, [r1] movs r1, 0x2 bl SetPokedexFlag -@0804CB3E: +_0804CB3E: ldr r2, =0x02024210 ldr r1, =gUnknown_0832A328 ldr r5, =0x02024064 @@ -121738,9 +121738,9 @@ atk4E_switch3: ; 804CAE8 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 @@ -121765,7 +121765,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 @@ -121776,7 +121776,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 @@ -121785,8 +121785,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 @@ -121798,16 +121798,16 @@ atk4F_jumpifcannotswitch: ; 804CBB0 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0804CF00 + b _0804CF00 .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 @@ -121816,23 +121816,23 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 @@ -121841,65 +121841,65 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 .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 .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 .pool -@0804CD00: +_0804CD00: ldr r5, =0x02024064 ldrb r0, [r5] bl battle_side_get_owner @@ -121908,11 +121908,11 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 @@ -121922,14 +121922,14 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 @@ -121938,58 +121938,58 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 .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 @@ -121998,39 +121998,39 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 .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 @@ -122039,21 +122039,21 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 .pool -@0804CE48: +_0804CE48: adds r6, r7, 0 -@0804CE4A: +_0804CE4A: ldr r0, =0x02024744 mov r8, r0 - b @0804CE82 + b _0804CE82 .pool -@0804CE54: +_0804CE54: movs r0, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -122063,21 +122063,21 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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 .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 @@ -122086,36 +122086,36 @@ atk4F_jumpifcannotswitch: ; 804CBB0 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] @@ -122129,14 +122129,14 @@ atk4F_jumpifcannotswitch: ; 804CBB0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0804CF00 + b _0804CF00 .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} @@ -122226,29 +122226,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, =gUnknown_0832A328 adds r4, r1, 0 ldr r2, =0x02024210 mov r8, r2 -@0804CFE2: +_0804CFE2: ldrb r2, [r4] lsls r0, r2, 2 adds r0, r6 @@ -122257,14 +122257,14 @@ atk50_openpartyscreen: ; 804CF88 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 @@ -122287,9 +122287,9 @@ atk50_openpartyscreen: ; 804CF88 bl sub_8034464 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0804D098 + b _0804D098 .pool -@0804D054: +_0804D054: ldr r5, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -122299,7 +122299,7 @@ atk50_openpartyscreen: ; 804CF88 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt @0804D098 + blt _0804D098 movs r0, 0x6 bl sub_804CF10 ldrb r1, [r4] @@ -122311,16 +122311,16 @@ atk50_openpartyscreen: ; 804CF88 movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b @0804D098 + b _0804D098 .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] @@ -122329,15 +122329,15 @@ atk50_openpartyscreen: ; 804CF88 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @0804CFE2 - b @0804D450 + bcc _0804CFE2 + b _0804D450 .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] @@ -122346,7 +122346,7 @@ atk50_openpartyscreen: ; 804CF88 ldr r0, [r6] ands r0, r5 cmp r0, 0 - beq @0804D170 + beq _0804D170 ldr r4, =0x02024064 strb r7, [r4] movs r0, 0 @@ -122355,7 +122355,7 @@ atk50_openpartyscreen: ; 804CF88 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq @0804D120 + beq _0804D120 ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -122377,9 +122377,9 @@ atk50_openpartyscreen: ; 804CF88 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0804D170 + b _0804D170 .pool -@0804D120: +_0804D120: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -122389,7 +122389,7 @@ atk50_openpartyscreen: ; 804CF88 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt @0804D15C + blt _0804D15C ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5E @@ -122404,9 +122404,9 @@ atk50_openpartyscreen: ; 804CF88 movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b @0804D170 + b _0804D170 .pool -@0804D15C: +_0804D15C: movs r0, 0 movs r1, 0x2 movs r2, 0 @@ -122415,16 +122415,16 @@ atk50_openpartyscreen: ; 804CF88 bl dp01_battle_side_mark_buffer_for_execution movs r0, 0x1 mov r9, r0 -@0804D170: +_0804D170: ldr r6, =gUnknown_0832A328 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] @@ -122434,7 +122434,7 @@ atk50_openpartyscreen: ; 804CF88 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq @0804D1D8 + beq _0804D1D8 ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -122456,9 +122456,9 @@ atk50_openpartyscreen: ; 804CF88 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0804D22E + b _0804D22E .pool -@0804D1D8: +_0804D1D8: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -122468,7 +122468,7 @@ atk50_openpartyscreen: ; 804CF88 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt @0804D214 + blt _0804D214 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5C @@ -122483,26 +122483,26 @@ atk50_openpartyscreen: ; 804CF88 movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b @0804D22E + b _0804D22E .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, =gUnknown_0832A328 ldr r0, [r6, 0x4] ands r0, r5 cmp r0, 0 - beq @0804D2E4 + beq _0804D2E4 ldr r4, =0x02024064 movs r0, 0x1 strb r0, [r4] @@ -122512,7 +122512,7 @@ atk50_openpartyscreen: ; 804CF88 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq @0804D290 + beq _0804D290 ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -122534,9 +122534,9 @@ atk50_openpartyscreen: ; 804CF88 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0804D2E4 + b _0804D2E4 .pool -@0804D290: +_0804D290: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -122546,7 +122546,7 @@ atk50_openpartyscreen: ; 804CF88 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt @0804D2CC + blt _0804D2CC ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5F @@ -122561,9 +122561,9 @@ atk50_openpartyscreen: ; 804CF88 movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b @0804D2E4 + b _0804D2E4 .pool -@0804D2CC: +_0804D2CC: movs r0, 0 movs r1, 0x2 movs r2, 0 @@ -122574,16 +122574,16 @@ atk50_openpartyscreen: ; 804CF88 mov r2, r9 orrs r2, r0 mov r9, r2 -@0804D2E4: +_0804D2E4: ldr r6, =gUnknown_0832A328 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] @@ -122593,7 +122593,7 @@ atk50_openpartyscreen: ; 804CF88 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq @0804D34C + beq _0804D34C ldr r2, =0x02024210 ldrb r0, [r4] lsls r0, 2 @@ -122615,9 +122615,9 @@ atk50_openpartyscreen: ; 804CF88 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution - b @0804D3A2 + b _0804D3A2 .pool -@0804D34C: +_0804D34C: ldr r6, =0x0202437c ldrb r0, [r4] lsls r1, r0, 2 @@ -122627,7 +122627,7 @@ atk50_openpartyscreen: ; 804CF88 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt @0804D388 + blt _0804D388 ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5D @@ -122642,50 +122642,50 @@ atk50_openpartyscreen: ; 804CF88 movs r2, 0x40 orrs r1, r2 strb r1, [r0] - b @0804D3A2 + b _0804D3A2 .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, =gUnknown_0832A328 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 .pool -@0804D3E4: +_0804D3E4: ldr r0, =0x02024064 strb r1, [r0] -@0804D3E8: +_0804D3E8: movs r0, 0 movs r1, 0x2 movs r2, 0 @@ -122693,35 +122693,35 @@ atk50_openpartyscreen: ; 804CF88 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, =gUnknown_0832A328 ldr r1, [r1, 0x4] ands r0, r1 cmp r0, 0 - beq @0804D438 + beq _0804D438 ldr r1, =0x02024064 movs r0, 0x3 - b @0804D43C + b _0804D43C .pool -@0804D438: +_0804D438: ldr r1, =0x02024064 movs r0, 0x1 -@0804D43C: +_0804D43C: strb r0, [r1] movs r0, 0 movs r1, 0x2 @@ -122730,32 +122730,32 @@ atk50_openpartyscreen: ; 804CF88 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 .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 @@ -122763,11 +122763,11 @@ atk50_openpartyscreen: ; 804CF88 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] @@ -122778,7 +122778,7 @@ atk50_openpartyscreen: ; 804CF88 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq @0804D4F8 + beq _0804D4F8 ldr r2, =0x02024210 ldrb r0, [r6] lsls r0, 2 @@ -122799,9 +122799,9 @@ atk50_openpartyscreen: ; 804CF88 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r6] bl dp01_battle_side_mark_buffer_for_execution - b @0804D52A + b _0804D52A .pool -@0804D4F8: +_0804D4F8: ldr r4, =0x0202437c ldrb r0, [r6] lsls r1, r0, 2 @@ -122811,7 +122811,7 @@ atk50_openpartyscreen: ; 804CF88 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt @0804D52A + blt _0804D52A ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5C @@ -122826,16 +122826,16 @@ atk50_openpartyscreen: ; 804CF88 movs r2, 0x40 orrs r1, r2 strb r1, [r0] -@0804D52A: +_0804D52A: ldr r4, =gUnknown_0832A328 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] @@ -122848,7 +122848,7 @@ atk50_openpartyscreen: ; 804CF88 bl sub_80423F4 lsls r0, 24 cmp r0, 0 - beq @0804D5A8 + beq _0804D5A8 ldr r2, =0x02024210 ldrb r0, [r5] lsls r0, 2 @@ -122870,9 +122870,9 @@ atk50_openpartyscreen: ; 804CF88 bl dp01_build_cmdbuf_x2A_2A_2A_2A ldrb r0, [r5] bl dp01_battle_side_mark_buffer_for_execution - b @0804D5DA + b _0804D5DA .pool -@0804D5A8: +_0804D5A8: ldr r4, =0x0202437c ldrb r0, [r5] lsls r1, r0, 2 @@ -122882,7 +122882,7 @@ atk50_openpartyscreen: ; 804CF88 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - blt @0804D5DA + blt _0804D5DA ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x5D @@ -122897,18 +122897,18 @@ atk50_openpartyscreen: ; 804CF88 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 .pool -@0804D5F4: +_0804D5F4: adds r0, r2, 0x6 str r0, [r6] -@0804D5F8: +_0804D5F8: ldr r0, =0x02024280 ldr r0, [r0] lsrs r5, r0, 28 @@ -122920,13 +122920,13 @@ atk50_openpartyscreen: ; 804CF88 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] @@ -122936,30 +122936,30 @@ atk50_openpartyscreen: ; 804CF88 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 .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 @@ -122973,20 +122973,20 @@ atk50_openpartyscreen: ; 804CF88 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 .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 @@ -123009,9 +123009,9 @@ atk50_openpartyscreen: ; 804CF88 str r0, [r3] mov r0, r8 str r0, [r6] - b @0804D804 + b _0804D804 .pool -@0804D6E0: +_0804D6E0: ldr r4, =0x02024064 strb r7, [r4] ldrb r0, [r4] @@ -123066,39 +123066,39 @@ atk50_openpartyscreen: ; 804CF88 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] @@ -123107,10 +123107,10 @@ atk50_openpartyscreen: ; 804CF88 lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bcc @0804D77C - b @0804D804 + bcc _0804D77C + b _0804D804 .pool -@0804D7C4: +_0804D7C4: adds r0, r7, 0 bl battle_get_per_side_status movs r1, 0x1 @@ -123129,18 +123129,18 @@ atk50_openpartyscreen: ; 804CF88 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 @@ -123157,9 +123157,9 @@ atk51_cmd51: ; 804D820 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] @@ -123169,32 +123169,32 @@ atk51_cmd51: ; 804D820 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 .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 @@ -123210,7 +123210,7 @@ atk51_cmd51: ; 804D820 ldr r4, [r0] ands r1, r4 cmp r1, 0 - bne @0804D8AA + bne _0804D8AA lsls r0, r6, 24 lsrs r0, 24 ldrb r1, [r7, 0x1] @@ -123220,7 +123220,7 @@ atk51_cmd51: ; 804D820 ldrb r0, [r1] orrs r4, r0 strb r4, [r1] -@0804D8AA: +_0804D8AA: movs r0, 0x80 lsls r0, 2 adds r7, r0 @@ -123228,23 +123228,23 @@ atk51_cmd51: ; 804D820 ldr r0, =0x0202406c ldrb r0, [r0] cmp r6, r0 - blt @0804D870 - b @0804DA82 + blt _0804D870 + b _0804DA82 .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 .pool -@0804D8E8: +_0804D8E8: ldr r4, =0x0202449c ldr r0, [r4] adds r0, 0x93 @@ -123256,7 +123256,7 @@ atk51_cmd51: ; 804D820 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0804D922 + bne _0804D922 ldr r0, =0x02023864 lsls r1, r2, 9 adds r0, 0x1 @@ -123273,7 +123273,7 @@ atk51_cmd51: ; 804D820 ldrb r1, [r2] orrs r0, r1 strb r0, [r2] -@0804D922: +_0804D922: ldr r1, =0x02024332 ldr r6, =0x02023864 ldr r7, =0x02024064 @@ -123298,7 +123298,7 @@ atk51_cmd51: ; 804D820 movs r0, 0x42 ands r0, r1 cmp r0, 0x42 - bne @0804DA14 + bne _0804DA14 ldrb r0, [r7] mov r3, r12 ldr r2, [r3] @@ -123381,14 +123381,14 @@ atk51_cmd51: ; 804D820 adds r0, r6 ldrb r0, [r0] strb r0, [r1] - b @0804DA36 + b _0804DA36 .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] @@ -123396,11 +123396,11 @@ atk51_cmd51: ; 804D820 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] @@ -123439,12 +123439,12 @@ atk51_cmd51: ; 804D820 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 @@ -123504,9 +123504,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 @@ -123516,9 +123516,9 @@ atk52_cmd52: ; 804DAAC 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 @@ -123529,17 +123529,17 @@ atk52_cmd52: ; 804DAAC 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 @@ -123587,10 +123587,10 @@ atk52_cmd52: ; 804DAAC 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] @@ -123599,26 +123599,26 @@ atk52_cmd52: ; 804DAAC ldr r0, [r7] ldrb r0, [r0, 0x1] cmp r0, 0 - bne @0804DC14 + bne _0804DC14 ldr r0, =gUnknown_082DAE90 str r0, [r7] - b @0804DD8E + b _0804DD8E .pool -@0804DC14: +_0804DC14: cmp r0, 0x1 - bne @0804DC24 + bne _0804DC24 ldr r0, =gUnknown_082DAE59 mov r1, r9 str r0, [r1] - b @0804DD8E + b _0804DD8E .pool -@0804DC24: +_0804DC24: ldr r0, =gUnknown_082DAEC7 mov r2, r9 str r0, [r2] - b @0804DD8E + b _0804DD8E .pool -@0804DC30: +_0804DC30: ldr r2, =0x02024084 ldr r1, =0x02024064 ldrb r3, [r1] @@ -123630,7 +123630,7 @@ atk52_cmd52: ; 804DAAC adds r5, r1, 0 ldr r4, =0x020242bc cmp r0, 0x36 - bne @0804DC5E + bne _0804DC5E lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -123638,11 +123638,11 @@ atk52_cmd52: ; 804DAAC 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 @@ -123661,16 +123661,16 @@ atk52_cmd52: ; 804DAAC 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 @@ -123685,34 +123685,34 @@ atk52_cmd52: ; 804DAAC 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 @@ -123730,14 +123730,14 @@ atk52_cmd52: ; 804DAAC 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 @@ -123746,17 +123746,17 @@ atk52_cmd52: ; 804DAAC adds r0, 0x1 strb r0, [r1] ldr r2, =gUnknown_0832A328 - b @0804DD6E + b _0804DD6E .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 @@ -123764,17 +123764,17 @@ atk52_cmd52: ; 804DAAC 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 @@ -123967,9 +123967,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] @@ -123982,25 +123982,25 @@ atk59_8025230: ; 804DEEC 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 .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 .pool -@0804DF88: +_0804DF88: movs r0, 0 bl battle_get_side_with_given_state ldr r1, =0x02024064 @@ -124014,7 +124014,7 @@ atk59_8025230: ; 804DEEC ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 - bne @0804DFC8 + bne _0804DFC8 ldr r4, =0x02024084 movs r0, 0x58 adds r2, r3, 0 @@ -124027,17 +124027,17 @@ atk59_8025230: ; 804DEEC 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 @@ -124051,7 +124051,7 @@ atk59_8025230: ; 804DEEC ldrh r0, [r0] ldrb r1, [r1, 0x10] cmp r0, r1 - bne @0804E014 + bne _0804E014 ldr r4, =0x02024084 movs r0, 0x58 adds r2, r3, 0 @@ -124064,14 +124064,14 @@ atk59_8025230: ; 804DEEC 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 @@ -124091,25 +124091,25 @@ 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 .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 @@ -124128,19 +124128,19 @@ sub_804E038: ; 804E038 strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 - b @0804E3B8 + b _0804E3B8 .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] @@ -124148,17 +124148,17 @@ sub_804E038: ; 804E038 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] @@ -124166,20 +124166,20 @@ sub_804E038: ; 804E038 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 @@ -124193,27 +124193,27 @@ sub_804E038: ; 804E038 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @0804E192 + b _0804E192 .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 FreeAllWindowBuffers ldr r0, =0x020244ec ldr r1, =0x0202449c @@ -124229,61 +124229,61 @@ sub_804E038: ; 804E038 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 .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 cmp r1, r0 - beq @0804E1D2 - b @0804E3B8 -@0804E1D2: + beq _0804E1D2 + b _0804E3B8 +_0804E1D2: ldrb r0, [r2, 0x1F] adds r0, 0x1 - b @0804E3B6 + b _0804E3B6 .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 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 .pool -@0804E224: +_0804E224: ldr r6, =0x0202449c ldr r0, [r6] ldrb r0, [r0, 0x10] @@ -124302,7 +124302,7 @@ sub_804E038: ; 804E038 adds r0, r4, 0 bl sub_806E804 cmp r0, 0 - beq @0804E274 + beq _0804E274 ldr r0, =0x0000013f ldr r1, =0x02024064 ldrb r1, [r1] @@ -124310,9 +124310,9 @@ sub_804E038: ; 804E038 ldr r1, =0x02024474 movs r0, 0x6 strb r0, [r1, 0x1F] - b @0804E3B8 + b _0804E3B8 .pool -@0804E274: +_0804E274: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -124359,14 +124359,14 @@ sub_804E038: ; 804E038 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 @@ -124376,7 +124376,7 @@ sub_804E038: ; 804E038 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0804E30A + bne _0804E30A adds r0, r4, 0 adds r1, r5, 0 bl sub_806B9E4 @@ -124384,20 +124384,20 @@ sub_804E038: ; 804E038 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 @@ -124407,7 +124407,7 @@ sub_804E038: ; 804E038 lsls r1, 14 ands r0, r1 cmp r0, 0 - bne @0804E3B8 + bne _0804E3B8 ldr r0, =0x020242bc adds r0, 0x50 ldrb r1, [r0] @@ -124418,7 +124418,7 @@ sub_804E038: ; 804E038 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @0804E3B8 + bne _0804E3B8 adds r4, 0xB0 adds r0, r4, 0 adds r1, r5, 0 @@ -124428,9 +124428,9 @@ sub_804E038: ; 804E038 adds r0, r4, 0 adds r2, r5, 0 bl sub_8069234 - b @0804E3B8 + b _0804E3B8 .pool -@0804E38C: +_0804E38C: movs r0, 0x1 str r0, [sp] movs r0, 0x18 @@ -124442,17 +124442,17 @@ sub_804E038: ; 804E038 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @0804E3B8 + b _0804E3B8 .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 @@ -124469,12 +124469,12 @@ atk5B_80256E0: ; 804E3C8 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 .pool -@0804E3E0: +_0804E3E0: str r4, [sp] movs r0, 0x18 movs r1, 0x8 @@ -124491,19 +124491,19 @@ atk5B_80256E0: ; 804E3C8 strb r4, [r0, 0x1] movs r0, 0 bl sub_8056B74 - b @0804E4FA + b _0804E4FA .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] @@ -124511,17 +124511,17 @@ atk5B_80256E0: ; 804E3C8 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] @@ -124529,20 +124529,20 @@ atk5B_80256E0: ; 804E3C8 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] @@ -124556,14 +124556,14 @@ atk5B_80256E0: ; 804E3C8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0804E4AC + b _0804E4AC .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 @@ -124571,13 +124571,13 @@ atk5B_80256E0: ; 804E3C8 movs r2, 0x1D movs r3, 0xD bl sub_8056A3C - b @0804E4FA + b _0804E4FA .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 @@ -124599,7 +124599,7 @@ atk5B_80256E0: ; 804E3C8 movs r2, 0x1D movs r3, 0xD bl sub_8056A3C -@0804E4FA: +_0804E4FA: add sp, 0x4 pop {r4,r5} pop {r0} @@ -124621,14 +124621,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 @@ -124640,7 +124640,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 @@ -124648,8 +124648,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 @@ -124659,13 +124659,13 @@ atk5C_cmd5c: ; 804E508 ldr r0, [r1] adds r0, 0x2 str r0, [r1] - b @0804E592 + b _0804E592 .pool -@0804E58C: +_0804E58C: ldr r0, [r4] adds r0, 0x2 str r0, [r4] -@0804E592: +_0804E592: pop {r4} pop {r0} bx r0 @@ -124685,7 +124685,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] @@ -124699,9 +124699,9 @@ sub_804E598: ; 804E598 adds r0, r1 lsls r0, 2 muls r0, r2 - b @0804E6CA + b _0804E6CA .pool -@0804E5D8: +_0804E5D8: ldr r0, =gTrainers lsls r2, r6, 2 adds r1, r2, r6 @@ -124710,20 +124710,20 @@ sub_804E598: ; 804E598 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 .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 @@ -124734,8 +124734,8 @@ sub_804E598: ; 804E598 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 @@ -124746,8 +124746,8 @@ sub_804E598: ; 804E598 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 @@ -124758,9 +124758,9 @@ sub_804E598: ; 804E598 lsls r0, 4 adds r0, r1 subs r0, 0x10 -@0804E642: +_0804E642: ldrb r5, [r0, 0x2] -@0804E644: +_0804E644: ldr r1, =gUnknown_0831AEB8 lsls r0, r7, 2 adds r4, r0, r1 @@ -124771,36 +124771,36 @@ sub_804E598: ; 804E598 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 @@ -124812,9 +124812,9 @@ sub_804E598: ; 804E598 add r0, r9 ldrb r0, [r0, 0x1] lsls r0, 1 - b @0804E6C8 + b _0804E6C8 .pool -@0804E6B4: +_0804E6B4: mov r1, r8 ldr r0, [r1] adds r0, 0x4A @@ -124825,9 +124825,9 @@ sub_804E598: ; 804E598 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 @@ -124850,12 +124850,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 @@ -124912,12 +124912,12 @@ 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 .pool -@0804E794: +_0804E794: movs r0, 0 movs r1, 0 movs r2, 0 @@ -124927,12 +124927,12 @@ atk5E_8025A70: ; 804E764 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 @@ -124946,7 +124946,7 @@ atk5E_8025A70: ; 804E764 subs r7, 0x18 mov r3, r12 adds r3, 0xC -@0804E7CE: +_0804E7CE: lsls r1, r2, 1 ldrb r0, [r4] muls r0, r5 @@ -124967,12 +124967,12 @@ atk5E_8025A70: ; 804E764 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} @@ -124999,14 +124999,14 @@ 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 .pool -@0804E854: +_0804E854: orrs r1, r3 -@0804E856: +_0804E856: str r1, [r2] ldr r1, =0x02024214 ldr r0, [r1] @@ -125025,12 +125025,12 @@ atk60_cmd60: ; 804E868 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 @@ -125049,7 +125049,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] @@ -125062,14 +125062,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 @@ -125078,21 +125078,21 @@ atk61_8025BA4: ; 804E898 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 .pool -@0804E914: +_0804E914: adds r0, r4, 0 movs r1, 0x39 bl pokemon_getattr @@ -125100,13 +125100,13 @@ atk61_8025BA4: ; 804E898 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 @@ -125118,7 +125118,7 @@ atk61_8025BA4: ; 804E898 ldr r0, [r1] adds r0, 0x2 str r0, [r1] -@0804E94C: +_0804E94C: add sp, 0x30 pop {r3} mov r8, r3 @@ -125158,14 +125158,14 @@ atk63_jumptoattack: ; 804E990 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 .pool -@0804E9B4: +_0804E9B4: ldr r2, =0x020241ec ldr r1, =0x020241ea ldr r0, =0x020241ee @@ -125173,7 +125173,7 @@ atk63_jumptoattack: ; 804E990 strh r0, [r1] strh r0, [r2] adds r0, r1, 0 -@0804E9C2: +_0804E9C2: ldr r3, =gUnknown_082D86A8 ldr r2, =gBattleMoves ldrh r1, [r0] @@ -125198,7 +125198,7 @@ atk64_statusanimation: ; 804E9F4 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0804EA5C + bne _0804EA5C ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -125213,7 +125213,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 @@ -125221,13 +125221,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 @@ -125239,12 +125239,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 @@ -125257,7 +125257,7 @@ atk65_8025D90: ; 804EA84 ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0804EB04 + bne _0804EB04 ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -125283,7 +125283,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 @@ -125291,13 +125291,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 @@ -125310,12 +125310,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 @@ -125328,7 +125328,7 @@ atk66_8025E38: ; 804EB2C ldr r0, =0x02024068 ldr r0, [r0] cmp r0, 0 - bne @0804EB9E + bne _0804EB9E ldr r4, =0x02024214 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -125354,7 +125354,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 @@ -125362,24 +125362,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 @@ -125393,12 +125393,12 @@ atk67_8025ECC: ; 804EBC0 ldr r5, =0x02024332 ldrb r4, [r5] cmp r4, 0 - beq @0804EBD8 + beq _0804EBD8 cmp r4, 0x1 - beq @0804EC04 - b @0804EC96 + beq _0804EC04 + b _0804EC96 .pool -@0804EBD8: +_0804EBD8: str r4, [sp] movs r0, 0x18 movs r1, 0x8 @@ -125414,18 +125414,18 @@ atk67_8025ECC: ; 804EBC0 strb r4, [r5, 0x1] movs r0, 0 bl sub_8056B74 - b @0804EC96 + b _0804EC96 .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] @@ -125433,17 +125433,17 @@ atk67_8025ECC: ; 804EBC0 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] @@ -125451,25 +125451,25 @@ atk67_8025ECC: ; 804EBC0 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 .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] @@ -125482,7 +125482,7 @@ atk67_8025ECC: ; 804EBC0 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -@0804EC96: +_0804EC96: add sp, 0x4 pop {r4,r5} pop {r0} @@ -125498,17 +125498,17 @@ sub_804ECA4: ; 804ECA4 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] @@ -125530,7 +125530,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 @@ -125538,9 +125538,9 @@ atk69_8025FE0: ; 804ECDC adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b @0804ED2A + b _0804ED2A .pool -@0804ED10: +_0804ED10: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -125552,13 +125552,13 @@ atk69_8025FE0: ; 804ECDC 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 @@ -125567,7 +125567,7 @@ atk69_8025FE0: ; 804ECDC 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 @@ -125581,7 +125581,7 @@ atk69_8025FE0: ; 804ECDC movs r2, 0x80 orrs r1, r2 strb r1, [r0] -@0804ED68: +_0804ED68: ldr r2, =0x02024084 ldr r3, =0x0202420c ldrb r4, [r3] @@ -125596,7 +125596,7 @@ atk69_8025FE0: ; 804ECDC ands r1, r0 adds r5, r2, 0 cmp r1, 0 - bne @0804EE38 + bne _0804EE38 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -125606,14 +125606,14 @@ atk69_8025FE0: ; 804ECDC 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 @@ -125622,8 +125622,8 @@ atk69_8025FE0: ; 804ECDC ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq @0804EE38 -@0804EDBA: + beq _0804EE38 +_0804EDBA: ldrb r0, [r3] movs r4, 0x58 muls r0, r4 @@ -125632,7 +125632,7 @@ atk69_8025FE0: ; 804ECDC ldr r2, =0x020241f0 ldr r0, [r2] cmp r1, r0 - bgt @0804EE38 + bgt _0804EE38 subs r0, r1, 0x1 str r0, [r2] ldr r1, =0x0202433c @@ -125642,15 +125642,15 @@ atk69_8025FE0: ; 804ECDC 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 .pool -@0804EE10: +_0804EE10: ldr r0, =0x0202437c lsls r1, r3, 2 adds r1, r3 @@ -125659,7 +125659,7 @@ atk69_8025FE0: ; 804ECDC ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq @0804EE38 + beq _0804EE38 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x80 @@ -125671,7 +125671,7 @@ atk69_8025FE0: ; 804ECDC adds r0, r5 ldrh r0, [r0, 0x2E] strh r0, [r1] -@0804EE38: +_0804EE38: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -125766,43 +125766,43 @@ atk6C_8026208: ; 804EF04 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 .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 .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] @@ -125816,21 +125816,21 @@ atk6C_8026208: ; 804EF04 ldr r1, =0x02024474 movs r0, 0x2 strb r0, [r1, 0x1E] - b @0804F0F2 + b _0804F0F2 .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 .pool -@0804EFAC: +_0804EFAC: ldr r1, =0x02022e18 movs r0, 0 strh r0, [r1] @@ -125861,44 +125861,44 @@ atk6C_8026208: ; 804EF04 ldr r1, =0x02024474 movs r0, 0x4 strb r0, [r1, 0x1E] - b @0804F0F2 + b _0804F0F2 .pool -@0804F000: +_0804F000: bl sub_804F100 movs r0, 0xD bl PutWindowTilemap movs r0, 0xD movs r1, 0x3 bl CopyWindowToVram - b @0804F06A -@0804F014: + b _0804F06A +_0804F014: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @0804F0F2 + bne _0804F0F2 ldr r0, =0x02022e1a strh r1, [r0] - b @0804F06A + b _0804F06A .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 CopyWindowToVram - b @0804F06A + b _0804F06A .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 @@ -125908,18 +125908,18 @@ atk6C_8026208: ; 804EF04 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 .pool -@0804F07C: +_0804F07C: bl sub_804F344 lsls r0, 24 cmp r0, 0 - bne @0804F0F2 + bne _0804F0F2 movs r0, 0xE bl ClearWindowTilemap movs r0, 0xE @@ -125939,13 +125939,13 @@ atk6C_8026208: ; 804EF04 ldr r1, =0x02024474 movs r0, 0xA strb r0, [r1, 0x1E] - b @0804F0F2 + b _0804F0F2 .pool -@0804F0C0: +_0804F0C0: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0804F0F2 + bne _0804F0F2 movs r0, 0 movs r1, 0x7 movs r2, 0 @@ -125962,7 +125962,7 @@ atk6C_8026208: ; 804EF04 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -@0804F0F2: +_0804F0F2: add sp, 0x4 pop {r4} pop {r0} @@ -126063,41 +126063,41 @@ sub_804F1CC: ; 804F1CC bl IsDma3ManagerBusyWithBgCopy 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 .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 @@ -126190,9 +126190,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 WriteColorChangeControlCode @@ -126202,9 +126202,9 @@ sub_804F220: ; 804F220 bl WriteColorChangeControlCode adds r5, r0, 0 movs r0, 0xB5 - b @0804F318 + b _0804F318 .pool -@0804F300: +_0804F300: adds r0, r5, 0 movs r1, 0 movs r2, 0xE @@ -126215,12 +126215,12 @@ sub_804F220: ; 804F220 bl WriteColorChangeControlCode 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] @@ -126248,23 +126248,23 @@ sub_804F344: ; 804F344 lsls r3, 1 adds r2, r0, 0 cmp r1, r3 - bne @0804F35C + bne _0804F35C movs r0, 0 - b @0804F380 + b _0804F380 .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 .pool -@0804F370: +_0804F370: strh r1, [r2] -@0804F372: +_0804F372: ldrh r1, [r2] movs r0, 0xD0 lsls r0, 1 @@ -126272,7 +126272,7 @@ sub_804F344: ; 804F344 negs r0, r1 orrs r0, r1 lsrs r0, 31 -@0804F380: +_0804F380: pop {r1} bx r1 thumb_func_end sub_804F344 @@ -126370,16 +126370,16 @@ 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 .pool -@0804F470: +_0804F470: movs r1, 0x2E ldrsh r0, [r2, r1] cmp r0, 0 - beq @0804F48C + beq _0804F48C adds r0, r2, 0 bl RemoveObjectAndFreeTiles ldr r4, =0x0000d75a @@ -126387,7 +126387,7 @@ sub_804F450: ; 804F450 bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag -@0804F48C: +_0804F48C: pop {r4} pop {r0} bx r0 @@ -126403,23 +126403,23 @@ 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 .pool -@0804F4CC: +_0804F4CC: movs r0, 0 -@0804F4CE: +_0804F4CE: pop {r1} bx r1 thumb_func_end sub_804F498 @@ -126540,7 +126540,7 @@ atk72_flee: ; 804F5B4 bl sub_803EC20 lsls r0, 24 cmp r0, 0 - beq @0804F5E8 + beq _0804F5E8 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -126554,14 +126554,14 @@ atk72_flee: ; 804F5B4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0804F5F0 + b _0804F5F0 .pool -@0804F5E8: +_0804F5E8: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@0804F5F0: +_0804F5F0: pop {r0} bx r0 .pool @@ -126575,7 +126575,7 @@ atk73_cmd73: ; 804F5F8 movs r6, 0x1 ands r4, r6 cmp r4, 0 - bne @0804F68E + bne _0804F68E ldr r0, =0x02024214 ldr r0, [r0] ldrb r0, [r0, 0x1] @@ -126596,46 +126596,46 @@ 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 .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 .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 .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 @@ -126657,7 +126657,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] @@ -126690,34 +126690,34 @@ 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 .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 @@ -126779,51 +126779,51 @@ 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 .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 .pool -@0804F85C: +_0804F85C: ldr r1, =0x0202420b ldr r4, =0x0202420c ldrb r0, [r4] @@ -126841,7 +126841,7 @@ sub_804F7AC: ; 804F7AC 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 @@ -126849,33 +126849,33 @@ sub_804F7AC: ; 804F7AC adds r0, r1 ldrh r0, [r0, 0x28] cmp r0, 0 - beq @0804F8A8 + beq _0804F8A8 strb r2, [r4] - b @0804FD70 + b _0804FD70 .pool -@0804F8A8: +_0804F8A8: ldr r0, =0x0202420c ldr r1, =0x02024064 ldrb r1, [r1] strb r1, [r0] - b @0804FD70 + b _0804FD70 .pool -@0804F8BC: +_0804F8BC: bl sub_803BB88 ldr r1, =0x02024332 strb r0, [r1] - b @0804FD70 + b _0804FD70 .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 .pool -@0804F8E4: +_0804F8E4: ldr r2, =0x02024280 ldr r1, =gUnknown_0832A328 ldr r0, =0x02024064 @@ -126887,18 +126887,18 @@ sub_804F7AC: ; 804F7AC 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 .pool -@0804F914: +_0804F914: ldr r0, =0x02024332 strb r2, [r0] - b @0804FD70 + b _0804FD70 .pool -@0804F920: +_0804F920: ldr r4, =0x0202437c ldr r3, =0x02024064 ldrb r0, [r3] @@ -126921,9 +126921,9 @@ sub_804F7AC: ; 804F7AC negs r0, r0 ands r0, r2 strb r0, [r1] - b @0804FD70 + b _0804FD70 .pool -@0804F958: +_0804F958: ldr r4, =0x0202406e ldr r1, =0x0202449c ldr r0, [r1] @@ -126931,23 +126931,23 @@ sub_804F7AC: ; 804F7AC 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 .pool -@0804F988: +_0804F988: ldr r1, =0x02024064 movs r0, 0x2 -@0804F98C: +_0804F98C: strb r0, [r1] adds r5, r1, 0 ldrb r2, [r5] @@ -126964,14 +126964,14 @@ sub_804F7AC: ; 804F7AC 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 @@ -126980,46 +126980,46 @@ sub_804F7AC: ; 804F7AC 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 .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 .pool -@0804FA20: +_0804FA20: ldr r2, =0x02024332 mov r8, r2 movs r0, 0 @@ -127042,9 +127042,9 @@ sub_804F7AC: ; 804F7AC 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 @@ -127056,13 +127056,13 @@ sub_804F7AC: ; 804F7AC 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 @@ -127070,9 +127070,9 @@ sub_804F7AC: ; 804F7AC 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 @@ -127094,22 +127094,22 @@ sub_804F7AC: ; 804F7AC ldrb r0, [r0] mov r2, r8 strb r0, [r2, 0x5] - b @0804FD70 + b _0804FD70 .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 .pool -@0804FAE8: +_0804FAE8: ldr r0, =0x02024084 adds r0, 0x80 movs r1, 0 @@ -127137,9 +127137,9 @@ sub_804F7AC: ; 804F7AC adds r1, 0x34 ldrb r0, [r1] movs r2, 0x2 - b @0804FBF4 + b _0804FBF4 .pool -@0804FB3C: +_0804FB3C: ldr r1, =0x02024084 movs r0, 0 strh r0, [r1, 0x28] @@ -127171,9 +127171,9 @@ sub_804F7AC: ; 804F7AC movs r1, 0x2 orrs r0, r1 strb r0, [r2, 0x18] - b @0804FD70 + b _0804FD70 .pool -@0804FB94: +_0804FB94: ldr r0, =0x02024084 movs r1, 0 strh r1, [r0, 0x28] @@ -127222,26 +127222,26 @@ sub_804F7AC: ; 804F7AC strb r0, [r1, 0x18] adds r1, 0x34 ldrb r0, [r1] -@0804FBF4: +_0804FBF4: orrs r0, r2 strb r0, [r1] - b @0804FD70 + b _0804FD70 .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 .pool -@0804FC2C: +_0804FC2C: bl sub_81A5BF8 - b @0804FD70 -@0804FC32: + b _0804FD70 +_0804FC32: bl sub_81A5D44 - b @0804FD70 -@0804FC38: + b _0804FD70 +_0804FC38: ldr r1, =gUnknown_085CD1C8 ldr r0, =0x02024214 ldr r0, [r0] @@ -127253,34 +127253,34 @@ sub_804F7AC: ; 804F7AC ldr r0, =0x02022e2c movs r1, 0x16 bl battle_show_message_maybe - b @0804FD70 + b _0804FD70 .pool -@0804FC60: +_0804FC60: movs r0, 0x16 bl IsTextPrinterActive 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 .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] @@ -127288,33 +127288,33 @@ sub_804F7AC: ; 804F7AC 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 .pool -@0804FCC4: +_0804FCC4: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x55 bl MPlayVolumeControl - b @0804FD70 + b _0804FD70 .pool -@0804FCD8: +_0804FCD8: ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 lsls r2, 1 bl MPlayVolumeControl - b @0804FD70 + b _0804FD70 .pool -@0804FCF0: +_0804FCF0: ldr r0, =0x0202449c ldr r2, [r0] ldr r0, =0x000002a2 @@ -127328,36 +127328,36 @@ sub_804F7AC: ; 804F7AC ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - b @0804FD70 + b _0804FD70 .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 .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 .pool -@0804FD50: +_0804FD50: ldr r1, =0x0202433a movs r0, 0xA strb r0, [r1] - b @0804FD70 + b _0804FD70 .pool -@0804FD5C: +_0804FD5C: movs r1, 0xCE lsls r1, 1 movs r0, 0 @@ -127366,12 +127366,12 @@ sub_804F7AC: ; 804F7AC 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} @@ -127395,27 +127395,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, =gUnknown_0831C3D8 mov r5, r8 ldrb r1, [r5] @@ -127431,9 +127431,9 @@ atk77_setprotect: ; 804FD8C lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bcc @0804FE80 + bcc _0804FE80 cmp r6, 0 - beq @0804FE80 + beq _0804FE80 ldr r4, =gBattleMoves ldr r3, =0x020241ea ldrh r0, [r3] @@ -127443,7 +127443,7 @@ atk77_setprotect: ; 804FD8C adds r1, r4 ldrb r0, [r1] cmp r0, 0x6F - bne @0804FE1C + bne _0804FE1C ldr r0, =0x0202433c ldrb r1, [r5] lsls r1, 4 @@ -127455,7 +127455,7 @@ atk77_setprotect: ; 804FD8C ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] -@0804FE1C: +_0804FE1C: ldrh r0, [r3] lsls r1, r0, 1 adds r1, r0 @@ -127463,7 +127463,7 @@ atk77_setprotect: ; 804FD8C adds r1, r4 ldrb r0, [r1] cmp r0, 0x74 - bne @0804FE42 + bne _0804FE42 ldr r0, =0x0202433c ldrb r1, [r5] lsls r1, 4 @@ -127475,7 +127475,7 @@ atk77_setprotect: ; 804FD8C ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] -@0804FE42: +_0804FE42: mov r1, r8 ldrb r0, [r1] lsls r1, r0, 3 @@ -127485,9 +127485,9 @@ atk77_setprotect: ; 804FD8C ldrb r0, [r1, 0x8] adds r0, 0x1 strb r0, [r1, 0x8] - b @0804FEA2 + b _0804FEA2 .pool -@0804FE80: +_0804FE80: ldr r2, =0x020242bc ldr r0, =0x0202420b ldrb r1, [r0] @@ -127505,7 +127505,7 @@ atk77_setprotect: ; 804FD8C movs r1, 0x1 orrs r0, r1 strb r0, [r2] -@0804FEA2: +_0804FEA2: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -127526,7 +127526,7 @@ atk78_faintifabilitynotdamp: ; 804FEC8 ldr r0, =0x02024068 ldr r2, [r0] cmp r2, 0 - bne @0804FFCC + bne _0804FFCC ldr r1, =0x0202420c strb r2, [r1] ldr r0, =0x0202406c @@ -127535,36 +127535,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] @@ -127590,16 +127590,16 @@ atk78_faintifabilitynotdamp: ; 804FEC8 mov r2, r8 ldrb r0, [r2] cmp r0, 0 - beq @0804FFCC + beq _0804FFCC adds r3, r5, 0 ldrb r5, [r7] ldr r7, =gUnknown_0832A328 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 @@ -127607,17 +127607,17 @@ atk78_faintifabilitynotdamp: ; 804FEC8 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 .pool -@0804FFB0: +_0804FFB0: ldr r1, =0x0202420a movs r0, 0x6 strb r0, [r1] @@ -127631,7 +127631,7 @@ atk78_faintifabilitynotdamp: ; 804FEC8 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB560 str r0, [r1] -@0804FFCC: +_0804FFCC: pop {r3} mov r8, r3 pop {r4-r7} @@ -127647,7 +127647,7 @@ atk79_setuserhptozero: ; 804FFE4 ldr r0, =0x02024068 ldr r3, [r0] cmp r3, 0 - bne @08050028 + bne _08050028 ldr r4, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -127674,7 +127674,7 @@ atk79_setuserhptozero: ; 804FFE4 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -@08050028: +_08050028: add sp, 0x4 pop {r4} pop {r0} @@ -127703,7 +127703,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 @@ -127718,8 +127718,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] @@ -127727,8 +127727,8 @@ sub_8050044: ; 8050044 lsrs r0, 24 ldrb r1, [r2] cmp r0, r1 - beq @0805008A -@0805009A: + beq _0805008A +_0805009A: ldrb r0, [r6] ldrb r1, [r3] lsls r1, 2 @@ -127736,24 +127736,24 @@ sub_8050044: ; 8050044 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 .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 @@ -127777,11 +127777,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] @@ -127792,10 +127792,10 @@ sub_80500E8: ; 80500E8 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] @@ -127805,15 +127805,15 @@ sub_80500E8: ; 80500E8 ldrh r1, [r0, 0x28] ldrh r0, [r0, 0x2C] cmp r1, r0 - bne @08050158 + bne _08050158 str r2, [r4] - b @0805015E + b _0805015E .pool -@08050158: +_08050158: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -@0805015E: +_0805015E: pop {r4-r6} pop {r0} bx r0 @@ -127832,17 +127832,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 @@ -127852,9 +127852,9 @@ sub_8050164: ; 8050164 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 @@ -127866,19 +127866,19 @@ sub_8050164: ; 8050164 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 @@ -127893,10 +127893,10 @@ sub_8050164: ; 8050164 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 @@ -127904,12 +127904,12 @@ sub_8050164: ; 8050164 str r0, [r2] ldr r4, =0x020241ea strh r3, [r4] - b @0805024A + b _0805024A .pool -@08050220: +_08050220: mov r0, r8 cmp r0, 0 - beq @08050290 + beq _08050290 ldr r2, =0x02024280 ldr r0, [r2] ldr r1, =0xfffffbff @@ -127926,7 +127926,7 @@ sub_8050164: ; 8050164 add r0, sp ldrh r0, [r0] strh r0, [r4] -@0805024A: +_0805024A: ldrh r0, [r4] movs r1, 0 bl sub_80458E0 @@ -127945,9 +127945,9 @@ sub_8050164: ; 8050164 adds r0, r3 ldr r0, [r0] str r0, [r5] - b @080502AE + b _080502AE .pool -@08050290: +_08050290: ldr r2, =0x0202437c mov r0, r10 ldrb r1, [r0] @@ -127963,7 +127963,7 @@ sub_8050164: ; 8050164 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -@080502AE: +_080502AE: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -127983,7 +127983,7 @@ sub_80502C8: ; 80502C8 movs r1, 0x7 ands r1, r0 cmp r1, 0 - beq @080502F4 + beq _080502F4 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -127992,9 +127992,9 @@ sub_80502C8: ; 80502C8 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b @08050304 + b _08050304 .pool -@080502F4: +_080502F4: movs r0, 0x1 strh r0, [r2] ldr r0, =0x02024332 @@ -128003,7 +128003,7 @@ sub_80502C8: ; 80502C8 adds r0, 0x28 movs r1, 0x5 strb r1, [r0] -@08050304: +_08050304: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -128029,7 +128029,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 @@ -128037,9 +128037,9 @@ atk7E_setreflect: ; 805031C strb r0, [r2] ldr r1, =0x02024332 movs r0, 0 - b @080503D0 + b _080503D0 .pool -@0805035C: +_0805035C: ldrb r0, [r6] bl battle_get_per_side_status adds r1, r5, 0 @@ -128075,23 +128075,23 @@ atk7E_setreflect: ; 805031C 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 .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 @@ -128113,7 +128113,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 @@ -128128,17 +128128,17 @@ 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 .pool -@08050438: +_08050438: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r4 @@ -128147,22 +128147,22 @@ sub_80503E8: ; 80503E8 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 .pool -@0805046C: +_0805046C: ldr r0, =0x0202420b ldrb r0, [r0] orrs r2, r0 @@ -128177,7 +128177,7 @@ sub_80503E8: ; 80503E8 str r0, [r1] ldr r0, =0x02024332 strb r3, [r0, 0x5] -@08050488: +_08050488: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -128199,24 +128199,24 @@ atk80_manipulatedamage: ; 80504A8 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 .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 .pool -@080504D8: +_080504D8: ldr r3, =0x020241f0 ldr r0, [r3] lsrs r1, r0, 31 @@ -128224,9 +128224,9 @@ atk80_manipulatedamage: ; 80504A8 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] @@ -128237,17 +128237,17 @@ atk80_manipulatedamage: ; 80504A8 lsrs r1, r0, 1 ldr r0, [r3] cmp r1, r0 - bge @08050518 + bge _08050518 str r1, [r3] - b @08050518 + b _08050518 .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] @@ -128299,12 +128299,12 @@ 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 .pool -@08050598: +_08050598: adds r0, r2, 0 adds r0, 0x4C adds r0, r4, r0 @@ -128312,16 +128312,16 @@ atk81_setrest: ; 8050528 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 .pool -@080505B4: +_080505B4: ldr r0, =0x02024332 strb r1, [r0, 0x5] -@080505B8: +_080505B8: ldrb r0, [r5] movs r3, 0x58 muls r0, r3 @@ -128344,7 +128344,7 @@ atk81_setrest: ; 8050528 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@080505E8: +_080505E8: add sp, 0x4 pop {r4-r7} pop {r0} @@ -128376,14 +128376,14 @@ 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 .pool -@08050638: +_08050638: str r3, [r5] -@0805063A: +_0805063A: pop {r4,r5} pop {r0} bx r0 @@ -128411,7 +128411,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 @@ -128423,7 +128423,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 @@ -128431,45 +128431,45 @@ sub_8050650: ; 8050650 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 .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 .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} @@ -128497,11 +128497,11 @@ sub_80506EC: ; 80506EC bl sub_8050650 lsls r0, 24 cmp r0, 0 - beq @08050720 + beq _08050720 str r4, [r5] - b @08050762 + b _08050762 .pool -@08050720: +_08050720: ldr r1, =0x02024084 ldrb r3, [r6] movs r0, 0x58 @@ -128511,10 +128511,10 @@ sub_80506EC: ; 80506EC 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 @@ -128524,13 +128524,13 @@ sub_80506EC: ; 80506EC ldrb r1, [r2] adds r0, r3, 0 bl b_history__record_ability_usage_of_player - b @08050762 + b _08050762 .pool -@0805075C: +_0805075C: ldr r0, [r5] adds r0, 0x5 str r0, [r5] -@08050762: +_08050762: pop {r4-r6} pop {r0} bx r0 @@ -128548,7 +128548,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 @@ -128557,9 +128557,9 @@ sub_8050768: ; 8050768 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b @080507CA + b _080507CA .pool -@080507A0: +_080507A0: adds r0, 0x1 movs r3, 0 strb r0, [r1, 0x9] @@ -128581,7 +128581,7 @@ sub_8050768: ; 8050768 strb r0, [r2, 0x5] ldr r0, =0x02024332 strb r3, [r0, 0x5] -@080507CA: +_080507CA: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -128619,15 +128619,15 @@ atk86_stockpiletobasedamage: ; 80507E4 adds r0, r7 ldrb r0, [r0, 0x9] cmp r0, 0 - bne @08050828 + bne _08050828 str r2, [r3] - b @080508CA + b _080508CA .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 @@ -128682,14 +128682,14 @@ atk86_stockpiletobasedamage: ; 80507E4 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] @@ -128703,7 +128703,7 @@ atk86_stockpiletobasedamage: ; 80507E4 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@080508CA: +_080508CA: add sp, 0x10 pop {r3} mov r8, r3 @@ -128741,13 +128741,13 @@ 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 .pool -@08050954: +_08050954: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 @@ -128755,7 +128755,7 @@ atk87_stockpiletohprecovery: ; 8050904 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] @@ -128765,9 +128765,9 @@ atk87_stockpiletohprecovery: ; 8050904 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b @080509D0 + b _080509D0 .pool -@08050984: +_08050984: ldr r5, =0x020241f0 ldrh r0, [r1, 0x2C] ldrb r1, [r4, 0x9] @@ -128779,9 +128779,9 @@ atk87_stockpiletohprecovery: ; 8050904 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] @@ -128806,7 +128806,7 @@ atk87_stockpiletohprecovery: ; 8050904 ldr r1, =0x0202420c ldrb r0, [r6] strb r0, [r1] -@080509D0: +_080509D0: pop {r3} mov r8, r3 pop {r4-r7} @@ -128827,11 +128827,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 @@ -128861,15 +128861,15 @@ 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 .pool -@08050A50: +_08050A50: ldr r0, =0x02024064 ldr r1, =0x0202420c -@08050A54: +_08050A54: ldrb r1, [r1] strb r1, [r0] movs r0, 0xBF @@ -128877,25 +128877,25 @@ sub_8050A1C: ; 8050A1C 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 @@ -128912,9 +128912,9 @@ sub_8050A1C: ; 8050A1C 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] @@ -128927,16 +128927,16 @@ sub_8050A1C: ; 8050A1C 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] @@ -128947,13 +128947,13 @@ sub_8050A1C: ; 8050A1C 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 .pool -@08050B10: +_08050B10: mov r0, r8 bl b_movescr_stack_push ldr r1, =0x02024474 @@ -128972,29 +128972,29 @@ sub_8050A1C: ; 8050A1C movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b @08050B68 + b _08050B68 .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, =gUnknown_082D9F1C str r0, [r1] -@08050B68: +_08050B68: movs r0, 0x1 - b @08050E80 + b _08050E80 .pool -@08050B78: +_08050B78: ldr r2, =0x02024084 ldr r1, =0x02024064 ldrb r3, [r1] @@ -129006,19 +129006,19 @@ sub_8050A1C: ; 8050A1C 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 @@ -129027,13 +129027,13 @@ sub_8050A1C: ; 8050A1C 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 .pool -@08050BD4: +_08050BD4: mov r0, r8 bl b_movescr_stack_push ldr r1, =0x02024474 @@ -129064,9 +129064,9 @@ sub_8050A1C: ; 8050A1C movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b @08050B68 + b _08050B68 .pool -@08050C2C: +_08050C2C: ldr r1, =0x02024064 ldrb r0, [r1] movs r4, 0x58 @@ -129075,14 +129075,14 @@ sub_8050A1C: ; 8050A1C 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 @@ -129102,9 +129102,9 @@ sub_8050A1C: ; 8050A1C ldrb r0, [r3] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b @08050B68 + b _08050B68 .pool -@08050C8C: +_08050C8C: ldr r4, =0x02024064 ldrb r0, [r4] movs r4, 0x58 @@ -129113,16 +129113,16 @@ sub_8050A1C: ; 8050A1C 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 @@ -129142,9 +129142,9 @@ sub_8050A1C: ; 8050A1C ldrb r0, [r2] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b @08050B68 + b _08050B68 .pool -@08050CF0: +_08050CF0: ldr r3, =0x02024064 ldrb r1, [r3] movs r0, 0x58 @@ -129153,11 +129153,11 @@ sub_8050A1C: ; 8050A1C 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 @@ -129173,13 +129173,13 @@ sub_8050A1C: ; 8050A1C 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 @@ -129205,21 +129205,21 @@ sub_8050A1C: ; 8050A1C 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 .pool -@08050D8C: +_08050D8C: asrs r6, r0, 28 movs r0, 0x7 ands r6, r0 @@ -129227,13 +129227,13 @@ sub_8050A1C: ; 8050A1C 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 @@ -129263,27 +129263,27 @@ sub_8050A1C: ; 8050A1C 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 .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 @@ -129305,10 +129305,10 @@ sub_8050A1C: ; 8050A1C 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 @@ -129317,34 +129317,34 @@ sub_8050A1C: ; 8050A1C 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 @@ -129382,11 +129382,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 @@ -129402,30 +129402,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 @@ -129499,11 +129499,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 @@ -129520,25 +129520,25 @@ atk8D_setloopcounter: ; 8050FF0 ldr r0, [r0] ldrb r1, [r0, 0x1] cmp r1, 0 - beq @0805100C + beq _0805100C ldr r0, =0x02024212 strb r1, [r0] - b @08051026 + b _08051026 .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 @@ -129590,16 +129590,16 @@ 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 .pool -@080510AC: +_080510AC: bl GenerateRandomNumber movs r3, 0xFF ands r3, r0 @@ -129621,7 +129621,7 @@ sub_8051064: ; 8051064 adds r0, 0x1 lsrs r1, 2 cmp r0, r1 - bhi @080510FC + bhi _080510FC ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -129636,16 +129636,16 @@ sub_8051064: ; 8051064 orrs r1, r0 str r1, [r3] movs r0, 0 - b @08051116 + b _08051116 .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] @@ -129653,7 +129653,7 @@ sub_8051064: ; 8051064 ldr r0, =gUnknown_082DADD8 str r0, [r1] movs r0, 0x1 -@08051116: +_08051116: pop {r4-r7} pop {r1} bx r1 @@ -129675,9 +129675,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 @@ -129685,45 +129685,45 @@ sub_805112C: ; 805112C 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 .pool -@080511AC: +_080511AC: movs r0, 0 mov r9, r0 movs r0, 0x3 -@080511B2: +_080511B2: mov r8, r0 movs r0, 0x3 mov r10, r0 @@ -129731,19 +129731,19 @@ sub_805112C: ; 805112C str r0, [sp, 0x8] ldr r2, =0x0202406e ldrb r1, [r1] - b @0805128E + b _0805128E .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 @@ -129752,17 +129752,17 @@ sub_805112C: ; 805112C 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 .pool -@080511FC: +_080511FC: movs r1, 0 mov r9, r1 movs r0, 0x3 -@08051202: +_08051202: mov r8, r0 movs r1, 0x3 mov r10, r1 @@ -129771,57 +129771,57 @@ sub_805112C: ; 805112C ldr r2, =0x0202406e ldr r0, =0x0202420c ldrb r1, [r0] - b @0805128E + b _0805128E .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 .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 @@ -129831,7 +129831,7 @@ sub_805112C: ; 805112C str r0, [sp, 0x8] ldr r2, =0x0202406e ldrb r1, [r4] -@0805128E: +_0805128E: lsls r0, r1, 1 adds r0, r2 ldrh r7, [r0] @@ -129840,9 +129840,9 @@ sub_805112C: ; 805112C lsls r1, 1 adds r1, r2 ldrh r5, [r1] - b @080512BE + b _080512BE .pool -@080512A4: +_080512A4: movs r1, 0 mov r9, r1 movs r0, 0x6 @@ -129856,11 +129856,11 @@ sub_805112C: ; 805112C 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] @@ -129869,29 +129869,29 @@ sub_805112C: ; 805112C 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] @@ -129905,14 +129905,14 @@ sub_805112C: ; 805112C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08051414 + b _08051414 .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 @@ -129921,9 +129921,9 @@ sub_805112C: ; 805112C 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] @@ -129932,18 +129932,18 @@ sub_805112C: ; 805112C 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 @@ -129954,10 +129954,10 @@ sub_805112C: ; 805112C 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 @@ -129965,21 +129965,21 @@ sub_805112C: ; 805112C 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 @@ -129993,24 +129993,24 @@ sub_805112C: ; 805112C 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 .pool -@08051410: +_08051410: bl sub_8051064 -@08051414: +_08051414: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -130040,15 +130040,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 @@ -130056,11 +130056,11 @@ sub_8051424: ; 8051424 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, =gBattleMoves mov r10, r0 ldr r5, =0x02024084 @@ -130073,7 +130073,7 @@ sub_8051424: ; 8051424 movs r0, 0xC add r0, r12 mov r9, r0 -@08051484: +_08051484: lsls r0, r3, 1 adds r0, r5 add r0, r9 @@ -130084,26 +130084,26 @@ sub_8051424: ; 8051424 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 .pool -@080514C4: +_080514C4: movs r2, 0 -@080514C6: +_080514C6: ldrb r0, [r7] muls r0, r4 add r0, r12 @@ -130111,20 +130111,20 @@ sub_8051424: ; 8051424 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] @@ -130138,18 +130138,18 @@ sub_8051424: ; 8051424 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @080515B0 + b _080515B0 .pool -@0805150C: +_0805150C: movs r7, 0x3 ldr r5, =gBattleMoves 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 @@ -130170,26 +130170,26 @@ sub_8051424: ; 8051424 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 .pool -@08051570: +_08051570: movs r2, 0 -@08051572: +_08051572: ldrb r0, [r4] movs r3, 0x58 muls r0, r3 @@ -130198,11 +130198,11 @@ sub_8051424: ; 8051424 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 @@ -130221,7 +130221,7 @@ sub_8051424: ; 8051424 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@080515B0: +_080515B0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -130240,11 +130240,11 @@ atk91_givemoney: ; 80515C8 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] @@ -130282,14 +130282,14 @@ atk91_givemoney: ; 80515C8 bl b_movescr_stack_push ldr r0, =gUnknown_082DB307 str r0, [r4] - b @08051658 + b _08051658 .pool -@08051650: +_08051650: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 str r0, [r1] -@08051658: +_08051658: pop {r4} pop {r0} bx r0 @@ -130312,7 +130312,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 @@ -130320,9 +130320,9 @@ atk92_setlightscreen: ; 8051664 strb r0, [r2] ldr r1, =0x02024332 movs r0, 0 - b @08051718 + b _08051718 .pool -@080516A4: +_080516A4: ldrb r0, [r5] bl battle_get_per_side_status adds r1, r6, 0 @@ -130358,21 +130358,21 @@ atk92_setlightscreen: ; 8051664 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 .pool -@08051714: +_08051714: ldr r1, =0x02024332 movs r0, 0x3 -@08051718: +_08051718: strb r0, [r1, 0x5] ldr r1, =0x02024214 ldr r0, [r1] @@ -130399,7 +130399,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 @@ -130407,9 +130407,9 @@ atk93_ko_move: ; 8051730 adds r0, r1 ldrb r4, [r0, 0x7] ldrb r6, [r0, 0x1A] - b @08051782 + b _08051782 .pool -@08051768: +_08051768: ldrh r0, [r1, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -130421,13 +130421,13 @@ atk93_ko_move: ; 8051730 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 @@ -130436,7 +130436,7 @@ atk93_ko_move: ; 8051730 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 @@ -130450,7 +130450,7 @@ atk93_ko_move: ; 8051730 movs r2, 0x80 orrs r1, r2 strb r1, [r0] -@080517C0: +_080517C0: ldr r1, =0x02024084 ldr r2, =0x0202420c ldrb r3, [r2] @@ -130464,7 +130464,7 @@ atk93_ko_move: ; 8051730 mov r8, r1 mov r9, r2 cmp r4, 0x5 - bne @0805181C + bne _0805181C ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -130479,9 +130479,9 @@ atk93_ko_move: ; 8051730 ldrb r0, [r1] movs r1, 0x5 bl b_history__record_ability_usage_of_player - b @08051A70 + b _08051A70 .pool -@0805181C: +_0805181C: ldr r1, =0x020242ac lsls r0, r3, 2 adds r0, r1 @@ -130489,7 +130489,7 @@ atk93_ko_move: ; 8051730 movs r1, 0x18 ands r0, r1 cmp r0, 0 - bne @080518A0 + bne _080518A0 ldr r1, =gBattleMoves ldr r0, =0x020241ea ldrh r0, [r0] @@ -130520,9 +130520,9 @@ atk93_ko_move: ; 8051730 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 @@ -130537,10 +130537,10 @@ atk93_ko_move: ; 8051730 movs r4, 0x1 ldrb r0, [r0] cmp r1, r0 - bcs @08051936 - b @08051A08 + bcs _08051936 + b _08051A08 .pool -@080518A0: +_080518A0: ldr r1, =0x020242bc lsls r0, r3, 3 subs r0, r3 @@ -130551,7 +130551,7 @@ atk93_ko_move: ; 8051730 adds r7, r1, 0 ldrb r3, [r7] cmp r0, r3 - bne @080518CA + bne _080518CA ldrb r0, [r7] muls r0, r6 add r0, r8 @@ -130561,8 +130561,8 @@ atk93_ko_move: ; 8051730 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcs @08051942 -@080518CA: + bcs _08051942 +_080518CA: ldr r1, =gBattleMoves ldr r0, =0x020241ea ldrh r0, [r0] @@ -130598,7 +130598,7 @@ atk93_ko_move: ; 8051730 lsrs r0, 16 adds r0, 0x1 cmp r0, r4 - bge @08051934 + bge _08051934 ldrb r0, [r7] adds r1, r0, 0 muls r1, r5 @@ -130613,17 +130613,17 @@ atk93_ko_move: ; 8051730 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] @@ -130632,7 +130632,7 @@ atk93_ko_move: ; 8051730 ldrb r0, [r1] lsls r0, 30 cmp r0, 0 - bge @08051990 + bge _08051990 ldr r1, =0x020241f0 movs r0, 0x58 muls r0, r2 @@ -130643,9 +130643,9 @@ atk93_ko_move: ; 8051730 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x40 - b @080519EE + b _080519EE .pool -@08051990: +_08051990: ldr r0, =0x0202437c lsls r1, r2, 2 adds r1, r2 @@ -130654,7 +130654,7 @@ atk93_ko_move: ; 8051730 ldrb r0, [r1] lsrs r0, 7 cmp r0, 0 - beq @080519DC + beq _080519DC ldr r1, =0x020241f0 movs r3, 0x58 adds r0, r2, 0 @@ -130675,9 +130675,9 @@ atk93_ko_move: ; 8051730 add r0, r8 ldrh r0, [r0, 0x2E] strh r0, [r1] - b @080519F2 + b _080519F2 .pool -@080519DC: +_080519DC: ldr r1, =0x020241f0 movs r0, 0x58 muls r0, r2 @@ -130687,17 +130687,17 @@ atk93_ko_move: ; 8051730 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 .pool -@08051A08: +_08051A08: ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -130719,15 +130719,15 @@ atk93_ko_move: ; 8051730 ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bcc @08051A50 + bcc _08051A50 ldr r1, =0x02024332 movs r0, 0 - b @08051A54 + b _08051A54 .pool -@08051A50: +_08051A50: ldr r1, =0x02024332 movs r0, 0x1 -@08051A54: +_08051A54: strb r0, [r1, 0x5] ldr r3, =0x02024214 ldr r2, [r3] @@ -130742,7 +130742,7 @@ atk93_ko_move: ; 8051730 lsls r0, 24 orrs r1, r0 str r1, [r3] -@08051A70: +_08051A70: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -130766,10 +130766,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 @@ -130787,7 +130787,7 @@ sub_8051AC0: ; 8051AC0 movs r0, 0x18 ands r0, r1 cmp r0, 0 - beq @08051AEC + beq _08051AEC ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -130796,9 +130796,9 @@ sub_8051AC0: ; 8051AC0 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b @08051AFE + b _08051AFE .pool -@08051AEC: +_08051AEC: movs r0, 0x8 strh r0, [r2] ldr r1, =0x02024332 @@ -130808,7 +130808,7 @@ sub_8051AC0: ; 8051AC0 adds r0, 0x28 movs r1, 0x5 strb r1, [r0] -@08051AFE: +_08051AFE: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -130832,9 +130832,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 @@ -130843,9 +130843,9 @@ sub_8051B18: ; 8051B18 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 @@ -130853,7 +130853,7 @@ sub_8051B18: ; 8051B18 adds r4, r2, 0 ldr r5, =0x0202420b cmp r0, 0 - beq @08051BDA + beq _08051BDA ldr r0, =0x02024084 ldrb r2, [r5] movs r1, 0x58 @@ -130863,25 +130863,25 @@ sub_8051B18: ; 8051B18 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 @@ -130889,33 +130889,33 @@ sub_8051B18: ; 8051B18 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 .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 @@ -130925,12 +130925,12 @@ sub_8051B18: ; 8051B18 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 @@ -130938,34 +130938,34 @@ sub_8051B18: ; 8051B18 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 .pool -@08051C3C: +_08051C3C: ldr r1, =0x020241f0 movs r0, 0 str r0, [r1] - b @08051C50 + b _08051C50 .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, =gUnknown_0832A328 @@ -130975,11 +130975,11 @@ sub_8051B18: ; 8051B18 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 @@ -131003,7 +131003,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 @@ -131012,9 +131012,9 @@ atk97_tryinfatuatetarget: ; 8051C90 movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @08051CD8 + b _08051CD8 .pool -@08051CC8: +_08051CC8: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -131023,14 +131023,14 @@ atk97_tryinfatuatetarget: ; 8051C90 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 @@ -131039,9 +131039,9 @@ atk97_tryinfatuatetarget: ; 8051C90 movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @08051D1C + b _08051D1C .pool -@08051D0C: +_08051D0C: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -131050,7 +131050,7 @@ atk97_tryinfatuatetarget: ; 8051C90 movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -@08051D1C: +_08051D1C: adds r4, r1, r0 adds r0, r5, 0 movs r1, 0xB @@ -131081,7 +131081,7 @@ atk97_tryinfatuatetarget: ; 8051C90 adds r0, 0x20 ldrb r2, [r0] cmp r2, 0xC - bne @08051D94 + bne _08051D94 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB5F5 str r0, [r1] @@ -131090,9 +131090,9 @@ atk97_tryinfatuatetarget: ; 8051C90 ldrb r0, [r5] movs r1, 0xC bl b_history__record_ability_usage_of_player - b @08051E2C + b _08051E2C .pool -@08051D94: +_08051D94: mov r0, r10 mov r1, r9 bl pokemon_species_get_gender_info @@ -131103,7 +131103,7 @@ atk97_tryinfatuatetarget: ; 8051C90 lsls r4, 24 lsls r0, 24 cmp r4, r0 - beq @08051DE4 + beq _08051DE4 ldrb r0, [r5] muls r0, r6 ldr r4, =0x02024084 @@ -131114,22 +131114,22 @@ atk97_tryinfatuatetarget: ; 8051C90 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] @@ -131143,9 +131143,9 @@ atk97_tryinfatuatetarget: ; 8051C90 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08051E2C + b _08051E2C .pool -@08051E08: +_08051E08: ldrb r0, [r5] adds r2, r0, 0 muls r2, r6 @@ -131164,7 +131164,7 @@ atk97_tryinfatuatetarget: ; 8051C90 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08051E2C: +_08051E2C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -131181,12 +131181,12 @@ sub_8051E48: ; 8051E48 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] @@ -131209,9 +131209,9 @@ sub_8051E48: ; 8051E48 ldr r0, [r5] adds r0, 0x2 str r0, [r5] - b @08051F34 + b _08051F34 .pool -@08051EA0: +_08051EA0: ldr r4, =0x02024064 ldr r5, =0x0202420b ldrb r0, [r5] @@ -131225,7 +131225,7 @@ sub_8051E48: ; 8051E48 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08051EDC + bne _08051EDC ldr r3, =0x02024084 movs r0, 0x58 muls r2, r0 @@ -131240,13 +131240,13 @@ sub_8051E48: ; 8051E48 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 @@ -131262,7 +131262,7 @@ sub_8051E48: ; 8051E48 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08051F2C + bne _08051F2C ldr r3, =0x02024084 movs r0, 0x58 muls r2, r0 @@ -131277,12 +131277,12 @@ sub_8051E48: ; 8051E48 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 @@ -131305,7 +131305,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 @@ -131313,9 +131313,9 @@ atk99_setmisteffect: ; 8051F58 strb r0, [r2] ldr r0, =0x02024332 strb r5, [r0, 0x5] - b @08051FE6 + b _08051FE6 .pool -@08051F98: +_08051F98: ldrb r0, [r4] bl battle_get_per_side_status adds r1, r5, 0 @@ -131352,7 +131352,7 @@ atk99_setmisteffect: ; 8051F58 strh r0, [r1] ldr r0, =0x02024332 strb r3, [r0, 0x5] -@08051FE6: +_08051FE6: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -131379,7 +131379,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 @@ -131388,14 +131388,14 @@ atk9A_setincreasedcriticalchance: ; 8052000 ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b @08052048 + b _08052048 .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 @@ -131433,7 +131433,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 @@ -131441,8 +131441,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 @@ -131450,9 +131450,9 @@ atk9B_transformdataexecution: ; 805205C strb r0, [r2] ldr r1, =0x02024332 movs r0, 0x1 - b @080521EC + b _080521EC .pool -@080520D8: +_080520D8: ldr r3, =0x0202420b ldrb r0, [r3] adds r1, r0, 0 @@ -131529,20 +131529,20 @@ atk9B_transformdataexecution: ; 805205C 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, =gBattleMoves ldr r3, =0x02024090 adds r5, r3, 0 adds r5, 0x18 -@08052188: +_08052188: lsls r1, r4, 1 ldrb r2, [r6] movs r0, 0x58 @@ -131556,20 +131556,20 @@ atk9B_transformdataexecution: ; 805205C 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 .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] @@ -131581,7 +131581,7 @@ atk9B_transformdataexecution: ; 805205C 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 @@ -131604,28 +131604,28 @@ 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 .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 @@ -131662,7 +131662,7 @@ sub_80521FC: ; 80521FC lsls r1, 1 orrs r0, r1 str r0, [r2] -@08052290: +_08052290: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -131684,19 +131684,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] @@ -131731,7 +131731,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] @@ -131748,16 +131748,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] @@ -131771,9 +131771,9 @@ atk9D_copyattack: ; 8052300 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @080524CC + b _080524CC .pool -@08052394: +_08052394: movs r2, 0 mov r3, r12 adds r3, 0xC @@ -131782,16 +131782,16 @@ atk9D_copyattack: ; 8052300 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 @@ -131803,10 +131803,10 @@ atk9D_copyattack: ; 8052300 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 @@ -131836,7 +131836,7 @@ atk9D_copyattack: ; 8052300 adds r0, r4 ldrb r4, [r0, 0x4] cmp r4, 0x4 - bhi @08052438 + bhi _08052438 mov r1, r9 ldrb r0, [r1] muls r0, r6 @@ -131846,9 +131846,9 @@ atk9D_copyattack: ; 8052300 adds r1, 0x24 adds r0, r1 strb r4, [r0] - b @0805244C + b _0805244C .pool -@08052438: +_08052438: mov r4, r9 ldrb r0, [r4] muls r0, r6 @@ -131859,7 +131859,7 @@ atk9D_copyattack: ; 8052300 adds r0, r1 movs r1, 0x5 strb r1, [r0] -@0805244C: +_0805244C: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -131902,9 +131902,9 @@ atk9D_copyattack: ; 8052300 ldr r0, [r4] adds r0, 0x5 str r0, [r4] - b @080524CC + b _080524CC .pool -@080524B0: +_080524B0: mov r0, r10 ldr r2, [r0] ldrb r1, [r2, 0x1] @@ -131919,7 +131919,7 @@ atk9D_copyattack: ; 8052300 orrs r1, r0 mov r2, r10 str r1, [r2] -@080524CC: +_080524CC: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -131940,7 +131940,7 @@ sub_80524DC: ; 80524DC ldr r5, =gUnknown_0831C3E0 ldr r0, =0x02024214 mov r8, r0 -@080524EE: +_080524EE: bl GenerateRandomNumber ldr r2, =0x000001ff adds r1, r2, 0 @@ -131948,27 +131948,27 @@ sub_80524DC: ; 80524DC 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 @@ -132024,12 +132024,12 @@ atk9F_nightshadedamageeffect: ; 8052584 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 @@ -132080,9 +132080,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] @@ -132091,7 +132091,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] @@ -132102,19 +132102,19 @@ 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 .pool -@08052690: +_08052690: ldr r2, =0x0202420c ldr r1, =0x0202433c ldr r0, =0x0202420b @@ -132123,14 +132123,14 @@ atkA1_counterdamagecalculator: ; 8052608 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 .pool -@080526BC: +_080526BC: ldr r2, =0x0202437c ldr r0, =0x0202420b ldrb r1, [r0] @@ -132155,7 +132155,7 @@ atkA1_counterdamagecalculator: ; 8052608 lsls r0, 24 orrs r1, r0 str r1, [r3] -@080526EC: +_080526EC: pop {r4-r6} pop {r0} bx r0 @@ -132185,9 +132185,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] @@ -132196,7 +132196,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] @@ -132207,19 +132207,19 @@ 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 .pool -@08052788: +_08052788: ldr r2, =0x0202420c ldr r1, =0x0202433c ldr r0, =0x0202420b @@ -132228,14 +132228,14 @@ atkA2_mirrorcoatdamagecalculator: ; 8052700 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 .pool -@080527B4: +_080527B4: ldr r2, =0x0202437c ldr r0, =0x0202420b ldrb r1, [r0] @@ -132260,7 +132260,7 @@ atkA2_mirrorcoatdamagecalculator: ; 8052700 lsls r0, 24 orrs r1, r0 str r1, [r3] -@080527E4: +_080527E4: pop {r4-r6} pop {r0} bx r0 @@ -132292,13 +132292,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] @@ -132311,8 +132311,8 @@ atkA3_disablelastusedattack: ; 80527F8 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 @@ -132320,9 +132320,9 @@ atkA3_disablelastusedattack: ; 80527F8 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 @@ -132332,7 +132332,7 @@ atkA3_disablelastusedattack: ; 80527F8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @08052910 + beq _08052910 ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -132397,9 +132397,9 @@ atkA3_disablelastusedattack: ; 80527F8 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @0805292A + b _0805292A .pool -@08052910: +_08052910: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -132413,7 +132413,7 @@ atkA3_disablelastusedattack: ; 80527F8 lsls r0, 24 orrs r1, r0 str r1, [r3] -@0805292A: +_0805292A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -132449,15 +132449,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] @@ -132470,21 +132470,21 @@ atkA4_setencore: ; 805293C 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 @@ -132493,9 +132493,9 @@ atkA4_setencore: ; 805293C 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 @@ -132505,7 +132505,7 @@ atkA4_setencore: ; 805293C adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @08052A44 + beq _08052A44 lsls r0, r5, 1 adds r0, r2 subs r1, 0x18 @@ -132549,9 +132549,9 @@ atkA4_setencore: ; 805293C ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @08052A5E + b _08052A5E .pool -@08052A44: +_08052A44: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -132565,7 +132565,7 @@ atkA4_setencore: ; 805293C lsls r0, 24 orrs r1, r0 str r1, [r3] -@08052A5E: +_08052A5E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -132594,7 +132594,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 @@ -132641,9 +132641,9 @@ sub_8052A70: ; 8052A70 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @08052B2A + b _08052B2A .pool -@08052B10: +_08052B10: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -132657,7 +132657,7 @@ sub_8052A70: ; 8052A70 lsls r0, 24 orrs r1, r0 str r1, [r3] -@08052B2A: +_08052B2A: pop {r4-r7} pop {r0} bx r0 @@ -132678,15 +132678,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] @@ -132701,8 +132701,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] @@ -132716,9 +132716,9 @@ atkA6_settypetorandomresistance: ; 8052B34 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08052D08 + b _08052D08 .pool -@08052BB4: +_08052BB4: mov r0, r12 strb r5, [r0] mov r1, r10 @@ -132736,9 +132736,9 @@ atkA6_settypetorandomresistance: ; 8052B34 movs r0, 0xFF strb r0, [r1, 0x3] ldr r1, =0x02024214 - b @08052C0A + b _08052C0A .pool -@08052BE0: +_08052BE0: mov r0, r8 adds r0, 0x1 adds r0, r3 @@ -132760,23 +132760,23 @@ atkA6_settypetorandomresistance: ; 8052B34 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 .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, =gUnknown_0831ACE8 @@ -132790,12 +132790,12 @@ atkA6_settypetorandomresistance: ; 8052B34 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 @@ -132811,18 +132811,18 @@ atkA6_settypetorandomresistance: ; 8052B34 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 @@ -132832,13 +132832,13 @@ atkA6_settypetorandomresistance: ; 8052B34 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 @@ -132846,10 +132846,10 @@ atkA6_settypetorandomresistance: ; 8052B34 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 @@ -132861,20 +132861,20 @@ atkA6_settypetorandomresistance: ; 8052B34 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] @@ -132889,7 +132889,7 @@ atkA6_settypetorandomresistance: ; 8052B34 orrs r1, r0 mov r4, r12 str r1, [r4] -@08052D08: +_08052D08: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -132967,9 +132967,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] @@ -132979,47 +132979,47 @@ atkA8_copymovepermanently: ; 8052D8C 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 @@ -133069,7 +133069,7 @@ atkA8_copymovepermanently: ; 8052D8C adds r3, r0, 0 add r2, sp, 0x4 add r5, sp, 0xC -@08052E7A: +_08052E7A: adds r0, r3, r6 ldrh r0, [r0] strh r0, [r2] @@ -133081,7 +133081,7 @@ atkA8_copymovepermanently: ; 8052D8C adds r2, 0x2 adds r7, 0x1 cmp r7, 0x3 - ble @08052E7A + ble _08052E7A add r2, sp, 0x4 mov r0, r10 ldrb r1, [r0] @@ -133124,9 +133124,9 @@ atkA8_copymovepermanently: ; 8052D8C ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @08052F32 + b _08052F32 .pool -@08052F18: +_08052F18: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -133140,7 +133140,7 @@ atkA8_copymovepermanently: ; 8052D8C lsls r0, 24 orrs r1, r0 str r1, [r3] -@08052F32: +_08052F32: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -133164,24 +133164,24 @@ 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 .pool -@08052F7C: +_08052F7C: movs r0, 0 -@08052F7E: +_08052F7E: pop {r1} bx r1 thumb_func_end sub_8052F48 @@ -133192,23 +133192,23 @@ sub_8052F84: ; 8052F84 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 @@ -133226,45 +133226,45 @@ 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 .pool -@08053010: +_08053010: movs r0, 0x2 -@08053012: +_08053012: pop {r1} bx r1 thumb_func_end move_weather_interaction @@ -133286,7 +133286,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] @@ -133299,7 +133299,7 @@ sub_8053018: ; 8053018 bl sub_8052F84 lsls r0, 24 cmp r0, 0 - bne @08053076 + bne _08053076 mov r1, r9 ldrb r0, [r1] mov r1, r8 @@ -133309,15 +133309,15 @@ sub_8053018: ; 8053018 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, =gUnknown_0832A328 lsls r0, r5, 2 adds r0, r1 @@ -133325,10 +133325,10 @@ sub_8053018: ; 8053018 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 @@ -133337,17 +133337,17 @@ sub_8053018: ; 8053018 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 .pool -@080530B8: +_080530B8: movs r7, 0x3 ldr r4, =gUnknown_0832A328 -@080530BC: +_080530BC: bl GenerateRandomNumber adds r5, r7, 0 ands r5, r0 @@ -133356,7 +133356,7 @@ sub_8053018: ; 8053018 ldr r0, [r0] ands r0, r6 cmp r0, 0 - bne @080530BC + bne _080530BC ldr r4, =0x020241ee ldr r2, =0x02024084 lsls r1, r5, 1 @@ -133394,7 +133394,7 @@ sub_8053018: ; 8053018 lsls r0, 24 orrs r1, r0 str r1, [r3] -@0805311C: +_0805311C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -133451,20 +133451,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 @@ -133505,17 +133505,17 @@ atkAC_remaininghptopower: ; 80531F8 ldr r0, =gUnknown_0831C408 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, =gUnknown_0831C408 adds r0, r3, 0x1 @@ -133547,14 +133547,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 @@ -133564,15 +133564,15 @@ atkAD_reducepprandom: ; 8053260 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 @@ -133583,12 +133583,12 @@ atkAD_reducepprandom: ; 8053260 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 @@ -133603,9 +133603,9 @@ atkAD_reducepprandom: ; 8053260 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 @@ -133618,9 +133618,9 @@ atkAD_reducepprandom: ; 8053260 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] @@ -133682,7 +133682,7 @@ atkAD_reducepprandom: ; 8053260 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @080533B8 + bne _080533B8 mov r2, r9 muls r2, r3 ldr r0, =0x02024084 @@ -133693,7 +133693,7 @@ atkAD_reducepprandom: ; 8053260 lsls r1, 14 ands r0, r1 cmp r0, 0 - bne @080533B8 + bne _080533B8 adds r1, r7, 0 adds r1, 0x9 lsls r1, 24 @@ -133708,7 +133708,7 @@ atkAD_reducepprandom: ; 8053260 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 @@ -133723,12 +133723,12 @@ atkAD_reducepprandom: ; 8053260 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 .pool -@08053408: +_08053408: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -133742,7 +133742,7 @@ atkAD_reducepprandom: ; 8053260 lsls r0, 24 orrs r1, r0 str r1, [r3] -@08053422: +_08053422: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -133768,9 +133768,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] @@ -133781,10 +133781,10 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 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 @@ -133795,7 +133795,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 adds r1, 0x20 ldrb r0, [r1] cmp r0, 0x2B - beq @080534C4 + beq _080534C4 adds r0, r4, 0 adds r0, 0x4C adds r0, r2, r0 @@ -133811,9 +133811,9 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - b @080534D4 + b _080534D4 .pool -@080534C4: +_080534C4: ldrb r1, [r1] adds r0, r3, 0 bl b_history__record_ability_usage_of_player @@ -133821,7 +133821,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 movs r1, 0x1 orrs r0, r1 strb r0, [r6, 0x5] -@080534D4: +_080534D4: ldr r7, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -133841,7 +133841,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @0805357A + beq _0805357A ldr r0, =0x02024210 ldrb r2, [r0] ldr r1, =gUnknown_0832A328 @@ -133851,7 +133851,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 ldr r0, [r0] ands r2, r0 cmp r2, 0 - bne @0805357A + bne _0805357A ldr r5, =0x02024084 movs r6, 0x58 adds r4, r3, 0 @@ -133861,7 +133861,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 adds r1, 0x20 ldrb r0, [r1] cmp r0, 0x2B - beq @08053568 + beq _08053568 adds r0, r5, 0 adds r0, 0x4C adds r0, r4, r0 @@ -133876,9 +133876,9 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 ldr r1, =0xf7ffffff ands r0, r1 str r0, [r2] - b @0805357A + b _0805357A .pool -@08053568: +_08053568: ldrb r1, [r1] adds r0, r3, 0 bl b_history__record_ability_usage_of_player @@ -133887,10 +133887,10 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 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 @@ -133906,11 +133906,11 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 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] @@ -133918,25 +133918,25 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 adds r0, r2 ldrh r0, [r0] cmp r0, r6 - bne @080535D0 + bne _080535D0 movs r0, 0x58 muls r0, r1 - b @08053600 + b _08053600 .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, =gUnknown_0832A328 @@ -133945,24 +133945,24 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 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 .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 @@ -133970,12 +133970,12 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 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] @@ -134015,7 +134015,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @080536BC + beq _080536BC ldr r0, =0x02024210 ldrb r2, [r0] ldr r1, =gUnknown_0832A328 @@ -134025,7 +134025,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 ldr r0, [r0] ands r2, r0 cmp r2, 0 - bne @080536BC + bne _080536BC adds r0, r3, 0 muls r0, r5 add r0, r9 @@ -134037,10 +134037,10 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 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] @@ -134053,7 +134053,7 @@ atkAE_clearstatusifnotsoundproofed: ; 8053438 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 @@ -134087,7 +134087,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] @@ -134101,9 +134101,9 @@ atkAF_cursetarget: ; 805371C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0805378C + b _0805378C .pool -@08053768: +_08053768: orrs r2, r3 str r2, [r1] ldr r1, =0x020241f0 @@ -134115,15 +134115,15 @@ atkAF_cursetarget: ; 805371C 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 @@ -134147,7 +134147,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 @@ -134171,9 +134171,9 @@ atkB0_setspikes: ; 80537A0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0805381E + b _0805381E .pool -@08053804: +_08053804: ldr r1, =0x0202428e adds r1, r2, r1 ldrh r2, [r1] @@ -134187,7 +134187,7 @@ atkB0_setspikes: ; 80537A0 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@0805381E: +_0805381E: pop {r4} pop {r0} bx r0 @@ -134230,7 +134230,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 @@ -134238,43 +134238,43 @@ 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 .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] @@ -134288,14 +134288,14 @@ atkB2_setperishsong: ; 805385C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08053904 + b _08053904 .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 @@ -134316,16 +134316,16 @@ 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, =gUnknown_082D8A60 str r0, [r1] - b @08053A60 + b _08053A60 .pool -@08053948: +_08053948: ldr r2, =0x02024084 ldr r1, =0x0202420b ldrb r3, [r1] @@ -134346,7 +134346,7 @@ atkB3_rolloutdamagecalculation: ; 8053914 ldr r2, =0x020241ea mov r8, r2 cmp r0, 0 - bne @080539BA + bne _080539BA lsls r0, r3, 3 subs r0, r3 lsls r0, 2 @@ -134383,7 +134383,7 @@ atkB3_rolloutdamagecalculation: ; 8053914 mov r2, r8 ldrh r1, [r2] strh r1, [r0] -@080539BA: +_080539BA: ldrb r0, [r6] lsls r2, r0, 3 subs r2, r0 @@ -134401,7 +134401,7 @@ atkB3_rolloutdamagecalculation: ; 8053914 orrs r0, r1 strb r0, [r2, 0x11] cmp r1, 0 - bne @080539EE + bne _080539EE ldrb r0, [r6] adds r1, r0, 0 muls r1, r5 @@ -134410,7 +134410,7 @@ atkB3_rolloutdamagecalculation: ; 8053914 ldr r2, =0xffffefff ands r0, r2 str r0, [r1] -@080539EE: +_080539EE: ldr r3, =0x02024400 ldr r2, =gBattleMoves mov r0, r8 @@ -134436,11 +134436,11 @@ atkB3_rolloutdamagecalculation: ; 8053914 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] @@ -134450,8 +134450,8 @@ atkB3_rolloutdamagecalculation: ; 8053914 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 @@ -134463,15 +134463,15 @@ atkB3_rolloutdamagecalculation: ; 8053914 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 @@ -134498,7 +134498,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 @@ -134509,7 +134509,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 @@ -134521,13 +134521,13 @@ atkB4_jumpifconfusedandattackmaxed: ; 8053A90 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08053AF2 + b _08053AF2 .pool -@08053AEC: +_08053AEC: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -@08053AF2: +_08053AF2: pop {r4,r5} pop {r0} bx r0 @@ -134541,7 +134541,7 @@ sub_8053AF8: ; 8053AF8 movs r0, 0x29 ands r0, r1 cmp r0, 0 - beq @08053B34 + beq _08053B34 ldr r2, =0x020242bc ldr r0, =0x0202420b ldrb r1, [r0] @@ -134554,9 +134554,9 @@ sub_8053AF8: ; 8053AF8 ldr r1, =0x02024214 ldr r0, =gUnknown_082D8A60 str r0, [r1] - b @08053B8C + b _08053B8C .pool -@08053B34: +_08053B34: ldr r5, =0x020242bc ldr r4, =0x0202420b ldrb r1, [r4] @@ -134566,10 +134566,10 @@ sub_8053AF8: ; 8053AF8 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, =gBattleMoves ldr r0, =0x020241ea @@ -134589,22 +134589,22 @@ sub_8053AF8: ; 8053AF8 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 @@ -134623,7 +134623,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 @@ -134633,9 +134633,9 @@ atkB6_happinesstodamagecalculation: ; 8053BAC adds r0, r2 adds r0, 0x2B ldrb r1, [r0] - b @08053C02 + b _08053C02 .pool -@08053BEC: +_08053BEC: ldr r4, =0x02024400 ldr r2, =0x02024084 ldr r0, =0x0202420b @@ -134647,7 +134647,7 @@ atkB6_happinesstodamagecalculation: ; 8053BAC ldrb r0, [r0] movs r1, 0xFF subs r1, r0 -@08053C02: +_08053C02: lsls r0, r1, 2 adds r0, r1 lsls r0, 1 @@ -134671,29 +134671,29 @@ atkB7_presentdamagecalculation: ; 8053C30 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 .pool -@08053C4C: +_08053C4C: cmp r4, 0xB1 - bgt @08053C5C + bgt _08053C5C ldr r1, =0x02024400 movs r0, 0x50 strh r0, [r1] - b @08053C8E + b _08053C8E .pool -@08053C5C: +_08053C5C: cmp r4, 0xCB - bgt @08053C6C + bgt _08053C6C ldr r1, =0x02024400 movs r0, 0x78 strh r0, [r1] - b @08053C8E + b _08053C8E .pool -@08053C6C: +_08053C6C: ldr r3, =0x020241f0 ldr r2, =0x02024084 ldr r0, =0x0202420c @@ -134705,21 +134705,21 @@ atkB7_presentdamagecalculation: ; 8053C30 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, =gUnknown_082D8A30 - b @08053CE6 + b _08053CE6 .pool -@08053CAC: +_08053CAC: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -134729,12 +134729,12 @@ atkB7_presentdamagecalculation: ; 8053C30 ldrh r1, [r0, 0x2C] ldrh r0, [r0, 0x28] cmp r1, r0 - bne @08053CD8 + bne _08053CD8 ldr r1, =0x02024214 ldr r0, =gUnknown_082D9EFB - b @08053CE6 + b _08053CE6 .pool -@08053CD8: +_08053CD8: ldr r2, =0x0202427c ldrb r1, [r2] movs r0, 0xF7 @@ -134742,7 +134742,7 @@ atkB7_presentdamagecalculation: ; 8053C30 strb r0, [r2] ldr r1, =0x02024214 ldr r0, =gUnknown_082D9EE1 -@08053CE6: +_08053CE6: str r0, [r1] pop {r4} pop {r0} @@ -134766,7 +134766,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 @@ -134775,9 +134775,9 @@ atkB8_setsafeguard: ; 8053CFC ldr r1, =0x02024332 movs r0, 0 strb r0, [r1, 0x5] - b @08053D88 + b _08053D88 .pool -@08053D40: +_08053D40: ldrb r0, [r7] bl battle_get_per_side_status adds r1, r6, 0 @@ -134811,7 +134811,7 @@ atkB8_setsafeguard: ; 8053CFC strb r1, [r0, 0x7] ldr r0, =0x02024332 strb r4, [r0, 0x5] -@08053D88: +_08053D88: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -134835,64 +134835,64 @@ 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 .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 .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 .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 .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 .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 .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 @@ -134913,17 +134913,17 @@ atkB9_magnitudedamagecalculation: ; 8053DA4 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, =gUnknown_0832A328 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 @@ -134931,15 +134931,15 @@ atkB9_magnitudedamagecalculation: ; 8053DA4 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 @@ -134962,32 +134962,32 @@ 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 .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 .pool -@08053F10: +_08053F10: movs r0, 0x2 -@08053F12: +_08053F12: bl battle_get_side_with_given_state ldr r1, =0x0202420c strb r0, [r1] @@ -134997,9 +134997,9 @@ atkBA_802B140: ; 8053EC8 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] @@ -135007,7 +135007,7 @@ atkBA_802B140: ; 8053EC8 ldrb r2, [r5] ldrb r1, [r1, 0xC] cmp r2, r1 - bne @08054030 + bne _08054030 ldr r4, =0x02024084 movs r2, 0x58 adds r0, r3, 0 @@ -135019,13 +135019,13 @@ atkBA_802B140: ; 8053EC8 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 @@ -135034,13 +135034,13 @@ atkBA_802B140: ; 8053EC8 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 @@ -135053,26 +135053,26 @@ atkBA_802B140: ; 8053EC8 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] @@ -135099,9 +135099,9 @@ atkBA_802B140: ; 8053EC8 ldr r1, =0xfffffbff ands r0, r1 str r0, [r2] - b @0805404A + b _0805404A .pool -@08054030: +_08054030: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -135115,7 +135115,7 @@ atkBA_802B140: ; 8053EC8 lsls r0, 24 orrs r1, r0 str r1, [r3] -@0805404A: +_0805404A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -135134,7 +135134,7 @@ sub_805405C: ; 805405C movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq @08054088 + beq _08054088 ldr r2, =0x0202427c ldrb r0, [r2] movs r1, 0x1 @@ -135143,9 +135143,9 @@ sub_805405C: ; 805405C ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b @0805409A + b _0805409A .pool -@08054088: +_08054088: movs r0, 0x20 strh r0, [r2] ldr r1, =0x02024332 @@ -135155,7 +135155,7 @@ sub_805405C: ; 805405C adds r0, 0x28 movs r1, 0x5 strb r1, [r0] -@0805409A: +_0805409A: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -135177,16 +135177,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 @@ -135197,17 +135197,17 @@ atkBC_maxattackhalvehp: ; 80540B4 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 .pool -@08054110: +_08054110: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -135221,7 +135221,7 @@ atkBC_maxattackhalvehp: ; 80540B4 lsls r0, 24 orrs r1, r0 str r1, [r3] -@0805412A: +_0805412A: pop {r4,r5} pop {r0} bx r0 @@ -135237,7 +135237,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 @@ -135251,7 +135251,7 @@ atkBD_copyfoestats: ; 8054134 strb r0, [r1] adds r2, 0x1 cmp r2, 0x7 - ble @08054142 + ble _08054142 ldr r0, [r7] adds r0, 0x5 str r0, [r7] @@ -135278,7 +135278,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] @@ -135317,9 +135317,9 @@ atkBE_breakfree: ; 805417C bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DAFC5 - b @080542BA + b _080542BA .pool -@08054210: +_08054210: ldr r4, =0x020242ac lsls r0, r2, 2 adds r3, r0, r4 @@ -135327,7 +135327,7 @@ atkBE_breakfree: ; 805417C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @08054250 + beq _08054250 movs r0, 0x5 negs r0, r0 ands r1, r0 @@ -135343,9 +135343,9 @@ atkBE_breakfree: ; 805417C bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DAFD6 - b @080542BA + b _080542BA .pool -@08054250: +_08054250: adds r0, r2, 0 bl battle_side_get_owner ldr r4, =0x0202428e @@ -135356,7 +135356,7 @@ atkBE_breakfree: ; 805417C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @080542B4 + beq _080542B4 ldrb r0, [r5] bl battle_side_get_owner lsls r0, 24 @@ -135380,13 +135380,13 @@ atkBE_breakfree: ; 805417C bl b_movescr_stack_push_cursor ldr r1, =0x02024214 ldr r0, =gUnknown_082DAFDD - b @080542BA + b _080542BA .pool -@080542B4: +_080542B4: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 -@080542BA: +_080542BA: str r0, [r1] pop {r4-r6} pop {r0} @@ -135432,11 +135432,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 @@ -135447,7 +135447,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 @@ -135456,8 +135456,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 @@ -135469,14 +135469,14 @@ atkC0_recoverbasedonsunlight: ; 80542F8 lsrs r0, 1 str r0, [r3] adds r1, r3, 0 - b @080543B2 + b _080543B2 .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 @@ -135489,9 +135489,9 @@ atkC0_recoverbasedonsunlight: ; 80542F8 bl __divsi3 str r0, [r4] adds r1, r4, 0 - b @080543B2 + b _080543B2 .pool -@080543A4: +_080543A4: ldr r1, =0x020241f0 ldrb r0, [r5] muls r0, r6 @@ -135499,14 +135499,14 @@ atkC0_recoverbasedonsunlight: ; 80542F8 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] @@ -135514,9 +135514,9 @@ atkC0_recoverbasedonsunlight: ; 80542F8 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @080543F2 + b _080543F2 .pool -@080543D8: +_080543D8: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -135530,7 +135530,7 @@ atkC0_recoverbasedonsunlight: ; 80542F8 lsls r0, 24 orrs r1, r0 str r1, [r3] -@080543F2: +_080543F2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -135655,10 +135655,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 @@ -135692,7 +135692,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] @@ -135700,10 +135700,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 @@ -135711,15 +135711,15 @@ atkC2_selectnexttarget: ; 8054524 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 @@ -135747,7 +135747,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] @@ -135761,9 +135761,9 @@ atkC3_setfutureattack: ; 8054598 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @080546CC + b _080546CC .pool -@080545DC: +_080545DC: adds r0, r1, 0 bl battle_get_per_side_status ldr r4, =0x0202428e @@ -135838,7 +135838,7 @@ atkC3_setfutureattack: ; 8054598 ldrb r0, [r0] lsls r0, 28 cmp r0, 0 - bge @0805468C + bge _0805468C ldrb r4, [r6] lsls r4, 2 adds r4, r2 @@ -135848,28 +135848,28 @@ atkC3_setfutureattack: ; 8054598 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 .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 @@ -135893,9 +135893,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] @@ -135904,7 +135904,7 @@ atkC4_802B910: ; 80546E4 adds r0, r2 ldrh r0, [r0, 0x28] cmp r0, 0 - bne @08054740 + bne _08054740 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -135915,33 +135915,33 @@ atkC4_802B910: ; 80546E4 lsls r0, 16 orrs r1, r0 ldrb r0, [r2, 0x4] - b @080548DC + b _080548DC .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 @@ -135950,15 +135950,15 @@ atkC4_802B910: ; 80546E4 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] @@ -135966,13 +135966,13 @@ atkC4_802B910: ; 80546E4 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] @@ -136057,24 +136057,24 @@ atkC4_802B910: ; 80546E4 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 .pool -@080548A8: +_080548A8: mov r0, r8 cmp r0, 0 - beq @080548C8 + beq _080548C8 ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -136085,9 +136085,9 @@ atkC4_802B910: ; 80546E4 lsls r0, 16 orrs r1, r0 ldrb r0, [r2, 0x4] - b @080548DC + b _080548DC .pool -@080548C8: +_080548C8: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x5] @@ -136098,11 +136098,11 @@ atkC4_802B910: ; 80546E4 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 @@ -136118,21 +136118,21 @@ atkC5_hidepreattack: ; 80548F4 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 .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] @@ -136140,9 +136140,9 @@ atkC5_hidepreattack: ; 80548F4 adds r1, r2 ldr r0, [r1] movs r2, 0x40 - b @0805495C + b _0805495C .pool -@08054934: +_08054934: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -136150,9 +136150,9 @@ atkC5_hidepreattack: ; 80548F4 adds r1, r2 ldr r0, [r1] movs r2, 0x80 - b @0805495C + b _0805495C .pool -@0805494C: +_0805494C: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -136161,10 +136161,10 @@ atkC5_hidepreattack: ; 80548F4 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 @@ -136180,21 +136180,21 @@ atkC6_unhidepostattack: ; 8054978 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 .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] @@ -136203,9 +136203,9 @@ atkC6_unhidepostattack: ; 8054978 ldr r0, [r1] movs r2, 0x41 negs r2, r2 - b @080549E6 + b _080549E6 .pool -@080549BC: +_080549BC: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -136214,9 +136214,9 @@ atkC6_unhidepostattack: ; 8054978 ldr r0, [r1] movs r2, 0x81 negs r2, r2 - b @080549E6 + b _080549E6 .pool -@080549D8: +_080549D8: ldr r2, =0x020242ac ldr r0, =0x0202420b ldrb r1, [r0] @@ -136224,10 +136224,10 @@ atkC6_unhidepostattack: ; 8054978 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 @@ -136246,7 +136246,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] @@ -136257,7 +136257,7 @@ atkC7_setminimize: ; 8054A08 lsls r2, 1 orrs r0, r2 str r0, [r1] -@08054A2C: +_08054A2C: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -136276,7 +136276,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 @@ -136285,9 +136285,9 @@ sub_8054A48: ; 8054A48 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] - b @08054A86 + b _08054A86 .pool -@08054A78: +_08054A78: strh r2, [r3] ldr r0, =0x02024332 movs r1, 0x5 @@ -136295,7 +136295,7 @@ sub_8054A48: ; 8054A48 ldr r0, =0x020243d0 adds r0, 0x28 strb r1, [r0] -@08054A86: +_08054A86: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -136318,15 +136318,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] @@ -136340,9 +136340,9 @@ atkC9_jumpifattackandspecialattackcannotfall: ; 8054AA0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08054B20 + b _08054B20 .pool -@08054AF4: +_08054AF4: ldr r4, =0x02024064 ldr r0, =0x0202420b ldrb r0, [r0] @@ -136363,7 +136363,7 @@ atkC9_jumpifattackandspecialattackcannotfall: ; 8054AA0 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08054B20: +_08054B20: pop {r4} pop {r0} bx r0 @@ -136511,7 +136511,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 @@ -136532,9 +136532,9 @@ 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 .pool -@08054CBC: +_08054CBC: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -136548,7 +136548,7 @@ atkCD_cureifburnedparalysedorpoisoned: ; 8054C60 lsls r0, 24 orrs r1, r0 str r1, [r3] -@08054CD6: +_08054CD6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -136570,7 +136570,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] @@ -136584,16 +136584,16 @@ atkCE_settorment: ; 8054CE4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08054D34 + b _08054D34 .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 .pool @@ -136610,21 +136610,21 @@ 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 .pool -@08054D74: +_08054D74: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -136638,7 +136638,7 @@ atkCF_jumpifnodamage: ; 8054D3C lsls r0, 24 orrs r1, r0 str r1, [r3] -@08054D8E: +_08054D8E: pop {r0} bx r0 .pool @@ -136657,7 +136657,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 @@ -136679,9 +136679,9 @@ atkD0_settaunt: ; 8054D98 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @08054E02 + b _08054E02 .pool -@08054DE8: +_08054DE8: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -136695,7 +136695,7 @@ atkD0_settaunt: ; 8054D98 lsls r0, 24 orrs r1, r0 str r1, [r3] -@08054E02: +_08054E02: pop {r4} pop {r0} bx r0 @@ -136720,7 +136720,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, =gUnknown_0832A328 @@ -136730,7 +136730,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 @@ -136738,13 +136738,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] @@ -136752,9 +136752,9 @@ atkD1_sethelpinghand: ; 8054E0C ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @08054EAA + b _08054EAA .pool -@08054E90: +_08054E90: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -136768,7 +136768,7 @@ atkD1_sethelpinghand: ; 8054E0C lsls r0, 24 orrs r1, r0 str r1, [r3] -@08054EAA: +_08054EAA: pop {r4} pop {r0} bx r0 @@ -136789,20 +136789,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 @@ -136818,7 +136818,7 @@ sub_8054EB4: ; 8054EB4 ldr r1, =0x0a3f0902 ands r0, r1 cmp r0, 0 - bne @08054F46 + bne _08054F46 ldr r0, =0x020243d0 adds r2, r0, 0 adds r2, 0x29 @@ -136835,7 +136835,7 @@ sub_8054EB4: ; 8054EB4 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08054F9A + bne _08054F9A adds r0, r5, r2 ldrb r1, [r0] ldrb r0, [r7] @@ -136847,8 +136847,8 @@ sub_8054EB4: ; 8054EB4 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08054F9A -@08054F46: + bne _08054F9A +_08054F46: ldr r0, =0x02024084 mov r8, r0 ldr r1, =0x0202420b @@ -136861,17 +136861,17 @@ sub_8054EB4: ; 8054EB4 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 @@ -136879,20 +136879,20 @@ sub_8054EB4: ; 8054EB4 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] @@ -136906,14 +136906,14 @@ sub_8054EB4: ; 8054EB4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08055132 + b _08055132 .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, =gUnknown_082DB63F str r0, [r1] @@ -136927,9 +136927,9 @@ sub_8054EB4: ; 8054EB4 ldrb r0, [r7] ldrb r1, [r1] bl b_history__record_ability_usage_of_player - b @08055132 + b _08055132 .pool -@08055010: +_08055010: ldr r3, =0x0202449c mov r10, r3 lsls r0, r4, 1 @@ -137037,29 +137037,29 @@ sub_8054EB4: ; 8054EB4 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 .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 .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 @@ -137084,9 +137084,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 @@ -137104,9 +137104,9 @@ sub_8055148: ; 8055148 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @080551B6 + b _080551B6 .pool -@0805519C: +_0805519C: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -137120,7 +137120,7 @@ sub_8055148: ; 8055148 lsls r0, 24 orrs r1, r0 str r1, [r3] -@080551B6: +_080551B6: pop {r4} pop {r0} bx r0 @@ -137134,12 +137134,12 @@ atkD4_802C408: ; 80551C0 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 .pool -@080551D8: +_080551D8: ldr r1, =0x020243d0 ldr r4, =0x0202420b adds r0, r1, 0 @@ -137148,7 +137148,7 @@ atkD4_802C408: ; 80551C0 adds r3, r0, r5 ldrb r0, [r3] cmp r0, 0 - bne @0805525C + bne _0805525C movs r0, 0x2 strb r0, [r3] ldrb r0, [r4] @@ -137161,9 +137161,9 @@ atkD4_802C408: ; 80551C0 strb r0, [r1] ldr r0, [r7] adds r0, 0x6 - b @0805528A + b _0805528A .pool -@08055210: +_08055210: ldr r1, =0x02022f58 movs r0, 0xFD strb r0, [r1] @@ -137190,9 +137190,9 @@ atkD4_802C408: ; 80551C0 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] @@ -137202,8 +137202,8 @@ atkD4_802C408: ; 80551C0 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 @@ -137215,13 +137215,13 @@ atkD4_802C408: ; 80551C0 lsls r0, 24 orrs r1, r0 str r1, [r7] - b @0805528C + b _0805528C .pool -@08055288: +_08055288: adds r0, r2, 0x6 -@0805528A: +_0805528A: str r0, [r7] -@0805528C: +_0805528C: pop {r4-r7} pop {r0} bx r0 @@ -137241,7 +137241,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] @@ -137255,16 +137255,16 @@ sub_8055294: ; 8055294 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @080552E4 + b _080552E4 .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 .pool @@ -137281,31 +137281,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 @@ -137328,7 +137328,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 @@ -137336,8 +137336,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] @@ -137351,9 +137351,9 @@ sub_805534C: ; 805534C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @080553B0 + b _080553B0 .pool -@080553A0: +_080553A0: movs r0, 0x80 lsls r0, 5 orrs r2, r0 @@ -137362,7 +137362,7 @@ sub_805534C: ; 805534C ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@080553B0: +_080553B0: pop {r4} pop {r0} bx r0 @@ -137385,7 +137385,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] @@ -137399,9 +137399,9 @@ atkD8_setdamagetohealthdifference: ; 80553BC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0805541A + b _0805541A .pool -@08055408: +_08055408: ldr r2, =0x020241f0 ldrh r0, [r3, 0x28] ldrh r1, [r1, 0x28] @@ -137411,7 +137411,7 @@ atkD8_setdamagetohealthdifference: ; 80553BC ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@0805541A: +_0805541A: pop {r0} bx r0 .pool @@ -137423,7 +137423,7 @@ atkD9_scaledamagebyhealthratio: ; 8055428 ldr r4, =0x02024400 ldrh r0, [r4] cmp r0, 0 - bne @08055464 + bne _08055464 ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -137445,10 +137445,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 @@ -137472,7 +137472,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 @@ -137480,10 +137480,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 @@ -137491,14 +137491,14 @@ atkDA_abilityswap: ; 805548C 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] @@ -137512,9 +137512,9 @@ atkDA_abilityswap: ; 805548C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0805551A + b _0805551A .pool -@08055504: +_08055504: ldrb r1, [r2] strb r3, [r2] ldrb r0, [r6] @@ -137526,7 +137526,7 @@ atkDA_abilityswap: ; 805548C ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@0805551A: +_0805551A: pop {r4-r6} pop {r0} bx r0 @@ -137549,10 +137549,10 @@ atkDB_imprisoneffect: ; 8055524 lsls r1, 6 ands r0, r1 cmp r0, 0 - beq @08055574 - b @080555F6 + beq _08055574 + b _080555F6 .pool -@0805554C: +_0805554C: ldr r0, =0x020242ac mov r2, r9 ldrb r1, [r2] @@ -137567,9 +137567,9 @@ atkDB_imprisoneffect: ; 8055524 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @080555EE + b _080555EE .pool -@08055574: +_08055574: adds r0, r2, 0 bl battle_side_get_owner lsls r0, 24 @@ -137578,14 +137578,14 @@ atkDB_imprisoneffect: ; 8055524 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 @@ -137600,48 +137600,48 @@ atkDB_imprisoneffect: ; 8055524 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] @@ -137655,7 +137655,7 @@ atkDB_imprisoneffect: ; 8055524 lsls r0, 24 orrs r1, r0 str r1, [r3] -@08055610: +_08055610: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -137679,7 +137679,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] @@ -137693,16 +137693,16 @@ atkDC_setgrudge: ; 805562C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0805567C + b _0805567C .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 .pool @@ -137718,13 +137718,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 @@ -137740,32 +137740,32 @@ atkDD_weightdamagecalculation: ; 8055684 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 .pool -@080556FC: +_080556FC: ldr r1, =0x02024400 movs r0, 0x78 strh r0, [r1] -@08055702: +_08055702: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x1 @@ -137800,12 +137800,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] @@ -137815,7 +137815,7 @@ atkDE_asistattackselect: ; 805571C str r1, [sp, 0x8] ldrh r0, [r0] cmp r2, r0 - beq @080557F4 + beq _080557F4 movs r0, 0x64 adds r6, r2, 0 muls r6, r0 @@ -137825,14 +137825,14 @@ atkDE_asistattackselect: ; 805571C 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 @@ -137841,7 +137841,7 @@ atkDE_asistattackselect: ; 805571C lsls r0, r1, 1 ldr r1, [sp, 0x4] adds r6, r0, r1 -@08055798: +_08055798: movs r7, 0 adds r1, r5, 0 adds r1, 0xD @@ -137855,48 +137855,48 @@ atkDE_asistattackselect: ; 805571C lsls r0, 24 adds r1, r5, 0x1 cmp r0, 0 - bne @080557EE + bne _080557EE ldr r0, =gUnknown_0831C3E0 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 @@ -137923,9 +137923,9 @@ atkDE_asistattackselect: ; 805571C ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @08055886 + b _08055886 .pool -@0805586C: +_0805586C: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -137939,7 +137939,7 @@ atkDE_asistattackselect: ; 805571C lsls r0, 24 orrs r1, r0 str r1, [r3] -@08055886: +_08055886: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -137974,7 +137974,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] @@ -137988,9 +137988,9 @@ atkDF_setmagiccoat: ; 805589C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08055914 + b _08055914 .pool -@080558FC: +_080558FC: ldr r0, =0x0202433c ldrb r1, [r3] lsls r1, 4 @@ -138003,7 +138003,7 @@ atkDF_setmagiccoat: ; 805589C ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08055914: +_08055914: pop {r0} bx r0 .pool @@ -138029,7 +138029,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] @@ -138043,9 +138043,9 @@ atkE0_setstealstatchange: ; 8055920 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0805598E + b _0805598E .pool -@08055978: +_08055978: ldr r0, =0x0202433c ldrb r1, [r3] lsls r1, 4 @@ -138057,7 +138057,7 @@ atkE0_setstealstatchange: ; 8055920 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@0805598E: +_0805598E: pop {r0} bx r0 .pool @@ -138096,16 +138096,16 @@ atkE1_802CBE4: ; 805599C ldrb r0, [r2] ldrb r1, [r1] cmp r0, r1 - bcs @08055A22 + bcs _08055A22 adds r4, r2, 0 ldr r6, =gUnknown_0832A328 -@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] @@ -138115,8 +138115,8 @@ atkE1_802CBE4: ; 805599C ands r1, r0 ldr r2, =0x0202406c cmp r1, 0 - beq @08055A18 -@08055A04: + beq _08055A18 +_08055A04: ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -138126,14 +138126,14 @@ atkE1_802CBE4: ; 805599C 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] @@ -138147,14 +138147,14 @@ atkE1_802CBE4: ; 805599C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08055A6C + b _08055A6C .pool -@08055A64: +_08055A64: ldr r1, =0x02024214 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08055A6C: +_08055A6C: pop {r4-r6} pop {r0} bx r0 @@ -138180,7 +138180,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 @@ -138205,7 +138205,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] @@ -138232,7 +138232,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] @@ -138245,13 +138245,13 @@ atkE3_jumpiffainted: ; 8055AF4 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08055B42 + b _08055B42 .pool -@08055B3C: +_08055B3C: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -@08055B42: +_08055B42: pop {r4} pop {r0} bx r0 @@ -138263,67 +138263,67 @@ sub_8055B48: ; 8055B48 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 .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 .pool -@08055B90: +_08055B90: ldr r1, =0x02024332 movs r0, 0x1 - b @08055BE8 + b _08055BE8 .pool -@08055B9C: +_08055B9C: ldr r1, =0x02024332 movs r0, 0x1B - b @08055BE8 + b _08055BE8 .pool -@08055BA8: +_08055BA8: ldr r1, =0x02024332 movs r0, 0x17 - b @08055BE8 + b _08055BE8 .pool -@08055BB4: +_08055BB4: ldr r1, =0x02024332 movs r0, 0x16 - b @08055BE8 + b _08055BE8 .pool -@08055BC0: +_08055BC0: ldr r1, =0x02024332 movs r0, 0x18 - b @08055BE8 + b _08055BE8 .pool -@08055BCC: +_08055BCC: ldr r1, =0x02024332 movs r0, 0x7 - b @08055BE8 + b _08055BE8 .pool -@08055BD8: +_08055BD8: ldr r1, =0x02024332 movs r0, 0x8 - b @08055BE8 + b _08055BE8 .pool -@08055BE4: +_08055BE4: ldr r1, =0x02024332 movs r0, 0x5 -@08055BE8: +_08055BE8: strb r0, [r1, 0x3] ldr r1, =0x02024214 ldr r0, [r1] @@ -138345,18 +138345,18 @@ atkE5_pickupitemcalculation: ; 8055C00 bl InBattlePike lsls r0, 24 cmp r0, 0 - beq @08055C18 - b @08055DD8 -@08055C18: + beq _08055C18 + b _08055DD8 +_08055C18: bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @08055CC4 + beq _08055CC4 movs r6, 0 mov r7, sp ldr r0, =gBaseStats mov r8, r0 -@08055C2A: +_08055C2A: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -138375,32 +138375,32 @@ atkE5_pickupitemcalculation: ; 8055C00 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 .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 @@ -138408,7 +138408,7 @@ atkE5_pickupitemcalculation: ; 8055C00 bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne @08055CB6 + bne _08055CB6 bl CalculateBattlePyramidPickupItemId strh r0, [r7] movs r0, 0x64 @@ -138418,19 +138418,19 @@ atkE5_pickupitemcalculation: ; 8055C00 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 .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 @@ -138448,16 +138448,16 @@ atkE5_pickupitemcalculation: ; 8055C00 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, =gBaseStats adds r0, r1 ldrb r0, [r0, 0x17] - b @08055D3C + b _08055D3C .pool -@08055D10: +_08055D10: mov r0, r8 muls r0, r6 adds r0, r7 @@ -138469,30 +138469,30 @@ atkE5_pickupitemcalculation: ; 8055C00 adds r2, r1 movs r1, 0xC bl pokemon_setattr - b @08055DD0 + b _08055DD0 .pool -@08055D30: +_08055D30: lsls r0, r5, 3 subs r0, r5 lsls r0, 2 ldr r1, =gBaseStats 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 @@ -138500,7 +138500,7 @@ atkE5_pickupitemcalculation: ; 8055C00 bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne @08055DD0 + bne _08055DD0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -138519,26 +138519,26 @@ atkE5_pickupitemcalculation: ; 8055C00 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 .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, =gPickupProbabilities adds r0, r2, r0 ldrb r0, [r0] cmp r0, r4 - ble @08055DA4 + ble _08055DA4 mov r0, r8 muls r0, r6 adds r0, r7 @@ -138548,12 +138548,12 @@ atkE5_pickupitemcalculation: ; 8055C00 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 @@ -138588,14 +138588,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] @@ -138627,7 +138627,7 @@ atkE7_castform_switch: ; 8055E64 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq @08055E8E + beq _08055E8E ldr r0, =gUnknown_082DB4A9 bl b_push_move_exec ldr r0, =0x0202449c @@ -138635,7 +138635,7 @@ atkE7_castform_switch: ; 8055E64 adds r0, 0x7F subs r1, r4, 0x1 strb r1, [r0] -@08055E8E: +_08055E8E: pop {r4} pop {r0} bx r0 @@ -138655,7 +138655,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] @@ -138667,14 +138667,14 @@ 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 .pool -@08055EF4: +_08055EF4: ldr r1, =0x020242ac ldr r0, =0x0202420b ldrb r0, [r0] @@ -138686,24 +138686,24 @@ atkE8_settypebasedhalvers: ; 8055EA4 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 .pool -@08055F38: +_08055F38: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -138717,7 +138717,7 @@ atkE8_settypebasedhalvers: ; 8055EA4 lsls r0, 24 orrs r1, r0 str r1, [r3] -@08055F52: +_08055F52: pop {r4} pop {r0} bx r0 @@ -138738,7 +138738,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 @@ -138747,62 +138747,62 @@ 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 .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 .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 .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 .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 @@ -138829,7 +138829,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 @@ -138837,7 +138837,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] @@ -138863,9 +138863,9 @@ atkEA_recycleitem: ; 8056014 ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @080560AE + b _080560AE .pool -@08056094: +_08056094: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -138879,7 +138879,7 @@ atkEA_recycleitem: ; 8056014 lsls r0, 24 orrs r1, r0 str r1, [r3] -@080560AE: +_080560AE: add sp, 0x4 pop {r4-r7} pop {r0} @@ -138912,12 +138912,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] @@ -138944,9 +138944,9 @@ atkEB_settypetoterrain: ; 80560BC ldr r0, [r1] adds r0, 0x5 str r0, [r1] - b @0805615E + b _0805615E .pool -@08056144: +_08056144: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -138960,7 +138960,7 @@ atkEB_settypetoterrain: ; 80560BC lsls r0, 24 orrs r1, r0 str r1, [r3] -@0805615E: +_0805615E: pop {r3} mov r8, r3 pop {r4-r7} @@ -138987,7 +138987,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, =gUnknown_0832A328 @@ -138997,18 +138997,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 @@ -139026,9 +139026,9 @@ atkEC_802D2A0: ; 805616C strb r1, [r0] ldrb r0, [r4] strb r0, [r5] - b @08056226 + b _08056226 .pool -@0805620C: +_0805620C: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -139042,7 +139042,7 @@ atkEC_802D2A0: ; 805616C lsls r0, 24 orrs r1, r0 str r1, [r3] -@08056226: +_08056226: pop {r4-r6} pop {r0} bx r0 @@ -139062,18 +139062,18 @@ 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 .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 @@ -139103,11 +139103,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] @@ -139123,13 +139123,13 @@ atkEE_removereflectlightscreen: ; 8056284 movs r0, 0x1 strb r0, [r1, 0x18] strb r0, [r1, 0x19] - b @080562EA + b _080562EA .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 @@ -139147,9 +139147,9 @@ sub_8056300: ; 8056300 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] @@ -139163,7 +139163,7 @@ sub_8056300: ; 8056300 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 @@ -139171,14 +139171,14 @@ sub_8056300: ; 8056300 bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x02024214 ldr r0, =gUnknown_082DBE02 - b @08056694 + b _08056694 .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 @@ -139186,13 +139186,13 @@ sub_8056300: ; 8056300 bl dp01_battle_side_mark_buffer_for_execution ldr r1, =0x02024214 ldr r0, =gUnknown_082DBDCA - b @08056694 + b _08056694 .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 @@ -139205,9 +139205,9 @@ sub_8056300: ; 8056300 bl __divsi3 lsls r0, 24 lsrs r5, r0, 24 - b @080563C8 + b _080563C8 .pool -@080563B0: +_080563B0: ldr r3, =gBaseStats ldr r2, =0x02024084 ldrb r1, [r6] @@ -139220,34 +139220,34 @@ sub_8056300: ; 8056300 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 .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] @@ -139258,27 +139258,27 @@ sub_8056300: ; 8056300 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 .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] @@ -139288,18 +139288,18 @@ sub_8056300: ; 8056300 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 .pool -@08056480: +_08056480: ldr r2, =0x02024084 ldr r0, =0x0202420c ldrb r1, [r0] @@ -139315,29 +139315,29 @@ sub_8056300: ; 8056300 lsls r0, 24 movs r4, 0xA cmp r0, 0 - beq @080564D2 -@080564A4: + beq _080564D2 +_080564A4: movs r4, 0x1E - b @080564D2 + b _080564D2 .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 .pool -@080564C8: +_080564C8: ldr r1, =gUnknown_0831C48D ldrh r0, [r2] subs r0, 0x2 adds r0, r1 ldrb r4, [r0] -@080564D2: +_080564D2: adds r0, r5, 0 muls r0, r4 movs r1, 0xA @@ -139364,33 +139364,33 @@ sub_8056300: ; 8056300 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 .pool -@08056550: +_08056550: ldr r0, =0x03005d10 ldrh r1, [r1] adds r0, r1 @@ -139398,12 +139398,12 @@ sub_8056300: ; 8056300 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 @@ -139430,10 +139430,10 @@ sub_8056300: ; 8056300 lsls r0, 24 lsrs r0, 24 cmp r0, 0x6 - beq @08056656 - b @08056680 + beq _08056656 + b _08056680 .pool -@080565C8: +_080565C8: movs r0, 0xFF lsls r0, 16 adds r1, r6, 0 @@ -139449,27 +139449,27 @@ sub_8056300: ; 8056300 bl __udivsi3 adds r6, r0, 0 movs r4, 0 - b @080565FA + b _080565FA .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 @@ -139477,7 +139477,7 @@ sub_8056300: ; 8056300 ldrb r0, [r0] bl dp01_battle_side_mark_buffer_for_execution cmp r4, 0x4 - bne @0805668C + bne _0805668C ldr r1, =0x02024214 ldr r0, =gUnknown_082DBD84 str r0, [r1] @@ -139498,27 +139498,27 @@ sub_8056300: ; 8056300 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 .pool -@08056680: +_08056680: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x5] - b @08056696 + b _08056696 .pool -@0805668C: +_0805668C: ldr r0, =0x02024332 strb r4, [r0, 0x5] ldr r1, =0x02024214 ldr r0, =gUnknown_082DBDD4 -@08056694: +_08056694: str r0, [r1] -@08056696: +_08056696: pop {r4-r6} pop {r0} bx r0 @@ -139549,12 +139549,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 @@ -139576,9 +139576,9 @@ atkF0_catch_pokemon: ; 80566A8 ldr r2, =0x02021dc4 movs r1, 0x2 bl pokemon_getattr - b @0805677E + b _0805677E .pool -@08056734: +_08056734: ldr r4, =0x02021cc4 ldr r0, =0x00004036 bl VarGet @@ -139609,17 +139609,17 @@ atkF0_catch_pokemon: ; 80566A8 ldr r1, =0x02024332 movs r0, 0x2 strb r0, [r1, 0x5] -@0805677E: +_0805677E: ldr r0, =0x000008ab bl FlagGet 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 @@ -139715,7 +139715,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] @@ -139729,9 +139729,9 @@ atkF1_802D95C: ; 8056850 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @080568C2 + b _080568C2 .pool -@080568A8: +_080568A8: adds r0, r5, 0 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -139743,7 +139743,7 @@ atkF1_802D95C: ; 8056850 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@080568C2: +_080568C2: pop {r4,r5} pop {r0} bx r0 @@ -139763,24 +139763,24 @@ 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 .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 @@ -139788,16 +139788,16 @@ sub_80568CC: ; 80568CC movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 FreeAllWindowBuffers adds r0, r4, 0 bl SpeciesToNationalPokedexNum @@ -139818,20 +139818,20 @@ sub_80568CC: ; 80568CC bl sub_80BFDF4 ldr r1, =0x02024332 strb r0, [r1, 0x1] - b @08056A08 + b _08056A08 .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 cmp r1, r0 - bne @08056A2C + bne _08056A2C ldr r2, =0x03005e00 ldr r4, =0x02024332 ldrb r1, [r4, 0x1] @@ -139841,15 +139841,15 @@ sub_80568CC: ; 80568CC adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - bne @08056A2C + bne _08056A2C ldr r0, =vblank_cb_08078BB4 bl SetVBlankCallback ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @08056A2C + b _08056A2C .pool -@080569C8: +_080569C8: bl c2_berry_program_update_menu bl sub_8035AA4 ldr r1, =0x02022e20 @@ -139857,14 +139857,14 @@ sub_80568CC: ; 80568CC lsls r2, 1 adds r0, r2, 0 strh r0, [r1] - b @08056A06 + b _08056A06 .pool -@080569E0: +_080569E0: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @08056A2C + bne _08056A2C ldr r0, =0x0000ffff str r1, [sp] movs r1, 0 @@ -139875,26 +139875,26 @@ sub_80568CC: ; 80568CC bl ShowBg movs r0, 0x3 bl ShowBg -@08056A06: +_08056A06: ldr r1, =0x02024332 -@08056A08: +_08056A08: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08056A2C + b _08056A2C .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} @@ -139931,88 +139931,88 @@ 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 .pool -@08056A9C: +_08056A9C: ldr r2, [sp, 0x1C] cmp r4, r2 - bne @08056AAC + bne _08056AAC ldr r0, =0x00001024 - b @08056AFE + b _08056AFE .pool -@08056AAC: +_08056AAC: ldr r0, =0x00001023 - b @08056AFE + b _08056AFE .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 .pool -@08056AC8: +_08056AC8: ldr r0, [sp, 0x1C] cmp r4, r0 - bne @08056AD8 + bne _08056AD8 ldr r0, =0x0000102a - b @08056AFE + b _08056AFE .pool -@08056AD8: +_08056AD8: ldr r0, =0x00001029 - b @08056AFE + b _08056AFE .pool -@08056AE0: +_08056AE0: cmp r4, r8 - bne @08056AEC + bne _08056AEC ldr r0, =0x00001025 - b @08056AFE + b _08056AFE .pool -@08056AEC: +_08056AEC: ldr r2, [sp, 0x1C] cmp r4, r2 - bne @08056AFC + bne _08056AFC ldr r0, =0x00001027 - b @08056AFE + b _08056AFE .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] @@ -140024,9 +140024,9 @@ sub_8056A3C: ; 8056A3C mov r7, r9 lsrs r3, r7, 24 bl CopyToBgTilemapBufferRect_ChangePalette - b @08056B50 + b _08056B50 .pool -@08056B38: +_08056B38: lsls r2, r4, 24 lsrs r2, 24 str r1, [sp] @@ -140038,18 +140038,18 @@ sub_8056A3C: ; 8056A3C mov r7, r9 lsrs r3, r7, 24 bl CopyToBgTilemapBufferRect_ChangePalette -@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 @@ -140134,23 +140134,23 @@ 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 .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 @@ -140168,18 +140168,18 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC strb r4, [r1, 0x1] movs r0, 0 bl sub_8056B74 - b @08056E62 + b _08056E62 .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] @@ -140187,17 +140187,17 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC 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] @@ -140205,50 +140205,50 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC 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 .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 .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 @@ -140328,20 +140328,20 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08056E62 + b _08056E62 .pool -@08056DD4: +_08056DD4: ldr r0, =0x030022c0 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 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] @@ -140359,21 +140359,21 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC adds r2, 0x6D movs r1, 0x2 bl pokemon_setattr - b @08056E48 + b _08056E48 .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 .pool -@08056E48: +_08056E48: ldr r3, =0x02024214 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -140387,7 +140387,7 @@ atkF3_receive_new_pokemon_maybe: ; 8056BEC lsls r0, 24 orrs r1, r0 str r1, [r3] -@08056E62: +_08056E62: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -140493,9 +140493,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 @@ -140560,7 +140560,7 @@ sub_8056F28: ; 8056F28 lsls r1, 20 ands r0, r1 cmp r0, 0 - beq @08056FFA + beq _08056FFA ldr r0, =0x00004054 bl VarGet lsls r0, 16 @@ -140574,7 +140574,7 @@ sub_8056F28: ; 8056F28 ldr r0, [r2] adds r0, r1 bl create_enemy_party -@08056FFA: +_08056FFA: pop {r4-r6} pop {r0} bx r0 @@ -140590,13 +140590,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 @@ -140653,7 +140653,7 @@ sub_8057028: ; 8057028 ldr r0, [r4] bl Free str r5, [r4] -@080570D0: +_080570D0: pop {r4-r6} pop {r0} bx r0 @@ -140670,7 +140670,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 @@ -140691,16 +140691,16 @@ sub_80570F4: ; 80570F4 ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bls @0805714A + bls _0805714A adds r4, r3, 0 - b @0805714A + b _0805714A .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 @@ -140716,11 +140716,11 @@ sub_80570F4: ; 80570F4 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 @@ -140731,9 +140731,9 @@ sub_80570F4: ; 80570F4 adds r0, r1 movs r1, 0x8 bl happiness_algorithm - b @080571CE + b _080571CE .pool -@08057198: +_08057198: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -140744,9 +140744,9 @@ sub_80570F4: ; 80570F4 adds r0, r1 movs r1, 0x6 bl happiness_algorithm - b @080571CE + b _080571CE .pool -@080571B8: +_080571B8: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -140757,7 +140757,7 @@ sub_80570F4: ; 80570F4 adds r0, r1 movs r1, 0x6 bl happiness_algorithm -@080571CE: +_080571CE: pop {r4,r5} pop {r0} bx r0 @@ -140776,13 +140776,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 @@ -140791,7 +140791,7 @@ sub_80571DC: ; 80571DC strb r1, [r0] adds r2, 0x1 cmp r2, 0x2 - ble @080571FE + ble _080571FE adds r0, r3, r6 ldrb r0, [r0] bl pokemon_order_func @@ -140808,7 +140808,7 @@ sub_80571DC: ; 80571DC movs r2, 0 ldr r4, =0x0202449c ldr r3, =0x0203cf00 -@08057236: +_08057236: ldr r0, [r4] adds r0, r2, r0 adds r0, 0x60 @@ -140817,8 +140817,8 @@ sub_80571DC: ; 80571DC strb r1, [r0] adds r2, 0x1 cmp r2, 0x2 - ble @08057236 -@08057248: + ble _08057236 +_08057248: pop {r4-r7} pop {r0} bx r0 @@ -140840,28 +140840,28 @@ sub_805725C: ; 805725C mov r8, r0 ldr r1, =0x02024332 mov r10, r1 - b @08057284 + b _08057284 .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 @@ -140873,12 +140873,12 @@ sub_805725C: ; 805725C 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 @@ -140900,31 +140900,31 @@ sub_805725C: ; 805725C str r0, [r1] movs r0, 0x2 mov r8, r0 - b @08057372 + b _08057372 .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 @@ -140936,15 +140936,15 @@ sub_805725C: ; 805725C movs r0, 0x7 ands r4, r0 cmp r4, 0 - beq @08057354 + beq _08057354 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB213 str r0, [r1] movs r1, 0x2 mov r8, r1 - b @08057372 + b _08057372 .pool -@08057354: +_08057354: adds r2, 0x50 adds r2, r1, r2 ldr r0, [r2] @@ -140959,15 +140959,15 @@ sub_805725C: ; 805725C 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 .pool -@08057390: +_08057390: ldr r1, =0x02024084 movs r0, 0x58 mov r2, r9 @@ -140979,7 +140979,7 @@ sub_805725C: ; 805725C movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq @080573F4 + beq _080573F4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -140988,13 +140988,13 @@ sub_805725C: ; 805725C lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq @080573D4 + beq _080573D4 ldr r1, =0x02024214 ldr r0, =gUnknown_082DB26A str r0, [r1] - b @080573EC + b _080573EC .pool -@080573D4: +_080573D4: ldr r0, [r4] movs r1, 0x21 negs r1, r1 @@ -141006,26 +141006,26 @@ sub_805725C: ; 805725C 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] @@ -141042,7 +141042,7 @@ sub_805725C: ; 805725C 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} @@ -141094,7 +141094,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] @@ -141108,9 +141108,9 @@ dp01_tbl1_exec_completed: ; 805748C adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @080574F2 + b _080574F2 .pool -@080574E0: +_080574E0: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -141120,7 +141120,7 @@ dp01_tbl1_exec_completed: ; 805748C ldr r0, [r2] bics r0, r1 str r0, [r2] -@080574F2: +_080574F2: add sp, 0x4 pop {r4} pop {r0} @@ -141141,24 +141141,24 @@ 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, =gUnknown_0831C514 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @08057550 + b _08057550 .pool -@0805754C: +_0805754C: bl dp01_tbl1_exec_completed -@08057550: +_08057550: pop {r0} bx r0 thumb_func_end bx_exec_buffer_A_ch0_tbl1 @@ -141179,9 +141179,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 .pool @@ -141216,21 +141216,21 @@ 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 .pool -@080575EC: +_080575EC: ldr r1, =0x020244cc movs r0, 0 -@080575F0: +_080575F0: strb r0, [r1] ldr r0, =0x030022c0 ldrh r2, [r0, 0x2E] @@ -141238,7 +141238,7 @@ sub_8057588: ; 8057588 adds r0, r3, 0 ands r0, r2 cmp r0, 0 - beq @08057658 + beq _08057658 movs r0, 0x5 bl audio_play ldr r1, =0x020244ac @@ -141247,42 +141247,42 @@ sub_8057588: ; 8057588 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 .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] @@ -141291,9 +141291,9 @@ sub_8057588: ; 8057588 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] @@ -141304,13 +141304,13 @@ sub_8057588: ; 8057588 adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b @08057732 + b _08057732 .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] @@ -141319,9 +141319,9 @@ sub_8057588: ; 8057588 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] @@ -141332,14 +141332,14 @@ sub_8057588: ; 8057588 adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b @08057732 + b _08057732 .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] @@ -141348,14 +141348,14 @@ sub_8057588: ; 8057588 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @080577E8 - b @0805771A + beq _080577E8 + b _0805771A .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] @@ -141364,8 +141364,8 @@ sub_8057588: ; 8057588 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @080577E8 -@0805771A: + bne _080577E8 +_0805771A: movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -141376,7 +141376,7 @@ sub_8057588: ; 8057588 adds r1, r5 ldrb r0, [r1] movs r2, 0x2 -@08057732: +_08057732: eors r0, r2 strb r0, [r1] ldrb r0, [r4] @@ -141384,29 +141384,29 @@ sub_8057588: ; 8057588 ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - b @080577E8 + b _080577E8 .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 @@ -141418,11 +141418,11 @@ sub_8057588: ; 8057588 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 @@ -141430,31 +141430,31 @@ sub_8057588: ; 8057588 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 .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 @@ -141500,49 +141500,49 @@ 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 .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 @@ -141573,17 +141573,17 @@ sub_8057824: ; 8057824 movs r1, 0x1 bl dp11b_obj_free bl dp01_tbl1_exec_completed - b @08057BC8 + b _08057BC8 .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 @@ -141619,15 +141619,15 @@ sub_8057824: ; 8057824 ldrb r0, [r5] movs r1, 0x1 bl dp11b_obj_free - b @08057BC8 + b _08057BC8 .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 @@ -141644,31 +141644,31 @@ sub_8057824: ; 8057824 ldr r1, =sub_8039B2C 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 .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] @@ -141679,32 +141679,32 @@ sub_8057824: ; 8057824 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 .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 @@ -141728,10 +141728,10 @@ sub_8057824: ; 8057824 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, =gUnknown_0832A328 @@ -141742,20 +141742,20 @@ sub_8057824: ; 8057824 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 .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 @@ -141772,31 +141772,31 @@ sub_8057824: ; 8057824 ldr r1, =sub_8039B2C 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 .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] @@ -141807,32 +141807,32 @@ sub_8057824: ; 8057824 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 .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 @@ -141856,10 +141856,10 @@ sub_8057824: ; 8057824 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, =gUnknown_0832A328 @@ -141870,12 +141870,12 @@ sub_8057824: ; 8057824 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] @@ -141888,7 +141888,7 @@ sub_8057824: ; 8057824 adds r0, r2 ldr r1, =sub_8039AD8 str r1, [r0] -@08057BC8: +_08057BC8: add sp, 0x4 pop {r4,r5} pop {r0} @@ -141914,30 +141914,30 @@ 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 .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 @@ -141949,11 +141949,11 @@ sub_8057BFC: ; 8057BFC 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 @@ -141962,9 +141962,9 @@ sub_8057BFC: ; 8057BFC asrs r4, r0, 31 movs r0, 0x10 ands r4, r0 - b @08057CA6 + b _08057CA6 .pool -@08057C98: +_08057C98: ldr r2, =gBattleMoves ldrh r1, [r1] lsls r0, r1, 1 @@ -141972,18 +141972,18 @@ sub_8057BFC: ; 8057BFC 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 .pool -@08057CC4: +_08057CC4: ldr r0, =0x02024064 ldrb r0, [r0] bl battle_get_per_side_status @@ -141995,7 +141995,7 @@ sub_8057BFC: ; 8057BFC bl battle_get_side_with_given_state ldr r1, =0x03005d74 strb r0, [r1] -@08057CDE: +_08057CDE: ldr r5, =0x02023064 ldr r0, =0x02024064 ldrb r3, [r0] @@ -142005,28 +142005,28 @@ sub_8057BFC: ; 8057BFC 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 .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 @@ -142035,29 +142035,29 @@ sub_8057BFC: ; 8057BFC 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 @@ -142066,9 +142066,9 @@ sub_8057BFC: ; 8057BFC ldrb r0, [r0] lsls r0, 8 orrs r2, r0 - b @08057E1C + b _08057E1C .pool -@08057D80: +_08057D80: ldr r1, =0x03005d60 ldrb r0, [r7] lsls r0, 2 @@ -142078,12 +142078,12 @@ sub_8057BFC: ; 8057BFC movs r0, 0x12 ands r4, r0 cmp r4, 0 - beq @08057DA8 + beq _08057DA8 ldr r1, =0x03005d74 ldrb r0, [r7] - b @08057DD8 + b _08057DD8 .pool -@08057DA8: +_08057DA8: movs r0, 0x1 bl battle_get_side_with_given_state ldr r1, =0x02024210 @@ -142095,16 +142095,16 @@ sub_8057BFC: ; 8057BFC ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08057DD0 + beq _08057DD0 movs r0, 0x3 - b @08057DD2 + b _08057DD2 .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 @@ -142118,33 +142118,33 @@ sub_8057BFC: ; 8057BFC adds r2, 0x1C adds r0, r2 ldr r1, =sub_8039AD8 - b @08057F9C + b _08057F9C .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 .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 @@ -142152,9 +142152,9 @@ sub_8057BFC: ; 8057BFC 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] @@ -142162,13 +142162,13 @@ sub_8057BFC: ; 8057BFC ldrb r0, [r1] movs r2, 0x1 eors r0, r2 - b @08057F08 + b _08057F08 .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 @@ -142177,30 +142177,30 @@ sub_8057BFC: ; 8057BFC 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 .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 @@ -142208,7 +142208,7 @@ sub_8057BFC: ; 8057BFC 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] @@ -142216,13 +142216,13 @@ sub_8057BFC: ; 8057BFC ldrb r0, [r1] movs r2, 0x2 eors r0, r2 - b @08057F08 + b _08057F08 .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 @@ -142231,20 +142231,20 @@ sub_8057BFC: ; 8057BFC 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 @@ -142255,22 +142255,22 @@ sub_8057BFC: ; 8057BFC bl battle_menu_cursor_related_2 bl sub_8059B3C bl sub_8059BB0 - b @08057F9E + b _08057F9E .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 @@ -142281,17 +142281,17 @@ sub_8057BFC: ; 8057BFC adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @08057F78 + beq _08057F78 ldr r0, =0x03005d74 strb r5, [r0] - b @08057F80 + b _08057F80 .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 @@ -142304,9 +142304,9 @@ sub_8057BFC: ; 8057BFC lsls r0, 2 adds r0, r1 ldr r1, =sub_8058138 -@08057F9C: +_08057F9C: str r1, [r0] -@08057F9E: +_08057F9E: pop {r3} mov r8, r3 pop {r4-r7} @@ -142325,16 +142325,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 @@ -142346,12 +142346,12 @@ sub_8057FBC: ; 8057FBC 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] @@ -142360,7 +142360,7 @@ sub_8057FBC: ; 8057FBC 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] @@ -142376,13 +142376,13 @@ sub_8057FBC: ; 8057FBC 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] @@ -142392,13 +142392,13 @@ sub_8057FBC: ; 8057FBC 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] @@ -142413,13 +142413,13 @@ sub_8057FBC: ; 8057FBC 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] @@ -142428,7 +142428,7 @@ sub_8057FBC: ; 8057FBC movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @080580C8 + beq _080580C8 ldrb r0, [r2] bl battle_menu_cursor_related ldrb r1, [r4] @@ -142444,13 +142444,13 @@ sub_8057FBC: ; 8057FBC 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] @@ -142460,13 +142460,13 @@ sub_8057FBC: ; 8057FBC 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] @@ -142481,7 +142481,7 @@ sub_8057FBC: ; 8057FBC ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 -@08058116: +_08058116: adds r0, r7, 0 pop {r4-r7} pop {r1} @@ -142502,9 +142502,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 @@ -142517,9 +142517,9 @@ sub_8058138: ; 8058138 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 @@ -142586,7 +142586,7 @@ sub_8058138: ; 8058138 ldr r0, [r0] ands r2, r0 cmp r2, 0 - beq @0805822A + beq _0805822A lsrs r1, r3, 28 bics r1, r0 lsls r1, 4 @@ -142613,7 +142613,7 @@ sub_8058138: ; 8058138 ands r2, r4 orrs r2, r0 strb r2, [r1, 0x18] -@0805822A: +_0805822A: bl sub_8059AAC movs r6, 0 mov r12, r7 @@ -142631,7 +142631,7 @@ sub_8058138: ; 8058138 mov r7, r8 mov r10, r2 movs r5, 0x3 -@0805824E: +_0805824E: mov r1, sp adds r3, r1, r6 ldrb r1, [r4] @@ -142643,7 +142643,7 @@ sub_8058138: ; 8058138 strb r1, [r3] adds r6, 0x1 cmp r6, 0x3 - ble @0805824E + ble _0805824E ldr r1, =0x020244b0 ldrb r0, [r7] adds r0, r1 @@ -142672,7 +142672,7 @@ sub_8058138: ; 8058138 strb r3, [r2] movs r6, 0 ldr r2, [sp, 0x1C] -@0805829E: +_0805829E: mov r3, sp adds r0, r3, r6 ldrb r1, [r0] @@ -142683,7 +142683,7 @@ sub_8058138: ; 8058138 strb r0, [r2] adds r6, 0x1 cmp r6, 0x3 - ble @0805829E + ble _0805829E ldrb r1, [r7] movs r0, 0x58 muls r0, r1 @@ -142702,7 +142702,7 @@ sub_8058138: ; 8058138 mov r7, r10 adds r7, 0xC mov r5, r12 -@080582D8: +_080582D8: lsls r1, r6, 1 ldrb r0, [r4] muls r0, r3 @@ -142721,7 +142721,7 @@ sub_8058138: ; 8058138 adds r2, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @080582D8 + ble _080582D8 ldr r2, =0x02024064 ldrb r1, [r2] movs r0, 0x58 @@ -142734,9 +142734,9 @@ sub_8058138: ; 8058138 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 @@ -142749,7 +142749,7 @@ sub_8058138: ; 8058138 movs r7, 0x64 ldr r5, =0x020244ec adds r4, r1, 0 -@08058332: +_08058332: mov r1, r8 ldrb r0, [r1] lsls r0, 1 @@ -142777,7 +142777,7 @@ sub_8058138: ; 8058138 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @08058332 + ble _08058332 ldr r1, =0x0202406e ldr r0, =0x02024064 ldrb r0, [r0] @@ -142795,7 +142795,7 @@ sub_8058138: ; 8058138 movs r6, 0 movs r5, 0x3 ldr r4, [sp, 0x1C] -@08058392: +_08058392: mov r0, sp adds r3, r0, r6 lsls r2, r6, 1 @@ -142807,7 +142807,7 @@ sub_8058138: ; 8058138 strb r0, [r3] adds r6, 0x1 cmp r6, 0x3 - ble @08058392 + ble _08058392 ldr r4, =0x020244b0 ldr r3, =0x02024064 ldrb r0, [r3] @@ -142866,7 +142866,7 @@ sub_8058138: ; 8058138 strb r5, [r2] movs r6, 0 ldr r2, [sp, 0x1C] -@0805841E: +_0805841E: mov r3, sp adds r0, r3, r6 ldrb r1, [r0] @@ -142877,7 +142877,7 @@ sub_8058138: ; 8058138 strb r0, [r2] adds r6, 0x1 cmp r6, 0x3 - ble @0805841E + ble _0805841E movs r6, 0 ldr r5, =0x0202406e mov r10, r5 @@ -142889,7 +142889,7 @@ sub_8058138: ; 8058138 ldr r5, [sp, 0x20] adds r5, 0x8 ldr r4, [sp, 0x20] -@0805844A: +_0805844A: mov r2, r9 ldrb r0, [r2] lsls r0, 1 @@ -142920,7 +142920,7 @@ sub_8058138: ; 8058138 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @0805844A + ble _0805844A ldr r1, =0x0202406e ldr r0, =0x02024064 ldrb r0, [r0] @@ -142934,7 +142934,7 @@ sub_8058138: ; 8058138 movs r1, 0x15 ldr r2, [sp, 0x1C] bl pokemon_setattr -@080584A8: +_080584A8: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -142953,13 +142953,13 @@ sub_8058138: ; 8058138 ldrb r0, [r0] movs r1, 0 bl battle_menu_cursor_related_2 - b @08058532 + b _08058532 .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 @@ -142978,108 +142978,108 @@ sub_8058138: ; 8058138 adds r0, r1 ldr r1, =sub_8057BFC str r1, [r0] -@08058532: +_08058532: bl sub_8059B18 bl sub_8059B3C bl sub_8059BB0 - b @080586E8 + b _080586E8 .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 .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 .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 .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 .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 @@ -143091,45 +143091,45 @@ sub_8058138: ; 8058138 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 .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 .pool -@080586A4: +_080586A4: ldrb r0, [r3] bl battle_menu_cursor_related -@080586AA: +_080586AA: ldr r4, =0x03005d74 ldrb r0, [r4] movs r1, 0x2 @@ -143144,18 +143144,18 @@ sub_8058138: ; 8058138 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 .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 @@ -143172,11 +143172,11 @@ sub_80586F8: ; 80586F8 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 @@ -143195,17 +143195,17 @@ sub_80586F8: ; 80586F8 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - bne @08058738 + bne _08058738 bl sub_817E3F4 -@08058738: +_08058738: bl FreeAllWindowBuffers - b @08058798 + b _08058798 .pool -@0805875C: +_0805875C: bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq @08058798 + beq _08058798 movs r0, 0x5A bl m4aSongNumStop ldr r3, =0x030022c0 @@ -143224,11 +143224,11 @@ sub_80586F8: ; 80586F8 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - bne @08058794 + bne _08058794 bl sub_817E3F4 -@08058794: +_08058794: bl FreeAllWindowBuffers -@08058798: +_08058798: pop {r0} bx r0 .pool @@ -143242,27 +143242,27 @@ sub_80587B0: ; 80587B0 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 .pool -@080587F0: +_080587F0: bl sub_800ADF8 -@080587F4: +_080587F4: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -143270,9 +143270,9 @@ sub_80587B0: ; 80587B0 adds r0, r1 ldr r1, =sub_80586F8 str r1, [r0] - b @08058832 + b _08058832 .pool -@08058810: +_08058810: movs r0, 0x5A bl m4aSongNumStop ldr r2, =0x030022c0 @@ -143288,7 +143288,7 @@ sub_80587B0: ; 80587B0 str r0, [r2] ldr r0, [r2, 0x8] bl SetMainCallback2 -@08058832: +_08058832: pop {r0} bx r0 .pool @@ -143311,9 +143311,9 @@ sub_8058844: ; 8058844 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08058868 + bne _08058868 bl dp01_tbl1_exec_completed -@08058868: +_08058868: pop {r0} bx r0 .pool @@ -143336,9 +143336,9 @@ sub_805887C: ; 805887C ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @080588A0 + bne _080588A0 bl dp01_tbl1_exec_completed -@080588A0: +_080588A0: pop {r0} bx r0 .pool @@ -143362,7 +143362,7 @@ bx_802F7A0: ; 80588B4 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08058908 + bne _08058908 ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -143384,7 +143384,7 @@ bx_802F7A0: ; 80588B4 adds r0, r6 bl RemoveObjectAndFreeTiles bl dp01_tbl1_exec_completed -@08058908: +_08058908: pop {r4-r6} pop {r0} bx r0 @@ -143409,7 +143409,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] @@ -143420,7 +143420,7 @@ sub_8058924: ; 8058924 movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl1_exec_completed -@0805895C: +_0805895C: pop {r4} pop {r0} bx r0 @@ -143438,18 +143438,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 @@ -143465,10 +143465,10 @@ sub_805896C: ; 805896C ldr r0, =DummyObjectCallback mov r10, r3 cmp r1, r0 - bne @08058A0A - b @08058A0E + bne _08058A0A + b _08058A0E .pool -@080589D0: +_080589D0: ldr r3, =0x02020630 ldr r6, =0x03005d70 ldr r2, =0x02024064 @@ -143485,7 +143485,7 @@ sub_805896C: ; 805896C ldr r0, =DummyObjectCallback mov r10, r2 cmp r3, r0 - bne @08058A0A + bne _08058A0A movs r0, 0x2 eors r4, r0 adds r0, r4, r6 @@ -143496,12 +143496,12 @@ sub_805896C: ; 805896C 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] @@ -143517,7 +143517,7 @@ sub_805896C: ; 805896C adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq @08058B08 + beq _08058B08 movs r1, 0x2 mov r8, r1 mov r1, r8 @@ -143530,7 +143530,7 @@ sub_805896C: ; 805896C adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq @08058B08 + beq _08058B08 ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -143594,7 +143594,7 @@ sub_805896C: ; 805896C bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq @08058AE4 + beq _08058AE4 ldrb r0, [r6] mov r1, r8 eors r1, r0 @@ -143604,7 +143604,7 @@ sub_805896C: ; 805896C muls r0, r5 adds r0, r4 bl sub_805E990 -@08058AE4: +_08058AE4: mov r2, r9 ldr r0, [r2] mov r2, r10 @@ -143623,7 +143623,7 @@ sub_805896C: ; 805896C adds r0, r1 ldr r1, =sub_8058924 str r1, [r0] -@08058B08: +_08058B08: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -143657,7 +143657,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] @@ -143667,7 +143667,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 @@ -143682,7 +143682,7 @@ sub_8058B40: ; 8058B40 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne @08058BB2 + bne _08058BB2 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -143692,7 +143692,7 @@ sub_8058B40: ; 8058B40 adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -@08058BB2: +_08058BB2: ldr r0, [r4] ldrb r2, [r7] ldr r3, [r0, 0x4] @@ -143705,7 +143705,7 @@ sub_8058B40: ; 8058B40 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 @@ -143716,22 +143716,22 @@ sub_8058B40: ; 8058B40 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 @@ -143756,7 +143756,7 @@ sub_8058B40: ; 8058B40 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@08058C38: +_08058C38: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -143778,7 +143778,7 @@ sub_8058B40: ; 8058B40 adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -@08058C68: +_08058C68: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -143792,7 +143792,7 @@ sub_8058B40: ; 8058B40 movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x1] -@08058C82: +_08058C82: ldr r5, =0x020244d0 ldr r0, [r5] ldr r4, =0x02024064 @@ -143806,7 +143806,7 @@ sub_8058B40: ; 8058B40 movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne @08058D32 + bne _08058D32 movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -143817,11 +143817,11 @@ sub_8058B40: ; 8058B40 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] @@ -143833,24 +143833,24 @@ sub_8058B40: ; 8058B40 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 .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 @@ -143866,22 +143866,22 @@ sub_8058B40: ; 8058B40 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 @@ -143896,7 +143896,7 @@ sub_8058B40: ; 8058B40 ldr r3, [r0] ldr r0, =DummyObjectCallback cmp r3, r0 - bne @08058E0A + bne _08058E0A ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] @@ -143906,10 +143906,10 @@ sub_8058B40: ; 8058B40 adds r0, r2 ldr r0, [r0] cmp r0, r3 - bne @08058E0A - b @08058E06 + bne _08058E0A + b _08058E06 .pool -@08058DAC: +_08058DAC: ldr r2, =0x02020630 ldr r7, =0x03005d7c ldr r0, =0x02024064 @@ -143924,7 +143924,7 @@ sub_8058B40: ; 8058B40 ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - bne @08058E0A + bne _08058E0A ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] @@ -143934,7 +143934,7 @@ sub_8058B40: ; 8058B40 adds r0, r2 ldr r5, [r0] cmp r5, r4 - bne @08058E0A + bne _08058E0A movs r0, 0x2 eors r3, r0 adds r0, r3, r7 @@ -143945,7 +143945,7 @@ sub_8058B40: ; 8058B40 adds r0, r2 ldr r4, [r0] cmp r4, r5 - bne @08058E0A + bne _08058E0A adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -143954,27 +143954,27 @@ sub_8058B40: ; 8058B40 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] @@ -143988,7 +143988,7 @@ sub_8058B40: ; 8058B40 ldr r1, =0x02020630 adds r0, r1 bl RemoveObjectAndFreeTiles -@08058E48: +_08058E48: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -144037,7 +144037,7 @@ sub_8058B40: ; 8058B40 adds r0, r1 ldr r1, =sub_805896C str r1, [r0] -@08058EAA: +_08058EAA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -144064,7 +144064,7 @@ sub_8058EDC: ; 8058EDC ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - bne @08058F94 + bne _08058F94 ldr r5, =0x020244d0 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -144076,7 +144076,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] @@ -144086,7 +144086,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] @@ -144126,19 +144126,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 str r0, [r1] -@08058F94: +_08058F94: pop {r4-r6} pop {r0} bx r0 @@ -144161,11 +144161,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 @@ -144182,7 +144182,7 @@ sub_8058FC0: ; 8058FC0 adds r0, r2 bl sub_805E990 bl dp01_tbl1_exec_completed -@0805900E: +_0805900E: pop {r4} pop {r0} bx r0 @@ -144205,7 +144205,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] @@ -144215,7 +144215,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] @@ -144230,7 +144230,7 @@ sub_805902C: ; 805902C ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @080590D2 + bne _080590D2 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -144241,7 +144241,7 @@ sub_805902C: ; 805902C movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @080590D2 + bne _080590D2 adds r0, r3, r4 bl RemoveObjectAndFreeTiles ldr r4, =0x03005d70 @@ -144270,7 +144270,7 @@ sub_805902C: ; 805902C adds r0, r1 ldr r1, =sub_8058EDC str r1, [r0] -@080590D2: +_080590D2: pop {r4-r6} pop {r0} bx r0 @@ -144285,7 +144285,7 @@ c3_0802FDF4: ; 8059100 bl sub_80A36C8 lsls r0, 24 cmp r0, 0 - bne @08059122 + bne _08059122 ldr r0, =0x03007420 ldr r1, =0x0000ffff movs r2, 0x80 @@ -144293,7 +144293,7 @@ c3_0802FDF4: ; 8059100 bl MPlayVolumeControl adds r0, r4, 0 bl remove_task -@08059122: +_08059122: pop {r4} pop {r0} bx r0 @@ -144323,15 +144323,15 @@ 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 .pool -@08059178: +_08059178: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -144343,7 +144343,7 @@ bx_t1_healthbar_update: ; 8059130 adds r0, r2 bl sub_805E990 bl dp01_tbl1_exec_completed -@08059192: +_08059192: pop {r4-r6} pop {r0} bx r0 @@ -144357,9 +144357,9 @@ sub_80591A0: ; 80591A0 bl IsTextPrinterActive 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 @@ -144392,15 +144392,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 @@ -144443,7 +144443,7 @@ sub_80591B8: ; 80591B8 asrs r1, 16 adds r0, r1 cmp r0, r2 - bcc @080592EC + bcc _080592EC adds r0, r6, 0 movs r1, 0x19 mov r2, sp @@ -144469,26 +144469,26 @@ sub_80591B8: ; 80591B8 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 - b @08059316 + b _08059316 .pool -@080592D4: +_080592D4: ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 @@ -144496,9 +144496,9 @@ sub_80591B8: ; 80591B8 lsls r1, 3 adds r1, r0 ldr r0, =sub_805965C - b @08059318 + b _08059318 .pool -@080592EC: +_080592EC: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r6, 0 @@ -144512,15 +144512,15 @@ sub_80591B8: ; 80591B8 str r1, [r0] mov r0, r9 bl remove_task - b @0805931A + b _0805931A .pool -@08059314: +_08059314: ldr r0, =sub_8059330 -@08059316: +_08059316: mov r1, r8 -@08059318: +_08059318: str r0, [r1] -@0805931A: +_0805931A: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -144644,12 +144644,12 @@ 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 .pool -@08059430: +_08059430: ldrb r0, [r6, 0x8] mov r9, r0 ldrh r2, [r6, 0xA] @@ -144672,7 +144672,7 @@ sub_8059400: ; 8059400 movs r0, 0x1 negs r0, r0 cmp r4, r0 - bne @0805952C + bne _0805952C movs r0, 0x21 bl m4aSongNumStop movs r0, 0x64 @@ -144717,7 +144717,7 @@ sub_8059400: ; 8059400 ldr r0, [sp, 0x4] adds r0, r4 cmp r0, r1 - blt @08059510 + blt _08059510 adds r0, r5, 0 movs r1, 0x19 mov r2, sp @@ -144740,9 +144740,9 @@ sub_8059400: ; 8059400 strb r5, [r4] ldr r0, =sub_8059544 str r0, [r6] - b @0805952C + b _0805952C .pool -@08059510: +_08059510: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r5, 0 @@ -144755,7 +144755,7 @@ sub_8059400: ; 8059400 str r1, [r0] mov r0, r8 bl remove_task -@0805952C: +_0805952C: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -144783,7 +144783,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 @@ -144792,9 +144792,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 @@ -144835,7 +144835,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 @@ -144849,7 +144849,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 @@ -144858,16 +144858,16 @@ 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 .pool -@08059624: +_08059624: ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] @@ -144877,7 +144877,7 @@ sub_80595A4: ; 80595A4 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe -@08059638: +_08059638: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -144885,7 +144885,7 @@ sub_80595A4: ; 80595A4 adds r1, r0 ldr r0, =sub_805965C str r0, [r1] -@08059646: +_08059646: pop {r4-r7} pop {r0} bx r0 @@ -144943,7 +144943,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 @@ -144982,7 +144982,7 @@ sub_80596A8: ; 80596A8 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl1_exec_completed -@08059724: +_08059724: pop {r4-r6} pop {r0} bx r0 @@ -145005,7 +145005,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] @@ -145029,7 +145029,7 @@ sub_8059744: ; 8059744 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl1_exec_completed -@08059798: +_08059798: pop {r4-r6} pop {r0} bx r0 @@ -145043,9 +145043,9 @@ sub_80597B4: ; 80597B4 bl IsTextPrinterActive 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 @@ -145058,7 +145058,7 @@ sub_80597CC: ; 80597CC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0805980A + bne _0805980A ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -145080,7 +145080,7 @@ sub_80597CC: ; 80597CC bl FreeAllWindowBuffers adds r0, r4, 0 bl sub_81B89AC -@0805980A: +_0805980A: pop {r4} pop {r0} bx r0 @@ -145094,30 +145094,30 @@ sub_8059828: ; 8059828 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 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 .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] @@ -145128,11 +145128,11 @@ sub_8059828: ; 8059828 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 .pool @@ -145146,7 +145146,7 @@ sub_80598A4: ; 80598A4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @080598CC + bne _080598CC ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -145157,7 +145157,7 @@ sub_80598A4: ; 80598A4 bl nullsub_35 bl FreeAllWindowBuffers bl sub_81AABB0 -@080598CC: +_080598CC: pop {r0} bx r0 .pool @@ -145170,19 +145170,19 @@ sub_80598E0: ; 80598E0 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 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 .pool @@ -145194,7 +145194,7 @@ bx_wait_t1: ; 805991C ldr r0, =0x020244b9 ldrb r0, [r0] cmp r0, 0 - beq @08059942 + beq _08059942 ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -145208,10 +145208,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 .pool @@ -145233,7 +145233,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] @@ -145246,14 +145246,14 @@ bx_blink_t1: ; 8059958 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl1_exec_completed - b @080599CE + b _080599CE .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] @@ -145267,11 +145267,11 @@ bx_blink_t1: ; 8059958 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 @@ -145286,11 +145286,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] @@ -145299,17 +145299,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] @@ -145318,14 +145318,14 @@ sub_80599D4: ; 80599D4 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 @@ -145337,27 +145337,27 @@ sub_80599D4: ; 80599D4 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 .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 @@ -145368,7 +145368,7 @@ sub_80599D4: ; 80599D4 movs r0, 0x5 bl audio_play bl dp01_tbl1_exec_completed -@08059AA0: +_08059AA0: add sp, 0x4 pop {r4} pop {r0} @@ -145390,7 +145390,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 @@ -145408,15 +145408,15 @@ sub_8059AAC: ; 8059AAC 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 @@ -145450,7 +145450,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 @@ -145483,7 +145483,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 @@ -145720,9 +145720,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 .pool @@ -145744,9 +145744,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 .pool @@ -145760,7 +145760,7 @@ b_link_standby_message: ; 8059DC0 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq @08059DE0 + beq _08059DE0 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -145769,7 +145769,7 @@ b_link_standby_message: ; 8059DC0 ldr r0, =gUnknown_085CCA29 movs r1, 0 bl battle_show_message_maybe -@08059DE0: +_08059DE0: pop {r0} bx r0 .pool @@ -145788,7 +145788,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 @@ -145796,28 +145796,28 @@ dp01t_00_1_getattr: ; 8059DF4 mov r1, sp bl dp01_getattr_by_ch1_for_player_pokemon_ adds r6, r0, 0 - b @08059E4E + b _08059E4E .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 @@ -145850,78 +145850,78 @@ 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 .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 @@ -145958,7 +145958,7 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@08059FE4: +_08059FE4: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -145974,7 +145974,7 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @08059FE4 + ble _08059FE4 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -146152,33 +146152,33 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 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 .pool -@0805A1BC: +_0805A1BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b @0805A536 + b _0805A536 .pool -@0805A1CC: +_0805A1CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b @0805A536 + b _0805A536 .pool -@0805A1DC: +_0805A1DC: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -146190,7 +146190,7 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -@0805A1F2: +_0805A1F2: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -146208,7 +146208,7 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @0805A1F2 + ble _0805A1F2 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -146219,17 +146219,17 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 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 .pool -@0805A244: +_0805A244: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -146240,16 +146240,16 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @0805A536 + b _0805A536 .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 @@ -146259,7 +146259,7 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @0805A26C + ble _0805A26C movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -146269,9 +146269,9 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @0805A5FE + b _0805A5FE .pool -@0805A29C: +_0805A29C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -146282,23 +146282,23 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @0805A5F6 + b _0805A5F6 .pool -@0805A2B8: +_0805A2B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b @0805A2D2 + b _0805A2D2 .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] @@ -146313,105 +146313,105 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @0805A5FE + b _0805A5FE .pool -@0805A2F8: +_0805A2F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b @0805A5F6 + b _0805A5F6 .pool -@0805A308: +_0805A308: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b @0805A5F6 + b _0805A5F6 .pool -@0805A318: +_0805A318: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b @0805A5F6 + b _0805A5F6 .pool -@0805A328: +_0805A328: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b @0805A5F6 + b _0805A5F6 .pool -@0805A338: +_0805A338: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b @0805A5F6 + b _0805A5F6 .pool -@0805A348: +_0805A348: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b @0805A5F6 + b _0805A5F6 .pool -@0805A358: +_0805A358: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b @0805A5F6 + b _0805A5F6 .pool -@0805A368: +_0805A368: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b @0805A5F6 + b _0805A5F6 .pool -@0805A378: +_0805A378: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b @0805A5F6 + b _0805A5F6 .pool -@0805A388: +_0805A388: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b @0805A5F6 + b _0805A5F6 .pool -@0805A398: +_0805A398: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b @0805A5F6 + b _0805A5F6 .pool -@0805A3A8: +_0805A3A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b @0805A5F6 + b _0805A5F6 .pool -@0805A3B8: +_0805A3B8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -146442,79 +146442,79 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @0805A5FE + b _0805A5FE .pool -@0805A408: +_0805A408: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b @0805A5F6 + b _0805A5F6 .pool -@0805A418: +_0805A418: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b @0805A5F6 + b _0805A5F6 .pool -@0805A428: +_0805A428: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b @0805A5F6 + b _0805A5F6 .pool -@0805A438: +_0805A438: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b @0805A5F6 + b _0805A5F6 .pool -@0805A448: +_0805A448: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b @0805A5F6 + b _0805A5F6 .pool -@0805A458: +_0805A458: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b @0805A5F6 + b _0805A5F6 .pool -@0805A468: +_0805A468: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b @0805A492 + b _0805A492 .pool -@0805A478: +_0805A478: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b @0805A536 + b _0805A536 .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] @@ -146531,71 +146531,71 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @0805A5FE + b _0805A5FE .pool -@0805A4BC: +_0805A4BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b @0805A5F6 + b _0805A5F6 .pool -@0805A4CC: +_0805A4CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b @0805A536 + b _0805A536 .pool -@0805A4DC: +_0805A4DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b @0805A536 + b _0805A536 .pool -@0805A4EC: +_0805A4EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b @0805A536 + b _0805A536 .pool -@0805A4FC: +_0805A4FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b @0805A536 + b _0805A536 .pool -@0805A50C: +_0805A50C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b @0805A536 + b _0805A536 .pool -@0805A51C: +_0805A51C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b @0805A536 + b _0805A536 .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 @@ -146603,99 +146603,99 @@ dp01_getattr_by_ch1_for_player_pokemon_: ; 8059E68 lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @0805A5FE + b _0805A5FE .pool -@0805A54C: +_0805A54C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b @0805A5F6 + b _0805A5F6 .pool -@0805A55C: +_0805A55C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b @0805A5F6 + b _0805A5F6 .pool -@0805A56C: +_0805A56C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b @0805A5F6 + b _0805A5F6 .pool -@0805A57C: +_0805A57C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b @0805A5F6 + b _0805A5F6 .pool -@0805A58C: +_0805A58C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b @0805A5F6 + b _0805A5F6 .pool -@0805A59C: +_0805A59C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b @0805A5F6 + b _0805A5F6 .pool -@0805A5AC: +_0805A5AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b @0805A5F6 + b _0805A5F6 .pool -@0805A5BC: +_0805A5BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b @0805A5F6 + b _0805A5F6 .pool -@0805A5CC: +_0805A5CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b @0805A5F6 + b _0805A5F6 .pool -@0805A5DC: +_0805A5DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b @0805A5F6 + b _0805A5F6 .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} @@ -146738,9 +146738,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] @@ -146753,8 +146753,8 @@ sub_805A614: ; 805A614 adds r0, r3 ldrb r0, [r0] cmp r2, r0 - bcc @0805A650 -@0805A66A: + bcc _0805A650 +_0805A66A: ldrb r0, [r7] lsls r0, 9 mov r1, r12 @@ -146783,32 +146783,32 @@ 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 .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} @@ -146836,78 +146836,78 @@ 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 .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 @@ -146957,7 +146957,7 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -@0805A88E: +_0805A88E: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -146974,7 +146974,7 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @0805A88E + ble _0805A88E movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -147086,9 +147086,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805A9C0: +_0805A9C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147099,9 +147099,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0xB bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805A9E0: +_0805A9E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147112,9 +147112,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0xC bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AA00: +_0805AA00: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -147128,7 +147128,7 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -@0805AA1A: +_0805AA1A: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -147145,7 +147145,7 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @0805AA1A + ble _0805AA1A movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147153,9 +147153,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AA58: +_0805AA58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147168,9 +147168,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @0805AAFC + b _0805AAFC .pool -@0805AA80: +_0805AA80: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -147211,9 +147211,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AAE4: +_0805AAE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147226,13 +147226,13 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 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 .pool -@0805AB14: +_0805AB14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147243,9 +147243,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AB34: +_0805AB34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147256,9 +147256,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AB54: +_0805AB54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147269,9 +147269,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AB74: +_0805AB74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147282,9 +147282,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AB94: +_0805AB94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147295,9 +147295,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ABB4: +_0805ABB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147308,9 +147308,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ABD4: +_0805ABD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147321,9 +147321,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ABF4: +_0805ABF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147334,9 +147334,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AC14: +_0805AC14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147347,9 +147347,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AC34: +_0805AC34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147360,9 +147360,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AC54: +_0805AC54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147373,9 +147373,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AC74: +_0805AC74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147386,9 +147386,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AC94: +_0805AC94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147399,9 +147399,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ACB4: +_0805ACB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147412,9 +147412,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ACD4: +_0805ACD4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -147460,9 +147460,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b @0805ADF4 + b _0805ADF4 .pool -@0805AD44: +_0805AD44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147473,9 +147473,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AD64: +_0805AD64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147486,9 +147486,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AD84: +_0805AD84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147499,9 +147499,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ADA4: +_0805ADA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147512,9 +147512,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ADC4: +_0805ADC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147525,9 +147525,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805ADE4: +_0805ADE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147536,12 +147536,12 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 ldrb r2, [r1] lsls r2, 9 adds r2, r7 -@0805ADF4: +_0805ADF4: movs r1, 0x2C bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AE04: +_0805AE04: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147552,9 +147552,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AE24: +_0805AE24: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147565,9 +147565,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AE44: +_0805AE44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147578,9 +147578,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AE64: +_0805AE64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147591,9 +147591,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AE84: +_0805AE84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147604,9 +147604,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AEA4: +_0805AEA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147617,9 +147617,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AEC4: +_0805AEC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147630,9 +147630,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AEE4: +_0805AEE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147643,9 +147643,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AF04: +_0805AF04: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147656,9 +147656,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AF24: +_0805AF24: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147669,9 +147669,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AF44: +_0805AF44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147682,9 +147682,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AF64: +_0805AF64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147695,9 +147695,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AF84: +_0805AF84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147708,9 +147708,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AFA4: +_0805AFA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147721,9 +147721,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AFC4: +_0805AFC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147734,9 +147734,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805AFE4: +_0805AFE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147747,9 +147747,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805B004: +_0805B004: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147760,9 +147760,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805B024: +_0805B024: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147773,9 +147773,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805B044: +_0805B044: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147786,9 +147786,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805B064: +_0805B064: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147799,9 +147799,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805B084: +_0805B084: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147812,9 +147812,9 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b @0805B0BA + b _0805B0BA .pool -@0805B0A4: +_0805B0A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -147825,7 +147825,7 @@ dp01_setattr_by_ch1_for_player_pokemon: ; 805A6F4 adds r2, r7 movs r1, 0x36 bl pokemon_setattr -@0805B0BA: +_0805B0BA: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -147873,11 +147873,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 @@ -147894,8 +147894,8 @@ sub_805B0F0: ; 805B0F0 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} @@ -148173,7 +148173,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] @@ -148188,9 +148188,9 @@ sub_805B3D4: ; 805B3D4 adds r0, r1 ldr r1, =sub_805B464 str r1, [r0] - b @0805B452 + b _0805B452 .pool -@0805B41C: +_0805B41C: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -148214,7 +148214,7 @@ sub_805B3D4: ; 805B3D4 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl1_exec_completed -@0805B452: +_0805B452: pop {r4-r6} pop {r0} bx r0 @@ -148235,12 +148235,12 @@ 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 .pool -@0805B48C: +_0805B48C: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -148248,12 +148248,12 @@ sub_805B464: ; 805B464 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] @@ -148263,15 +148263,15 @@ sub_805B464: ; 805B464 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 @@ -148284,7 +148284,7 @@ sub_805B464: ; 805B464 adds r0, r1 ldr r1, =sub_8059744 str r1, [r0] -@0805B4E2: +_0805B4E2: pop {r4-r6} pop {r0} bx r0 @@ -148302,7 +148302,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 @@ -148314,7 +148314,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 @@ -148326,8 +148326,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 @@ -148337,9 +148337,9 @@ sub_805B4F0: ; 805B4F0 adds r1, r5 ldrb r0, [r1, 0x13] adds r4, r0, 0x2 - b @0805B5BA + b _0805B5BA .pool -@0805B558: +_0805B558: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -148351,7 +148351,7 @@ sub_805B4F0: ; 805B4F0 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 @@ -148362,8 +148362,8 @@ sub_805B4F0: ; 805B4F0 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 @@ -148373,8 +148373,8 @@ sub_805B4F0: ; 805B4F0 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 @@ -148383,19 +148383,19 @@ sub_805B4F0: ; 805B4F0 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 @@ -148404,27 +148404,27 @@ sub_805B4F0: ; 805B4F0 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, =gUnknown_083054E0 - b @0805B642 + b _0805B642 .pool -@0805B618: +_0805B618: ldr r1, =gUnknown_08305D2C lsls r0, r4, 2 adds r0, r1 @@ -148437,13 +148437,13 @@ sub_805B4F0: ; 805B4F0 adds r0, r1 lsrs r7, r0, 16 ldr r5, =0x02022fec - b @0805B656 + b _0805B656 .pool -@0805B63C: +_0805B63C: movs r0, 0x50 mov r9, r0 ldr r1, =gUnknown_08305D2C -@0805B642: +_0805B642: lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] @@ -148454,22 +148454,22 @@ sub_805B4F0: ; 805B4F0 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] @@ -148586,9 +148586,9 @@ sub_805B4F0: ; 805B4F0 movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b @0805B82A + b _0805B82A .pool -@0805B794: +_0805B794: ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -148659,7 +148659,7 @@ sub_805B4F0: ; 805B4F0 adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] -@0805B82A: +_0805B82A: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -148684,7 +148684,7 @@ dp01t_08_1_8032428: ; 805B864 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq @0805B920 + beq _0805B920 bl link_get_multiplayer_id ldr r5, =0x020229e8 lsls r0, 24 @@ -148696,7 +148696,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 @@ -148708,8 +148708,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 @@ -148719,9 +148719,9 @@ dp01t_08_1_8032428: ; 805B864 adds r1, r5 ldrb r0, [r1, 0x13] adds r4, r0, 0x2 - b @0805B926 + b _0805B926 .pool -@0805B8C4: +_0805B8C4: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -148733,7 +148733,7 @@ dp01t_08_1_8032428: ; 805B864 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 @@ -148744,8 +148744,8 @@ dp01t_08_1_8032428: ; 805B864 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 @@ -148755,8 +148755,8 @@ dp01t_08_1_8032428: ; 805B864 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 @@ -148765,12 +148765,12 @@ dp01t_08_1_8032428: ; 805B864 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 @@ -148951,7 +148951,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 @@ -148959,12 +148959,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] @@ -148975,16 +148975,16 @@ sub_805BAB8: ; 805BAB8 ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b @0805BB82 + b _0805BB82 .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] @@ -149035,7 +149035,7 @@ sub_805BAB8: ; 805BAB8 adds r0, r1 ldr r1, =sub_80596A8 str r1, [r0] -@0805BB82: +_0805BB82: pop {r4-r6} pop {r0} bx r0 @@ -149144,14 +149144,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 @@ -149168,9 +149168,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] @@ -149274,11 +149274,11 @@ dp01t_0F_1_move_anim: ; 805BCA8 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq @0805BDBC + beq _0805BDBC bl dp01_tbl1_exec_completed - b @0805BDE4 + b _0805BDE4 .pool -@0805BDBC: +_0805BDBC: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] @@ -149298,7 +149298,7 @@ dp01t_0F_1_move_anim: ; 805BCA8 ldr r2, [r7] adds r0, r6, 0 bl sub_817E0FC -@0805BDE4: +_0805BDE4: pop {r3} mov r8, r3 pop {r4-r7} @@ -149341,20 +149341,20 @@ 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 .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 @@ -149362,7 +149362,7 @@ bx_move_anim_1: ; 805BDFC movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne @0805BE80 + bne _0805BE80 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -149371,7 +149371,7 @@ bx_move_anim_1: ; 805BDFC adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -@0805BE80: +_0805BE80: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -149381,13 +149381,13 @@ bx_move_anim_1: ; 805BDFC 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 @@ -149401,15 +149401,15 @@ bx_move_anim_1: ; 805BDFC 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] @@ -149421,10 +149421,10 @@ bx_move_anim_1: ; 805BDFC 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 @@ -149439,7 +149439,7 @@ bx_move_anim_1: ; 805BDFC negs r0, r0 ands r0, r2 strb r0, [r1] -@0805BF0C: +_0805BF0C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -149451,16 +149451,16 @@ bx_move_anim_1: ; 805BDFC adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @0805BF70 + b _0805BF70 .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 @@ -149481,7 +149481,7 @@ bx_move_anim_1: ; 805BDFC adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl1_exec_completed -@0805BF70: +_0805BF70: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -149534,13 +149534,13 @@ dp01t_11_1_message_for_player_only: ; 805BFE0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne @0805BFFC + bne _0805BFFC bl sub_805BF80 - b @0805C000 + b _0805C000 .pool -@0805BFFC: +_0805BFFC: bl dp01_tbl1_exec_completed -@0805C000: +_0805C000: pop {r0} bx r0 thumb_func_end dp01t_11_1_message_for_player_only @@ -149552,7 +149552,7 @@ sub_805C004: ; 805C004 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @0805C02A + bne _0805C02A ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -149565,7 +149565,7 @@ sub_805C004: ; 805C004 adds r0, r1 ldr r1, =sub_8057588 str r1, [r0] -@0805C02A: +_0805C02A: pop {r0} bx r0 .pool @@ -149586,13 +149586,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] @@ -149621,7 +149621,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 @@ -149642,11 +149642,11 @@ sub_805C0B0: ; 805C0B0 adds r0, r1 ldr r1, =sub_80599D4 str r1, [r0] - b @0805C10C + b _0805C10C .pool -@0805C108: +_0805C108: bl dp01_tbl1_exec_completed -@0805C10C: +_0805C10C: add sp, 0x4 pop {r4} pop {r0} @@ -149660,7 +149660,7 @@ sub_805C114: ; 805C114 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @0805C13E + bne _0805C13E ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -149675,7 +149675,7 @@ sub_805C114: ; 805C114 adds r0, r1 ldr r1, =sub_8057BFC str r1, [r0] -@0805C13E: +_0805C13E: pop {r0} bx r0 .pool @@ -149697,7 +149697,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] @@ -149710,7 +149710,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 .pool @@ -149725,7 +149725,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 @@ -149741,9 +149741,9 @@ dp01t_14_5_move_menu_pokedude: ; 805C1A8 lsls r0, 2 adds r0, r1 ldr r1, =sub_805C158 - b @0805C1FC + b _0805C1FC .pool -@0805C1EC: +_0805C1EC: bl sub_805C210 ldr r1, =0x03005d60 ldr r0, =0x02024064 @@ -149751,7 +149751,7 @@ dp01t_14_5_move_menu_pokedude: ; 805C1A8 lsls r0, 2 adds r0, r1 ldr r1, =sub_805C114 -@0805C1FC: +_0805C1FC: str r1, [r0] pop {r0} bx r0 @@ -149804,7 +149804,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 @@ -149815,7 +149815,7 @@ sub_805C248: ; 805C248 strb r1, [r0] adds r3, 0x1 cmp r3, 0x2 - ble @0805C276 + ble _0805C276 add sp, 0x4 pop {r4,r5} pop {r0} @@ -149839,7 +149839,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 @@ -149850,13 +149850,13 @@ sub_805C2AC: ; 805C2AC 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 @@ -149866,7 +149866,7 @@ sub_805C2AC: ; 805C2AC movs r0, 0xF ands r0, r1 cmp r0, 0x2 - beq @0805C330 + beq _0805C330 ldr r1, =0x0202406e lsls r0, r3, 1 adds r0, r1 @@ -149878,9 +149878,9 @@ sub_805C2AC: ; 805C2AC mov r2, r12 bl dp01_build_cmdbuf_x22_a_three_bytes bl dp01_tbl1_exec_completed - b @0805C3BC + b _0805C3BC .pool -@0805C330: +_0805C330: ldr r0, =nullsub_4 movs r1, 0xFF bl AddTask @@ -149949,7 +149949,7 @@ sub_805C2AC: ; 805C2AC ldr r1, =0x020244b8 ldrb r0, [r4] strb r0, [r1] -@0805C3BC: +_0805C3BC: add sp, 0x4 pop {r3} mov r8, r3 @@ -150003,15 +150003,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] @@ -150043,9 +150043,9 @@ sub_805C410: ; 805C410 str r7, [sp] mov r2, r8 bl sub_807294C - b @0805C4F2 + b _0805C4F2 .pool -@0805C4B4: +_0805C4B4: ldr r1, =0x0202406e mov r2, r9 ldrb r0, [r2] @@ -150074,7 +150074,7 @@ sub_805C410: ; 805C410 movs r1, 0 movs r2, 0 bl heathbar_draw_hp -@0805C4F2: +_0805C4F2: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -150111,11 +150111,11 @@ 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 .pool -@0805C560: +_0805C560: movs r0, 0x1 bl load_gfxc_health_bar adds r0, r4, 0 @@ -150151,7 +150151,7 @@ sub_805C528: ; 805C528 adds r0, r1 ldr r1, =nullsub_21 str r1, [r0] -@0805C5AC: +_0805C5AC: pop {r4-r7} pop {r0} bx r0 @@ -150166,7 +150166,7 @@ sub_805C5C4: ; 805C5C4 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @0805C618 + bne _0805C618 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -150200,7 +150200,7 @@ sub_805C5C4: ; 805C5C4 adds r0, r1 ldr r1, =sub_8059D60 str r1, [r0] -@0805C618: +_0805C618: pop {r4} pop {r0} bx r0 @@ -150215,7 +150215,7 @@ sub_805C63C: ; 805C63C bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @0805C68C + bne _0805C68C ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -150247,7 +150247,7 @@ sub_805C63C: ; 805C63C adds r0, r1 ldr r1, =sub_8059D60 str r1, [r0] -@0805C68C: +_0805C68C: pop {r4,r5} pop {r0} bx r0 @@ -150349,7 +150349,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] @@ -150359,9 +150359,9 @@ sub_805C71C: ; 805C71C orrs r1, r2 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - b @0805C7B8 + b _0805C7B8 .pool -@0805C78C: +_0805C78C: ldr r3, =0x040000d4 str r2, [r3] str r5, [r3, 0x4] @@ -150375,7 +150375,7 @@ sub_805C71C: ; 805C71C ldr r1, =0xfffff000 adds r4, r1 cmp r4, r0 - bhi @0805C78C + bhi _0805C78C str r2, [r3] str r5, [r3, 0x4] lsrs r0, r4, 1 @@ -150384,7 +150384,7 @@ sub_805C71C: ; 805C71C orrs r0, r1 str r0, [r3, 0x8] ldr r0, [r3, 0x8] -@0805C7B8: +_0805C7B8: bl dp01_tbl1_exec_completed pop {r4,r5} pop {r0} @@ -150560,11 +150560,11 @@ 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 .pool -@0805C924: +_0805C924: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -150585,7 +150585,7 @@ dp01t_29_1_blink: ; 805C8F0 adds r0, r1 ldr r1, =bx_blink_t1 str r1, [r0] -@0805C94E: +_0805C94E: pop {r4} pop {r0} bx r0 @@ -150609,9 +150609,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 @@ -150644,7 +150644,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 @@ -150657,9 +150657,9 @@ sub_805C9B0: ; 805C9B0 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @0805CA00 + b _0805CA00 .pool -@0805C9EC: +_0805C9EC: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -150669,7 +150669,7 @@ sub_805C9B0: ; 805C9B0 lsls r1, 8 orrs r0, r1 bl fanfare_play -@0805CA00: +_0805CA00: bl dp01_tbl1_exec_completed pop {r4,r5} pop {r0} @@ -150856,7 +150856,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] @@ -150866,7 +150866,7 @@ dp01t_2F_1_pokemon_enter: ; 805CA80 adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@0805CBA2: +_0805CBA2: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -150945,12 +150945,12 @@ 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 .pool -@0805CC94: +_0805CC94: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -150959,14 +150959,14 @@ task05_08033660: ; 805CC68 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 @@ -150980,9 +150980,9 @@ task05_08033660: ; 805CC68 ldrb r0, [r7] movs r1, 0 bl sub_805B258 - b @0805CD38 + b _0805CD38 .pool -@0805CCE4: +_0805CCE4: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -151022,7 +151022,7 @@ task05_08033660: ; 805CC68 ldrb r0, [r7] eors r0, r6 strb r0, [r7] -@0805CD38: +_0805CD38: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -151034,7 +151034,7 @@ task05_08033660: ; 805CC68 strb r3, [r2] mov r0, r8 bl remove_task -@0805CD50: +_0805CD50: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -151055,16 +151055,16 @@ 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 .pool -@0805CDA4: +_0805CDA4: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -151107,7 +151107,7 @@ sub_805CD74: ; 805CD74 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @0805CE0C + beq _0805CE0C ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -151116,14 +151116,14 @@ sub_805CD74: ; 805CD74 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 str r0, [r1] -@0805CE18: +_0805CE18: pop {r4-r6} pop {r0} bx r0 @@ -151148,7 +151148,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] @@ -151159,7 +151159,7 @@ sub_805CE38: ; 805CE38 movs r1, 0 strb r1, [r0, 0x5] bl dp01_tbl1_exec_completed -@0805CE70: +_0805CE70: pop {r4} pop {r0} bx r0 @@ -151182,7 +151182,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 @@ -151193,7 +151193,7 @@ sub_805CE80: ; 805CE80 adds r0, r2 ldr r1, =sub_8073C30 str r1, [r0] -@0805CEB2: +_0805CEB2: bl dp01_tbl1_exec_completed pop {r0} bx r0 @@ -151225,7 +151225,7 @@ dp01t_33_1_enemy_move: ; 805CEF4 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq @0805CF3A + beq _0805CF3A ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -151252,7 +151252,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} @@ -151269,7 +151269,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 @@ -151291,21 +151291,21 @@ 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 .pool -@0805CFA4: +_0805CFA4: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =bx_8030B2C str r0, [r1] -@0805CFB0: +_0805CFB0: adds r0, r6, 0 bl sub_817E32C -@0805CFB6: +_0805CFB6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -151328,20 +151328,20 @@ 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 .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 @@ -151349,11 +151349,11 @@ dp01t_35_1_link_standby_message_and_free_vram: ; 805CFC8 ldrb r0, [r4] movs r1, 0 bl dp11b_obj_free - b @0805D020 + b _0805D020 .pool -@0805D01C: +_0805D01C: bl b_link_standby_message -@0805D020: +_0805D020: bl dp01_tbl1_exec_completed pop {r4,r5} pop {r0} @@ -151371,18 +151371,18 @@ 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 .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] @@ -151390,19 +151390,19 @@ sub_805D02C: ; 805D02C ldrb r0, [r4] adds r0, r1 strb r2, [r0] - b @0805D084 + b _0805D084 .pool -@0805D074: +_0805D074: ldr r0, =0x020244ac - b @0805D07E + b _0805D07E .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} @@ -151501,7 +151501,7 @@ dp11_free: ; 805D158 ldr r5, =0x020244d0 ldr r0, [r5] cmp r0, 0 - beq @0805D192 + beq _0805D192 ldr r0, [r0, 0xC] bl Free ldr r0, [r5] @@ -151521,7 +151521,7 @@ dp11_free: ; 805D158 str r4, [r0] bl Free str r4, [r5] -@0805D192: +_0805D192: pop {r4,r5} pop {r0} bx r0 @@ -151574,13 +151574,13 @@ sub_805D19C: ; 805D19C ands r4, r0 adds r6, r4, 0 adds r5, r4, 0x2 - b @0805D20E + b _0805D20E .pool -@0805D20C: +_0805D20C: adds r4, 0x1 -@0805D20E: +_0805D20E: cmp r4, r5 - bge @0805D234 + bge _0805D234 ldr r0, =0x02024064 ldrb r1, [r0] movs r0, 0x58 @@ -151596,49 +151596,49 @@ sub_805D19C: ; 805D19C 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, =gUnknown_0832A328 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 @@ -151659,93 +151659,93 @@ sub_805D19C: ; 805D19C 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, =gUnknown_0832A328 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, =gUnknown_0832A328 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, =gUnknown_0832A328 -@0805D348: +_0805D348: bl GenerateRandomNumber lsls r0, 16 movs r1, 0xC0 @@ -151758,28 +151758,28 @@ sub_805D19C: ; 805D19C 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 .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 @@ -151793,7 +151793,7 @@ sub_805D19C: ; 805D19C mov r2, r8 ands r0, r2 cmp r0, 0 - bne @0805D3CC + bne _0805D3CC lsls r0, r4, 1 add r0, r10 ldrh r0, [r0] @@ -151801,14 +151801,14 @@ sub_805D19C: ; 805D19C 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 @@ -151817,8 +151817,8 @@ sub_805D19C: ; 805D19C lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bls @0805D40C -@0805D3EA: + bls _0805D40C +_0805D3EA: ldr r2, =0x0202433c ldr r0, =0x02024064 ldrb r1, [r0] @@ -151829,20 +151829,20 @@ sub_805D19C: ; 805D19C orrs r0, r2 strb r0, [r1, 0x2] movs r0, 0 - b @0805D496 + b _0805D496 .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 @@ -151851,8 +151851,8 @@ sub_805D19C: ; 805D19C asrs r5, r0, 31 movs r0, 0x10 ands r5, r0 - b @0805D442 -@0805D434: + b _0805D442 +_0805D434: ldr r2, =gBattleMoves ldrh r1, [r1] lsls r0, r1, 1 @@ -151860,27 +151860,27 @@ sub_805D19C: ; 805D19C 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 .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 @@ -151892,15 +151892,15 @@ sub_805D19C: ; 805D19C 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 @@ -151924,99 +151924,99 @@ 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 .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 @@ -152032,29 +152032,29 @@ 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 .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 @@ -152069,7 +152069,7 @@ sub_805D5F4: ; 805D5F4 ldrh r0, [r5, 0x28] ldrh r3, [r6, 0x28] cmp r0, r3 - bne @0805D680 + bne _0805D680 bl GenerateRandomNumber adds r3, r0, 0 ldr r0, =0x02024064 @@ -152081,9 +152081,9 @@ sub_805D5F4: ; 805D5F4 movs r1, 0x2 ands r1, r3 adds r0, r1 - b @0805D702 + b _0805D702 .pool -@0805D680: +_0805D680: ldr r4, =gUnknown_0831C604 ldr r0, =0x02024064 mov r9, r0 @@ -152098,40 +152098,40 @@ sub_805D5F4: ; 805D5F4 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 .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 @@ -152144,15 +152144,15 @@ sub_805D5F4: ; 805D5F4 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 @@ -152179,32 +152179,32 @@ 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 .pool -@0805D75C: +_0805D75C: lsls r0, r3, 27 cmp r0, 0 - bge @0805D766 + bge _0805D766 ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@0805D766: +_0805D766: pop {r4} pop {r0} bx r0 @@ -152225,17 +152225,17 @@ sub_805D770: ; 805D770 ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] cmp r1, 0 - bne @0805D798 + bne _0805D798 adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim - b @0805D7A0 + b _0805D7A0 .pool -@0805D798: +_0805D798: adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim -@0805D7A0: +_0805D7A0: adds r0, r4, 0 bl AnimateObject pop {r4} @@ -152252,26 +152252,26 @@ 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 - b @0805D7E2 + b _0805D7E2 .pool -@0805D7E0: +_0805D7E0: ldr r0, =DummyObjectCallback -@0805D7E2: +_0805D7E2: str r0, [r2, 0x1C] -@0805D7E4: +_0805D7E4: pop {r0} bx r0 .pool @@ -152286,10 +152286,10 @@ sub_805D7EC: ; 805D7EC strh r0, [r1, 0x26] lsls r0, 16 cmp r0, 0 - bne @0805D800 + bne _0805D800 ldr r0, =DummyObjectCallback str r0, [r1, 0x1C] -@0805D800: +_0805D800: pop {r0} bx r0 .pool @@ -152314,99 +152314,99 @@ 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 .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] @@ -152419,7 +152419,7 @@ move_anim_start_t2_for_situation: ; 805D808 negs r0, r0 ands r0, r2 strb r0, [r1] -@0805D902: +_0805D902: pop {r4-r6} pop {r0} bx r0 @@ -152447,11 +152447,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 @@ -152459,9 +152459,9 @@ move_anim_start_t3: ; 805D908 ands r1, r2 strb r1, [r0] movs r0, 0x1 - b @0805DA1E + b _0805DA1E .pool -@0805D950: +_0805D950: ldr r0, =0x020244d0 mov r9, r0 ldr r0, [r0] @@ -152474,16 +152474,16 @@ move_anim_start_t3: ; 805D908 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 .pool -@0805D980: +_0805D980: mov r1, r9 ldr r0, [r1] ldr r0, [r0] @@ -152492,9 +152492,9 @@ move_anim_start_t3: ; 805D908 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 @@ -152507,16 +152507,16 @@ move_anim_start_t3: ; 805D908 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 .pool -@0805D9CC: +_0805D9CC: ldr r0, =0x02038436 mov r2, r10 strb r2, [r0] @@ -152556,7 +152556,7 @@ move_anim_start_t3: ; 805D908 orrs r1, r2 strb r1, [r0] movs r0, 0 -@0805DA1E: +_0805DA1E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -152579,7 +152579,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 @@ -152601,7 +152601,7 @@ task0A_0803415C: ; 805DA48 strb r0, [r1] adds r0, r4, 0 bl remove_task -@0805DA8A: +_0805DA8A: pop {r4} pop {r0} bx r0 @@ -152614,21 +152614,21 @@ sub_805DAA0: ; 805DAA0 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 @@ -152690,7 +152690,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 @@ -152712,7 +152712,7 @@ task0A_08034248: ; 805DB34 strb r0, [r1] adds r0, r4, 0 bl remove_task -@0805DB76: +_0805DB76: pop {r4} pop {r0} bx r0 @@ -152734,7 +152734,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] @@ -152755,19 +152755,19 @@ 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 .pool -@0805DBF0: +_0805DBF0: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -152777,7 +152777,7 @@ mplay_80342A4: ; 805DB90 adds r0, r1 strb r5, [r0, 0x8] movs r0, 0 -@0805DC02: +_0805DC02: pop {r4,r5} pop {r1} bx r1 @@ -152807,21 +152807,21 @@ 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 .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 @@ -152856,17 +152856,17 @@ sub_805DC0C: ; 805DC0C 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 .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 @@ -152883,7 +152883,7 @@ sub_805DC0C: ; 805DC0C bl gpu_pal_apply ldr r0, =0x00000181 cmp r5, r0 - bne @0805DD1A + bne _0805DD1A movs r7, 0x80 lsls r7, 1 add r7, r9 @@ -152904,7 +152904,7 @@ sub_805DC0C: ; 805DC0C adds r1, r7, 0 movs r2, 0x20 bl gpu_pal_apply -@0805DD1A: +_0805DD1A: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -152912,7 +152912,7 @@ sub_805DC0C: ; 805DC0C 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 @@ -152925,7 +152925,7 @@ sub_805DC0C: ; 805DC0C adds r1, r2 ldr r2, =0x04000008 bl CpuSet -@0805DD46: +_0805DD46: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -152960,21 +152960,21 @@ 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 .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 @@ -152992,15 +152992,15 @@ sub_805DD7C: ; 805DD7C 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, =gMonBackPicTable adds r0, r1 @@ -153013,9 +153013,9 @@ sub_805DD7C: ; 805DD7C adds r2, r5, 0 adds r3, r4, 0 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack - b @0805DE46 + b _0805DE46 .pool -@0805DE2C: +_0805DE2C: lsls r0, r5, 3 ldr r1, =gMonBackPicTable adds r0, r1 @@ -153028,7 +153028,7 @@ sub_805DD7C: ; 805DD7C adds r2, r5, 0 adds r3, r4, 0 bl DecompressMonPic_DetectFrontOrBack -@0805DE46: +_0805DE46: mov r2, r8 lsls r1, r2, 4 movs r0, 0x80 @@ -153041,17 +153041,17 @@ sub_805DD7C: ; 805DD7C 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 .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 @@ -153068,7 +153068,7 @@ sub_805DD7C: ; 805DD7C bl gpu_pal_apply ldr r0, =0x00000181 cmp r5, r0 - bne @0805DED2 + bne _0805DED2 movs r7, 0x80 lsls r7, 1 add r7, r9 @@ -153089,14 +153089,14 @@ sub_805DD7C: ; 805DD7C 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 @@ -153109,7 +153109,7 @@ sub_805DD7C: ; 805DD7C adds r1, r2 ldr r2, =0x04000008 bl CpuSet -@0805DEFC: +_0805DEFC: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -153236,15 +153236,15 @@ sub_805DFFC: ; 805DFFC bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne @0805E034 + bne _0805E034 ldr r0, =gUnknown_0832C0D0 bl LoadCompressedObjectPic ldr r0, =gUnknown_0832C0D8 bl LoadCompressedObjectPic movs r5, 0x2 - b @0805E056 + b _0805E056 .pool -@0805E034: +_0805E034: ldr r4, =gUnknown_0832C0E0 adds r0, r4, 0 bl LoadCompressedObjectPic @@ -153258,13 +153258,13 @@ sub_805DFFC: ; 805DFFC adds r0, r4, 0 bl LoadCompressedObjectPic movs r5, 0x4 -@0805E056: +_0805E056: movs r4, 0 cmp r4, r5 - bcs @0805E076 + bcs _0805E076 ldr r7, =0x02024076 ldr r6, =gUnknown_0832C108 -@0805E060: +_0805E060: adds r0, r4, r7 ldrb r0, [r0] lsls r0, 3 @@ -153274,8 +153274,8 @@ sub_805DFFC: ; 805DFFC lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc @0805E060 -@0805E076: + bcc _0805E060 +_0805E076: pop {r4-r7} pop {r0} bx r0 @@ -153290,126 +153290,126 @@ sub_805E08C: ; 805E08C 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, =gUnknown_0832C128 adds r0, r4, 0 bl LoadTaggedObjectPalette adds r4, 0x8 adds r0, r4, 0 bl LoadTaggedObjectPalette - b @0805E1AE + b _0805E1AE .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, =gUnknown_0832C100 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E0E4: +_0805E0E4: ldr r0, =gUnknown_0832C0D0 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E0F0: +_0805E0F0: cmp r4, 0x3 - bne @0805E100 + bne _0805E100 ldr r0, =gUnknown_0832C0D8 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E100: +_0805E100: cmp r4, 0x4 - bne @0805E110 + bne _0805E110 ldr r0, =0x02024076 ldrb r0, [r0] - b @0805E198 + b _0805E198 .pool -@0805E110: +_0805E110: cmp r4, 0x5 - bne @0805E1AC + bne _0805E1AC ldr r0, =0x02024076 ldrb r0, [r0, 0x1] - b @0805E198 + b _0805E198 .pool -@0805E120: +_0805E120: cmp r4, 0x2 - bne @0805E130 + bne _0805E130 ldr r0, =gUnknown_0832C0E0 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E130: +_0805E130: cmp r4, 0x3 - bne @0805E140 + bne _0805E140 ldr r0, =gUnknown_0832C0E8 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E140: +_0805E140: cmp r4, 0x4 - bne @0805E150 + bne _0805E150 ldr r0, =gUnknown_0832C0F0 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E150: +_0805E150: cmp r4, 0x5 - bne @0805E160 + bne _0805E160 ldr r0, =gUnknown_0832C0F8 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E160: +_0805E160: cmp r4, 0x6 - bne @0805E170 + bne _0805E170 ldr r0, =0x02024076 ldrb r0, [r0] - b @0805E198 + b _0805E198 .pool -@0805E170: +_0805E170: cmp r4, 0x7 - bne @0805E180 + bne _0805E180 ldr r0, =0x02024076 ldrb r0, [r0, 0x1] - b @0805E198 + b _0805E198 .pool -@0805E180: +_0805E180: cmp r4, 0x8 - bne @0805E190 + bne _0805E190 ldr r0, =0x02024076 ldrb r0, [r0, 0x2] - b @0805E198 + b _0805E198 .pool -@0805E190: +_0805E190: cmp r5, 0x9 - bne @0805E1AC + bne _0805E1AC ldr r0, =0x02024076 ldrb r0, [r0, 0x3] -@0805E198: +_0805E198: lsls r0, 3 ldr r1, =gUnknown_0832C108 adds r0, r1 bl LoadCompressedObjectPic - b @0805E1AE + b _0805E1AE .pool -@0805E1AC: +_0805E1AC: movs r6, 0x1 -@0805E1AE: +_0805E1AE: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -153440,63 +153440,63 @@ battle_load_something: ; 805E1D8 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 .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 .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 .pool -@0805E260: +_0805E260: ldrb r0, [r4] bl sub_8072B18 ldr r0, =0x02024076 @@ -153504,34 +153504,34 @@ battle_load_something: ; 805E1D8 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 .pool -@0805E288: +_0805E288: ldr r0, =0x03005d70 adds r0, r1, r0 ldrb r0, [r0] movs r1, 0x1 bl nullsub_30 - b @0805E30E + b _0805E30E .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 @@ -153546,9 +153546,9 @@ battle_load_something: ; 805E1D8 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe - b @0805E302 + b _0805E302 .pool -@0805E2E4: +_0805E2E4: ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -153563,13 +153563,13 @@ battle_load_something: ; 805E1D8 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] @@ -153578,21 +153578,21 @@ battle_load_something: ; 805E1D8 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 .pool -@0805E33C: +_0805E33C: bl sub_805EC84 bl sub_81B8C68 movs r6, 0x1 -@0805E346: +_0805E346: adds r0, r6, 0 pop {r4-r6} pop {r1} @@ -153644,7 +153644,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 @@ -153654,7 +153654,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 @@ -153679,8 +153679,8 @@ sub_805E394: ; 805E394 adds r4, 0x1 ldrb r0, [r5] cmp r4, r0 - blt @0805E3B8 -@0805E3EA: + blt _0805E3B8 +_0805E3EA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -153736,7 +153736,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] @@ -153781,7 +153781,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 @@ -153794,7 +153794,7 @@ sub_805E448: ; 805E448 adds r1, r2 ldr r2, =0x04000008 bl CpuSet -@0805E4DE: +_0805E4DE: adds r0, r7, 0 bl sub_80A6138 ldrb r2, [r5] @@ -153805,13 +153805,13 @@ sub_805E448: ; 805E448 lsls r0, 24 lsrs r0, 24 strh r0, [r1, 0x22] - b @0805E77A + b _0805E77A .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 @@ -153829,9 +153829,9 @@ sub_805E448: ; 805E448 ldr r1, [r1] ldr r1, [r1, 0x4] ldr r3, [r2, 0x10] - b @0805E5FA + b _0805E5FA .pool -@0805E558: +_0805E558: adds r0, r7, 0 bl battle_get_per_side_status lsls r0, 24 @@ -153842,7 +153842,7 @@ sub_805E448: ; 805E448 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0805E58C + bne _0805E58C ldr r1, =0x0202406e ldr r2, [sp] lsls r0, r2, 1 @@ -153851,9 +153851,9 @@ sub_805E448: ; 805E448 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @0805E59C + b _0805E59C .pool -@0805E58C: +_0805E58C: ldr r1, =0x0202406e ldr r3, [sp] lsls r0, r3, 1 @@ -153862,7 +153862,7 @@ sub_805E448: ; 805E448 movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -@0805E59C: +_0805E59C: adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -153873,7 +153873,7 @@ sub_805E448: ; 805E448 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 @@ -153906,12 +153906,12 @@ sub_805E448: ; 805E448 lsls r2, r7, 2 adds r2, r3 ldr r3, [r2] -@0805E5FA: +_0805E5FA: mov r2, r8 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack - b @0805E662 + b _0805E662 .pool -@0805E618: +_0805E618: ldr r0, =0x0202406e lsls r4, r7, 1 adds r4, r0 @@ -153946,7 +153946,7 @@ sub_805E448: ; 805E448 ldr r3, [r2] mov r2, r8 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack -@0805E662: +_0805E662: ldr r0, =0x020244d4 ldr r0, [r0] mov r2, r10 @@ -153993,7 +153993,7 @@ sub_805E448: ; 805E448 bl gpu_pal_apply ldr r0, =0x00000181 cmp r8, r0 - bne @0805E70A + bne _0805E70A mov r2, r10 ldrb r1, [r2] lsls r0, r1, 4 @@ -154026,7 +154026,7 @@ sub_805E448: ; 805E448 adds r1, r6, 0 movs r2, 0x20 bl gpu_pal_apply -@0805E70A: +_0805E70A: ldr r3, =0x00007fff adds r0, r6, 0 movs r1, 0x10 @@ -154042,7 +154042,7 @@ sub_805E448: ; 805E448 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @0805E74A + bne _0805E74A ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -154056,7 +154056,7 @@ sub_805E448: ; 805E448 adds r0, r3, r0 ldrb r0, [r0] strb r0, [r1] -@0805E74A: +_0805E74A: adds r0, r7, 0 bl sub_80A6138 mov r1, r10 @@ -154079,7 +154079,7 @@ sub_805E448: ; 805E448 adds r1, r7, r1 ldrb r1, [r1] bl StartObjectImageAnim -@0805E77A: +_0805E77A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -154099,34 +154099,34 @@ sub_805E7DC: ; 805E7DC 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, =gUnknown_08C2D120 - b @0805E822 + b _0805E822 .pool -@0805E814: +_0805E814: adds r0, r5, 0 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq @0805E83C + beq _0805E83C ldr r0, =gUnknown_08C2CEE0 -@0805E822: +_0805E822: ldr r1, =0x020244d4 ldr r1, [r1] lsls r4, 2 @@ -154134,9 +154134,9 @@ sub_805E7DC: ; 805E7DC adds r1, r4 ldr r1, [r1] bl LZDecompressVram - b @0805E84E + b _0805E84E .pool -@0805E83C: +_0805E83C: ldr r0, =gUnknown_08C2D120 ldr r1, =0x020244d4 ldr r1, [r1] @@ -154145,7 +154145,7 @@ sub_805E7DC: ; 805E7DC adds r1, r4 ldr r1, [r1] bl LZDecompressVram -@0805E84E: +_0805E84E: movs r3, 0x1 lsls r6, r5, 4 ldr r7, =gUnknown_08C2CEBC @@ -154155,7 +154155,7 @@ sub_805E7DC: ; 805E7DC adds r4, r0, r4 ldr r2, =0x040000d4 ldr r5, =0x84000200 -@0805E860: +_0805E860: ldr r0, [r4] lsls r1, r3, 11 adds r1, r0, r1 @@ -154165,25 +154165,25 @@ sub_805E7DC: ; 805E7DC 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 .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 @@ -154194,9 +154194,9 @@ sub_805E7DC: ; 805E7DC adds r0, r1 adds r1, r4, 0 bl sub_805DC0C - b @0805E8E6 + b _0805E8E6 .pool -@0805E8D0: +_0805E8D0: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -154207,7 +154207,7 @@ sub_805E7DC: ; 805E7DC adds r0, r1 adds r1, r5, 0 bl sub_805DD7C -@0805E8E6: +_0805E8E6: pop {r4-r7} pop {r0} bx r0 @@ -154239,15 +154239,15 @@ refresh_graphics_maybe: ; 805E8F4 adds r0, r4, 0 bl StartObjectImageAnim cmp r5, 0 - bne @0805E938 + bne _0805E938 adds r0, r6, 0 bl sub_80A614C - b @0805E93E + b _0805E93E .pool -@0805E938: +_0805E938: adds r0, r6, 0 bl sub_80A6138 -@0805E93E: +_0805E93E: lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -154264,7 +154264,7 @@ sub_805E94C: ; 805E94C lsls r1, 16 lsrs r1, 16 cmp r1, 0xA4 - bne @0805E96C + bne _0805E96C ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -154274,7 +154274,7 @@ sub_805E94C: ; 805E94C movs r2, 0x4 orrs r0, r2 strb r0, [r1] -@0805E96C: +_0805E96C: pop {r0} bx r0 .pool @@ -154322,7 +154322,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] @@ -154334,7 +154334,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 @@ -154343,19 +154343,19 @@ 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 .pool -@0805EA08: +_0805EA08: ldr r4, =0x020244d0 ldr r0, [r4] ldr r0, [r0] @@ -154369,16 +154369,16 @@ sub_805E990: ; 805E990 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - bne @0805EA34 + bne _0805EA34 movs r0, 0x5A bl m4aSongNumStop - b @0805EA5A + b _0805EA5A .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 @@ -154389,10 +154389,10 @@ sub_805E990: ; 805E990 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 @@ -154419,7 +154419,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 @@ -154431,7 +154431,7 @@ sub_805EA60: ; 805EA60 adds r0, r6, 0 ands r0, r2 strb r0, [r1] -@0805EAA2: +_0805EAA2: movs r0, 0x5A bl m4aSongNumStop pop {r4-r6} @@ -154479,7 +154479,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 @@ -154515,15 +154515,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 @@ -154531,11 +154531,11 @@ sub_805EAE8: ; 805EAE8 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 @@ -154559,7 +154559,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 @@ -154569,13 +154569,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 @@ -154594,7 +154594,7 @@ sub_805EB9C: ; 805EB9C strb r1, [r0, 0x1] mov r7, r8 cmp r7, 0 - bne @0805EC3C + bne _0805EC3C ldr r0, =0x020244d0 ldr r0, [r0] ldr r2, [r0, 0x4] @@ -154617,9 +154617,9 @@ sub_805EB9C: ; 805EB9C mov r2, r9 ands r1, r2 strb r1, [r0, 0x3] - b @0805EC60 + b _0805EC60 .pool -@0805EC3C: +_0805EC3C: ldrb r0, [r3] lsls r2, r0, 4 adds r2, r0 @@ -154638,14 +154638,14 @@ sub_805EB9C: ; 805EB9C 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 @@ -154711,7 +154711,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 @@ -154753,7 +154753,7 @@ sub_805EC84: ; 805EC84 lsls r0, 2 adds r0, r7 strh r5, [r0, 0x2E] -@0805ED56: +_0805ED56: pop {r3} mov r8, r3 pop {r4-r7} @@ -154788,35 +154788,35 @@ 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 str r0, [r5, 0x1C] - b @0805EE36 + b _0805EE36 .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 .pool -@0805EDE4: +_0805EDE4: ldr r2, =0x020244d0 ldr r0, [r2] ldr r0, [r0] @@ -154825,16 +154825,16 @@ sub_805ED70: ; 805ED70 ldrh r0, [r3, 0x2] adds r4, r1, 0 cmp r0, 0 - beq @0805EE06 + beq _0805EE06 ldr r0, =gUnknown_08305DCC 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 @@ -154842,10 +154842,10 @@ sub_805ED70: ; 805ED70 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] @@ -154860,7 +154860,7 @@ sub_805ED70: ; 805ED70 ands r0, r1 orrs r0, r3 strb r0, [r2] -@0805EE36: +_0805EE36: pop {r3} mov r8, r3 pop {r4-r7} @@ -154891,7 +154891,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] @@ -154899,14 +154899,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, =gUnknown_08305DCC 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 @@ -154920,9 +154920,9 @@ sub_805EE54: ; 805EE54 adds r2, 0x1C adds r0, r2 ldr r1, =sub_805ED70 - b @0805EECE + b _0805EECE .pool -@0805EEB4: +_0805EEB4: ldr r2, =0x02020630 ldr r1, [r3, 0x4] lsls r0, r6, 1 @@ -154936,9 +154936,9 @@ sub_805EE54: ; 805EE54 adds r2, 0x1C adds r0, r2 ldr r1, =sub_805EE48 -@0805EECE: +_0805EECE: str r1, [r0] -@0805EED0: +_0805EED0: pop {r4-r6} pop {r0} bx r0 @@ -154976,57 +154976,57 @@ sub_805EF14: ; 805EF14 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 @@ -155051,10 +155051,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 @@ -155080,7 +155080,7 @@ init_uns_table_pokemon_copy: ; 805EFBC bl AllocZeroed ldr r1, [r4] str r0, [r1] -@0805EFE2: +_0805EFE2: ldr r0, =0x020244d4 ldr r1, [r0] lsls r4, r6, 2 @@ -155109,7 +155109,7 @@ init_uns_table_pokemon_copy: ; 805EFBC mov r10, r1 mov r12, r8 adds r7, r4, 0 -@0805F01A: +_0805F01A: ldr r2, =0x020244d4 ldr r1, [r2] lsls r4, r5, 3 @@ -155132,7 +155132,7 @@ init_uns_table_pokemon_copy: ; 805EFBC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @0805F01A + bls _0805F01A ldr r1, =0x020244d4 ldr r2, [r1] mov r5, r9 @@ -155149,7 +155149,7 @@ init_uns_table_pokemon_copy: ; 805EFBC lsls r0, r7, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls @0805EFE2 + bls _0805EFE2 movs r0, 0x80 lsls r0, 5 bl AllocZeroed @@ -155175,13 +155175,13 @@ sub_805F094: ; 805F094 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 @@ -155189,14 +155189,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 @@ -155204,7 +155204,7 @@ sub_805F094: ; 805F094 adds r0, r1 movs r1, 0 str r1, [r0] -@0805F0D8: +_0805F0D8: ldr r0, [r6] movs r5, 0xBA lsls r5, 1 @@ -155225,7 +155225,7 @@ sub_805F094: ; 805F094 str r4, [r0, 0x10] bl Free str r4, [r6] -@0805F106: +_0805F106: pop {r4-r6} pop {r0} bx r0 @@ -155241,7 +155241,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 @@ -155261,13 +155261,13 @@ sub_805F110: ; 805F110 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - ble @0805F158 + ble _0805F158 movs r0, 0x1 - b @0805F15A + b _0805F15A .pool -@0805F158: +_0805F158: movs r0, 0 -@0805F15A: +_0805F15A: pop {r4,r5} pop {r1} bx r1 @@ -155304,24 +155304,24 @@ 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, =gUnknown_0831C6C8 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @0805F1CC + b _0805F1CC .pool -@0805F1C8: +_0805F1C8: bl dp01_tbl7_exec_completed -@0805F1CC: +_0805F1CC: pop {r0} bx r0 thumb_func_end bx_exec_buffer_A_ch0_tbl7 @@ -155343,9 +155343,9 @@ sub_805F1D0: ; 805F1D0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805F1F4 + bne _0805F1F4 bl dp01_tbl7_exec_completed -@0805F1F4: +_0805F1F4: pop {r0} bx r0 .pool @@ -155368,9 +155368,9 @@ sub_805F208: ; 805F208 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805F22C + bne _0805F22C bl dp01_tbl7_exec_completed -@0805F22C: +_0805F22C: pop {r0} bx r0 .pool @@ -155394,7 +155394,7 @@ sub_805F240: ; 805F240 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805F292 + bne _0805F292 adds r0, r2, r5 ldrh r0, [r0, 0x6] bl sub_805DFE4 @@ -155415,7 +155415,7 @@ sub_805F240: ; 805F240 adds r0, r5 bl RemoveObjectAndFreeTiles bl dp01_tbl7_exec_completed -@0805F292: +_0805F292: pop {r4-r6} pop {r0} bx r0 @@ -155440,7 +155440,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] @@ -155451,7 +155451,7 @@ sub_805F2A8: ; 805F2A8 movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl7_exec_completed -@0805F2E0: +_0805F2E0: pop {r4} pop {r0} bx r0 @@ -155470,26 +155470,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 @@ -155504,14 +155504,14 @@ sub_805F2F0: ; 805F2F0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805F34E + bne _0805F34E movs r1, 0x1 mov r10, r1 -@0805F34E: +_0805F34E: movs r6, 0 - b @0805F3A2 + b _0805F3A2 .pool -@0805F368: +_0805F368: ldr r3, =0x02020630 ldr r6, =0x03005d70 ldr r2, =0x02024064 @@ -155526,7 +155526,7 @@ sub_805F2F0: ; 805F2F0 ldr r5, [r0] ldr r0, =DummyObjectCallback cmp r5, r0 - bne @0805F3A0 + bne _0805F3A0 movs r0, 0x2 eors r4, r0 adds r0, r4, r6 @@ -155537,12 +155537,12 @@ sub_805F2F0: ; 805F2F0 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 @@ -155568,11 +155568,11 @@ sub_805F2F0: ; 805F2F0 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 @@ -155582,9 +155582,9 @@ sub_805F2F0: ; 805F2F0 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 @@ -155594,9 +155594,9 @@ sub_805F2F0: ; 805F2F0 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 @@ -155647,9 +155647,9 @@ sub_805F2F0: ; 805F2F0 bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag - b @0805F51A + b _0805F51A .pool -@0805F494: +_0805F494: ldrb r2, [r7] lsls r0, r2, 1 adds r0, r2 @@ -155659,13 +155659,13 @@ sub_805F2F0: ; 805F2F0 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] @@ -155681,13 +155681,13 @@ sub_805F2F0: ; 805F2F0 lsls r0, 1 ands r0, r1 cmp r0, 0 - bne @0805F53C + bne _0805F53C ldr r4, =0x000027f9 adds r0, r4, 0 bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag -@0805F4E4: +_0805F4E4: mov r1, r8 ldr r0, [r1] ldr r1, =0x02024064 @@ -155715,7 +155715,7 @@ sub_805F2F0: ; 805F2F0 negs r0, r0 ands r0, r2 strb r0, [r1, 0x1] -@0805F51A: +_0805F51A: ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, =0x02024064 @@ -155733,7 +155733,7 @@ sub_805F2F0: ; 805F2F0 adds r0, r1 ldr r1, =sub_805F2A8 str r1, [r0] -@0805F53C: +_0805F53C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -155770,7 +155770,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] @@ -155780,17 +155780,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 @@ -155805,7 +155805,7 @@ sub_805F560: ; 805F560 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne @0805F5EE + bne _0805F5EE ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] @@ -155815,7 +155815,7 @@ sub_805F560: ; 805F560 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 -@0805F5EE: +_0805F5EE: ldr r2, =0x020244d0 ldr r0, [r2] ldr r1, =0x02024064 @@ -155832,7 +155832,7 @@ sub_805F560: ; 805F560 ands r0, r1 mov r9, r2 cmp r0, 0 - bne @0805F6D0 + bne _0805F6D0 movs r7, 0x2 adds r1, r7, 0 eors r1, r4 @@ -155844,22 +155844,22 @@ sub_805F560: ; 805F560 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] @@ -155887,7 +155887,7 @@ sub_805F560: ; 805F560 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@0805F684: +_0805F684: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -155909,7 +155909,7 @@ sub_805F560: ; 805F560 adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -@0805F6B4: +_0805F6B4: ldr r3, =0x020244d0 ldr r2, [r3] ldr r0, =0x02024064 @@ -155924,7 +155924,7 @@ sub_805F560: ; 805F560 orrs r1, r2 strb r1, [r0, 0x1] mov r9, r3 -@0805F6D0: +_0805F6D0: mov r1, r9 ldr r0, [r1] ldr r4, =0x02024064 @@ -155938,7 +155938,7 @@ sub_805F560: ; 805F560 movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne @0805F792 + bne _0805F792 movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -155949,11 +155949,11 @@ sub_805F560: ; 805F560 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] @@ -155966,30 +155966,30 @@ sub_805F560: ; 805F560 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 .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 @@ -156005,22 +156005,22 @@ sub_805F560: ; 805F560 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 @@ -156035,7 +156035,7 @@ sub_805F560: ; 805F560 ldr r3, [r0] ldr r0, =DummyObjectCallback cmp r3, r0 - bne @0805F86E + bne _0805F86E ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] @@ -156045,12 +156045,12 @@ sub_805F560: ; 805F560 adds r0, r2 ldr r0, [r0] cmp r0, r3 - bne @0805F86E + bne _0805F86E movs r1, 0x1 mov r10, r1 - b @0805F86E + b _0805F86E .pool -@0805F810: +_0805F810: ldr r2, =0x02020630 ldr r7, =0x03005d7c ldr r0, =0x02024064 @@ -156065,7 +156065,7 @@ sub_805F560: ; 805F560 ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - bne @0805F86E + bne _0805F86E ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] @@ -156075,7 +156075,7 @@ sub_805F560: ; 805F560 adds r0, r2 ldr r5, [r0] cmp r5, r4 - bne @0805F86E + bne _0805F86E movs r0, 0x2 eors r3, r0 adds r0, r3, r7 @@ -156086,7 +156086,7 @@ sub_805F560: ; 805F560 adds r0, r2 ldr r4, [r0] cmp r4, r5 - bne @0805F86E + bne _0805F86E adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -156095,26 +156095,26 @@ sub_805F560: ; 805F560 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] @@ -156145,7 +156145,7 @@ sub_805F560: ; 805F560 lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -@0805F8D2: +_0805F8D2: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -156210,7 +156210,7 @@ sub_805F560: ; 805F560 adds r0, r1 ldr r1, =sub_805F2F0 str r1, [r0] -@0805F958: +_0805F958: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -156238,7 +156238,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] @@ -156251,7 +156251,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] @@ -156261,7 +156261,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 @@ -156276,7 +156276,7 @@ sub_805F994: ; 805F994 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805FA48 + bne _0805FA48 ldr r4, =0x020244d0 ldr r0, [r4] ldr r1, [r0, 0x4] @@ -156288,7 +156288,7 @@ sub_805F994: ; 805F994 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0805FA48 + beq _0805FA48 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -156311,7 +156311,7 @@ sub_805F994: ; 805F994 adds r0, r4, 0 bl FreeObjectPaletteByTag bl dp01_tbl7_exec_completed -@0805FA48: +_0805FA48: pop {r4,r5} pop {r0} bx r0 @@ -156341,17 +156341,17 @@ 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 .pool -@0805FAB8: +_0805FAB8: bl dp01_tbl7_exec_completed -@0805FABC: +_0805FABC: pop {r4-r6} pop {r0} bx r0 @@ -156374,13 +156374,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 .pool @@ -156402,7 +156402,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] @@ -156428,7 +156428,7 @@ sub_805FB08: ; 805FB08 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl7_exec_completed -@0805FB62: +_0805FB62: pop {r4-r6} pop {r0} bx r0 @@ -156442,9 +156442,9 @@ bx_t7_button_a: ; 805FB7C bl IsTextPrinterActive 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 @@ -156465,7 +156465,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] @@ -156478,14 +156478,14 @@ bx_blink_t7: ; 805FB94 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl7_exec_completed - b @0805FC0A + b _0805FC0A .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] @@ -156499,11 +156499,11 @@ bx_blink_t7: ; 805FB94 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 @@ -156526,7 +156526,7 @@ sub_805FC10: ; 805FC10 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805FC5C + bne _0805FC5C ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -156536,20 +156536,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 str r0, [r1] -@0805FC5C: +_0805FC5C: pop {r4} pop {r0} bx r0 @@ -156572,11 +156572,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] @@ -156590,18 +156590,18 @@ bx_803AEDC: ; 805FC80 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @0805FCCA + beq _0805FCCA ldr r0, =nullsub_18 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 @@ -156624,7 +156624,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 @@ -156638,7 +156638,7 @@ sub_805FD00: ; 805FD00 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805FDBC + bne _0805FDBC ldrb r1, [r3] movs r0, 0x7F ands r0, r1 @@ -156697,7 +156697,7 @@ sub_805FD00: ; 805FD00 adds r0, r1 ldr r1, =sub_805FC10 str r1, [r0] -@0805FDBC: +_0805FDBC: pop {r4-r7} pop {r0} bx r0 @@ -156720,7 +156720,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] @@ -156730,7 +156730,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] @@ -156745,7 +156745,7 @@ sub_805FDF0: ; 805FDF0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0805FE8C + bne _0805FE8C ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -156756,7 +156756,7 @@ sub_805FDF0: ; 805FDF0 movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @0805FE8C + bne _0805FE8C adds r0, r3, r4 bl RemoveObjectAndFreeTiles ldrb r4, [r5] @@ -156781,7 +156781,7 @@ sub_805FDF0: ; 805FDF0 adds r0, r1 ldr r1, =sub_805FD00 str r1, [r0] -@0805FE8C: +_0805FE8C: pop {r4-r6} pop {r0} bx r0 @@ -156804,9 +156804,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 .pool @@ -156828,9 +156828,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 .pool @@ -156852,7 +156852,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] @@ -156866,9 +156866,9 @@ dp01_tbl7_exec_completed: ; 805FF18 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @0805FF7E + b _0805FF7E .pool -@0805FF6C: +_0805FF6C: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -156878,7 +156878,7 @@ dp01_tbl7_exec_completed: ; 805FF18 ldr r0, [r2] bics r0, r1 str r0, [r2] -@0805FF7E: +_0805FF7E: add sp, 0x4 pop {r4} pop {r0} @@ -156899,7 +156899,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 @@ -156907,28 +156907,28 @@ dp01t_00_7_getattr: ; 805FF90 mov r1, sp bl sub_8060004 adds r6, r0, 0 - b @0805FFEA + b _0805FFEA .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 @@ -156961,78 +156961,78 @@ 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 .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 @@ -157069,7 +157069,7 @@ sub_8060004: ; 8060004 str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@08060180: +_08060180: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -157085,7 +157085,7 @@ sub_8060004: ; 8060004 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @08060180 + ble _08060180 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -157263,33 +157263,33 @@ sub_8060004: ; 8060004 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 .pool -@08060358: +_08060358: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB - b @080606D2 + b _080606D2 .pool -@08060368: +_08060368: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC - b @080606D2 + b _080606D2 .pool -@08060378: +_08060378: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -157301,7 +157301,7 @@ sub_8060004: ; 8060004 ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 -@0806038E: +_0806038E: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -157319,7 +157319,7 @@ sub_8060004: ; 8060004 add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @0806038E + ble _0806038E movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -157330,17 +157330,17 @@ sub_8060004: ; 8060004 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 .pool -@080603E0: +_080603E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -157351,16 +157351,16 @@ sub_8060004: ; 8060004 adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @080606D2 + b _080606D2 .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 @@ -157370,7 +157370,7 @@ sub_8060004: ; 8060004 strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @08060408 + ble _08060408 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -157380,9 +157380,9 @@ sub_8060004: ; 8060004 adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @0806079A + b _0806079A .pool -@08060438: +_08060438: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -157393,23 +157393,23 @@ sub_8060004: ; 8060004 adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @08060792 + b _08060792 .pool -@08060454: +_08060454: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 - b @0806046E + b _0806046E .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] @@ -157424,105 +157424,105 @@ sub_8060004: ; 8060004 lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @0806079A + b _0806079A .pool -@08060494: +_08060494: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A - b @08060792 + b _08060792 .pool -@080604A4: +_080604A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B - b @08060792 + b _08060792 .pool -@080604B4: +_080604B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C - b @08060792 + b _08060792 .pool -@080604C4: +_080604C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D - b @08060792 + b _08060792 .pool -@080604D4: +_080604D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E - b @08060792 + b _08060792 .pool -@080604E4: +_080604E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F - b @08060792 + b _08060792 .pool -@080604F4: +_080604F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 - b @08060792 + b _08060792 .pool -@08060504: +_08060504: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 - b @08060792 + b _08060792 .pool -@08060514: +_08060514: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 - b @08060792 + b _08060792 .pool -@08060524: +_08060524: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 - b @08060792 + b _08060792 .pool -@08060534: +_08060534: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 - b @08060792 + b _08060792 .pool -@08060544: +_08060544: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 - b @08060792 + b _08060792 .pool -@08060554: +_08060554: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -157553,79 +157553,79 @@ sub_8060004: ; 8060004 bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @0806079A + b _0806079A .pool -@080605A4: +_080605A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 - b @08060792 + b _08060792 .pool -@080605B4: +_080605B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 - b @08060792 + b _08060792 .pool -@080605C4: +_080605C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 - b @08060792 + b _08060792 .pool -@080605D4: +_080605D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A - b @08060792 + b _08060792 .pool -@080605E4: +_080605E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B - b @08060792 + b _08060792 .pool -@080605F4: +_080605F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C - b @08060792 + b _08060792 .pool -@08060604: +_08060604: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0 - b @0806062E + b _0806062E .pool -@08060614: +_08060614: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 - b @080606D2 + b _080606D2 .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] @@ -157642,71 +157642,71 @@ sub_8060004: ; 8060004 lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @0806079A + b _0806079A .pool -@08060658: +_08060658: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 - b @08060792 + b _08060792 .pool -@08060668: +_08060668: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 - b @080606D2 + b _080606D2 .pool -@08060678: +_08060678: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A - b @080606D2 + b _080606D2 .pool -@08060688: +_08060688: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B - b @080606D2 + b _080606D2 .pool -@08060698: +_08060698: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C - b @080606D2 + b _080606D2 .pool -@080606A8: +_080606A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D - b @080606D2 + b _080606D2 .pool -@080606B8: +_080606B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E - b @080606D2 + b _080606D2 .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 @@ -157714,99 +157714,99 @@ sub_8060004: ; 8060004 lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @0806079A + b _0806079A .pool -@080606E8: +_080606E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 - b @08060792 + b _08060792 .pool -@080606F8: +_080606F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 - b @08060792 + b _08060792 .pool -@08060708: +_08060708: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 - b @08060792 + b _08060792 .pool -@08060718: +_08060718: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 - b @08060792 + b _08060792 .pool -@08060728: +_08060728: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F - b @08060792 + b _08060792 .pool -@08060738: +_08060738: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 - b @08060792 + b _08060792 .pool -@08060748: +_08060748: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 - b @08060792 + b _08060792 .pool -@08060758: +_08060758: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 - b @08060792 + b _08060792 .pool -@08060768: +_08060768: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 - b @08060792 + b _08060792 .pool -@08060778: +_08060778: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 - b @08060792 + b _08060792 .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} @@ -157849,9 +157849,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] @@ -157864,8 +157864,8 @@ dp01t_01_2_read_pokmon_data_slice: ; 80607B0 adds r0, r3 ldrb r0, [r0] cmp r2, r0 - bcc @080607EC -@08060806: + bcc _080607EC +_08060806: ldrb r0, [r7] lsls r0, 9 mov r1, r12 @@ -157894,32 +157894,32 @@ 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 .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} @@ -157948,78 +157948,78 @@ 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 .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 @@ -158069,7 +158069,7 @@ sub_8060890: ; 8060890 adds r6, 0x24 adds r4, r7, 0 adds r4, 0xC -@08060A2A: +_08060A2A: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -158086,7 +158086,7 @@ sub_8060890: ; 8060890 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @08060A2A + ble _08060A2A movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -158198,9 +158198,9 @@ sub_8060890: ; 8060890 movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060B5C: +_08060B5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158210,9 +158210,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0xB bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060B78: +_08060B78: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158222,9 +158222,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0xC bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060B94: +_08060B94: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -158237,7 +158237,7 @@ sub_8060890: ; 8060890 adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 -@08060BAC: +_08060BAC: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -158254,7 +158254,7 @@ sub_8060890: ; 8060890 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @08060BAC + ble _08060BAC movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158262,9 +158262,9 @@ sub_8060890: ; 8060890 movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060BE8: +_08060BE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158276,9 +158276,9 @@ sub_8060890: ; 8060890 adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @08060C86 + b _08060C86 .pool -@08060C08: +_08060C08: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -158323,9 +158323,9 @@ sub_8060890: ; 8060890 adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060C70: +_08060C70: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158337,13 +158337,13 @@ sub_8060890: ; 8060890 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 .pool -@08060C98: +_08060C98: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158353,9 +158353,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x1 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060CB4: +_08060CB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158365,9 +158365,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x19 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060CD0: +_08060CD0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158377,9 +158377,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x1A bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060CEC: +_08060CEC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158389,9 +158389,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x1B bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060D08: +_08060D08: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158401,9 +158401,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x1C bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060D24: +_08060D24: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158413,9 +158413,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x1D bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060D40: +_08060D40: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158425,9 +158425,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x1E bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060D5C: +_08060D5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158437,9 +158437,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x1F bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060D78: +_08060D78: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158449,9 +158449,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x20 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060D94: +_08060D94: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158461,9 +158461,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x22 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060DB0: +_08060DB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158473,9 +158473,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x23 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060DCC: +_08060DCC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158485,9 +158485,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x24 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060DE8: +_08060DE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158497,9 +158497,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x25 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060E04: +_08060E04: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158509,9 +158509,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x26 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060E20: +_08060E20: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -158562,9 +158562,9 @@ sub_8060890: ; 8060890 adds r0, r3, 0x5 adds r2, r0 adds r0, r4, 0 - b @08060F2E + b _08060F2E .pool -@08060E94: +_08060E94: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158574,9 +158574,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x27 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060EB0: +_08060EB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158586,9 +158586,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x28 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060ECC: +_08060ECC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158598,9 +158598,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x29 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060EE8: +_08060EE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158610,9 +158610,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x2A bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060F04: +_08060F04: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158622,9 +158622,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x2B bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060F20: +_08060F20: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158632,12 +158632,12 @@ sub_8060890: ; 8060890 ldrb r2, [r6] lsls r2, 9 adds r2, r3 -@08060F2E: +_08060F2E: movs r1, 0x2C bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060F3C: +_08060F3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158647,9 +158647,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060F58: +_08060F58: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158659,9 +158659,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x9 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060F74: +_08060F74: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158671,9 +158671,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x37 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060F90: +_08060F90: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158683,9 +158683,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x38 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060FAC: +_08060FAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158695,9 +158695,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x39 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060FC8: +_08060FC8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158707,9 +158707,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x3A bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08060FE4: +_08060FE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158719,9 +158719,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x3B bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061000: +_08061000: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158731,9 +158731,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x3C bl pokemon_setattr - b @0806119C + b _0806119C .pool -@0806101C: +_0806101C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158743,9 +158743,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x3D bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061038: +_08061038: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158755,9 +158755,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x3E bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061054: +_08061054: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158767,9 +158767,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x3F bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061070: +_08061070: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158779,9 +158779,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x16 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@0806108C: +_0806108C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158791,9 +158791,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x17 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@080610A8: +_080610A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158803,9 +158803,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x18 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@080610C4: +_080610C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158815,9 +158815,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x21 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@080610E0: +_080610E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158827,9 +158827,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x2F bl pokemon_setattr - b @0806119C + b _0806119C .pool -@080610FC: +_080610FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158839,9 +158839,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x30 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061118: +_08061118: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158851,9 +158851,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x32 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061134: +_08061134: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158863,9 +158863,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x33 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061150: +_08061150: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158875,9 +158875,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x34 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@0806116C: +_0806116C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158887,9 +158887,9 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x35 bl pokemon_setattr - b @0806119C + b _0806119C .pool -@08061188: +_08061188: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -158899,7 +158899,7 @@ sub_8060890: ; 8060890 adds r2, r3 movs r1, 0x36 bl pokemon_setattr -@0806119C: +_0806119C: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -158936,11 +158936,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 @@ -158957,8 +158957,8 @@ sub_80611B0: ; 80611B0 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} @@ -159335,7 +159335,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] @@ -159350,9 +159350,9 @@ sub_806156C: ; 806156C adds r0, r1 ldr r1, =sub_8061604 str r1, [r0] - b @080615F0 + b _080615F0 .pool -@080615B4: +_080615B4: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -159378,7 +159378,7 @@ sub_806156C: ; 806156C ldrb r0, [r0] bl sub_8072984 bl dp01_tbl7_exec_completed -@080615F0: +_080615F0: pop {r4-r6} pop {r0} bx r0 @@ -159399,12 +159399,12 @@ 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 .pool -@0806162C: +_0806162C: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -159412,12 +159412,12 @@ sub_8061604: ; 8061604 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] @@ -159427,15 +159427,15 @@ sub_8061604: ; 8061604 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 @@ -159448,7 +159448,7 @@ sub_8061604: ; 8061604 adds r0, r1 ldr r1, =sub_805FB08 str r1, [r0] -@08061682: +_08061682: pop {r4-r6} pop {r0} bx r0 @@ -159467,117 +159467,117 @@ sub_8061690: ; 8061690 lsls r0, 20 ands r0, r2 cmp r0, 0 - beq @080616B0 + beq _080616B0 bl sub_806B830 - b @0806175A + b _0806175A .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 .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 .pool -@080616F0: +_080616F0: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5588 - b @0806175A + b _0806175A .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 .pool -@08061734: +_08061734: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_8162AA0 - b @0806175A + b _0806175A .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, =gTrainers ldr r0, =0x02038bcc ldrh r1, [r0] - b @0806178C + b _0806178C .pool -@08061788: +_08061788: ldr r2, =gTrainers 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 @@ -159585,13 +159585,13 @@ sub_8061690: ; 8061690 ands r1, r0 movs r7, 0xC8 cmp r1, 0 - beq @080617CA + beq _080617CA movs r7, 0x98 - b @080617CA + b _080617CA .pool -@080617C8: +_080617C8: movs r7, 0xB0 -@080617CA: +_080617CA: mov r8, r4 ldr r5, =0x02024064 ldrb r1, [r5] @@ -159714,111 +159714,111 @@ sub_80618D8: ; 80618D8 lsls r0, 20 ands r0, r2 cmp r0, 0 - beq @080618F8 + beq _080618F8 bl sub_806B830 - b @080619A2 + b _080619A2 .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 .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 .pool -@08061938: +_08061938: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81D5588 - b @080619A2 + b _080619A2 .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 .pool -@0806197C: +_0806197C: ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_8162AA0 - b @080619A2 + b _080619A2 .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, =gTrainers ldr r0, =0x02038bcc ldrh r1, [r0] - b @080619D4 + b _080619D4 .pool -@080619D0: +_080619D0: ldr r2, =gTrainers 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] @@ -160019,7 +160019,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 @@ -160027,12 +160027,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] @@ -160043,16 +160043,16 @@ sub_8061B9C: ; 8061B9C ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b @08061C2C + b _08061C2C .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 @@ -160075,7 +160075,7 @@ sub_8061B9C: ; 8061B9C adds r0, r1 ldr r1, =sub_805FAC4 str r1, [r0] -@08061C2C: +_08061C2C: pop {r4-r6} pop {r0} bx r0 @@ -160122,9 +160122,9 @@ sub_8061C78: ; 8061C78 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] @@ -160224,11 +160224,11 @@ sub_8061C78: ; 8061C78 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq @08061D80 + beq _08061D80 bl dp01_tbl7_exec_completed - b @08061D9E + b _08061D9E .pool -@08061D80: +_08061D80: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -160244,7 +160244,7 @@ sub_8061C78: ; 8061C78 adds r0, r1 ldr r1, =bx_move_anim_7 str r1, [r0] -@08061D9E: +_08061D9E: pop {r4-r6} pop {r0} bx r0 @@ -160285,20 +160285,20 @@ 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 .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 @@ -160306,7 +160306,7 @@ bx_move_anim_7: ; 8061DB0 movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne @08061E34 + bne _08061E34 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -160315,7 +160315,7 @@ bx_move_anim_7: ; 8061DB0 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -@08061E34: +_08061E34: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -160325,13 +160325,13 @@ bx_move_anim_7: ; 8061DB0 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 @@ -160345,15 +160345,15 @@ bx_move_anim_7: ; 8061DB0 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] @@ -160365,10 +160365,10 @@ bx_move_anim_7: ; 8061DB0 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 @@ -160383,7 +160383,7 @@ bx_move_anim_7: ; 8061DB0 negs r0, r0 ands r0, r2 strb r0, [r1] -@08061EC0: +_08061EC0: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -160395,16 +160395,16 @@ bx_move_anim_7: ; 8061DB0 adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @08061F24 + b _08061F24 .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 @@ -160425,7 +160425,7 @@ bx_move_anim_7: ; 8061DB0 adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl7_exec_completed -@08061F24: +_08061F24: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -160502,20 +160502,20 @@ 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 .pool -@08061FE4: +_08061FE4: ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 9 @@ -160525,42 +160525,42 @@ sub_8061FB8: ; 8061FB8 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 .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 .pool -@08062040: +_08062040: ldr r3, =gBattleMoves lsls r0, r4, 1 adds r2, r5, r0 @@ -160573,12 +160573,12 @@ sub_8061FB8: ; 8061FB8 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 @@ -160588,7 +160588,7 @@ sub_8061FB8: ; 8061FB8 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 @@ -160602,11 +160602,11 @@ sub_8061FB8: ; 8061FB8 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 @@ -160615,11 +160615,11 @@ sub_8061FB8: ; 8061FB8 movs r1, 0xA adds r2, r4, 0 bl dp01_build_cmdbuf_x21_a_bb - b @08061FDA + b _08061FDA .pool -@080620C4: +_080620C4: movs r6, 0x3 -@080620C6: +_080620C6: bl GenerateRandomNumber adds r4, r0, 0 ands r4, r6 @@ -160627,7 +160627,7 @@ sub_8061FB8: ; 8061FB8 adds r0, r5, r0 ldrh r2, [r0] cmp r2, 0 - beq @080620C6 + beq _080620C6 ldr r1, =gBattleMoves lsls r0, r2, 1 adds r0, r2 @@ -160637,7 +160637,7 @@ sub_8061FB8: ; 8061FB8 movs r0, 0x12 ands r0, r1 cmp r0, 0 - beq @08062108 + beq _08062108 ldr r0, =0x02024064 ldrb r0, [r0] lsls r0, 8 @@ -160646,15 +160646,15 @@ sub_8061FB8: ; 8061FB8 movs r1, 0xA adds r2, r4, 0 bl dp01_build_cmdbuf_x21_a_bb - b @08062152 + b _08062152 .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 @@ -160669,9 +160669,9 @@ sub_8061FB8: ; 8061FB8 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - b @08062152 + b _08062152 .pool -@0806213C: +_0806213C: movs r0, 0 bl battle_get_side_with_given_state adds r2, r0, 0 @@ -160681,9 +160681,9 @@ sub_8061FB8: ; 8061FB8 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 @@ -160722,26 +160722,26 @@ 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 .pool -@080621D4: +_080621D4: movs r0, 0x1 bl battle_get_side_with_given_state lsls r0, 24 @@ -160750,36 +160750,36 @@ sub_8062188: ; 8062188 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 .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 @@ -160787,25 +160787,25 @@ sub_8062188: ; 8062188 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 .pool -@08062254: +_08062254: ldrb r4, [r1] movs r0, 0x6 strb r0, [r1] -@0806225A: +_0806225A: ldr r0, =0x02024064 ldrb r0, [r0] ldr r1, =0x0202449c @@ -160859,7 +160859,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 @@ -160889,9 +160889,9 @@ sub_8062294: ; 8062294 str r7, [sp] mov r2, r8 bl sub_807294C - b @0806234E + b _0806234E .pool -@08062324: +_08062324: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -160911,7 +160911,7 @@ sub_8062294: ; 8062294 str r7, [sp] movs r3, 0 bl sub_807294C -@0806234E: +_0806234E: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -160945,7 +160945,7 @@ sub_8062390: ; 8062390 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @080623E4 + bne _080623E4 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -160979,7 +160979,7 @@ sub_8062390: ; 8062390 adds r0, r1 ldr r1, =sub_805FEB8 str r1, [r0] -@080623E4: +_080623E4: pop {r4} pop {r0} bx r0 @@ -160994,7 +160994,7 @@ sub_8062408: ; 8062408 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @08062458 + bne _08062458 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -161026,7 +161026,7 @@ sub_8062408: ; 8062408 adds r0, r1 ldr r1, =sub_805FEB8 str r1, [r0] -@08062458: +_08062458: pop {r4,r5} pop {r0} bx r0 @@ -161197,11 +161197,11 @@ 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 .pool -@080625A4: +_080625A4: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -161222,7 +161222,7 @@ dp01t_29_7_blink: ; 8062570 adds r0, r1 ldr r1, =bx_blink_t7 str r1, [r0] -@080625CE: +_080625CE: pop {r4} pop {r0} bx r0 @@ -161246,9 +161246,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 @@ -161281,7 +161281,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 @@ -161294,9 +161294,9 @@ sub_8062630: ; 8062630 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @08062680 + b _08062680 .pool -@0806266C: +_0806266C: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -161306,7 +161306,7 @@ sub_8062630: ; 8062630 lsls r1, 8 orrs r0, r1 bl fanfare_play -@08062680: +_08062680: bl dp01_tbl7_exec_completed pop {r4,r5} pop {r0} @@ -161447,7 +161447,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] @@ -161457,7 +161457,7 @@ sub_80626FC: ; 80626FC adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@080627BE: +_080627BE: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -161514,19 +161514,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 @@ -161540,9 +161540,9 @@ sub_8062828: ; 8062828 ldrb r0, [r7] movs r1, 0 bl sub_80613DC - b @080628E0 + b _080628E0 .pool -@080628A0: +_080628A0: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -161573,7 +161573,7 @@ sub_8062828: ; 8062828 ldrb r0, [r7] eors r0, r5 strb r0, [r7] -@080628E0: +_080628E0: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -161605,16 +161605,16 @@ 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 .pool -@08062948: +_08062948: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -161636,7 +161636,7 @@ dp01t_30_7_0803D67C: ; 8062918 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 @@ -161647,7 +161647,7 @@ dp01t_30_7_0803D67C: ; 8062918 lsls r1, r2, 27 lsrs r0, r1, 28 cmp r0, 0x1 - bhi @080629AC + bhi _080629AC adds r0, 0x1 movs r1, 0xF ands r0, r1 @@ -161657,14 +161657,14 @@ dp01t_30_7_0803D67C: ; 8062918 ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] - b @08062A12 + b _08062A12 .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 @@ -161696,7 +161696,7 @@ dp01t_30_7_0803D67C: ; 8062918 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @08062A06 + beq _08062A06 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -161705,14 +161705,14 @@ dp01t_30_7_0803D67C: ; 8062918 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 str r0, [r1] -@08062A12: +_08062A12: pop {r4-r7} pop {r0} bx r0 @@ -161737,7 +161737,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] @@ -161748,7 +161748,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 @@ -161771,7 +161771,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 @@ -161782,7 +161782,7 @@ sub_8062A74: ; 8062A74 adds r0, r2 ldr r1, =sub_8073C30 str r1, [r0] -@08062AA6: +_08062AA6: bl dp01_tbl7_exec_completed pop {r0} bx r0 @@ -161805,7 +161805,7 @@ sub_8062AD0: ; 8062AD0 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq @08062B16 + beq _08062B16 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -161832,7 +161832,7 @@ sub_8062AD0: ; 8062AD0 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -@08062B16: +_08062B16: bl dp01_tbl7_exec_completed pop {r4} pop {r0} @@ -161849,7 +161849,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 @@ -161870,18 +161870,18 @@ 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 .pool -@08062B7C: +_08062B7C: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =bx_803B0F4 str r0, [r1] -@08062B88: +_08062B88: add sp, 0x4 pop {r4-r6} pop {r0} @@ -161913,7 +161913,7 @@ sub_8062BB0: ; 8062BB0 movs r1, 0x6 ands r0, r1 cmp r0, 0x2 - bne @08062BDA + bne _08062BDA ldr r2, =0x030022c0 ldr r0, =0x00000439 adds r3, r2, r0 @@ -161927,7 +161927,7 @@ sub_8062BB0: ; 8062BB0 str r0, [r2] ldr r0, [r2, 0x8] bl SetMainCallback2 -@08062BDA: +_08062BDA: bl dp01_tbl7_exec_completed pop {r0} bx r0 @@ -161951,7 +161951,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 @@ -161960,7 +161960,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 @@ -161974,11 +161974,11 @@ ai_switch_perish_song: ; 8062BF8 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b @08062C52 + b _08062C52 .pool -@08062C50: +_08062C50: movs r0, 0 -@08062C52: +_08062C52: pop {r1} bx r1 thumb_func_end ai_switch_perish_song @@ -161996,9 +161996,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 @@ -162017,9 +162017,9 @@ sub_8062C58: ; 8062C58 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 @@ -162033,7 +162033,7 @@ sub_8062C58: ; 8062C58 movs r0, 0x20 adds r0, r4 mov r9, r0 -@08062CBA: +_08062CBA: lsls r1, r6, 1 ldr r5, =0x02024064 ldrb r0, [r5] @@ -162044,7 +162044,7 @@ sub_8062C58: ; 8062C58 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq @08062CE8 + beq _08062CE8 ldrh r1, [r4] mov r3, r9 ldrb r2, [r3] @@ -162054,35 +162054,35 @@ sub_8062C58: ; 8062C58 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 .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 @@ -162097,29 +162097,29 @@ sub_8062C58: ; 8062C58 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b @08062E2E + b _08062E2E .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 @@ -162129,19 +162129,19 @@ sub_8062C58: ; 8062C58 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] @@ -162149,7 +162149,7 @@ sub_8062C58: ; 8062C58 adds r0, r1 ldrh r0, [r0] cmp r6, r0 - beq @08062E24 + beq _08062E24 adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr @@ -162168,7 +162168,7 @@ sub_8062C58: ; 8062C58 adds r5, r0, r1 adds r7, r5, 0 adds r7, 0x20 -@08062DE0: +_08062DE0: adds r1, r4, 0 adds r1, 0xD mov r0, r9 @@ -162177,7 +162177,7 @@ sub_8062C58: ; 8062C58 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq @08062E1E + beq _08062E1E ldrh r1, [r5] ldrb r2, [r7] bl ai_rate_move @@ -162186,7 +162186,7 @@ sub_8062C58: ; 8062C58 movs r0, 0x2 ands r1, r0 cmp r1, 0 - beq @08062E1E + beq _08062E1E bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -162195,19 +162195,19 @@ sub_8062C58: ; 8062C58 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 @@ -162231,7 +162231,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 @@ -162239,9 +162239,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] @@ -162249,14 +162249,14 @@ sub_8062E54: ; 8062E54 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, =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 @@ -162265,15 +162265,15 @@ sub_8062E54: ; 8062E54 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 @@ -162291,11 +162291,11 @@ sub_8062E54: ; 8062E54 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08062F04 + beq _08062F04 ldrb r7, [r5] - b @08062F1E + b _08062F1E .pool -@08062F04: +_08062F04: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r4 @@ -162304,11 +162304,11 @@ sub_8062E54: ; 8062E54 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, =gBattleMoves ldr r1, =0x02024250 ldr r2, =0x02024064 @@ -162322,25 +162322,25 @@ sub_8062E54: ; 8062E54 adds r0, r3 ldrb r0, [r0, 0x2] cmp r0, 0xA - bne @08062F4C + bne _08062F4C movs r0, 0x12 - b @08062F5E + b _08062F5E .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 @@ -162350,29 +162350,29 @@ sub_8062E54: ; 8062E54 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 .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 @@ -162387,30 +162387,30 @@ sub_8062E54: ; 8062E54 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b @080630AE + b _080630AE .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, =gBaseStats mov r9, r0 -@08062FF0: +_08062FF0: movs r0, 0x64 muls r0, r5 ldr r1, [sp, 0x4] @@ -162419,43 +162419,43 @@ sub_8062E54: ; 8062E54 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 @@ -162465,37 +162465,37 @@ sub_8062E54: ; 8062E54 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 .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 @@ -162522,37 +162522,37 @@ 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 .pool -@08063128: +_08063128: ldr r2, =gBattleMoves ldr r1, =0x02024250 ldr r4, =0x02024064 @@ -162566,40 +162566,40 @@ ai_switchout_natural_cure: ; 80630C0 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 .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 @@ -162612,9 +162612,9 @@ ai_switchout_natural_cure: ; 80630C0 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 @@ -162650,7 +162650,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 @@ -162660,7 +162660,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] @@ -162671,7 +162671,7 @@ ai_has_super_effective_move_on_field: ; 80631BC adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq @08063250 + beq _08063250 ldrh r1, [r5] mov r3, r8 ldrb r2, [r3] @@ -162681,10 +162681,10 @@ ai_has_super_effective_move_on_field: ; 80631BC 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 @@ -162692,24 +162692,24 @@ ai_has_super_effective_move_on_field: ; 80631BC 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 .pool -@08063278: +_08063278: movs r0, 0x1 - b @080632FC -@0806327C: + b _080632FC +_0806327C: movs r1, 0x2 mov r0, r10 eors r0, r1 @@ -162724,7 +162724,7 @@ ai_has_super_effective_move_on_field: ; 80631BC ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @080632FA + bne _080632FA movs r4, 0 ldr r6, =0x02024084 movs r7, 0x58 @@ -162734,7 +162734,7 @@ ai_has_super_effective_move_on_field: ; 80631BC movs r3, 0x20 adds r3, r5 mov r8, r3 -@080632AE: +_080632AE: lsls r1, r4, 1 ldr r0, =0x02024064 ldrb r0, [r0] @@ -162745,7 +162745,7 @@ ai_has_super_effective_move_on_field: ; 80631BC adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq @080632F4 + beq _080632F4 ldrh r1, [r5] mov r3, r8 ldrb r2, [r3] @@ -162755,10 +162755,10 @@ ai_has_super_effective_move_on_field: ; 80631BC 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 @@ -162766,14 +162766,14 @@ ai_has_super_effective_move_on_field: ; 80631BC 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 @@ -162796,28 +162796,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 @@ -162846,21 +162846,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, =gBattleMoves ldrh r1, [r4] lsls r0, r1, 1 @@ -162869,15 +162869,15 @@ ai_switchout_something: ; 8063364 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 @@ -162895,12 +162895,12 @@ ai_switchout_something: ; 8063364 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08063414 + beq _08063414 ldrb r5, [r5] mov r10, r5 - b @08063430 + b _08063430 .pool -@08063414: +_08063414: ldrb r0, [r5] bl battle_get_per_side_status eors r0, r4 @@ -162910,35 +162910,35 @@ ai_switchout_something: ; 8063364 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 .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 @@ -162953,28 +162953,28 @@ ai_switchout_something: ; 8063364 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb movs r0, 0x1 - b @080635F0 + b _080635F0 .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 .pool -@080634BC: +_080634BC: movs r0, 0x64 muls r0, r6 ldr r1, [sp, 0xC] @@ -162983,36 +162983,36 @@ ai_switchout_something: ; 8063364 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 @@ -163020,13 +163020,13 @@ ai_switchout_something: ; 8063364 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 @@ -163036,23 +163036,23 @@ ai_switchout_something: ; 8063364 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, =gBaseStats adds r0, r1 ldrb r2, [r0, 0x17] - b @08063564 + b _08063564 .pool -@08063558: +_08063558: lsls r0, r4, 3 subs r0, r4 lsls r0, 2 ldr r2, =gBaseStats adds r0, r2 ldrb r2, [r0, 0x16] -@08063564: +_08063564: ldr r1, =0x02024250 ldr r5, =0x02024064 ldrb r0, [r5] @@ -163064,7 +163064,7 @@ ai_switchout_something: ; 8063364 ldr r1, [sp] ands r1, r0 cmp r1, 0 - beq @080635E4 + beq _080635E4 ldr r1, =0x02024270 ldrb r0, [r5] adds r0, r1 @@ -163083,7 +163083,7 @@ ai_switchout_something: ; 8063364 adds r5, r0, r1 adds r7, r5, 0 adds r7, 0x20 -@080635A2: +_080635A2: adds r1, r4, 0 adds r1, 0xD ldr r0, [sp, 0xC] @@ -163092,7 +163092,7 @@ ai_switchout_something: ; 8063364 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq @080635DE + beq _080635DE ldrh r1, [r5] ldrb r2, [r7] bl ai_rate_move @@ -163101,29 +163101,29 @@ ai_switchout_something: ; 8063364 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 @@ -163156,9 +163156,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 @@ -163167,9 +163167,9 @@ sub_8063614: ; 8063614 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 @@ -163179,9 +163179,9 @@ sub_8063614: ; 8063614 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 @@ -163191,9 +163191,9 @@ sub_8063614: ; 8063614 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 @@ -163202,7 +163202,7 @@ sub_8063614: ; 8063614 bl ability_something lsls r0, 24 cmp r0, 0 - beq @080636B4 + beq _080636B4 ldrb r0, [r4] muls r0, r5 adds r1, r0, r6 @@ -163210,31 +163210,31 @@ sub_8063614: ; 8063614 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 @@ -163252,11 +163252,11 @@ sub_8063614: ; 8063614 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08063718 + beq _08063718 ldrb r6, [r4] - b @08063732 + b _08063732 .pool -@08063718: +_08063718: ldrb r0, [r4] bl battle_get_per_side_status eors r0, r5 @@ -163265,53 +163265,53 @@ sub_8063614: ; 8063614 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 .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 @@ -163320,96 +163320,96 @@ sub_8063614: ; 8063614 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 .pool -@0806386C: +_0806386C: movs r0, 0 -@0806386E: +_0806386E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -163437,24 +163437,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] @@ -163464,25 +163464,25 @@ sub_8063880: ; 8063880 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 .pool -@08063910: +_08063910: adds r0, r5, 0 bl battle_get_side_with_given_state lsls r0, 24 @@ -163493,70 +163493,70 @@ sub_8063880: ; 8063880 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 .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 @@ -163566,7 +163566,7 @@ sub_8063880: ; 8063880 lsls r1, 2 adds r0, r1 strb r4, [r0] -@080639B8: +_080639B8: ldr r0, =0x02024064 ldrb r1, [r0] ldr r0, [r2] @@ -163578,14 +163578,14 @@ sub_8063880: ; 8063880 adds r0, r2 ldrb r0, [r0] strb r0, [r1] - b @080639F8 + b _080639F8 .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 @@ -163594,7 +163594,7 @@ sub_8063880: ; 8063880 movs r0, 0x1 movs r1, 0 bl dp01_build_cmdbuf_x21_a_bb -@080639F8: +_080639F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -163626,44 +163626,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 @@ -163692,16 +163692,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 @@ -163709,13 +163709,13 @@ sub_8063A90: ; 8063A90 adds r0, 0x1 lsls r0, 24 lsrs r0, 24 - b @08063E50 + b _08063E50 .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 @@ -163733,12 +163733,12 @@ sub_8063A90: ; 8063A90 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08063B20 + beq _08063B20 ldrb r4, [r4] str r4, [sp, 0x14] - b @08063B36 + b _08063B36 .pool -@08063B20: +_08063B20: ldrb r0, [r4] bl battle_get_per_side_status eors r0, r5 @@ -163748,7 +163748,7 @@ sub_8063A90: ; 8063A90 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x14] -@08063B36: +_08063B36: bl GenerateRandomNumber movs r3, 0x2 ands r0, r3 @@ -163764,14 +163764,14 @@ sub_8063A90: ; 8063A90 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 .pool -@08063B6C: +_08063B6C: adds r0, r2, 0 bl battle_get_per_side_status movs r1, 0x1 @@ -163785,51 +163785,51 @@ sub_8063A90: ; 8063A90 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 .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 @@ -163837,15 +163837,15 @@ sub_8063A90: ; 8063A90 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, =gUnknown_0832A328 adds r0, r1 mov r8, r0 mov r10, sp -@08063C00: +_08063C00: movs r0, 0x64 muls r0, r7 ldr r2, [sp, 0x20] @@ -163856,43 +163856,43 @@ sub_8063A90: ; 8063A90 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, =gBaseStats lsls r0, r5, 3 subs r0, r5 @@ -163926,16 +163926,16 @@ sub_8063A90: ; 8063A90 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 .pool -@08063CD8: +_08063CD8: mov r4, r8 ldr r0, [r4] mov r1, r9 @@ -163943,23 +163943,23 @@ sub_8063A90: ; 8063A90 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] @@ -163968,7 +163968,7 @@ sub_8063A90: ; 8063A90 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @08063D2A + beq _08063D2A ldr r0, =0x02024064 ldrb r1, [r0] adds r0, r4, 0 @@ -163977,16 +163977,16 @@ sub_8063A90: ; 8063A90 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, =gUnknown_0832A328 @@ -163997,17 +163997,17 @@ sub_8063A90: ; 8063A90 lsls r0, r2, 24 lsrs r0, 24 mov r9, r0 - b @08063D58 + b _08063D58 .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] @@ -164028,8 +164028,8 @@ sub_8063A90: ; 8063A90 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 @@ -164042,43 +164042,43 @@ sub_8063A90: ; 8063A90 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] @@ -164090,7 +164090,7 @@ sub_8063A90: ; 8063A90 mov r1, r8 str r0, [r1] cmp r4, 0 - beq @08063E2A + beq _08063E2A ldr r0, =gBattleMoves lsls r1, r4, 1 adds r1, r4 @@ -164098,7 +164098,7 @@ sub_8063A90: ; 8063A90 adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0x1 - beq @08063E2A + beq _08063E2A ldrb r0, [r6] ldr r1, [sp, 0x4] bl sub_8046E7C @@ -164106,30 +164106,30 @@ sub_8063A90: ; 8063A90 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 @@ -164148,51 +164148,51 @@ ai_identify_item_effect: ; 8063E84 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 @@ -164215,28 +164215,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 @@ -164246,37 +164246,37 @@ sub_8063EE0: ; 8063EE0 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 @@ -164285,9 +164285,9 @@ sub_8063EE0: ; 8063EE0 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 @@ -164298,30 +164298,30 @@ sub_8063EE0: ; 8063EE0 mov r9, r0 str r1, [sp] cmp r0, 0 - bne @08063FA6 - b @08064370 -@08063FA6: + bne _08063FA6 + b _08064370 +_08063FA6: ldr r1, =gItemEffectInfoPointers 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 .pool -@08063FE8: +_08063FE8: adds r5, r1, 0 -@08063FEA: +_08063FEA: mov r2, r9 lsls r0, r2, 24 lsrs r0, 24 @@ -164343,24 +164343,24 @@ sub_8063EE0: ; 8063EE0 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 .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] @@ -164371,17 +164371,17 @@ sub_8063EE0: ; 8063EE0 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 .pool -@08064074: +_08064074: mov r0, r9 movs r1, 0x4 movs r2, 0x4 @@ -164389,9 +164389,9 @@ sub_8063EE0: ; 8063EE0 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] @@ -164400,24 +164400,24 @@ sub_8063EE0: ; 8063EE0 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 .pool -@080640BC: +_080640BC: ldr r3, =0x02024064 ldrb r0, [r3] lsrs r0, 1 @@ -164432,7 +164432,7 @@ sub_8063EE0: ; 8063EE0 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @08064100 + beq _08064100 ldr r1, =0x02024084 ldrb r4, [r3] movs r0, 0x58 @@ -164443,7 +164443,7 @@ sub_8063EE0: ; 8063EE0 movs r1, 0x7 ands r0, r1 cmp r0, 0 - beq @08064100 + beq _08064100 lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -164452,13 +164452,13 @@ sub_8063EE0: ; 8063EE0 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 @@ -164469,12 +164469,12 @@ sub_8063EE0: ; 8063EE0 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 @@ -164483,13 +164483,13 @@ sub_8063EE0: ; 8063EE0 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 @@ -164500,7 +164500,7 @@ sub_8063EE0: ; 8063EE0 movs r1, 0x10 ands r0, r1 cmp r0, 0 - beq @0806416C + beq _0806416C lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -164509,13 +164509,13 @@ sub_8063EE0: ; 8063EE0 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 @@ -164526,7 +164526,7 @@ sub_8063EE0: ; 8063EE0 movs r1, 0x20 ands r0, r1 cmp r0, 0 - beq @0806419E + beq _0806419E lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -164535,13 +164535,13 @@ sub_8063EE0: ; 8063EE0 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 @@ -164552,7 +164552,7 @@ sub_8063EE0: ; 8063EE0 movs r1, 0x40 ands r0, r1 cmp r0, 0 - beq @080641D0 + beq _080641D0 lsrs r1, r4, 1 ldr r0, [r2] adds r1, r0 @@ -164561,15 +164561,15 @@ sub_8063EE0: ; 8063EE0 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 @@ -164580,9 +164580,9 @@ sub_8063EE0: ; 8063EE0 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 @@ -164590,9 +164590,9 @@ sub_8063EE0: ; 8063EE0 ldrb r0, [r1] orrs r0, r4 strb r0, [r1] - b @08064066 + b _08064066 .pool -@08064214: +_08064214: ldr r4, =0x02024064 ldrb r0, [r4] lsrs r0, 1 @@ -164610,13 +164610,13 @@ sub_8063EE0: ; 8063EE0 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 @@ -164625,13 +164625,13 @@ sub_8063EE0: ; 8063EE0 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] @@ -164641,12 +164641,12 @@ sub_8063EE0: ; 8063EE0 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] @@ -164656,12 +164656,12 @@ sub_8063EE0: ; 8063EE0 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] @@ -164671,12 +164671,12 @@ sub_8063EE0: ; 8063EE0 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] @@ -164686,14 +164686,14 @@ sub_8063EE0: ; 8063EE0 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] @@ -164703,9 +164703,9 @@ sub_8063EE0: ; 8063EE0 movs r2, 0x80 orrs r1, r2 strb r1, [r0] - b @08064066 + b _08064066 .pool -@080642F4: +_080642F4: ldr r4, =0x02024064 ldrb r0, [r4] bl battle_side_get_owner @@ -164719,7 +164719,7 @@ sub_8063EE0: ; 8063EE0 adds r0, r2 ldrb r0, [r0, 0x16] cmp r0, 0 - beq @08064324 + beq _08064324 ldr r0, =0x02024294 lsls r1, r3, 1 adds r1, r3 @@ -164727,12 +164727,12 @@ sub_8063EE0: ; 8063EE0 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 @@ -164756,18 +164756,18 @@ sub_8063EE0: ; 8063EE0 movs r1, 0 strh r1, [r0] adds r0, r7, 0 - b @0806437E + b _0806437E .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 @@ -164809,24 +164809,24 @@ 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, =gUnknown_0831C7B4 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @080643FC + b _080643FC .pool -@080643F8: +_080643F8: bl sub_8065068 -@080643FC: +_080643FC: pop {r0} bx r0 thumb_func_end sub_80643B0 @@ -164848,9 +164848,9 @@ sub_8064400: ; 8064400 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08064424 + bne _08064424 bl sub_8065068 -@08064424: +_08064424: pop {r0} bx r0 .pool @@ -164873,9 +164873,9 @@ sub_8064438: ; 8064438 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0806445C + bne _0806445C bl sub_8065068 -@0806445C: +_0806445C: pop {r0} bx r0 .pool @@ -164899,7 +164899,7 @@ sub_8064470: ; 8064470 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @080644C2 + bne _080644C2 adds r0, r2, r5 ldrh r0, [r0, 0x6] bl sub_805DFE4 @@ -164920,7 +164920,7 @@ sub_8064470: ; 8064470 adds r0, r5 bl RemoveObjectAndFreeTiles bl sub_8065068 -@080644C2: +_080644C2: pop {r4-r6} pop {r0} bx r0 @@ -164945,7 +164945,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] @@ -164956,7 +164956,7 @@ sub_80644D8: ; 80644D8 movs r1, 0 strb r1, [r0, 0x9] bl sub_8065068 -@08064510: +_08064510: pop {r4} pop {r0} bx r0 @@ -164974,18 +164974,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 @@ -165001,10 +165001,10 @@ sub_8064520: ; 8064520 ldr r0, =DummyObjectCallback adds r7, r3, 0 cmp r1, r0 - bne @080645C2 - b @080645CA + bne _080645C2 + b _080645CA .pool -@08064584: +_08064584: ldr r3, =0x02020630 ldr r6, =0x03005d70 ldr r2, =0x02024064 @@ -165021,7 +165021,7 @@ sub_8064520: ; 8064520 ldr r0, =DummyObjectCallback adds r7, r2, 0 cmp r3, r0 - bne @080645C0 + bne _080645C0 movs r0, 0x2 eors r4, r0 adds r0, r4, r6 @@ -165032,27 +165032,27 @@ sub_8064520: ; 8064520 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] @@ -165068,9 +165068,9 @@ sub_8064520: ; 8064520 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 @@ -165082,7 +165082,7 @@ sub_8064520: ; 8064520 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq @08064714 + beq _08064714 ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -165133,9 +165133,9 @@ sub_8064520: ; 8064520 bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag - b @080646F2 + b _080646F2 .pool -@0806469C: +_0806469C: ldr r3, =0x020244d0 ldr r0, [r3] ldrb r1, [r7] @@ -165148,7 +165148,7 @@ sub_8064520: ; 8064520 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @08064714 + beq _08064714 ldrb r1, [r2] movs r0, 0x7F ands r0, r1 @@ -165170,13 +165170,13 @@ sub_8064520: ; 8064520 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne @080646F2 + bne _080646F2 ldr r4, =0x000027f9 adds r0, r4, 0 bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag -@080646F2: +_080646F2: ldr r0, =0x020244d0 ldr r0, [r0] ldr r3, =0x02024064 @@ -165194,7 +165194,7 @@ sub_8064520: ; 8064520 adds r0, r1 ldr r1, =sub_80644D8 str r1, [r0] -@08064714: +_08064714: pop {r3} mov r8, r3 pop {r4-r7} @@ -165227,7 +165227,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] @@ -165237,13 +165237,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 @@ -165258,7 +165258,7 @@ sub_8064734: ; 8064734 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne @080647B4 + bne _080647B4 ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] @@ -165268,7 +165268,7 @@ sub_8064734: ; 8064734 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 -@080647B4: +_080647B4: ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, =0x02024064 @@ -165285,7 +165285,7 @@ sub_8064734: ; 8064734 mov r8, r3 mov r9, r2 cmp r0, 0 - bne @08064898 + bne _08064898 movs r7, 0x2 adds r1, r7, 0 eors r1, r5 @@ -165297,22 +165297,22 @@ sub_8064734: ; 8064734 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] @@ -165340,7 +165340,7 @@ sub_8064734: ; 8064734 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@0806484A: +_0806484A: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -165362,7 +165362,7 @@ sub_8064734: ; 8064734 adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -@0806487A: +_0806487A: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -165378,7 +165378,7 @@ sub_8064734: ; 8064734 strb r1, [r0, 0x1] mov r8, r4 mov r9, r3 -@08064898: +_08064898: mov r1, r8 ldr r0, [r1] mov r1, r9 @@ -165392,7 +165392,7 @@ sub_8064734: ; 8064734 movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne @0806495A + bne _0806495A movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -165403,11 +165403,11 @@ sub_8064734: ; 8064734 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 @@ -165421,30 +165421,30 @@ sub_8064734: ; 8064734 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 .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 @@ -165460,12 +165460,12 @@ sub_8064734: ; 8064734 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 @@ -165480,9 +165480,9 @@ sub_8064734: ; 8064734 ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - beq @08064982 - b @08064AC0 -@08064982: + beq _08064982 + b _08064AC0 +_08064982: ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] @@ -165492,21 +165492,21 @@ sub_8064734: ; 8064734 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] @@ -165521,7 +165521,7 @@ sub_8064734: ; 8064734 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @08064AC0 + beq _08064AC0 ldr r0, [r3] ldrb r1, [r5] ldr r2, [r0, 0x4] @@ -165531,17 +165531,17 @@ sub_8064734: ; 8064734 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] @@ -165572,7 +165572,7 @@ sub_8064734: ; 8064734 lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -@08064A3A: +_08064A3A: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -165637,7 +165637,7 @@ sub_8064734: ; 8064734 adds r0, r1 ldr r1, =sub_8064520 str r1, [r0] -@08064AC0: +_08064AC0: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -165666,12 +165666,12 @@ sub_8064B04: ; 8064B04 ldr r1, [r0] ldr r0, =DummyObjectCallback 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] @@ -165683,7 +165683,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] @@ -165693,14 +165693,14 @@ sub_8064B04: ; 8064B04 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 - b @08064BB6 + b _08064BB6 .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] @@ -165722,7 +165722,7 @@ sub_8064B04: ; 8064B04 adds r0, r4, 0 bl FreeObjectPaletteByTag bl sub_8065068 -@08064BB6: +_08064BB6: pop {r4-r7} pop {r0} bx r0 @@ -165752,17 +165752,17 @@ 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 .pool -@08064C08: +_08064C08: bl sub_8065068 -@08064C0C: +_08064C0C: pop {r4-r6} pop {r0} bx r0 @@ -165785,13 +165785,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 .pool @@ -165813,7 +165813,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] @@ -165839,7 +165839,7 @@ sub_8064C58: ; 8064C58 ldrb r0, [r0] bl sub_8072984 bl sub_8065068 -@08064CB2: +_08064CB2: pop {r4-r6} pop {r0} bx r0 @@ -165853,9 +165853,9 @@ sub_8064CCC: ; 8064CCC bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 - bne @08064CDE + bne _08064CDE bl sub_8065068 -@08064CDE: +_08064CDE: pop {r0} bx r0 thumb_func_end sub_8064CCC @@ -165876,7 +165876,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] @@ -165889,14 +165889,14 @@ sub_8064CE4: ; 8064CE4 ldr r0, =0x020244b9 strb r3, [r0] bl sub_8065068 - b @08064D5A + b _08064D5A .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] @@ -165910,11 +165910,11 @@ sub_8064CE4: ; 8064CE4 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 @@ -165937,7 +165937,7 @@ sub_8064D60: ; 8064D60 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08064DAC + bne _08064DAC ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -165947,20 +165947,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 str r0, [r1] -@08064DAC: +_08064DAC: pop {r4} pop {r0} bx r0 @@ -165983,11 +165983,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] @@ -166001,18 +166001,18 @@ sub_8064DD0: ; 8064DD0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @08064E1A + beq _08064E1A ldr r0, =nullsub_18 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 @@ -166035,7 +166035,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 @@ -166049,7 +166049,7 @@ sub_8064E50: ; 8064E50 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08064F0C + bne _08064F0C ldrb r1, [r3] movs r0, 0x7F ands r0, r1 @@ -166108,7 +166108,7 @@ sub_8064E50: ; 8064E50 adds r0, r1 ldr r1, =sub_8064D60 str r1, [r0] -@08064F0C: +_08064F0C: pop {r4-r7} pop {r0} bx r0 @@ -166131,7 +166131,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] @@ -166141,7 +166141,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] @@ -166156,7 +166156,7 @@ sub_8064F40: ; 8064F40 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08064FDC + bne _08064FDC ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -166167,7 +166167,7 @@ sub_8064F40: ; 8064F40 movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @08064FDC + bne _08064FDC adds r0, r3, r4 bl RemoveObjectAndFreeTiles ldrb r4, [r5] @@ -166192,7 +166192,7 @@ sub_8064F40: ; 8064F40 adds r0, r1 ldr r1, =sub_8064E50 str r1, [r0] -@08064FDC: +_08064FDC: pop {r4-r6} pop {r0} bx r0 @@ -166215,9 +166215,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 .pool @@ -166239,9 +166239,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 .pool @@ -166263,7 +166263,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] @@ -166277,9 +166277,9 @@ sub_8065068: ; 8065068 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @080650CE + b _080650CE .pool -@080650BC: +_080650BC: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -166289,7 +166289,7 @@ sub_8065068: ; 8065068 ldr r0, [r2] bics r0, r1 str r0, [r2] -@080650CE: +_080650CE: add sp, 0x4 pop {r4} pop {r0} @@ -166310,7 +166310,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 @@ -166318,28 +166318,28 @@ dp01t_00_2_getattr: ; 80650E0 mov r1, sp bl dp01_getattr_by_ch1_for_opponent_pokemon adds r6, r0, 0 - b @0806513A + b _0806513A .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 @@ -166372,78 +166372,78 @@ 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 .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 @@ -166480,7 +166480,7 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@080652D0: +_080652D0: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -166496,7 +166496,7 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @080652D0 + ble _080652D0 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -166674,33 +166674,33 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 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 .pool -@080654A8: +_080654A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB - b @08065822 + b _08065822 .pool -@080654B8: +_080654B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC - b @08065822 + b _08065822 .pool -@080654C8: +_080654C8: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -166712,7 +166712,7 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 -@080654DE: +_080654DE: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -166730,7 +166730,7 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @080654DE + ble _080654DE movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -166741,17 +166741,17 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 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 .pool -@08065530: +_08065530: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -166762,16 +166762,16 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @08065822 + b _08065822 .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 @@ -166781,7 +166781,7 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @08065558 + ble _08065558 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -166791,9 +166791,9 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @080658EA + b _080658EA .pool -@08065588: +_08065588: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -166804,23 +166804,23 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @080658E2 + b _080658E2 .pool -@080655A4: +_080655A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 - b @080655BE + b _080655BE .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] @@ -166835,105 +166835,105 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @080658EA + b _080658EA .pool -@080655E4: +_080655E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A - b @080658E2 + b _080658E2 .pool -@080655F4: +_080655F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B - b @080658E2 + b _080658E2 .pool -@08065604: +_08065604: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C - b @080658E2 + b _080658E2 .pool -@08065614: +_08065614: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D - b @080658E2 + b _080658E2 .pool -@08065624: +_08065624: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E - b @080658E2 + b _080658E2 .pool -@08065634: +_08065634: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F - b @080658E2 + b _080658E2 .pool -@08065644: +_08065644: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 - b @080658E2 + b _080658E2 .pool -@08065654: +_08065654: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 - b @080658E2 + b _080658E2 .pool -@08065664: +_08065664: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 - b @080658E2 + b _080658E2 .pool -@08065674: +_08065674: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 - b @080658E2 + b _080658E2 .pool -@08065684: +_08065684: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 - b @080658E2 + b _080658E2 .pool -@08065694: +_08065694: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 - b @080658E2 + b _080658E2 .pool -@080656A4: +_080656A4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -166964,79 +166964,79 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @080658EA + b _080658EA .pool -@080656F4: +_080656F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 - b @080658E2 + b _080658E2 .pool -@08065704: +_08065704: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 - b @080658E2 + b _080658E2 .pool -@08065714: +_08065714: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 - b @080658E2 + b _080658E2 .pool -@08065724: +_08065724: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A - b @080658E2 + b _080658E2 .pool -@08065734: +_08065734: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B - b @080658E2 + b _080658E2 .pool -@08065744: +_08065744: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C - b @080658E2 + b _080658E2 .pool -@08065754: +_08065754: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0 - b @0806577E + b _0806577E .pool -@08065764: +_08065764: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 - b @08065822 + b _08065822 .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] @@ -167053,71 +167053,71 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @080658EA + b _080658EA .pool -@080657A8: +_080657A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 - b @080658E2 + b _080658E2 .pool -@080657B8: +_080657B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 - b @08065822 + b _08065822 .pool -@080657C8: +_080657C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A - b @08065822 + b _08065822 .pool -@080657D8: +_080657D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B - b @08065822 + b _08065822 .pool -@080657E8: +_080657E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C - b @08065822 + b _08065822 .pool -@080657F8: +_080657F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D - b @08065822 + b _08065822 .pool -@08065808: +_08065808: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E - b @08065822 + b _08065822 .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 @@ -167125,99 +167125,99 @@ dp01_getattr_by_ch1_for_opponent_pokemon: ; 8065154 lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @080658EA + b _080658EA .pool -@08065838: +_08065838: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 - b @080658E2 + b _080658E2 .pool -@08065848: +_08065848: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 - b @080658E2 + b _080658E2 .pool -@08065858: +_08065858: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 - b @080658E2 + b _080658E2 .pool -@08065868: +_08065868: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 - b @080658E2 + b _080658E2 .pool -@08065878: +_08065878: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F - b @080658E2 + b _080658E2 .pool -@08065888: +_08065888: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 - b @080658E2 + b _080658E2 .pool -@08065898: +_08065898: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 - b @080658E2 + b _080658E2 .pool -@080658A8: +_080658A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 - b @080658E2 + b _080658E2 .pool -@080658B8: +_080658B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 - b @080658E2 + b _080658E2 .pool -@080658C8: +_080658C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 - b @080658E2 + b _080658E2 .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} @@ -167249,32 +167249,32 @@ 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 .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} @@ -167303,78 +167303,78 @@ 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 .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 @@ -167424,7 +167424,7 @@ sub_8065964: ; 8065964 adds r6, 0x24 adds r4, r7, 0 adds r4, 0xC -@08065AFE: +_08065AFE: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -167441,7 +167441,7 @@ sub_8065964: ; 8065964 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @08065AFE + ble _08065AFE movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -167553,9 +167553,9 @@ sub_8065964: ; 8065964 movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065C30: +_08065C30: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167565,9 +167565,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0xB bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065C4C: +_08065C4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167577,9 +167577,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0xC bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065C68: +_08065C68: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -167592,7 +167592,7 @@ sub_8065964: ; 8065964 adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 -@08065C80: +_08065C80: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -167609,7 +167609,7 @@ sub_8065964: ; 8065964 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @08065C80 + ble _08065C80 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167617,9 +167617,9 @@ sub_8065964: ; 8065964 movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065CBC: +_08065CBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167631,9 +167631,9 @@ sub_8065964: ; 8065964 adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @08065D5A + b _08065D5A .pool -@08065CDC: +_08065CDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -167678,9 +167678,9 @@ sub_8065964: ; 8065964 adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065D44: +_08065D44: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167692,13 +167692,13 @@ sub_8065964: ; 8065964 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 .pool -@08065D6C: +_08065D6C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167708,9 +167708,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x1 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065D88: +_08065D88: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167720,9 +167720,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x19 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065DA4: +_08065DA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167732,9 +167732,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x1A bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065DC0: +_08065DC0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167744,9 +167744,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x1B bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065DDC: +_08065DDC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167756,9 +167756,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x1C bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065DF8: +_08065DF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167768,9 +167768,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x1D bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065E14: +_08065E14: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167780,9 +167780,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x1E bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065E30: +_08065E30: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167792,9 +167792,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x1F bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065E4C: +_08065E4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167804,9 +167804,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x20 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065E68: +_08065E68: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167816,9 +167816,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x22 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065E84: +_08065E84: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167828,9 +167828,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x23 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065EA0: +_08065EA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167840,9 +167840,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x24 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065EBC: +_08065EBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167852,9 +167852,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x25 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065ED8: +_08065ED8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167864,9 +167864,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x26 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065EF4: +_08065EF4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -167917,9 +167917,9 @@ sub_8065964: ; 8065964 adds r0, r3, 0x5 adds r2, r0 adds r0, r4, 0 - b @08066002 + b _08066002 .pool -@08065F68: +_08065F68: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167929,9 +167929,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x27 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065F84: +_08065F84: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167941,9 +167941,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x28 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065FA0: +_08065FA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167953,9 +167953,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x29 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065FBC: +_08065FBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167965,9 +167965,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x2A bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065FD8: +_08065FD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167977,9 +167977,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x2B bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08065FF4: +_08065FF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -167987,12 +167987,12 @@ sub_8065964: ; 8065964 ldrb r2, [r6] lsls r2, 9 adds r2, r3 -@08066002: +_08066002: movs r1, 0x2C bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066010: +_08066010: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168002,9 +168002,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@0806602C: +_0806602C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168014,9 +168014,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x9 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066048: +_08066048: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168026,9 +168026,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x37 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066064: +_08066064: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168038,9 +168038,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x38 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066080: +_08066080: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168050,9 +168050,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x39 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@0806609C: +_0806609C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168062,9 +168062,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x3A bl pokemon_setattr - b @08066270 + b _08066270 .pool -@080660B8: +_080660B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168074,9 +168074,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x3B bl pokemon_setattr - b @08066270 + b _08066270 .pool -@080660D4: +_080660D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168086,9 +168086,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x3C bl pokemon_setattr - b @08066270 + b _08066270 .pool -@080660F0: +_080660F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168098,9 +168098,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x3D bl pokemon_setattr - b @08066270 + b _08066270 .pool -@0806610C: +_0806610C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168110,9 +168110,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x3E bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066128: +_08066128: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168122,9 +168122,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x3F bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066144: +_08066144: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168134,9 +168134,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x16 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066160: +_08066160: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168146,9 +168146,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x17 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@0806617C: +_0806617C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168158,9 +168158,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x18 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066198: +_08066198: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168170,9 +168170,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x21 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@080661B4: +_080661B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168182,9 +168182,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x2F bl pokemon_setattr - b @08066270 + b _08066270 .pool -@080661D0: +_080661D0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168194,9 +168194,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x30 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@080661EC: +_080661EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168206,9 +168206,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x32 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066208: +_08066208: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168218,9 +168218,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x33 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066224: +_08066224: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168230,9 +168230,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x34 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@08066240: +_08066240: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168242,9 +168242,9 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x35 bl pokemon_setattr - b @08066270 + b _08066270 .pool -@0806625C: +_0806625C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -168254,7 +168254,7 @@ sub_8065964: ; 8065964 adds r2, r3 movs r1, 0x36 bl pokemon_setattr -@08066270: +_08066270: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -168291,11 +168291,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 @@ -168312,8 +168312,8 @@ sub_8066284: ; 8066284 adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc @080662BA -@080662DC: + bcc _080662BA +_080662DC: bl sub_8065068 pop {r4-r7} pop {r0} @@ -168678,7 +168678,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] @@ -168693,9 +168693,9 @@ sub_8066624: ; 8066624 adds r0, r1 ldr r1, =sub_80666BC str r1, [r0] - b @080666A8 + b _080666A8 .pool -@0806666C: +_0806666C: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -168721,7 +168721,7 @@ sub_8066624: ; 8066624 ldrb r0, [r0] bl sub_8072984 bl sub_8065068 -@080666A8: +_080666A8: pop {r4-r6} pop {r0} bx r0 @@ -168742,12 +168742,12 @@ 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 .pool -@080666E4: +_080666E4: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -168755,12 +168755,12 @@ sub_80666BC: ; 80666BC 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] @@ -168770,15 +168770,15 @@ sub_80666BC: ; 80666BC 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 @@ -168791,7 +168791,7 @@ sub_80666BC: ; 80666BC adds r0, r1 ldr r1, =sub_8064C58 str r1, [r0] -@0806673A: +_0806673A: pop {r4-r6} pop {r0} bx r0 @@ -168809,7 +168809,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 @@ -168817,31 +168817,31 @@ 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 .pool -@08066794: +_08066794: ldr r0, =0x02038bcc -@08066796: +_08066796: ldrh r0, [r0] bl sub_8162AA0 lsls r0, 24 lsrs r0, 24 - b @0806694C + b _0806694C .pool -@080667A8: +_080667A8: ldrb r0, [r5] bl sub_806D864 ldr r6, =0x020229e8 @@ -168852,7 +168852,7 @@ sub_8066748: ; 8066748 movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq @080667D8 + beq _080667D8 ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -168863,8 +168863,8 @@ sub_8066748: ; 8066748 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 @@ -168873,10 +168873,10 @@ sub_8066748: ; 8066748 adds r1, r6 ldrb r0, [r1, 0x13] cmp r0, 0 - bne @080668AA - b @080668BC + bne _080668AA + b _080668BC .pool -@080667F4: +_080667F4: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -168887,7 +168887,7 @@ sub_8066748: ; 8066748 adds r0, r4, 0 ands r0, r1 cmp r0, 0x2 - beq @08066822 + beq _08066822 ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -168897,8 +168897,8 @@ sub_8066748: ; 8066748 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 @@ -168907,24 +168907,24 @@ sub_8066748: ; 8066748 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 .pool -@08066858: +_08066858: bl link_get_multiplayer_id ldr r6, =0x020229e8 movs r5, 0x1 @@ -168938,7 +168938,7 @@ sub_8066748: ; 8066748 movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq @08066892 + beq _08066892 bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -168951,8 +168951,8 @@ sub_8066748: ; 8066748 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 @@ -168963,20 +168963,20 @@ sub_8066748: ; 8066748 adds r1, r6 ldrb r0, [r1, 0x13] cmp r0, 0 - beq @080668BC -@080668AA: + beq _080668BC +_080668AA: ldr r0, =gTrainerPicIndices adds r0, 0x4F ldrb r0, [r0] - b @0806694C + b _0806694C .pool -@080668BC: +_080668BC: ldr r0, =gTrainerPicIndices adds r0, 0x4E ldrb r0, [r0] - b @0806694C + b _0806694C .pool -@080668C8: +_080668C8: bl link_get_multiplayer_id eors r0, r5 lsls r0, 24 @@ -168989,7 +168989,7 @@ sub_8066748: ; 8066748 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 @@ -169001,8 +169001,8 @@ sub_8066748: ; 8066748 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 @@ -169013,35 +169013,35 @@ sub_8066748: ; 8066748 adds r1, r6 ldrb r0, [r1, 0x13] cmp r0, 0 - beq @08066924 -@08066916: + beq _08066924 +_08066916: ldr r0, =gTrainerPicIndices adds r0, 0x51 ldrb r0, [r0] - b @0806694C + b _0806694C .pool -@08066924: +_08066924: ldr r0, =gTrainerPicIndices adds r0, 0x50 ldrb r0, [r0] - b @0806694C + b _0806694C .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] @@ -169160,13 +169160,13 @@ sub_8066A58: ; 8066A58 ldr r0, =0x02024064 ldrb r0, [r0] cmp r0, 0x1 - bne @08066A74 + bne _08066A74 ldr r0, =0x02038bca - b @08066A76 + b _08066A76 .pool -@08066A74: +_08066A74: ldr r0, =0x02038bcc -@08066A76: +_08066A76: ldrh r0, [r0] bl sub_8162AA0 lsls r0, 24 @@ -169372,7 +169372,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 @@ -169380,12 +169380,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] @@ -169396,16 +169396,16 @@ sub_8066C40: ; 8066C40 ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b @08066CD0 + b _08066CD0 .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 @@ -169428,7 +169428,7 @@ sub_8066C40: ; 8066C40 adds r0, r1 ldr r1, =sub_8064C14 str r1, [r0] -@08066CD0: +_08066CD0: pop {r4-r6} pop {r0} bx r0 @@ -169477,9 +169477,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] @@ -169583,11 +169583,11 @@ sub_8066D1C: ; 8066D1C lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq @08066E30 + beq _08066E30 bl sub_8065068 - b @08066E58 + b _08066E58 .pool -@08066E30: +_08066E30: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] @@ -169607,7 +169607,7 @@ sub_8066D1C: ; 8066D1C ldr r2, [r7] adds r0, r6, 0 bl sub_817E0FC -@08066E58: +_08066E58: pop {r3} mov r8, r3 pop {r4-r7} @@ -169650,20 +169650,20 @@ 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 .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 @@ -169671,7 +169671,7 @@ sub_8066E70: ; 8066E70 movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne @08066EF4 + bne _08066EF4 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -169680,7 +169680,7 @@ sub_8066E70: ; 8066E70 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -@08066EF4: +_08066EF4: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -169690,13 +169690,13 @@ sub_8066E70: ; 8066E70 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 @@ -169710,15 +169710,15 @@ sub_8066E70: ; 8066E70 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] @@ -169730,10 +169730,10 @@ sub_8066E70: ; 8066E70 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 @@ -169748,7 +169748,7 @@ sub_8066E70: ; 8066E70 negs r0, r0 ands r0, r2 strb r0, [r1] -@08066F80: +_08066F80: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -169760,16 +169760,16 @@ sub_8066E70: ; 8066E70 adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @08066FE4 + b _08066FE4 .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 @@ -169790,7 +169790,7 @@ sub_8066E70: ; 8066E70 adds r0, r2 strb r4, [r0, 0x4] bl sub_8065068 -@08066FE4: +_08066FE4: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -169914,7 +169914,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 @@ -169944,9 +169944,9 @@ sub_80670A0: ; 80670A0 str r7, [sp] mov r2, r8 bl sub_807294C - b @0806715A + b _0806715A .pool -@08067130: +_08067130: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -169966,7 +169966,7 @@ sub_80670A0: ; 80670A0 str r7, [sp] movs r3, 0 bl sub_807294C -@0806715A: +_0806715A: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -170000,7 +170000,7 @@ sub_806719C: ; 806719C bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @080671F0 + bne _080671F0 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -170034,7 +170034,7 @@ sub_806719C: ; 806719C adds r0, r1 ldr r1, =sub_8065008 str r1, [r0] -@080671F0: +_080671F0: pop {r4} pop {r0} bx r0 @@ -170049,7 +170049,7 @@ sub_8067214: ; 8067214 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @08067264 + bne _08067264 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -170081,7 +170081,7 @@ sub_8067214: ; 8067214 adds r0, r1 ldr r1, =sub_8065008 str r1, [r0] -@08067264: +_08067264: pop {r4,r5} pop {r0} bx r0 @@ -170252,11 +170252,11 @@ sub_806737C: ; 806737C ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge @080673B0 + bge _080673B0 bl sub_8065068 - b @080673DA + b _080673DA .pool -@080673B0: +_080673B0: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -170277,7 +170277,7 @@ sub_806737C: ; 806737C adds r0, r1 ldr r1, =sub_8064CE4 str r1, [r0] -@080673DA: +_080673DA: pop {r4} pop {r0} bx r0 @@ -170301,9 +170301,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 @@ -170336,7 +170336,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 @@ -170349,9 +170349,9 @@ sub_806743C: ; 806743C lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @0806748C + b _0806748C .pool -@08067478: +_08067478: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -170361,7 +170361,7 @@ sub_806743C: ; 806743C lsls r1, 8 orrs r0, r1 bl fanfare_play -@0806748C: +_0806748C: bl sub_8065068 pop {r4,r5} pop {r0} @@ -170502,7 +170502,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] @@ -170512,7 +170512,7 @@ sub_8067508: ; 8067508 adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@080675CA: +_080675CA: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -170554,14 +170554,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 @@ -170575,9 +170575,9 @@ c3_08038DC4: ; 8067618 ldrb r0, [r7] movs r1, 0 bl sub_8066494 - b @080676C4 + b _080676C4 .pool -@08067684: +_08067684: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -170608,7 +170608,7 @@ c3_08038DC4: ; 8067618 ldrb r0, [r7] eors r0, r5 strb r0, [r7] -@080676C4: +_080676C4: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -170655,16 +170655,16 @@ 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 .pool -@08067748: +_08067748: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -170686,7 +170686,7 @@ sub_8067718: ; 8067718 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 @@ -170697,7 +170697,7 @@ sub_8067718: ; 8067718 lsls r1, r2, 27 lsrs r0, r1, 28 cmp r0, 0x1 - bhi @080677AC + bhi _080677AC adds r0, 0x1 movs r1, 0xF ands r0, r1 @@ -170707,14 +170707,14 @@ sub_8067718: ; 8067718 ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] - b @08067812 + b _08067812 .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 @@ -170746,7 +170746,7 @@ sub_8067718: ; 8067718 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @08067806 + beq _08067806 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -170755,14 +170755,14 @@ sub_8067718: ; 8067718 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 str r0, [r1] -@08067812: +_08067812: pop {r4-r7} pop {r0} bx r0 @@ -170787,7 +170787,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] @@ -170798,7 +170798,7 @@ sub_806782C: ; 806782C movs r1, 0 strb r1, [r0, 0x5] bl sub_8065068 -@08067864: +_08067864: pop {r4} pop {r0} bx r0 @@ -170821,7 +170821,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 @@ -170832,7 +170832,7 @@ sub_8067874: ; 8067874 adds r0, r2 ldr r1, =sub_8073C30 str r1, [r0] -@080678A6: +_080678A6: bl sub_8065068 pop {r0} bx r0 @@ -170855,7 +170855,7 @@ sub_80678D0: ; 80678D0 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq @08067916 + beq _08067916 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -170882,7 +170882,7 @@ sub_80678D0: ; 80678D0 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -@08067916: +_08067916: bl sub_8065068 pop {r4} pop {r0} @@ -170899,7 +170899,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 @@ -170921,21 +170921,21 @@ 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 .pool -@08067980: +_08067980: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =sub_8065038 str r0, [r1] -@0806798C: +_0806798C: adds r0, r6, 0 bl sub_817E32C -@08067992: +_08067992: add sp, 0x4 pop {r4-r6} pop {r0} @@ -170981,17 +170981,17 @@ 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 .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 @@ -171041,12 +171041,12 @@ zero_pokemon_boxed_data: ; 8067A74 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 @@ -171116,12 +171116,12 @@ zero_player_party_data: ; 8067B0C 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 @@ -171135,12 +171135,12 @@ zero_enemy_party_data: ; 8067B2C 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 @@ -171231,11 +171231,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 @@ -171244,7 +171244,7 @@ create_pokemon: ; 8067BBC lsls r0, 16 orrs r4, r0 str r4, [sp, 0x14] -@08067C0C: +_08067C0C: add r2, sp, 0x14 adds r0, r7, 0 movs r1, 0 @@ -171254,11 +171254,11 @@ create_pokemon: ; 8067BBC 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 @@ -171281,17 +171281,17 @@ create_pokemon: ; 8067BBC ands r2, r6 eors r1, r2 cmp r1, 0x7 - bls @08067C28 - b @08067C8A + bls _08067C28 + b _08067C8A .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] @@ -171305,7 +171305,7 @@ create_pokemon: ; 8067BBC lsls r0, 24 orrs r1, r0 str r1, [sp, 0x18] -@08067C8A: +_08067C8A: adds r0, r7, 0 movs r1, 0x1 mov r2, r9 @@ -171401,7 +171401,7 @@ create_pokemon: ; 8067BBC mov r2, sp ldrb r0, [r2, 0x11] cmp r0, 0x1F - bhi @08067DC8 + bhi _08067DC8 adds r0, r7, 0 movs r1, 0x27 adds r2, 0x11 @@ -171431,9 +171431,9 @@ create_pokemon: ; 8067BBC mov r2, sp adds r2, 0x11 bl pokemon_setattr_encrypted - b @08067E50 + b _08067E50 .pool -@08067DC8: +_08067DC8: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -171494,7 +171494,7 @@ create_pokemon: ; 8067BBC movs r1, 0x2C adds r2, r4, 0 bl pokemon_setattr_encrypted -@08067E50: +_08067E50: ldr r2, =gBaseStats mov r3, sp ldrh r1, [r3, 0xE] @@ -171504,7 +171504,7 @@ create_pokemon: ; 8067BBC adds r0, r2 ldrb r0, [r0, 0x17] cmp r0, 0 - beq @08067E76 + beq _08067E76 ldr r0, [sp, 0x14] movs r1, 0x1 ands r0, r1 @@ -171513,7 +171513,7 @@ create_pokemon: ; 8067BBC movs r1, 0x2E mov r2, r9 bl pokemon_setattr_encrypted -@08067E76: +_08067E76: adds r0, r7, 0 bl sub_8069270 add sp, 0x20 @@ -171545,7 +171545,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 @@ -171558,7 +171558,7 @@ pokemon_make_with_nature: ; 8067E90 lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne @08067EB0 + bne _08067EB0 movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] @@ -171612,8 +171612,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 @@ -171647,20 +171647,20 @@ sub_8067EF8: ; 8067EF8 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 @@ -171673,15 +171673,15 @@ sub_8067EF8: ; 8067EF8 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] @@ -171714,7 +171714,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 @@ -171734,7 +171734,7 @@ sub_8067FF8: ; 8067FF8 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] @@ -171865,17 +171865,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 @@ -171884,22 +171884,22 @@ pokemon_make_ev_something: ; 8068114 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 @@ -171938,7 +171938,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 @@ -171947,7 +171947,7 @@ sub_806819C: ; 806819C adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @080681D2 + ble _080681D2 adds r2, r6, 0 adds r2, 0xD adds r0, r7, 0 @@ -171969,22 +171969,22 @@ sub_806819C: ; 806819C 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 StripExtendedControlCodes - 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 @@ -172118,20 +172118,20 @@ 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 .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] @@ -172174,7 +172174,7 @@ sub_8068338: ; 8068338 add r1, sp mov r8, r1 adds r4, r6, 0x4 -@080683D2: +_080683D2: ldrh r1, [r4] lsls r2, r5, 24 lsrs r2, 24 @@ -172183,7 +172183,7 @@ sub_8068338: ; 8068338 adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @080683D2 + ble _080683D2 adds r0, r7, 0 movs r1, 0x15 mov r2, r10 @@ -172202,22 +172202,22 @@ sub_8068338: ; 8068338 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 StripExtendedControlCodes - 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 @@ -172400,7 +172400,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 @@ -172410,14 +172410,14 @@ sub_8068528: ; 8068528 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 @@ -172425,7 +172425,7 @@ sub_8068528: ; 8068528 bl pokemon_setattr adds r4, 0x1 cmp r4, 0x5 - ble @080685E0 + ble _080685E0 ldrb r0, [r5] mov r1, r8 strb r0, [r1] @@ -172482,7 +172482,7 @@ sub_8068634: ; 8068634 lsrs r4, 24 mov r8, r4 movs r6, 0 -@08068664: +_08068664: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -172495,7 +172495,7 @@ sub_8068634: ; 8068634 lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne @08068664 + bne _08068664 movs r0, 0x1 str r0, [sp] str r4, [sp, 0x4] @@ -172510,17 +172510,17 @@ sub_8068634: ; 8068634 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 @@ -172529,22 +172529,22 @@ sub_8068634: ; 8068634 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 @@ -172576,9 +172576,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 @@ -172588,7 +172588,7 @@ sub_80686FC: ; 80686FC adds r1, r6 mov r9, r1 adds r4, r6, 0x4 -@08068738: +_08068738: adds r1, r5, 0 adds r1, 0xD adds r0, r7, 0 @@ -172598,7 +172598,7 @@ sub_80686FC: ; 80686FC adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @08068738 + ble _08068738 adds r0, r7, 0 movs r1, 0x38 movs r2, 0 @@ -172798,28 +172798,28 @@ sub_80688F8: ; 80688F8 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 .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 @@ -172827,16 +172827,16 @@ sub_80688F8: ; 80688F8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @080689CE - b @080689B6 + beq _080689CE + b _080689B6 .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 @@ -172844,23 +172844,23 @@ sub_80688F8: ; 80688F8 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 .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 @@ -172868,12 +172868,12 @@ sub_80688F8: ; 80688F8 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 @@ -172884,12 +172884,12 @@ sub_80688F8: ; 80688F8 adds r1, r4 ldrh r0, [r1, 0x18] cmp r0, r5 - bne @08068A00 -@080689CE: + bne _08068A00 +_080689CE: movs r0, 0 - b @08068A02 + b _08068A02 .pool -@080689E4: +_080689E4: ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -172897,16 +172897,16 @@ sub_80688F8: ; 80688F8 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 @@ -172923,7 +172923,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 @@ -172931,12 +172931,12 @@ 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 .pool -@08068A3C: +_08068A3C: adds r1, r6, 0 adds r1, 0x27 adds r0, r5, 0 @@ -172955,9 +172955,9 @@ get_pokemon_data_3: ; 8068A10 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 @@ -172980,7 +172980,7 @@ get_pokemon_data_3: ; 8068A10 lsls r0, 16 lsrs r4, r0, 16 adds r0, r4, 0 -@08068A9A: +_08068A9A: pop {r4-r6} pop {r1} bx r1 @@ -172992,7 +172992,7 @@ 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 @@ -173005,7 +173005,7 @@ sub_8068AA4: ; 8068AA4 movs r1, 0xCD lsls r1, 1 cmp r0, r1 - bne @08068B34 + bne _08068B34 adds r0, r4, 0 movs r1, 0x3B movs r2, 0 @@ -173051,10 +173051,10 @@ sub_8068AA4: ; 8068AA4 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} @@ -173071,20 +173071,20 @@ 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 .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 @@ -173119,20 +173119,20 @@ 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 .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 @@ -173183,7 +173183,7 @@ DoScriptedWildBattle: ; 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 @@ -173193,7 +173193,7 @@ DoScriptedWildBattle: ; 8068C18 movs r1, 0xC add r2, sp, 0x10 bl pokemon_setattr -@08068C60: +_08068C60: add sp, 0x14 pop {r4-r7} pop {r0} @@ -173229,7 +173229,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 @@ -173237,10 +173237,10 @@ pokemon_calc_checksum: ; 8068C78 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 @@ -173248,10 +173248,10 @@ pokemon_calc_checksum: ; 8068C78 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 @@ -173259,10 +173259,10 @@ pokemon_calc_checksum: ; 8068C78 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 @@ -173270,7 +173270,7 @@ pokemon_calc_checksum: ; 8068C78 adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge @08068CEE + bge _08068CEE adds r0, r6, 0 pop {r3} mov r8, r3 @@ -173374,13 +173374,13 @@ 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 .pool -@08068DF8: +_08068DF8: ldr r1, =gBaseStats lsls r2, r7, 3 subs r0, r2, r7 @@ -173392,9 +173392,9 @@ pokemon_calc_effective_stats: ; 8068D0C 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] @@ -173404,7 +173404,7 @@ pokemon_calc_effective_stats: ; 8068D0C adds r0, r4 adds r0, 0xA str r0, [sp, 0x4] -@08068E26: +_08068E26: ldr r1, =0x02024474 add r2, sp, 0x4 ldrb r0, [r2] @@ -173414,10 +173414,10 @@ pokemon_calc_effective_stats: ; 8068D0C 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 @@ -173431,9 +173431,9 @@ pokemon_calc_effective_stats: ; 8068D0C 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] @@ -173463,9 +173463,9 @@ pokemon_calc_effective_stats: ; 8068D0C 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] @@ -173495,9 +173495,9 @@ pokemon_calc_effective_stats: ; 8068D0C 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] @@ -173527,9 +173527,9 @@ pokemon_calc_effective_stats: ; 8068D0C 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] @@ -173559,9 +173559,9 @@ pokemon_calc_effective_stats: ; 8068D0C 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] @@ -173587,38 +173587,38 @@ pokemon_calc_effective_stats: ; 8068D0C 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 .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 @@ -173697,12 +173697,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 @@ -173710,8 +173710,8 @@ level_by_exp: ; 8069054 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 @@ -173751,12 +173751,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 @@ -173764,8 +173764,8 @@ sub_80690C0: ; 80690C0 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 @@ -173796,7 +173796,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 @@ -173806,7 +173806,7 @@ pokemon_moveset_pad: ; 8069140 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @0806918C + bne _0806918C adds r0, r7, 0 adds r1, r4, 0 mov r2, sp @@ -173822,21 +173822,21 @@ pokemon_moveset_pad: ; 8069140 adds r0, r7, 0 bl pokemon_setattr_encrypted ldrh r0, [r6] - b @080691A4 + b _080691A4 .pool -@0806918C: +_0806918C: ldrh r1, [r6] cmp r0, r1 - bne @0806919C + bne _0806919C ldr r0, =0x0000fffe - b @080691A4 + b _080691A4 .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} @@ -173859,24 +173859,24 @@ 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 .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 @@ -173979,10 +173979,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, =gLevelUpLearnsetPointers adds r7, r6, r0 ldr r0, [r7] @@ -173995,7 +173995,7 @@ sub_8069270: ; 8069270 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 @@ -174009,19 +174009,19 @@ sub_8069270: ; 8069270 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 @@ -174061,7 +174061,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] @@ -174081,13 +174081,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] @@ -174097,16 +174097,16 @@ sub_8069318: ; 8069318 adds r0, r1 ldrh r1, [r0] cmp r1, r12 - bne @080693A8 + bne _080693A8 movs r0, 0 - b @08069404 + b _08069404 .pool -@080693A8: +_080693A8: adds r0, r6, 0 ands r0, r1 cmp r0, r4 - bne @08069384 -@080693B0: + bne _08069384 +_080693B0: ldr r3, =gLevelUpLearnsetPointers mov r1, r9 lsls r4, r1, 2 @@ -174126,8 +174126,8 @@ sub_8069318: ; 8069318 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 @@ -174148,9 +174148,9 @@ sub_8069318: ; 8069318 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 @@ -174178,7 +174178,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 @@ -174195,7 +174195,7 @@ sub_8069424: ; 8069424 adds r5, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble @08069440 + ble _08069440 adds r0, r6, 0 movs r1, 0x15 movs r2, 0 @@ -174218,7 +174218,7 @@ sub_8069424: ; 8069424 strb r0, [r7, 0x3] movs r4, 0 mov r5, sp -@08069494: +_08069494: adds r1, r4, 0 adds r1, 0xD adds r0, r6, 0 @@ -174232,7 +174232,7 @@ sub_8069424: ; 8069424 adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble @08069494 + ble _08069494 adds r0, r6, 0 movs r1, 0x15 mov r2, r9 @@ -174263,7 +174263,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 @@ -174280,7 +174280,7 @@ sub_80694D0: ; 80694D0 adds r5, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble @080694EC + ble _080694EC adds r0, r6, 0 movs r1, 0x15 movs r2, 0 @@ -174303,7 +174303,7 @@ sub_80694D0: ; 80694D0 strb r0, [r7, 0x3] movs r4, 0 mov r5, sp -@08069540: +_08069540: adds r1, r4, 0 adds r1, 0xD adds r0, r6, 0 @@ -174317,7 +174317,7 @@ sub_80694D0: ; 80694D0 adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble @08069540 + ble _08069540 adds r0, r6, 0 movs r1, 0x15 mov r2, r9 @@ -174362,7 +174362,7 @@ sub_806957C: ; 806957C str r4, [sp, 0x14] movs r5, 0 cmp r3, 0 - bne @080695D4 + bne _080695D4 ldr r2, =0x020244e0 ldr r1, =gBattleMoves ldr r3, [sp, 0x8] @@ -174372,14 +174372,14 @@ sub_806957C: ; 806957C adds r0, r1 ldrb r0, [r0, 0x1] strh r0, [r2] - b @080695D8 + b _080695D8 .pool -@080695D4: +_080695D4: ldr r0, =0x020244e0 strh r3, [r0] -@080695D8: +_080695D8: cmp r7, 0 - bne @080695F8 + bne _080695F8 ldr r1, =gBattleMoves ldr r7, [sp, 0x8] lsls r0, r7, 1 @@ -174388,15 +174388,15 @@ sub_806957C: ; 806957C adds r0, r1 ldrb r0, [r0, 0x2] mov r10, r0 - b @08069602 + b _08069602 .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] @@ -174408,7 +174408,7 @@ sub_806957C: ; 806957C 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 @@ -174418,9 +174418,9 @@ sub_806957C: ; 806957C ldrb r3, [r0, 0x7] mov r9, r3 ldrb r0, [r0, 0x1A] - b @0806964A + b _0806964A .pool -@08069634: +_08069634: ldrh r0, [r6, 0x2E] bl itemid_get_x12 lsls r0, 24 @@ -174430,12 +174430,12 @@ sub_806957C: ; 806957C 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 @@ -174444,9 +174444,9 @@ sub_806957C: ; 806957C adds r0, r1 ldrb r0, [r0, 0x7] str r0, [sp, 0x20] - b @08069694 + b _08069694 .pool -@0806966C: +_0806966C: ldr r0, [sp, 0x24] adds r0, 0x64 muls r0, r7 @@ -174454,8 +174454,8 @@ sub_806957C: ; 806957C 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 @@ -174465,38 +174465,38 @@ sub_806957C: ; 806957C 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 @@ -174505,14 +174505,14 @@ sub_806957C: ; 806957C 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 @@ -174522,13 +174522,13 @@ sub_806957C: ; 806957C 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 @@ -174537,26 +174537,26 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 str r0, [sp, 0x1C] -@08069728: +_08069728: movs r2, 0 ldr r4, =gUnknown_08329D74 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 @@ -174567,33 +174567,33 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 mov r8, r0 - b @0806977C + b _0806977C .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] @@ -174601,7 +174601,7 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi @080697C6 + bhi _080697C6 movs r0, 0x96 mov r3, r8 muls r3, r0 @@ -174611,16 +174611,16 @@ sub_806957C: ; 806957C 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] @@ -174629,7 +174629,7 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi @080697FC + bhi _080697FC movs r0, 0x96 ldr r3, [sp, 0x1C] muls r0, r3 @@ -174638,94 +174638,94 @@ sub_806957C: ; 806957C 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 @@ -174735,7 +174735,7 @@ sub_806957C: ; 806957C bl ability_something lsls r0, 24 cmp r0, 0 - beq @080698C6 + beq _080698C6 movs r0, 0x96 mov r1, r8 muls r1, r0 @@ -174745,11 +174745,11 @@ sub_806957C: ; 806957C 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 @@ -174759,7 +174759,7 @@ sub_806957C: ; 806957C bl ability_something lsls r0, 24 cmp r0, 0 - beq @080698F8 + beq _080698F8 movs r0, 0x96 mov r3, r8 muls r3, r0 @@ -174769,29 +174769,29 @@ sub_806957C: ; 806957C 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 @@ -174800,10 +174800,10 @@ sub_806957C: ; 806957C 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 @@ -174813,15 +174813,15 @@ sub_806957C: ; 806957C 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 @@ -174831,19 +174831,19 @@ sub_806957C: ; 806957C 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 @@ -174851,7 +174851,7 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi @080699AE + bhi _080699AE ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -174859,14 +174859,14 @@ sub_806957C: ; 806957C 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 @@ -174874,7 +174874,7 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi @080699DE + bhi _080699DE ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -174882,14 +174882,14 @@ sub_806957C: ; 806957C 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 @@ -174897,7 +174897,7 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi @08069A0E + bhi _08069A0E ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -174905,14 +174905,14 @@ sub_806957C: ; 806957C 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 @@ -174920,7 +174920,7 @@ sub_806957C: ; 806957C lsls r0, 16 lsrs r0, 16 cmp r1, r0 - bhi @08069A3E + bhi _08069A3E ldr r4, =0x020244e0 ldrh r1, [r4] movs r0, 0x96 @@ -174928,7 +174928,7 @@ sub_806957C: ; 806957C movs r1, 0x64 bl __divsi3 strh r0, [r4] -@08069A3E: +_08069A3E: ldr r2, =gBattleMoves ldr r0, =0x020241ea ldrh r1, [r0] @@ -174938,36 +174938,36 @@ sub_806957C: ; 806957C 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, =gUnknown_08329D2E - b @08069AA6 + b _08069AA6 .pool -@08069A9C: +_08069A9C: adds r5, r7, 0 - b @08069ABE -@08069AA0: + b _08069ABE +_08069AA0: ldr r2, =gUnknown_08329D2E movs r0, 0x19 ldrsb r0, [r6, r0] -@08069AA6: +_08069AA6: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -174979,7 +174979,7 @@ sub_806957C: ; 806957C adds r0, r5, 0 bl __divsi3 adds r5, r0, 0 -@08069ABE: +_08069ABE: ldr r0, =0x020244e0 ldrh r0, [r0] muls r5, r0 @@ -174993,27 +174993,27 @@ sub_806957C: ; 806957C 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, =gUnknown_08329D2E ldr r3, [sp, 0x4] movs r0, 0x1A ldrsb r0, [r3, r0] - b @08069B04 + b _08069B04 .pool -@08069AF8: +_08069AF8: ldr r3, [sp, 0x18] - b @08069B1E -@08069AFC: + b _08069B1E +_08069AFC: ldr r2, =gUnknown_08329D2E ldr r1, [sp, 0x4] movs r0, 0x1A ldrsb r0, [r1, r0] -@08069B04: +_08069B04: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -175026,7 +175026,7 @@ sub_806957C: ; 806957C adds r0, r3, 0 bl __divsi3 adds r3, r0, 0 -@08069B1E: +_08069B1E: adds r0, r5, 0 adds r1, r3, 0 bl __divsi3 @@ -175038,51 +175038,51 @@ sub_806957C: ; 806957C 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 .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, =gBattleMoves ldr r3, [sp, 0x8] lsls r1, r3, 1 @@ -175091,51 +175091,51 @@ sub_806957C: ; 806957C 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, =gUnknown_08329D2E - b @08069C02 + b _08069C02 .pool -@08069BF8: +_08069BF8: mov r5, r8 - b @08069C1A -@08069BFC: + b _08069C1A +_08069BFC: ldr r2, =gUnknown_08329D2E movs r0, 0x1C ldrsb r0, [r6, r0] -@08069C02: +_08069C02: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -175147,7 +175147,7 @@ sub_806957C: ; 806957C adds r0, r5, 0 bl __divsi3 adds r5, r0, 0 -@08069C1A: +_08069C1A: ldr r0, =0x020244e0 ldrh r0, [r0] muls r5, r0 @@ -175161,24 +175161,24 @@ sub_806957C: ; 806957C 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, =gUnknown_08329D2E - b @08069C5C + b _08069C5C .pool -@08069C50: +_08069C50: ldr r3, [sp, 0x1C] - b @08069C76 -@08069C54: + b _08069C76 +_08069C54: ldr r2, =gUnknown_08329D2E ldr r7, [sp, 0x4] movs r0, 0x1D ldrsb r0, [r7, r0] -@08069C5C: +_08069C5C: lsls r0, 1 adds r1, r0, r2 ldrb r1, [r1] @@ -175191,7 +175191,7 @@ sub_806957C: ; 806957C adds r0, r3, 0 bl __divsi3 adds r3, r0, 0 -@08069C76: +_08069C76: adds r0, r5, 0 adds r1, r3, 0 bl __divsi3 @@ -175203,38 +175203,38 @@ sub_806957C: ; 806957C 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 .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, =gBattleMoves ldr r2, [sp, 0x8] lsls r1, r2, 1 @@ -175243,17 +175243,17 @@ sub_806957C: ; 806957C 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 @@ -175264,7 +175264,7 @@ sub_806957C: ; 806957C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @08069DAC + bne _08069DAC str r0, [sp] movs r0, 0xE movs r1, 0 @@ -175273,70 +175273,70 @@ sub_806957C: ; 806957C 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 .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 .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] @@ -175347,16 +175347,16 @@ sub_806957C: ; 806957C 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} @@ -175377,43 +175377,43 @@ sub_8069DEC: ; 8069DEC 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, =gUnknown_0832A328 -@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 .pool -@08069E40: +_08069E40: movs r5, 0 -@08069E42: +_08069E42: lsls r0, r5, 24 lsrs r0, 24 bl battle_side_get_owner @@ -175424,7 +175424,7 @@ sub_8069DEC: ; 8069DEC lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne @08069E74 + bne _08069E74 ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =gUnknown_0832A328 @@ -175433,19 +175433,19 @@ sub_8069DEC: ; 8069DEC 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 .pool -@08069E88: +_08069E88: movs r5, 0 -@08069E8A: +_08069E8A: lsls r0, r5, 24 lsrs r0, 24 bl battle_side_get_owner @@ -175456,7 +175456,7 @@ sub_8069DEC: ; 8069DEC lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne @08069EBC + bne _08069EBC ldr r0, =0x02024210 ldrb r1, [r0] ldr r2, =gUnknown_0832A328 @@ -175465,15 +175465,15 @@ sub_8069DEC: ; 8069DEC 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} @@ -175493,36 +175493,36 @@ 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 FlagGet lsls r0, 24 cmp r0, 0 - bne @08069F2C -@08069F1C: + bne _08069F2C +_08069F1C: movs r0, 0 - b @08069F2E + b _08069F2E .pool -@08069F2C: +_08069F2C: movs r0, 0x1 -@08069F2E: +_08069F2E: pop {r4,r5} pop {r1} bx r1 @@ -175544,29 +175544,29 @@ sub_8069F34: ; 8069F34 ldr r0, [r0] ands r0, r6 cmp r0, 0 - bne @08069F5C + bne _08069F5C adds r0, r4, 0 - b @08069FA6 + b _08069FA6 .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, =gUnknown_0832A328 @@ -175575,15 +175575,15 @@ sub_8069F34: ; 8069F34 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08069FA0 + bne _08069FA0 adds r0, r4, 0 - b @08069FA6 + b _08069FA6 .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 @@ -175623,14 +175623,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, =gBaseStats lsls r0, r5, 3 subs r0, r5 @@ -175640,13 +175640,13 @@ pokemon_roll_gender: ; 8069FC4 movs r0, 0xFF ands r0, r2 cmp r1, r0 - bhi @0806A018 + bhi _0806A018 movs r0, 0 - b @0806A01A + b _0806A01A .pool -@0806A018: +_0806A018: movs r0, 0xFE -@0806A01A: +_0806A01A: pop {r4,r5} pop {r1} bx r1 @@ -175665,14 +175665,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 @@ -175681,13 +175681,13 @@ pokemon_species_get_gender_info: ; 806A020 movs r0, 0xFF ands r0, r3 cmp r1, r0 - bhi @0806A060 + bhi _0806A060 movs r0, 0 - b @0806A062 + b _0806A062 .pool -@0806A060: +_0806A060: movs r0, 0xFE -@0806A062: +_0806A062: pop {r1} bx r1 thumb_func_end pokemon_species_get_gender_info @@ -175702,7 +175702,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 @@ -175715,29 +175715,29 @@ sub_806A068: ; 806A068 ldm r1!, {r3,r6,r7} stm r2!, {r3,r6,r7} adds r3, r0, 0 - b @0806A0DA + b _0806A0DA .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 .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 .pool -@0806A0C4: +_0806A0C4: ldr r3, =0x0202499c ldr r2, =gUnknown_08329D98 -@0806A0C8: +_0806A0C8: lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -175747,23 +175747,23 @@ sub_806A068: ; 806A068 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, =gUnknown_082FF70C str r0, [r2, 0x8] - b @0806A122 + b _0806A122 .pool -@0806A0F8: +_0806A0F8: movs r0, 0xFA lsls r0, 1 cmp r5, r0 - bls @0806A118 + bls _0806A118 ldr r0, =gUnknown_08309AAC ldr r3, =0xfffffe0c adds r1, r5, r3 @@ -175771,15 +175771,15 @@ sub_806A068: ; 806A068 adds r1, r0 ldr r0, [r1] str r0, [r2, 0x8] - b @0806A122 + b _0806A122 .pool -@0806A118: +_0806A118: ldr r0, =gUnknown_08309AAC lsls r1, r5, 2 adds r1, r0 ldr r0, [r1] str r0, [r3, 0x8] -@0806A122: +_0806A122: pop {r4-r7} pop {r0} bx r0 @@ -175797,10 +175797,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, =gUnknown_08329DF8 lsls r0, r4, 1 adds r0, r4 @@ -175815,13 +175815,13 @@ template_build_for_pokemon_or_trainer: ; 806A12C lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] - b @0806A1B0 + b _0806A1B0 .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 @@ -175832,9 +175832,9 @@ template_build_for_pokemon_or_trainer: ; 806A12C stm r1!, {r2,r3,r6} ldm r0!, {r2,r3,r6} stm r1!, {r2,r3,r6} - b @0806A1A8 + b _0806A1A8 .pool -@0806A194: +_0806A194: ldr r0, =gUnknown_08329D98 lsls r1, r3, 1 adds r1, r3 @@ -175845,12 +175845,12 @@ template_build_for_pokemon_or_trainer: ; 806A12C stm r2!, {r0,r3,r6} ldm r1!, {r0,r3,r6} stm r2!, {r0,r3,r6} -@0806A1A8: +_0806A1A8: ldr r0, =gUnknown_0830536C lsls r1, r4, 2 adds r1, r0 ldr r0, [r1] -@0806A1B0: +_0806A1B0: str r0, [r5, 0x8] pop {r4-r6} pop {r0} @@ -175868,7 +175868,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 @@ -175881,9 +175881,9 @@ sub_806A1C0: ; 806A1C0 ldm r1!, {r3,r4,r6} stm r2!, {r3,r4,r6} adds r3, r0, 0 - b @0806A20A + b _0806A20A .pool -@0806A1F4: +_0806A1F4: ldr r3, =0x0202499c ldr r2, =gUnknown_08329D98 lsls r0, r4, 1 @@ -175895,7 +175895,7 @@ sub_806A1C0: ; 806A1C0 stm r1!, {r2,r4,r6} ldm r0!, {r2,r4,r6} stm r1!, {r2,r4,r6} -@0806A20A: +_0806A20A: strh r5, [r3, 0x2] ldr r0, =gUnknown_0830536C lsls r1, r5, 2 @@ -175916,7 +175916,7 @@ pokemon_encrypt: ; 806A228 movs r4, 0 adds r2, r3, 0 adds r2, 0x20 -@0806A232: +_0806A232: ldr r0, [r2] ldr r1, [r3] eors r0, r1 @@ -175926,7 +175926,7 @@ pokemon_encrypt: ; 806A228 stm r2!, {r0} adds r4, 0x1 cmp r4, 0xB - bls @0806A232 + bls _0806A232 pop {r4} pop {r0} bx r0 @@ -175940,7 +175940,7 @@ pokemon_decrypt: ; 806A24C movs r4, 0 adds r2, r3, 0 adds r2, 0x20 -@0806A256: +_0806A256: ldr r0, [r2] ldr r1, [r3, 0x4] eors r0, r1 @@ -175950,7 +175950,7 @@ pokemon_decrypt: ; 806A24C stm r2!, {r0} adds r4, 0x1 cmp r4, 0xB - bls @0806A256 + bls _0806A256 pop {r4} pop {r0} bx r0 @@ -175968,378 +175968,378 @@ 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 .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} @@ -176355,149 +176355,149 @@ pokemon_getattr: ; 806A518 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 .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 @@ -176521,7 +176521,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 @@ -176551,7 +176551,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 @@ -176563,145 +176563,145 @@ 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 .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, =gUnknown_085CCB90 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 .pool -@0806A89C: +_0806A89C: movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @0806A8BC + beq _0806A8BC ldr r1, =gUnknown_085E8264 adds r0, r6, 0 bl CopyString @@ -176709,13 +176709,13 @@ pokemon_getattr_encrypted: ; 806A674 bl GetStringLength lsls r0, 16 lsrs r4, r0, 16 - b @0806AC8C + b _0806AC8C .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 @@ -176724,10 +176724,10 @@ pokemon_getattr_encrypted: ; 806A674 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] @@ -176735,11 +176735,11 @@ pokemon_getattr_encrypted: ; 806A674 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] @@ -176748,66 +176748,66 @@ pokemon_getattr_encrypted: ; 806A674 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 @@ -176815,251 +176815,251 @@ pokemon_getattr_encrypted: ; 806A674 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 @@ -177088,70 +177088,70 @@ pokemon_getattr_encrypted: ; 806A674 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, =gUnknown_0832A328 -@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 .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 @@ -177205,17 +177205,17 @@ pokemon_getattr_encrypted: ; 806A674 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] @@ -177284,13 +177284,13 @@ pokemon_getattr_encrypted: ; 806A674 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} @@ -177310,27 +177310,27 @@ pokemon_setattr: ; 806ACAC 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 .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 @@ -177342,14 +177342,14 @@ pokemon_setattr: ; 806ACAC 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 @@ -177357,8 +177357,8 @@ pokemon_setattr: ; 806ACAC 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 @@ -177366,8 +177366,8 @@ pokemon_setattr: ; 806ACAC 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 @@ -177375,8 +177375,8 @@ pokemon_setattr: ; 806ACAC 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 @@ -177384,8 +177384,8 @@ pokemon_setattr: ; 806ACAC 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 @@ -177393,8 +177393,8 @@ pokemon_setattr: ; 806ACAC 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 @@ -177402,8 +177402,8 @@ pokemon_setattr: ; 806ACAC 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 @@ -177411,17 +177411,17 @@ pokemon_setattr: ; 806ACAC 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 @@ -177443,7 +177443,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 @@ -177472,7 +177472,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 @@ -177485,103 +177485,103 @@ 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 .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 @@ -177593,8 +177593,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177606,25 +177606,25 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177632,8 +177632,8 @@ pokemon_setattr_encrypted: ; 806AD9C movs r0, 0x2 negs r0, r0 ands r0, r2 - b @0806B1F2 -@0806AFD4: + b _0806B1F2 +_0806AFD4: ldrb r0, [r4] movs r1, 0x1 ands r1, r0 @@ -177642,8 +177642,8 @@ pokemon_setattr_encrypted: ; 806AD9C movs r0, 0x3 negs r0, r0 ands r0, r2 - b @0806B1F2 -@0806AFE6: + b _0806B1F2 +_0806AFE6: ldrb r0, [r4] movs r1, 0x1 ands r1, r0 @@ -177652,39 +177652,39 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177693,24 +177693,24 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177723,18 +177723,18 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177744,71 +177744,71 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177818,8 +177818,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177829,9 +177829,9 @@ pokemon_setattr_encrypted: ; 806AD9C ands r0, r2 orrs r0, r1 strh r0, [r5, 0x2] - b @0806B3D8 + b _0806B3D8 .pool -@0806B124: +_0806B124: ldrb r1, [r4] movs r0, 0xF ands r1, r0 @@ -177842,8 +177842,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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] @@ -177851,8 +177851,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177862,8 +177862,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177873,9 +177873,9 @@ pokemon_setattr_encrypted: ; 806AD9C ands r0, r2 orrs r0, r1 strh r0, [r5, 0x4] - b @0806B3D8 + b _0806B3D8 .pool -@0806B178: +_0806B178: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -177886,8 +177886,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177897,9 +177897,9 @@ pokemon_setattr_encrypted: ; 806AD9C ands r0, r1 orrs r0, r2 str r0, [r5, 0x4] - b @0806B3D8 + b _0806B3D8 .pool -@0806B1A8: +_0806B1A8: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -177909,9 +177909,9 @@ pokemon_setattr_encrypted: ; 806AD9C ands r0, r2 orrs r0, r1 strh r0, [r5, 0x6] - b @0806B3D8 + b _0806B3D8 .pool -@0806B1C0: +_0806B1C0: ldrb r1, [r4] movs r0, 0x1F ands r1, r0 @@ -177921,8 +177921,8 @@ pokemon_setattr_encrypted: ; 806AD9C negs r0, r0 ands r0, r2 orrs r0, r1 - b @0806B3D6 -@0806B1D4: + b _0806B3D6 +_0806B1D4: ldrb r1, [r4] movs r0, 0x1 ands r1, r0 @@ -177935,22 +177935,22 @@ pokemon_setattr_encrypted: ; 806AD9C 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] @@ -177958,16 +177958,16 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177975,12 +177975,12 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -177990,9 +177990,9 @@ pokemon_setattr_encrypted: ; 806AD9C ands r0, r2 orrs r0, r1 strh r0, [r5, 0x8] - b @0806B3D8 + b _0806B3D8 .pool -@0806B250: +_0806B250: ldrb r1, [r4] movs r0, 0x7 ands r1, r0 @@ -178000,8 +178000,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178009,12 +178009,12 @@ pokemon_setattr_encrypted: ; 806AD9C 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] @@ -178022,16 +178022,16 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178039,8 +178039,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178048,8 +178048,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178057,8 +178057,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178066,8 +178066,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178075,8 +178075,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178084,12 +178084,12 @@ pokemon_setattr_encrypted: ; 806AD9C 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] @@ -178097,16 +178097,16 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178114,8 +178114,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178123,8 +178123,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178132,12 +178132,12 @@ pokemon_setattr_encrypted: ; 806AD9C 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] @@ -178145,8 +178145,8 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178207,18 +178207,18 @@ pokemon_setattr_encrypted: ; 806AD9C 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 @@ -178258,13 +178258,13 @@ pokemon_catch: ; 806B414 movs r1, 0x1 bl pokemon_setattr movs r5, 0 - b @0806B446 + b _0806B446 .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 @@ -178275,7 +178275,7 @@ pokemon_catch: ; 806B414 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne @0806B444 + bne _0806B444 adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x64 @@ -178284,14 +178284,14 @@ pokemon_catch: ; 806B414 adds r0, r5, 0x1 strb r0, [r1] movs r0, 0 - b @0806B48A + b _0806B48A .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 @@ -178312,10 +178312,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 @@ -178325,7 +178325,7 @@ pokemon_add_to_pc: ; 806B490 movs r2, 0 bl pokemon_getattr_encrypted cmp r0, 0 - bne @0806B514 + bne _0806B514 mov r0, r8 bl sub_806E924 adds r0, r4, 0 @@ -178340,33 +178340,33 @@ pokemon_add_to_pc: ; 806B490 lsls r0, 16 lsrs r0, 16 cmp r0, r5 - beq @0806B4F4 + beq _0806B4F4 ldr r0, =0x000008d7 bl FlagReset -@0806B4F4: +_0806B4F4: lsls r1, r5, 16 ldr r0, =0x00004036 lsrs r1, 16 bl VarSet movs r0, 0x1 - b @0806B530 + b _0806B530 .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} @@ -178381,18 +178381,18 @@ calc_player_party_count: ; 806B53C ldr r0, =0x020244e9 movs r1, 0 strb r1, [r0] - b @0806B554 + b _0806B554 .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 @@ -178402,8 +178402,8 @@ calc_player_party_count: ; 806B53C movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne @0806B54C -@0806B572: + bne _0806B54C +_0806B572: ldrb r0, [r4] pop {r4} pop {r1} @@ -178418,18 +178418,18 @@ calc_enemy_party_count: ; 806B580 ldr r0, =0x020244ea movs r1, 0 strb r1, [r0] - b @0806B598 + b _0806B598 .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 @@ -178439,8 +178439,8 @@ calc_enemy_party_count: ; 806B580 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne @0806B590 -@0806B5B6: + bne _0806B590 +_0806B5B6: ldrb r0, [r4] pop {r4} pop {r1} @@ -178456,12 +178456,12 @@ sub_806B5C4: ; 806B5C4 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 @@ -178474,32 +178474,32 @@ sub_806B5C4: ; 806B5C4 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 @@ -178512,7 +178512,7 @@ CheckPlayerPartySize: ; 806B638 push {r4-r6,lr} movs r6, 0 movs r5, 0 -@0806B63E: +_0806B63E: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -178526,31 +178526,31 @@ CheckPlayerPartySize: ; 806B638 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 .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 @@ -178564,7 +178564,7 @@ sub_806B694: ; 806B694 lsrs r3, r0, 16 lsls r1, 24 cmp r1, 0 - beq @0806B6B8 + beq _0806B6B8 ldr r2, =0x0202420a ldr r1, =gBaseStats lsls r0, r3, 3 @@ -178572,9 +178572,9 @@ sub_806B694: ; 806B694 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x17] - b @0806B6C6 + b _0806B6C6 .pool -@0806B6B8: +_0806B6B8: ldr r2, =0x0202420a ldr r1, =gBaseStats lsls r0, r3, 3 @@ -178582,7 +178582,7 @@ sub_806B694: ; 806B694 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x16] -@0806B6C6: +_0806B6C6: strb r0, [r2] ldrb r0, [r2] pop {r1} @@ -178635,7 +178635,7 @@ create_enemy_party: ; 806B70C bl memcpy movs r0, 0 mov r9, r0 -@0806B730: +_0806B730: ldr r1, =0x020244a8 ldr r3, [r1] ldr r2, [r3] @@ -178648,7 +178648,7 @@ create_enemy_party: ; 806B70C adds r4, 0x1 str r4, [sp, 0x10] cmp r0, 0 - beq @0806B80A + beq _0806B80A movs r0, 0x64 mov r6, r9 muls r6, r0 @@ -178690,7 +178690,7 @@ create_enemy_party: ; 806B70C mov r7, r9 adds r7, 0x9A mov r4, r8 -@0806B7A0: +_0806B7A0: adds r1, r5, 0 adds r1, 0x1A ldr r2, =0x020244a8 @@ -178701,7 +178701,7 @@ create_enemy_party: ; 806B70C bl pokemon_setattr adds r5, 0x1 cmp r5, 0x5 - ble @0806B7A0 + ble _0806B7A0 movs r5, 0 movs r3, 0x64 mov r0, r9 @@ -178713,7 +178713,7 @@ create_enemy_party: ; 806B70C adds r6, r0, 0 adds r6, 0x4C adds r4, r0, 0 -@0806B7CE: +_0806B7CE: adds r1, r5, 0 adds r1, 0xD ldr r2, =0x020244a8 @@ -178741,12 +178741,12 @@ create_enemy_party: ; 806B70C 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 @@ -178820,7 +178820,7 @@ sub_806B870: ; 806B870 sub_806B8B0: ; 806B8B0 push {r4,lr} movs r4, 0 -@0806B8B4: +_0806B8B4: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -178829,18 +178829,18 @@ sub_806B8B0: ; 806B8B0 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne @0806B8D0 + bne _0806B8D0 movs r0, 0 - b @0806B8DE + b _0806B8DE .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 @@ -178850,28 +178850,28 @@ sub_806B8B0: ; 806B8B0 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 @@ -178893,29 +178893,29 @@ GetSpeciesName: ; 806B914 muls r0, r5 adds r3, r0, r7 adds r2, r6, 0 - b @0806B93A + b _0806B93A .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} @@ -179046,7 +179046,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 @@ -179067,7 +179067,7 @@ battle_data_fill: ; 806B9FC adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @0806BA4E + ble _0806BA4E movs r0, 0x64 mov r4, r9 muls r4, r0 @@ -179324,12 +179324,12 @@ battle_data_fill: ; 806B9FC 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] @@ -179414,7 +179414,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne @0806BDBC + bne _0806BDBC ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -179422,7 +179422,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @0806BDA8 + beq _0806BDA8 ldr r2, =0x02024404 ldr r0, =0x020244b8 ldrb r1, [r0] @@ -179431,21 +179431,21 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x7] - b @0806BDC4 + b _0806BDC4 .pool -@0806BDA8: +_0806BDA8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003226 adds r0, r2 ldrb r0, [r0] - b @0806BDC4 + b _0806BDC4 .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 @@ -179460,7 +179460,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq @0806BE64 + beq _0806BE64 ldr r0, =0x02024064 strb r2, [r0] ldrb r0, [r0] @@ -179476,7 +179476,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 subs r4, 0xD ldrb r0, [r0] cmp r1, r0 - bge @0806BE70 + bge _0806BE70 ldr r2, =0x0202406e lsls r0, r1, 1 adds r0, r2 @@ -179486,59 +179486,59 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .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 .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, =gItemEffectInfoPointers 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 .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 @@ -179546,7 +179546,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @0806BECC + beq _0806BECC ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 @@ -179554,52 +179554,52 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 2 ldr r1, =0x0202440c adds r0, r1 - b @0806BEF6 + b _0806BEF6 .pool -@0806BECC: +_0806BECC: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00003214 adds r3, r0, r3 str r3, [sp, 0x24] - b @0806BEF8 + b _0806BEF8 .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 .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 @@ -179608,7 +179608,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq @0806BF76 + beq _0806BF76 ldr r0, =0x030022c0 ldr r5, =0x00000439 adds r0, r5 @@ -179616,10 +179616,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179631,18 +179631,18 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179656,19 +179656,19 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179679,9 +179679,9 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179690,14 +179690,14 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .pool -@0806BFFC: +_0806BFFC: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] adds r2, r1, r3 @@ -179707,7 +179707,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r3, r0, 24 adds r6, r2, 0 cmp r3, 0 - beq @0806C042 + beq _0806C042 ldr r7, =0x02024084 ldr r5, =0x02024064 ldrb r0, [r5] @@ -179718,7 +179718,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179728,20 +179728,20 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179752,9 +179752,9 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179763,12 +179763,12 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .pool -@0806C08C: +_0806C08C: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] adds r2, r1, r3 @@ -179778,7 +179778,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r3, r0, 24 adds r6, r2, 0 cmp r3, 0 - beq @0806C0D2 + beq _0806C0D2 ldr r7, =0x02024084 ldr r5, =0x02024064 ldrb r0, [r5] @@ -179789,7 +179789,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179799,20 +179799,20 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179823,9 +179823,9 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179834,15 +179834,15 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .pool -@0806C120: +_0806C120: ldr r1, [sp, 0x24] ldr r3, [sp, 0x1C] adds r2, r1, r3 @@ -179851,7 +179851,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq @0806C168 + beq _0806C168 ldr r5, =0x02024294 ldr r4, =0x02024064 ldrb r0, [r4] @@ -179864,7 +179864,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -179877,18 +179877,18 @@ ExecuteTableBasedItemEffect: ; 806BD28 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, =gExperienceTables mov r0, r8 movs r1, 0x38 @@ -179922,12 +179922,12 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -179935,10 +179935,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl HealStatusConditions 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] @@ -179950,15 +179950,15 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -179966,15 +179966,15 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl HealStatusConditions 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 @@ -179982,15 +179982,15 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl HealStatusConditions 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 @@ -179998,15 +179998,15 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl HealStatusConditions 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 @@ -180014,17 +180014,17 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl HealStatusConditions 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 @@ -180032,14 +180032,14 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -180050,18 +180050,18 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .pool -@0806C300: +_0806C300: ldr r5, [sp, 0x24] ldr r1, [sp, 0x1C] adds r0, r5, r1 @@ -180071,7 +180071,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 mov r2, r10 ands r0, r2 cmp r0, 0 - beq @0806C3D8 + beq _0806C3D8 movs r0, 0xDF ands r2, r0 mov r10, r2 @@ -180111,10 +180111,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180160,43 +180160,43 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .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 @@ -180217,56 +180217,56 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .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, =gUnknown_08329EC2 ldr r5, [sp, 0x2C] adds r0, r5, r0 @@ -180281,25 +180281,25 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x28] - b @0806C978 + b _0806C978 .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 @@ -180308,10 +180308,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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, =gUnknown_0832A328 lsls r0, r3, 2 @@ -180332,9 +180332,9 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl battle_data_fill ldr r0, =0x02024064 ldrb r0, [r0] - b @0806C574 + b _0806C574 .pool -@0806C55C: +_0806C55C: ldr r3, =0x02024210 ldr r1, =gUnknown_0832A328 ldr r2, =0x02024064 @@ -180347,31 +180347,31 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .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 @@ -180383,15 +180383,15 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180403,8 +180403,8 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl pokemon_getattr subs r4, r0 str r4, [sp] - b @0806C612 -@0806C5F4: + b _0806C612 +_0806C5F4: mov r0, r8 movs r1, 0x3A movs r2, 0 @@ -180412,16 +180412,16 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180432,10 +180432,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180449,13 +180449,13 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180467,10 +180467,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180481,20 +180481,20 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -180506,36 +180506,36 @@ ExecuteTableBasedItemEffect: ; 806BD28 ldrb r0, [r4] bl dp01_battle_side_mark_buffer_for_execution strb r5, [r4] - b @0806C6EC + b _0806C6EC .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 .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 @@ -180569,7 +180569,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180597,7 +180597,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsrs r0, 24 ldr r1, [sp] cmp r1, r0 - bls @0806C7CC + bls _0806C7CC mov r0, r8 adds r1, r7, 0 movs r2, 0 @@ -180618,7 +180618,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 24 lsrs r0, 24 str r0, [sp] -@0806C7CC: +_0806C7CC: mov r0, r8 mov r1, r9 mov r2, sp @@ -180630,10 +180630,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180646,7 +180646,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 14 ands r1, r0 cmp r1, 0 - bne @0806C82E + bne _0806C82E ldr r1, =0x020242bc lsls r0, r2, 3 subs r0, r2 @@ -180660,30 +180660,30 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .pool -@0806C858: +_0806C858: ldr r6, [sp, 0x14] adds r6, 0x11 mov r0, r8 @@ -180714,9 +180714,9 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180748,7 +180748,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsrs r0, 24 ldr r1, [sp] cmp r1, r0 - bls @0806C914 + bls _0806C914 mov r0, r8 adds r1, r5, 0 movs r2, 0 @@ -180769,7 +180769,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r0, 24 lsrs r0, 24 str r0, [sp] -@0806C914: +_0806C914: mov r0, r8 adds r1, r6, 0 mov r2, sp @@ -180781,10 +180781,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180797,7 +180797,7 @@ ExecuteTableBasedItemEffect: ; 806BD28 lsls r1, 14 ands r0, r1 cmp r0, 0 - bne @0806C978 + bne _0806C978 ldr r1, =0x020242bc lsls r0, r2, 3 subs r0, r2 @@ -180812,19 +180812,19 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .pool -@0806C994: +_0806C994: mov r0, r8 movs r1, 0x2 ldr r2, [sp, 0xC] @@ -180832,9 +180832,9 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -180842,11 +180842,11 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -180856,38 +180856,38 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .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 @@ -180909,53 +180909,53 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 .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, =gUnknown_08329EC2 adds r0, r4, r0 ldrb r1, [r0] @@ -180966,9 +180966,9 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl pokemon_calc_effective_stats movs r3, 0 str r3, [sp, 0x20] - b @0806CD30 + b _0806CD30 .pool -@0806CAB8: +_0806CAB8: mov r0, r8 movs r1, 0x15 movs r2, 0 @@ -181004,13 +181004,13 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -181064,36 +181064,36 @@ ExecuteTableBasedItemEffect: ; 806BD28 bl pokemon_setattr movs r5, 0 str r5, [sp, 0x20] - b @0806CD3A + b _0806CD3A .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 @@ -181109,10 +181109,10 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -181120,39 +181120,39 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -181168,32 +181168,32 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -181209,11 +181209,11 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -181221,27 +181221,27 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -181251,36 +181251,36 @@ ExecuteTableBasedItemEffect: ; 806BD28 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] @@ -181288,18 +181288,18 @@ ExecuteTableBasedItemEffect: ; 806BD28 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 @@ -181326,7 +181326,7 @@ HealStatusConditions: ; 806CD6C str r1, [sp] ands r0, r4 cmp r0, 0 - beq @0806CDD0 + beq _0806CDD0 mvns r4, r4 ands r1, r4 str r1, [sp] @@ -181341,9 +181341,9 @@ HealStatusConditions: ; 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 @@ -181352,13 +181352,13 @@ HealStatusConditions: ; 806CD6C ldr r0, [r1] ands r0, r4 str r0, [r1] -@0806CDBE: +_0806CDBE: movs r0, 0 - b @0806CDD2 + b _0806CDD2 .pool -@0806CDD0: +_0806CDD0: movs r0, 0x1 -@0806CDD2: +_0806CDD2: add sp, 0x4 pop {r4-r6} pop {r1} @@ -181382,17 +181382,17 @@ sub_806CDDC: ; 806CDDC 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 .pool -@0806CE08: +_0806CE08: cmp r3, 0xAF - bne @0806CE1A -@0806CE0C: + bne _0806CE1A +_0806CE0C: ldr r0, =0x02024064 ldrb r1, [r0] lsls r0, r1, 3 @@ -181400,145 +181400,145 @@ sub_806CDDC: ; 806CDDC 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 .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 .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 @@ -181579,7 +181579,7 @@ sub_806CF78: ; 806CF78 lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne @0806CFCC + bne _0806CFCC ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -181587,7 +181587,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 @@ -181595,24 +181595,24 @@ sub_806CF78: ; 806CF78 lsls r0, 2 ldr r1, =0x0202440c adds r7, r0, r1 - b @0806CFD8 + b _0806CFD8 .pool -@0806CFB8: +_0806CFB8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003214 adds r7, r0, r1 - b @0806CFD6 + b _0806CFD6 .pool -@0806CFCC: +_0806CFCC: ldr r1, =gItemEffectInfoPointers 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] @@ -181620,51 +181620,51 @@ sub_806CF78: ; 806CF78 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 .pool -@0806D020: +_0806D020: ldr r0, =0x020244b8 ldrb r0, [r0] mov r1, r8 strb r0, [r1] ldr r0, =gUnknown_085CA459 bl get_battle_strings_ -@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, =gUnknown_085CA424 bl get_battle_strings_ -@0806D04E: +_0806D04E: ldr r0, =0x02022e2c pop {r3} mov r8, r3 @@ -181746,47 +181746,47 @@ 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 .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, =gEvolutionTable lsls r6, r7, 2 - b @0806D38E + b _0806D38E .pool -@0806D144: +_0806D144: mov r0, r8 movs r1, 0x38 movs r2, 0 @@ -181804,7 +181804,7 @@ GetEvolutionTargetSpecies: ; 806D098 movs r0, 0 str r0, [sp, 0x4] lsls r6, r7, 2 -@0806D16A: +_0806D16A: ldr r1, =gEvolutionTable ldr r0, [sp, 0x4] lsls r2, r0, 3 @@ -181817,44 +181817,44 @@ GetEvolutionTargetSpecies: ; 806D098 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 .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 GameFreakRTC_CalcLocalDateTime ldr r0, =0x03005cf8 ldrb r0, [r0, 0x2] @@ -181862,56 +181862,56 @@ GetEvolutionTargetSpecies: ; 806D098 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 .pool -@0806D208: +_0806D208: bl GameFreakRTC_CalcLocalDateTime 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, =gEvolutionTable 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 .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 @@ -181922,16 +181922,16 @@ GetEvolutionTargetSpecies: ; 806D098 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 @@ -181942,16 +181942,16 @@ GetEvolutionTargetSpecies: ; 806D098 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 @@ -181962,56 +181962,56 @@ GetEvolutionTargetSpecies: ; 806D098 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 @@ -182019,20 +182019,20 @@ GetEvolutionTargetSpecies: ; 806D098 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, =gEvolutionTable adds r0, r6, r7 @@ -182041,39 +182041,39 @@ GetEvolutionTargetSpecies: ; 806D098 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 .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 @@ -182081,19 +182081,19 @@ GetEvolutionTargetSpecies: ; 806D098 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 @@ -182110,37 +182110,37 @@ HoennPokedexNumToSpecies: ; 806D3C0 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 .pool -@0806D404: +_0806D404: movs r0, 0 -@0806D406: +_0806D406: pop {r4} pop {r1} bx r1 @@ -182152,37 +182152,37 @@ NationalPokedexNumToSpecies: ; 806D40C 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 .pool -@0806D450: +_0806D450: movs r0, 0 -@0806D452: +_0806D452: pop {r4} pop {r1} bx r1 @@ -182194,37 +182194,37 @@ NationalToHoennOrder: ; 806D458 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 .pool -@0806D49C: +_0806D49C: movs r0, 0 -@0806D49E: +_0806D49E: pop {r4} pop {r1} bx r1 @@ -182236,17 +182236,17 @@ SpeciesToNationalPokedexNum: ; 806D4A4 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 .pool -@0806D4C0: +_0806D4C0: movs r0, 0 -@0806D4C2: +_0806D4C2: pop {r1} bx r1 thumb_func_end SpeciesToNationalPokedexNum @@ -182257,17 +182257,17 @@ SpeciesToHoennPokedexNum: ; 806D4C8 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 .pool -@0806D4E4: +_0806D4E4: movs r0, 0 -@0806D4E6: +_0806D4E6: pop {r1} bx r1 thumb_func_end SpeciesToHoennPokedexNum @@ -182278,17 +182278,17 @@ HoennToNationalOrder: ; 806D4EC 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 .pool -@0806D508: +_0806D508: movs r0, 0 -@0806D50A: +_0806D50A: pop {r1} bx r1 thumb_func_end HoennToNationalOrder @@ -182300,21 +182300,21 @@ speciesid_conv: ; 806D510 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, =gUnknown_0831F61C ldr r2, =0xfffffeec adds r1, r2 lsls r1, 1 adds r1, r0 ldrh r0, [r1] - b @0806D53E + b _0806D53E .pool -@0806D53C: +_0806D53C: movs r0, 0xC8 -@0806D53E: +_0806D53E: pop {r1} bx r1 thumb_func_end speciesid_conv @@ -182333,17 +182333,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 @@ -182372,7 +182372,7 @@ sub_806D544: ; 806D544 adds r5, 0x1 str r5, [sp] mov r9, r3 -@0806D5A8: +_0806D5A8: lsls r0, r2, 1 add r0, r9 ldr r3, =gSpindaSpotGraphics + 0x2 @@ -182385,18 +182385,18 @@ sub_806D544: ; 806D544 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 @@ -182412,11 +182412,11 @@ sub_806D544: ; 806D544 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 @@ -182424,12 +182424,12 @@ sub_806D544: ; 806D544 lsls r0, 24 lsrs r0, 24 cmp r0, 0x20 - bhi @0806D634 + bhi _0806D634 adds r0, r1, 0 adds r0, 0x40 - b @0806D632 + b _0806D632 .pool -@0806D620: +_0806D620: ldrb r1, [r2] movs r0, 0xF ands r0, r1 @@ -182437,28 +182437,28 @@ sub_806D544: ; 806D544 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 @@ -182486,11 +182486,11 @@ DrawSpindaSpots: ; 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 @@ -182519,7 +182519,7 @@ DrawSpindaSpots: ; 806D664 adds r6, 0x1 mov r10, r6 mov r9, r3 -@0806D6C0: +_0806D6C0: lsls r0, r2, 1 add r0, r9 ldr r3, =gSpindaSpotGraphics + 0x2 @@ -182532,18 +182532,18 @@ DrawSpindaSpots: ; 806D664 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] @@ -182560,11 +182560,11 @@ DrawSpindaSpots: ; 806D664 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 @@ -182572,12 +182572,12 @@ DrawSpindaSpots: ; 806D664 lsls r0, 24 lsrs r0, 24 cmp r0, 0x20 - bhi @0806D748 + bhi _0806D748 adds r0, r1, 0 adds r0, 0x40 - b @0806D746 + b _0806D746 .pool -@0806D734: +_0806D734: ldrb r1, [r2] movs r0, 0xF ands r0, r1 @@ -182585,28 +182585,28 @@ DrawSpindaSpots: ; 806D664 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 @@ -182645,7 +182645,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 @@ -182654,14 +182654,14 @@ sub_806D778: ; 806D778 mov r1, r9 bl CompareString 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 @@ -182686,22 +182686,22 @@ 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 .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} @@ -182721,22 +182721,22 @@ 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 .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 @@ -182749,18 +182749,18 @@ sub_806D864: ; 806D864 lsrs r3, r0, 16 movs r2, 0 ldr r1, =0x020229e8 - b @0806D87C + b _0806D87C .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 @@ -182776,15 +182776,15 @@ GetTrainerEncounterMusicId: ; 806D888 bl InBattlePyramid 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, =gTrainers lsls r0, r4, 2 adds r0, r4 @@ -182793,15 +182793,15 @@ GetTrainerEncounterMusicId: ; 806D888 ldrb r1, [r0, 0x2] movs r0, 0x7F ands r0, r1 - b @0806D8CE + b _0806D8CE .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 @@ -182821,10 +182821,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, =gNatureStatTable lsls r1, r4, 2 adds r1, r4 @@ -182837,15 +182837,15 @@ nature_stat_mod: ; 806D8D4 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 .pool -@0806D918: +_0806D918: movs r0, 0x5A -@0806D91A: +_0806D91A: muls r0, r3 lsls r0, 16 lsrs r0, 16 @@ -182853,10 +182853,10 @@ nature_stat_mod: ; 806D8D4 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 @@ -182872,9 +182872,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 @@ -182888,7 +182888,7 @@ happiness_algorithm: ; 806D934 lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne @0806D9A0 + bne _0806D9A0 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -182896,34 +182896,34 @@ happiness_algorithm: ; 806D934 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @0806D98C + beq _0806D98C ldr r0, =0x02024404 ldrb r4, [r0, 0x7] - b @0806D9A8 + b _0806D9A8 .pool -@0806D98C: +_0806D98C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003226 adds r0, r1 ldrb r4, [r0] - b @0806D9A8 + b _0806D9A8 .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 @@ -182936,31 +182936,31 @@ happiness_algorithm: ; 806D934 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, =gTrainers ldr r0, =0x02038bca ldrh r1, [r0] @@ -182974,10 +182974,10 @@ happiness_algorithm: ; 806D934 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls @0806DA20 + bls _0806DA20 cmp r1, 0x26 - bne @0806DAC2 -@0806DA20: + bne _0806DAC2 +_0806DA20: ldr r1, =gUnknown_08329ECE lsls r0, r5, 1 adds r0, r5 @@ -182987,16 +182987,16 @@ happiness_algorithm: ; 806D934 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 @@ -183006,20 +183006,20 @@ happiness_algorithm: ; 806D934 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 @@ -183029,37 +183029,37 @@ happiness_algorithm: ; 806D934 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} @@ -183079,7 +183079,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 @@ -183094,36 +183094,36 @@ sub_806DADC: ; 806DADC 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 .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, =gBaseStats lsls r1, r5, 3 subs r1, r5 @@ -183131,18 +183131,18 @@ sub_806DADC: ; 806DADC adds r1, r0 ldrb r0, [r1, 0xA] lsls r0, 30 - b @0806DBC2 + b _0806DBC2 .pool -@0806DB64: +_0806DB64: ldr r0, =gBaseStats lsls r1, r5, 3 subs r1, r5 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0xA] - b @0806DBC0 + b _0806DBC0 .pool -@0806DB78: +_0806DB78: ldr r0, =gBaseStats lsls r1, r5, 3 subs r1, r5 @@ -183150,9 +183150,9 @@ sub_806DADC: ; 806DADC adds r1, r0 ldrb r0, [r1, 0xA] lsls r0, 26 - b @0806DBC2 + b _0806DBC2 .pool -@0806DB8C: +_0806DB8C: ldr r0, =gBaseStats lsls r1, r5, 3 subs r1, r5 @@ -183160,9 +183160,9 @@ sub_806DADC: ; 806DADC adds r1, r0 ldrb r0, [r1, 0xA] lsrs r0, 6 - b @0806DBC4 + b _0806DBC4 .pool -@0806DBA0: +_0806DBA0: ldr r0, =gBaseStats lsls r1, r5, 3 subs r1, r5 @@ -183170,23 +183170,23 @@ sub_806DADC: ; 806DADC adds r1, r0 ldrb r0, [r1, 0xB] lsls r0, 30 - b @0806DBC2 + b _0806DBC2 .pool -@0806DBB4: +_0806DBB4: ldr r0, =gBaseStats 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 @@ -183194,7 +183194,7 @@ sub_806DADC: ; 806DADC lsls r0, 16 lsrs r0, 16 cmp r0, 0xAF - bne @0806DC14 + bne _0806DC14 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -183202,42 +183202,42 @@ sub_806DADC: ; 806DADC movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @0806DC00 + beq _0806DC00 ldr r0, =0x02024404 ldrb r0, [r0, 0x7] - b @0806DC1C + b _0806DC1C .pool -@0806DC00: +_0806DC00: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003226 adds r0, r2 ldrb r0, [r0] - b @0806DC1C + b _0806DC1C .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] @@ -183245,14 +183245,14 @@ sub_806DADC: ; 806DADC 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 @@ -183264,13 +183264,13 @@ sub_806DADC: ; 806DADC 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 @@ -183286,7 +183286,7 @@ sub_806DC8C: ; 806DC8C adds r6, r0, 0 movs r5, 0 movs r4, 0 -@0806DC94: +_0806DC94: adds r1, r4, 0 adds r1, 0x1A adds r0, r6, 0 @@ -183297,7 +183297,7 @@ sub_806DC8C: ; 806DC8C lsrs r5, r0, 16 adds r4, 0x1 cmp r4, 0x5 - ble @0806DC94 + ble _0806DC94 adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -183315,16 +183315,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 @@ -183340,13 +183340,13 @@ sub_806DCB4: ; 806DCB4 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, =gUnknown_0832A328 lsls r0, r5, 2 adds r0, r1 @@ -183355,9 +183355,9 @@ sub_806DCB4: ; 806DCB4 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 @@ -183367,14 +183367,14 @@ sub_806DCB4: ; 806DCB4 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 @@ -183395,7 +183395,7 @@ sub_806DCB4: ; 806DCB4 movs r1, 0x22 mov r2, sp bl pokemon_setattr -@0806DD70: +_0806DD70: add sp, 0x4 pop {r4-r6} pop {r0} @@ -183414,12 +183414,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 @@ -183431,18 +183431,18 @@ sub_806DD7C: ; 806DD7C 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 @@ -183450,9 +183450,9 @@ sub_806DD7C: ; 806DD7C 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} @@ -183471,12 +183471,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 @@ -183486,26 +183486,26 @@ sub_806DDE4: ; 806DDE4 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} @@ -183521,7 +183521,7 @@ sub_806DE44: ; 806DE44 lsrs r7, r0, 16 movs r6, 0 mov r5, sp -@0806DE50: +_0806DE50: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 @@ -183532,7 +183532,7 @@ sub_806DE44: ; 806DE44 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq @0806DEB2 + beq _0806DEB2 adds r0, r4, 0 movs r1, 0x22 movs r2, 0 @@ -183544,26 +183544,26 @@ sub_806DE44: ; 806DE44 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 .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 @@ -183571,10 +183571,10 @@ sub_806DE44: ; 806DE44 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} @@ -183594,9 +183594,9 @@ sub_806DEC4: ; 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 @@ -183606,7 +183606,7 @@ sub_806DEC4: ; 806DEC4 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq @0806DF64 + beq _0806DF64 adds r0, r4, 0 movs r1, 0x22 movs r2, 0 @@ -183616,13 +183616,13 @@ sub_806DEC4: ; 806DEC4 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 @@ -183633,14 +183633,14 @@ sub_806DEC4: ; 806DEC4 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 @@ -183652,17 +183652,17 @@ sub_806DEC4: ; 806DEC4 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} @@ -183709,35 +183709,35 @@ 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 .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} @@ -183759,12 +183759,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 @@ -183775,9 +183775,9 @@ sub_806E00C: ; 806E00C adds r1, r0 ldr r0, [r1] ands r0, r2 - b @0806E05A + b _0806E05A .pool -@0806E04C: +_0806E04C: movs r1, 0x1 lsls r1, r5 ldr r2, =gTMHMLearnsets @@ -183785,7 +183785,7 @@ sub_806E00C: ; 806E00C adds r0, r2 ldr r0, [r0] ands r0, r1 -@0806E05A: +_0806E05A: pop {r4,r5} pop {r1} bx r1 @@ -183804,12 +183804,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 @@ -183820,9 +183820,9 @@ sub_806E064: ; 806E064 adds r1, r0 ldr r0, [r1] ands r0, r2 - b @0806E0AA + b _0806E0AA .pool -@0806E09C: +_0806E09C: movs r1, 0x1 lsls r1, r2 ldr r2, =gTMHMLearnsets @@ -183830,7 +183830,7 @@ sub_806E064: ; 806E064 adds r0, r2 ldr r0, [r0] ands r0, r1 -@0806E0AA: +_0806E0AA: pop {r4} pop {r1} bx r1 @@ -183864,7 +183864,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 @@ -183874,7 +183874,7 @@ sub_806E0B4: ; 806E0B4 adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @0806E0EA + ble _0806E0EA movs r5, 0 ldr r6, =gLevelUpLearnsetPointers lsls r1, r7, 2 @@ -183884,10 +183884,10 @@ sub_806E0B4: ; 806E0B4 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 @@ -183901,14 +183901,14 @@ sub_806E0B4: ; 806E0B4 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, =gLevelUpLearnsetPointers adds r6, r0, r1 @@ -183916,11 +183916,11 @@ sub_806E0B4: ; 806E0B4 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] @@ -183928,13 +183928,13 @@ sub_806E0B4: ; 806E0B4 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 @@ -183944,7 +183944,7 @@ sub_806E0B4: ; 806E0B4 ldr r0, =0x000001ff ands r0, r1 cmp r2, r0 - beq @0806E1AC + beq _0806E1AC ldr r1, [sp, 0x14] ldr r2, =gLevelUpLearnsetPointers adds r6, r1, r2 @@ -183952,11 +183952,11 @@ sub_806E0B4: ; 806E0B4 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] @@ -183964,10 +183964,10 @@ sub_806E0B4: ; 806E0B4 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 @@ -183983,10 +183983,10 @@ sub_806E0B4: ; 806E0B4 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 @@ -183994,8 +183994,8 @@ sub_806E0B4: ; 806E0B4 ldrh r0, [r1] ldr r2, =0x0000ffff cmp r0, r2 - bne @0806E118 -@0806E1E4: + bne _0806E118 +_0806E1E4: mov r0, r10 add sp, 0x18 pop {r3-r5} @@ -184022,12 +184022,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 @@ -184041,11 +184041,11 @@ sub_806E204: ; 806E204 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} @@ -184080,15 +184080,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 @@ -184098,7 +184098,7 @@ sub_806E25C: ; 806E25C adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @0806E2A0 + ble _0806E2A0 movs r5, 0 ldr r3, =gLevelUpLearnsetPointers ldr r2, [sp, 0x38] @@ -184107,12 +184107,12 @@ sub_806E25C: ; 806E25C 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 @@ -184127,14 +184127,14 @@ sub_806E25C: ; 806E25C 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, =gLevelUpLearnsetPointers adds r6, r0, r1 @@ -184142,11 +184142,11 @@ sub_806E25C: ; 806E25C 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] @@ -184154,13 +184154,13 @@ sub_806E25C: ; 806E25C 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 @@ -184171,7 +184171,7 @@ sub_806E25C: ; 806E25C ands r0, r1 add r1, sp, 0x8 cmp r2, r0 - beq @0806E368 + beq _0806E368 ldr r2, [sp, 0x38] ldr r0, =gLevelUpLearnsetPointers adds r6, r2, r0 @@ -184179,11 +184179,11 @@ sub_806E25C: ; 806E25C 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] @@ -184191,10 +184191,10 @@ sub_806E25C: ; 806E25C 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 @@ -184210,10 +184210,10 @@ sub_806E25C: ; 806E25C 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 @@ -184221,10 +184221,10 @@ sub_806E25C: ; 806E25C 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 @@ -184243,24 +184243,24 @@ sub_806E3C0: ; 806E3C0 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 .pool -@0806E3F0: +_0806E3F0: adds r0, r4, 0 -@0806E3F2: +_0806E3F2: pop {r4} pop {r1} bx r1 @@ -184275,12 +184275,12 @@ 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 @@ -184291,11 +184291,11 @@ sub_806E414: ; 806E414 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 .pool @@ -184310,53 +184310,53 @@ 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 .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 .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 .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, =gTrainers ldr r0, =0x02038bca ldrh r1, [r0] @@ -184365,110 +184365,110 @@ song_id_for_battle: ; 806E42C 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 .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 .pool -@0806E5D0: +_0806E5D0: ldr r0, =0x000001db - b @0806E646 + b _0806E646 .pool -@0806E5D8: +_0806E5D8: ldr r0, =0x000001dd - b @0806E646 + b _0806E646 .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 .pool -@0806E604: +_0806E604: ldr r0, =0x02038bca ldrh r1, [r0] lsls r0, r1, 2 @@ -184479,25 +184479,25 @@ song_id_for_battle: ; 806E42C ldr r1, =gUnknown_085CCB98 bl CompareString cmp r0, 0 - beq @0806E63C - b @0806E5F2 + beq _0806E63C + b _0806E5F2 .pool -@0806E62C: +_0806E62C: movs r0, 0xF1 lsls r0, 1 - b @0806E646 -@0806E632: + b _0806E646 +_0806E632: ldr r0, =0x000001d7 - b @0806E646 + b _0806E646 .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 @@ -184523,16 +184523,16 @@ current_map_music_set__default_for_battle: ; 806E668 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 @@ -184576,17 +184576,17 @@ 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 .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} @@ -184632,12 +184632,12 @@ species_and_otid_get_pal: ; 806E740 movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls @0806E75C + bls _0806E75C ldr r0, =gMonPaletteTable ldr r0, [r0] - b @0806E788 + b _0806E788 .pool -@0806E75C: +_0806E75C: lsrs r0, r1, 16 ldr r2, =0x0000ffff ands r1, r2 @@ -184647,18 +184647,18 @@ species_and_otid_get_pal: ; 806E740 ands r3, r2 eors r0, r3 cmp r0, 0x7 - bls @0806E780 + bls _0806E780 ldr r0, =gMonPaletteTable lsls r1, r4, 3 - b @0806E784 + b _0806E784 .pool -@0806E780: +_0806E780: ldr r0, =gMonShinyPaletteTable lsls r1, r5, 3 -@0806E784: +_0806E784: adds r1, r0 ldr r0, [r1] -@0806E788: +_0806E788: pop {r4,r5} pop {r1} bx r1 @@ -184707,15 +184707,15 @@ sub_806E7CC: ; 806E7CC ands r2, r3 eors r0, r2 cmp r0, 0x7 - bls @0806E7F4 + bls _0806E7F4 lsls r0, r4, 3 ldr r1, =gMonPaletteTable - b @0806E7F8 + b _0806E7F8 .pool -@0806E7F4: +_0806E7F4: lsls r0, r4, 3 ldr r1, =gMonShinyPaletteTable -@0806E7F8: +_0806E7F8: adds r0, r1 pop {r4} pop {r1} @@ -184732,25 +184732,25 @@ 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 .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 @@ -184852,30 +184852,30 @@ 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 .pool -@0806E91C: +_0806E91C: movs r0, 0x1 -@0806E91E: +_0806E91E: pop {r4,r5} pop {r1} bx r1 @@ -184895,7 +184895,7 @@ pokemon_restore_pp: ; 806E930 sub sp, 0x4 adds r5, r0, 0 movs r6, 0 -@0806E938: +_0806E938: adds r4, r6, 0 adds r4, 0xD adds r0, r5, 0 @@ -184903,7 +184903,7 @@ pokemon_restore_pp: ; 806E930 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 @@ -184929,10 +184929,10 @@ pokemon_restore_pp: ; 806E930 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} @@ -184963,7 +184963,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 @@ -184972,9 +184972,9 @@ sub_806E994: ; 806E994 adds r0, r1 ldrb r0, [r0] bl pokemon_order_func - b @0806E9F6 + b _0806E9F6 .pool -@0806E9E8: +_0806E9E8: ldr r1, =0x0202406e ldr r0, [r5] adds r0, 0x49 @@ -184982,7 +184982,7 @@ sub_806E994: ; 806E994 lsls r0, 1 adds r0, r1 ldrh r0, [r0] -@0806E9F6: +_0806E9F6: strb r0, [r4, 0x3] ldr r4, =0x02022f68 movs r0, 0xFD @@ -185017,20 +185017,20 @@ sub_806EA40: ; 806EA40 lsrs r3, r0, 16 movs r1, 0 ldr r2, =gUnknown_08329EFC -@0806EA4A: +_0806EA4A: ldrh r0, [r2] cmp r0, r3 - bne @0806EA58 + bne _0806EA58 adds r0, r1, 0 - b @0806EA62 + b _0806EA62 .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 @@ -185045,9 +185045,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 @@ -185070,53 +185070,53 @@ sub_806EA68: ; 806EA68 movs r2, 0 bl pokemon_getattr cmp r0, 0 - bne @0806EAC6 + bne _0806EAC6 adds r0, r5, 0 bl GetMonAbility 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, =gUnknown_08329EFE - b @0806EB6C + b _0806EB6C .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 .pool -@0806EB18: +_0806EB18: ldr r0, =0x02024744 lsls r2, r4, 3 subs r2, r4 lsls r2, 2 ldr r1, =gBaseStats + 0xe ; item 2 offset - b @0806EB6C + b _0806EB6C .pool -@0806EB2C: +_0806EB2C: ldr r0, =gBaseStats mov r12, r0 lsls r0, r4, 3 @@ -185128,33 +185128,33 @@ sub_806EA68: ; 806EA68 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 .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, =gBaseStats + 0xc ; item 1 offset -@0806EB6C: +_0806EB6C: adds r2, r1 -@0806EB6E: +_0806EB6E: movs r1, 0xC bl pokemon_setattr - b @0806EB90 + b _0806EB90 .pool -@0806EB80: +_0806EB80: ldr r0, =0x02024744 subs r2, r4 lsls r2, 2 @@ -185162,7 +185162,7 @@ sub_806EA68: ; 806EA68 adds r2, r1 movs r1, 0xC bl pokemon_setattr -@0806EB90: +_0806EB90: pop {r3} mov r8, r3 pop {r4-r7} @@ -185206,9 +185206,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} @@ -185225,24 +185225,24 @@ 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, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name - b @0806EC64 + b _0806EC64 .pool -@0806EC28: +_0806EC28: ldr r4, =0x02021cc4 ldrh r1, [r2] adds r0, r4, 0 bl sub_8162E20 adds r0, r4, 0 - b @0806EC64 + b _0806EC64 .pool -@0806EC3C: +_0806EC3C: bl link_get_multiplayer_id lsls r0, 24 lsrs r0, 24 @@ -185261,7 +185261,7 @@ sub_806EBF8: ; 806EBF8 lsls r0, 2 adds r4, 0x8 adds r0, r4 -@0806EC64: +_0806EC64: pop {r4} pop {r1} bx r1 @@ -185283,7 +185283,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 @@ -185292,7 +185292,7 @@ sub_806EC70: ; 806EC70 bl sub_817F544 adds r0, r4, 0 bl remove_task -@0806ECA0: +_0806ECA0: pop {r4} pop {r0} bx r0 @@ -185314,7 +185314,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 @@ -185325,7 +185325,7 @@ sub_806ECAC: ; 806ECAC bl sub_81C488C adds r0, r4, 0 bl remove_task -@0806ECE2: +_0806ECE2: pop {r4} pop {r0} bx r0 @@ -185347,25 +185347,25 @@ 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 .pool -@0806ED30: +_0806ED30: adds r0, r5, 0 adds r1, r4, 0 bl sub_806ED40 -@0806ED38: +_0806ED38: pop {r4,r5} pop {r0} bx r0 @@ -185384,34 +185384,34 @@ 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, =DummyObjectCallback - b @0806EDFA + b _0806EDFA .pool -@0806ED84: +_0806ED84: cmp r2, 0 - bne @0806EDA6 + bne _0806EDA6 lsls r1, 24 asrs r1, 24 adds r0, r4, 0 @@ -185420,17 +185420,17 @@ sub_806ED40: ; 806ED40 bl sub_806F0D4 lsls r0, 24 cmp r0, 0 - beq @0806EDA6 + beq _0806EDA6 adds r0, r5, 0 movs r1, 0x1 bl StartObjectImageAnim -@0806EDA6: +_0806EDA6: ldr r0, =gUnknown_08329B87 subs r4, 0x1 adds r6, r4, r0 ldrb r0, [r6] cmp r0, 0 - beq @0806EDEC + beq _0806EDEC ldr r0, =sub_806EC70 movs r1, 0 bl AddTask @@ -185450,17 +185450,17 @@ sub_806ED40: ; 806ED40 strh r0, [r1, 0xC] ldrb r0, [r6] strh r0, [r1, 0xE] - b @0806EDF8 + b _0806EDF8 .pool -@0806EDEC: +_0806EDEC: ldr r0, =gUnknown_083299EC adds r0, r4, r0 ldrb r1, [r0] adds r0, r5, 0 bl sub_817F544 -@0806EDF8: +_0806EDF8: ldr r0, =nullsub_18 -@0806EDFA: +_0806EDFA: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -185476,22 +185476,22 @@ sub_806EE0C: ; 806EE0C 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 StartObjectImageAnim -@0806EE2E: +_0806EE2E: ldr r0, =gUnknown_08329B87 subs r4, 0x1 adds r6, r4, r0 ldrb r0, [r6] cmp r0, 0 - beq @0806EE80 + beq _0806EE80 ldr r0, =sub_806ECAC movs r1, 0 bl AddTask @@ -185514,15 +185514,15 @@ sub_806EE0C: ; 806EE0C bl sub_81C488C adds r0, r5, 0 bl sub_817F60C - b @0806EE8C + b _0806EE8C .pool -@0806EE80: +_0806EE80: ldr r0, =gUnknown_083299EC adds r0, r4, r0 ldrb r1, [r0] adds r0, r5, 0 bl sub_817F578 -@0806EE8C: +_0806EE8C: pop {r4-r6} pop {r0} bx r0 @@ -185537,9 +185537,9 @@ sub_806EE98: ; 806EE98 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @0806EEAC + beq _0806EEAC bl remove_task -@0806EEAC: +_0806EEAC: pop {r0} bx r0 .pool @@ -185556,17 +185556,17 @@ 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, =DummyObjectCallback - b @0806EEFC + b _0806EEFC .pool -@0806EEE8: +_0806EEE8: adds r0, r2, 0 bl sub_817F474 adds r1, r0, 0 @@ -185575,7 +185575,7 @@ sub_806EEB4: ; 806EEB4 adds r0, r4, 0 bl sub_817F594 ldr r0, =nullsub_18 -@0806EEFC: +_0806EEFC: str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -185599,49 +185599,49 @@ 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 .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} @@ -185665,46 +185665,46 @@ 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 .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} @@ -185729,12 +185729,12 @@ 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 TrainerClassToTrainerPic lsls r0, 16 lsrs r0, 16 @@ -185761,7 +185761,7 @@ SetPokedexFlag: ; 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 @@ -185770,22 +185770,22 @@ SetPokedexFlag: ; 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 @@ -185799,9 +185799,9 @@ sub_806F07C: ; 806F07C lsrs r2, r0, 16 ldr r0, =0x00000356 cmp r2, r0 - bls @0806F08A + bls _0806F08A movs r2, 0 -@0806F08A: +_0806F08A: ldr r1, =gTrainers lsls r0, r2, 2 adds r0, r2 @@ -185824,9 +185824,9 @@ sub_806F0B0: ; 806F0B0 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 @@ -185845,19 +185845,19 @@ sub_806F0D4: ; 806F0D4 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 @@ -185874,36 +185874,36 @@ 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 InBattlePike lsls r0, 24 cmp r0, 0 - bne @0806F144 + bne _0806F144 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0806F158 -@0806F144: + beq _0806F158 +_0806F144: movs r0, 0x1 - b @0806F15A + b _0806F15A .pool -@0806F158: +_0806F158: movs r0, 0 -@0806F15A: +_0806F15A: pop {r1} bx r1 thumb_func_end sub_806F104 @@ -185920,8 +185920,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 @@ -185943,13 +185943,13 @@ sub_806F160: ; 806F160 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 @@ -185963,8 +185963,8 @@ sub_806F160: ; 806F160 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 @@ -185981,8 +185981,8 @@ sub_806F160: ; 806F160 lsls r0, 28 lsrs r0, 28 cmp r4, r0 - blt @0806F176 -@0806F1EA: + blt _0806F176 +_0806F1EA: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -186005,10 +186005,10 @@ sub_806F1FC: ; 806F1FC lsls r0, 28 movs r3, 0 cmp r0, 0 - beq @0806F296 + beq _0806F296 ldr r0, =gUnknown_08329F28 mov r10, r0 -@0806F216: +_0806F216: ldr r0, [r4, 0xC] lsls r2, r3, 1 adds r1, r2, r3 @@ -186028,13 +186028,13 @@ sub_806F1FC: ; 806F1FC 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 @@ -186051,8 +186051,8 @@ sub_806F1FC: ; 806F1FC 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 @@ -186074,8 +186074,8 @@ sub_806F1FC: ; 806F1FC lsls r0, 28 lsrs r0, 28 cmp r3, r0 - blt @0806F216 -@0806F296: + blt _0806F216 +_0806F296: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -186102,22 +186102,22 @@ sub_806F2AC: ; 806F2AC bl AllocZeroed 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 @@ -186138,7 +186138,7 @@ sub_806F2AC: ; 806F2AC orrs r2, r0 ands r2, r3 strb r2, [r4, 0x3] -@0806F30E: +_0806F30E: ldrb r1, [r4, 0x3] lsls r1, 28 lsrs r1, 28 @@ -186156,26 +186156,26 @@ sub_806F2AC: ; 806F2AC 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] @@ -186192,8 +186192,8 @@ sub_806F2AC: ; 806F2AC lsls r0, 28 lsrs r0, 28 cmp r3, r0 - blt @0806F356 -@0806F378: + blt _0806F356 +_0806F378: ldrb r1, [r4] lsls r1, 28 lsrs r1, 28 @@ -186213,16 +186213,16 @@ sub_806F2AC: ; 806F2AC 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] @@ -186230,10 +186230,10 @@ sub_806F2AC: ; 806F2AC 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 @@ -186247,79 +186247,79 @@ sub_806F2AC: ; 806F2AC 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} @@ -186340,52 +186340,52 @@ 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 .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 @@ -186406,23 +186406,23 @@ sub_806F4F8: ; 806F4F8 ldr r1, [r0] ldrb r0, [r1, 0x2] cmp r0, 0xA3 - beq @0806F51C + beq _0806F51C movs r0, 0 - b @0806F530 + b _0806F530 .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 @@ -186487,14 +186487,14 @@ sine2: ; 806F570 adds r4, r1 ldrh r1, [r4] cmp r0, 0 - bne @0806F5A8 + bne _0806F5A8 lsls r0, r1, 16 - b @0806F5AC + b _0806F5AC .pool -@0806F5A8: +_0806F5A8: lsls r0, r1, 16 negs r0, r0 -@0806F5AC: +_0806F5AC: asrs r0, 16 pop {r4,r5} pop {r1} @@ -186712,14 +186712,14 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C ldrb r1, [r1] str r1, [sp, 0x28] movs r0, 0 - b @0806F88C + b _0806F88C .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 @@ -186733,7 +186733,7 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C 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 @@ -186745,13 +186745,13 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C mov r10, r7 adds r5, 0x1 mov r9, r5 - b @0806F86A + b _0806F86A .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] @@ -186760,7 +186760,7 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C mov r10, r2 adds r5, 0x1 mov r9, r5 -@0806F7A0: +_0806F7A0: lsls r4, r1, 24 asrs r4, 24 movs r0, 0x7 @@ -186778,10 +186778,10 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C lsrs r1, r4, 24 asrs r4, 24 cmp r4, 0x7 - ble @0806F7A0 - b @0806F86A + ble _0806F7A0 + b _0806F86A .pool -@0806F7CC: +_0806F7CC: movs r1, 0 adds r4, 0x2 str r4, [sp, 0x2C] @@ -186792,7 +186792,7 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C mov r9, r5 movs r0, 0xF mov r12, r0 -@0806F7E0: +_0806F7E0: movs r2, 0 lsls r4, r1, 24 lsls r0, r4, 2 @@ -186800,7 +186800,7 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C adds r6, r0, 0x3 mov r1, r8 adds r5, r1, r0 -@0806F7EE: +_0806F7EE: lsls r1, r2, 24 asrs r1, 24 subs r0, r6, r1 @@ -186821,23 +186821,23 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C 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 @@ -186853,26 +186853,26 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C lsrs r1, r4, 24 asrs r4, 24 cmp r4, 0x7 - ble @0806F836 - b @0806F86A + ble _0806F836 + b _0806F86A .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 @@ -186881,12 +186881,12 @@ rfu_MBOOT_CHILD_inheritanceLinkStatus: ; 806F70C 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 @@ -186904,22 +186904,22 @@ sub_806F8A8: ; 806F8A8 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 @@ -186932,40 +186932,40 @@ sub_806F8D0: ; 806F8D0 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 .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 @@ -186982,9 +186982,9 @@ sub_806F928: ; 806F928 ldr r2, =0x00001121 movs r3, 0 cmp r3, r4 - bcs @0806F956 + bcs _0806F956 ldr r6, =gUnknown_0832A3D8 -@0806F938: +_0806F938: lsrs r1, r2, 8 adds r0, r5, r3 ldrb r0, [r0] @@ -186999,8 +186999,8 @@ sub_806F928: ; 806F928 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 @@ -187017,15 +187017,15 @@ sub_806F96C: ; 806F96C 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} @@ -187052,12 +187052,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 @@ -187101,8 +187101,8 @@ pal_fade_1: ; 806F98C 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 @@ -187154,23 +187154,23 @@ daycare_count_pokemon: ; 806FA6C 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} @@ -187192,7 +187192,7 @@ sub_806FA9C: ; 806FA9C adds r6, 0x74 movs r0, 0x1 mov r8, r0 -@0806FAB6: +_0806FAB6: movs r0, 0x8C muls r0, r5 mov r1, r9 @@ -187201,7 +187201,7 @@ sub_806FA9C: ; 806FA9C 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 @@ -187210,21 +187210,21 @@ sub_806FA9C: ; 806FA9C 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} @@ -187242,26 +187242,26 @@ 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 @@ -187276,7 +187276,7 @@ sub_806FB38: ; 806FB38 bl sub_80D43F0 lsls r0, 24 cmp r0, 0 - beq @0806FBBC + beq _0806FBBC adds r0, r5, 0 adds r0, 0x74 ldr r1, =0x03005d90 @@ -187329,7 +187329,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 @@ -187401,13 +187401,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 @@ -187430,7 +187430,7 @@ sub_806FC48: ; 806FC48 str r6, [r1] adds r0, r4, 0 bl sub_806FF80 -@0806FC9E: +_0806FC9E: pop {r4-r6} pop {r0} bx r0 @@ -187442,35 +187442,35 @@ sub_806FCA4: ; 806FCA4 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 .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} @@ -187498,7 +187498,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 @@ -187513,7 +187513,7 @@ sub_806FCF8: ; 806FCF8 bl pokemon_setattr mov r0, sp bl sub_806FCA4 -@0806FD46: +_0806FD46: ldr r0, =0x020244ec movs r1, 0xFA lsls r1, 1 @@ -187526,7 +187526,7 @@ sub_806FCF8: ; 806FCF8 adds r0, 0x70 ldrh r0, [r0] cmp r0, 0 - beq @0806FD74 + beq _0806FD74 adds r4, r5, 0 adds r4, 0x50 adds r0, r6, 0 @@ -187534,7 +187534,7 @@ sub_806FCF8: ; 806FCF8 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 @@ -187758,11 +187758,11 @@ sub_806FF30: ; 806FF30 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - bne @0806FF60 + bne _0806FF60 movs r0, 0 - b @0806FF76 + b _0806FF76 .pool -@0806FF60: +_0806FF60: ldrh r0, [r5] adds r1, r0, 0 muls r1, r4 @@ -187773,7 +187773,7 @@ sub_806FF30: ; 806FF30 bl sub_806FE54 lsls r0, 24 lsrs r0, 24 -@0806FF76: +_0806FF76: pop {r4-r6} pop {r1} bx r1 @@ -187787,22 +187787,22 @@ sub_806FF80: ; 806FF80 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 @@ -187831,7 +187831,7 @@ sub_806FFD0: ; 806FFD0 adds r5, r0, 0 movs r4, 0 movs r6, 0x8C -@0806FFD8: +_0806FFD8: adds r0, r4, 0 muls r0, r6 adds r0, r5, r0 @@ -187840,7 +187840,7 @@ sub_806FFD0: ; 806FFD0 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @0806FFD8 + bls _0806FFD8 movs r1, 0x8C lsls r1, 1 adds r0, r5, r1 @@ -187866,7 +187866,7 @@ sub_8070004: ; 8070004 mov r8, r0 ldr r0, =gEvolutionTable mov r12, r0 -@08070016: +_08070016: movs r7, 0 movs r6, 0x1 movs r4, 0x80 @@ -187874,29 +187874,29 @@ sub_8070004: ; 8070004 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 .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 @@ -187905,18 +187905,18 @@ sub_8070004: ; 8070004 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 @@ -187934,7 +187934,7 @@ sub_8070084: ; 8070084 movs r7, 0x1 negs r7, r7 movs r4, 0 -@08070090: +_08070090: movs r0, 0x8C muls r0, r4 adds r0, r6, r0 @@ -187942,15 +187942,15 @@ sub_8070084: ; 8070084 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 @@ -187960,43 +187960,43 @@ sub_8070084: ; 8070084 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 .pool -@08070108: +_08070108: adds r0, r7, 0 -@0807010A: +_0807010A: add sp, 0x8 pop {r4-r7} pop {r1} @@ -188015,7 +188015,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 @@ -188032,9 +188032,9 @@ sub_8070114: ; 8070114 adds r0, 0x1 orrs r4, r0 str r4, [r5] - b @080701AC + b _080701AC .pool -@08070160: +_08070160: movs r0, 0x8C muls r0, r1 adds r0, r5, r0 @@ -188044,7 +188044,7 @@ sub_8070114: ; 8070114 bl GetNatureFromPersonality lsls r0, 24 lsrs r7, r0, 24 -@08070176: +_08070176: bl GenerateRandomNumber2 adds r4, r0, 0 bl GenerateRandomNumber @@ -188057,21 +188057,21 @@ sub_8070114: ; 8070114 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 FlagSet pop {r4-r7} @@ -188138,7 +188138,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 @@ -188146,23 +188146,23 @@ sub_8070218: ; 8070218 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} @@ -188182,17 +188182,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 @@ -188211,10 +188211,10 @@ sub_8070260: ; 8070260 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 @@ -188225,29 +188225,29 @@ sub_8070260: ; 8070260 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 .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 @@ -188260,8 +188260,8 @@ sub_8070260: ; 8070260 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] @@ -188273,8 +188273,8 @@ sub_8070260: ; 8070260 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] @@ -188286,8 +188286,8 @@ sub_8070260: ; 8070260 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] @@ -188299,8 +188299,8 @@ sub_8070260: ; 8070260 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] @@ -188312,11 +188312,11 @@ sub_8070260: ; 8070260 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] @@ -188330,12 +188330,12 @@ sub_8070260: ; 8070260 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 @@ -188363,39 +188363,39 @@ 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 .pool -@080703F8: +_080703F8: adds r0, r2, 0x1 lsls r0, 16 lsrs r2, r0, 16 ldr r0, =0x00000471 ldr r5, =gEggMoves 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 @@ -188410,14 +188410,14 @@ pokemon_get_eggmoves: ; 80703C8 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} @@ -188446,7 +188446,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] @@ -188458,11 +188458,11 @@ daycare_build_child_moveset: ; 8070470 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] @@ -188470,11 +188470,11 @@ daycare_build_child_moveset: ; 8070470 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] @@ -188482,7 +188482,7 @@ daycare_build_child_moveset: ; 8070470 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x31 - bls @080704C4 + bls _080704C4 adds r0, r7, 0 movs r1, 0xB bl pokemon_getattr @@ -188496,7 +188496,7 @@ daycare_build_child_moveset: ; 8070470 movs r6, 0 ldr r1, =0x02024a28 mov r8, r1 -@080704F2: +_080704F2: adds r5, r6, 0 adds r5, 0xD mov r0, r10 @@ -188516,7 +188516,7 @@ daycare_build_child_moveset: ; 8070470 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 @@ -188524,27 +188524,27 @@ daycare_build_child_moveset: ; 8070470 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] @@ -188553,29 +188553,29 @@ daycare_build_child_moveset: ; 8070470 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 .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 @@ -188584,13 +188584,13 @@ daycare_build_child_moveset: ; 8070470 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 @@ -188600,62 +188600,62 @@ daycare_build_child_moveset: ; 8070470 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 @@ -188664,49 +188664,49 @@ daycare_build_child_moveset: ; 8070470 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] @@ -188715,33 +188715,33 @@ daycare_build_child_moveset: ; 8070470 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 .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 @@ -188790,12 +188790,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 @@ -188809,26 +188809,26 @@ incense_effects: ; 8070744 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 @@ -188848,10 +188848,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 @@ -188860,11 +188860,11 @@ sub_80707A4: ; 80707A4 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 @@ -188882,7 +188882,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 @@ -188895,31 +188895,31 @@ sub_80707EC: ; 80707EC 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 @@ -188928,7 +188928,7 @@ sub_80707EC: ; 80707EC lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1D - bne @08070870 + bne _08070870 movs r1, 0x8C lsls r1, 1 adds r0, r7, r1 @@ -188937,12 +188937,12 @@ sub_80707EC: ; 80707EC 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 @@ -188951,16 +188951,16 @@ sub_80707EC: ; 80707EC 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 @@ -188969,12 +188969,12 @@ sub_80707EC: ; 80707EC 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} @@ -189017,11 +189017,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 @@ -189108,14 +189108,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 @@ -189225,7 +189225,7 @@ sub_8070AC4: ; 8070AC4 adds r6, r0, 0 movs r7, 0 movs r5, 0 -@08070ACE: +_08070ACE: movs r0, 0x8C adds r4, r5, 0 muls r4, r0 @@ -189233,7 +189233,7 @@ sub_8070AC4: ; 8070AC4 movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq @08070AEE + beq _08070AEE adds r1, r6, 0 adds r1, 0x88 adds r1, r4 @@ -189241,23 +189241,23 @@ sub_8070AC4: ; 8070AC4 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 @@ -189271,9 +189271,9 @@ sub_8070AC4: ; 8070AC4 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 @@ -189283,7 +189283,7 @@ sub_8070AC4: ; 8070AC4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne @08070BC0 + bne _08070BC0 bl sub_807228C lsls r0, 24 lsrs r6, r0, 24 @@ -189291,56 +189291,56 @@ sub_8070AC4: ; 8070AC4 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 .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 .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} @@ -189371,9 +189371,9 @@ sub_8070BF0: ; 8070BF0 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 @@ -189386,7 +189386,7 @@ sub_8070C04: ; 8070C04 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_ @@ -189397,17 +189397,17 @@ sub_8070C04: ; 8070C04 ldr r0, =0x02021ec4 mov r1, sp bl CopyString -@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} @@ -189465,11 +189465,11 @@ sp0B6_daycare: ; 8070CB0 bl sub_8070BF0 lsls r0, 24 cmp r0, 0 - beq @08070CD0 + beq _08070CD0 movs r0, 0x1 - b @08070CF2 + b _08070CF2 .pool -@08070CD0: +_08070CD0: ldr r0, [r4] ldr r1, =0x00003030 adds r0, r1 @@ -189477,15 +189477,15 @@ sp0B6_daycare: ; 8070CB0 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @08070CEC + bne _08070CEC movs r0, 0 - b @08070CF2 + b _08070CF2 .pool -@08070CEC: +_08070CEC: adds r0, 0x1 lsls r0, 24 lsrs r0, 24 -@08070CF2: +_08070CF2: pop {r4} pop {r1} bx r1 @@ -189502,9 +189502,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 .pool @@ -189516,27 +189516,27 @@ sub_8070D1C: ; 8070D1C 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 @@ -189569,7 +189569,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 @@ -189617,72 +189617,72 @@ daycare_relationship_score: ; 8070D4C 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 .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 @@ -189717,21 +189717,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, =gUnknown_0832B6F8 lsls r1, 2 @@ -189758,58 +189758,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} @@ -189823,30 +189823,30 @@ sub_8070F48: ; 8070F48 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, =gUnknown_0832DAC7 - b @08070F86 + b _08070F86 .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, =gUnknown_0832DAC9 - b @08070F86 + b _08070F86 .pool -@08070F84: +_08070F84: ldr r1, =gUnknown_0832DACB -@08070F86: +_08070F86: adds r0, r4, 0 bl AppendString pop {r4} @@ -189885,7 +189885,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 @@ -189905,7 +189905,7 @@ sub_8070FB4: ; 8070FB4 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - bls @08070FCC + bls _08070FCC adds r0, r7, 0 mov r1, sp bl CopyString @@ -189941,7 +189941,7 @@ sub_8071038: ; 8071038 movs r0, 0xFF strb r0, [r4] movs r5, 0 -@08071046: +_08071046: adds r0, r4, 0 ldr r1, =gUnknown_085EF888 bl AppendString @@ -189971,7 +189971,7 @@ sub_8071038: ; 8071038 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x1 - bls @08071046 + bls _08071046 add sp, 0x14 pop {r4-r6} pop {r0} @@ -190131,7 +190131,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] @@ -190148,7 +190148,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} @@ -190176,23 +190176,23 @@ 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 .pool -@0807123C: +_0807123C: ldr r0, =0x020375f0 strh r1, [r0] - b @0807124E + b _0807124E .pool -@08071248: +_08071248: ldr r1, =0x020375f0 movs r0, 0x2 strh r0, [r1] -@0807124E: +_0807124E: ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 @@ -190210,14 +190210,14 @@ c3_080469FC: ; 8071204 adds r0, r5, 0 bl remove_task bl script_env_2_enable_and_set_ctx_running - b @080712B4 + b _080712B4 .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] @@ -190232,7 +190232,7 @@ c3_080469FC: ; 8071204 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 @@ -190331,7 +190331,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 @@ -190344,13 +190344,13 @@ sub_8071348: ; 8071348 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 @@ -190362,7 +190362,7 @@ sub_8071348: ; 8071348 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @080713AE + bls _080713AE adds r0, r5, 0 movs r1, 0x3 bl pokemon_getattr @@ -190400,7 +190400,7 @@ sub_8071348: ; 8071348 movs r3, 0x20 bl create_pokemon_set_level movs r4, 0 -@0807141E: +_0807141E: adds r1, r4, 0 adds r1, 0xD lsls r0, r4, 1 @@ -190413,9 +190413,9 @@ sub_8071348: ; 8071348 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 @@ -190426,7 +190426,7 @@ sub_8071348: ; 8071348 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @0807143C + bls _0807143C movs r0, 0x2 mov r1, r8 strb r0, [r1] @@ -190577,7 +190577,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 @@ -190586,14 +190586,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 CompareStringWithoutExtendedControlCodes cmp r0, 0 - beq @08071608 -@080715CE: + beq _08071608 +_080715CE: ldr r0, =0x02021cc4 mov r1, sp bl CopyString @@ -190610,11 +190610,11 @@ sub_807158C: ; 807158C adds r1, r6, 0 bl sub_81DB5E8 movs r0, 0x1 - b @0807160A + b _0807160A .pool -@08071608: +_08071608: movs r0, 0 -@0807160A: +_0807160A: add sp, 0x20 pop {r4-r6} pop {r1} @@ -190657,29 +190657,29 @@ 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 .pool -@08071688: +_08071688: adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -190709,9 +190709,9 @@ sub_807163C: ; 807163C bl LoadCompressedObjectPalette mov r0, r9 strh r4, [r0] - b @08071712 + b _08071712 .pool -@080716D8: +_080716D8: adds r0, r5, 0 bl sub_806E794 ldrh r0, [r0, 0x4] @@ -190738,7 +190738,7 @@ sub_807163C: ; 807163C adds r1, r4 ldr r0, =DummyObjectCallback str r0, [r1] -@08071712: +_08071712: adds r0, r7, 0 pop {r3,r4} mov r8, r3 @@ -190784,7 +190784,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 bl SetMainCallback2 @@ -190793,7 +190793,7 @@ sub_8071760: ; 8071760 str r0, [r1] adds r0, r4, 0 bl remove_task -@08071788: +_08071788: pop {r4} pop {r0} bx r0 @@ -190810,27 +190810,27 @@ 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 .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 SetGpuReg @@ -190897,18 +190897,18 @@ c1_hatching_egg: ; 80717A0 bl clear_tasks bl remove_some_task bl SoundVSyncOn_rev01 - b @080719A6 + b _080719A6 .pool -@080718B8: +_080718B8: ldr r0, =gUnknown_0832C06C bl InitWindows ldr r0, =0x03000de0 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x8] - b @080719A6 + b _080719A6 .pool -@080718D0: +_080718D0: ldr r1, =gUnknown_08C00000 movs r0, 0 str r0, [sp] @@ -190924,27 +190924,27 @@ c1_hatching_egg: ; 80717A0 movs r1, 0 movs r2, 0x20 bl decompress_palette - b @080719A6 + b _080719A6 .pool -@08071904: +_08071904: ldr r0, =gUnknown_0832BFE4 bl LoadObjectPic ldr r0, =gUnknown_0832BFEC bl LoadObjectPic ldr r0, =gUnknown_0832BFF4 bl LoadTaggedObjectPalette - b @080719A6 + b _080719A6 .pool -@08071924: +_08071924: movs r0, 0 bl CopyBgTilemapBufferToVram ldr r0, =0x03000de0 ldr r0, [r0] ldrb r0, [r0, 0x4] bl sub_80714B8 - b @080719A6 + b _080719A6 .pool -@0807193C: +_0807193C: ldr r0, =0x03000de0 ldr r3, [r0] ldrb r2, [r3, 0x4] @@ -190952,9 +190952,9 @@ c1_hatching_egg: ; 80717A0 movs r0, 0 movs r1, 0 bl sub_807163C - b @080719A6 + b _080719A6 .pool -@08071954: +_08071954: ldr r4, =0x03000de0 ldr r3, [r4] ldrb r2, [r3, 0x4] @@ -190964,9 +190964,9 @@ c1_hatching_egg: ; 80717A0 bl sub_807163C ldr r1, [r4] strb r0, [r1, 0x1] - b @080719A6 + b _080719A6 .pool -@08071970: +_08071970: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -190989,7 +190989,7 @@ c1_hatching_egg: ; 80717A0 bl CopyToBgTilemapBuffer movs r0, 0x1 bl CopyBgTilemapBufferToVram -@080719A6: +_080719A6: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -190997,16 +190997,16 @@ c1_hatching_egg: ; 80717A0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @080719D6 + b _080719D6 .pool -@080719C8: +_080719C8: ldr r0, =sub_8071A94 bl SetMainCallback2 ldr r0, =0x03000de0 ldr r1, [r0] movs r0, 0 strb r0, [r1, 0x2] -@080719D6: +_080719D6: bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks @@ -191055,27 +191055,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] @@ -191097,31 +191097,31 @@ 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 .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 @@ -191148,9 +191148,9 @@ sub_8071A94: ; 8071A94 ldr r0, =c3_080472E4 movs r1, 0x5 bl AddTask - b @08071E06 + b _08071E06 .pool -@08071B40: +_08071B40: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -191158,9 +191158,9 @@ sub_8071A94: ; 8071A94 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 @@ -191168,9 +191168,9 @@ sub_8071A94: ; 8071A94 ldr r0, [r5] strb r4, [r0, 0x3] ldr r1, [r5] - b @08071DC8 + b _08071DC8 .pool -@08071B68: +_08071B68: ldr r1, [r5] ldrb r0, [r1, 0x3] adds r0, 0x1 @@ -191178,9 +191178,9 @@ sub_8071A94: ; 8071A94 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 @@ -191195,9 +191195,9 @@ sub_8071A94: ; 8071A94 adds r0, r2 ldr r1, =sub_8071E34 str r1, [r0] - b @08071E06 + b _08071E06 .pool -@08071BA0: +_08071BA0: ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2] @@ -191210,9 +191210,9 @@ sub_8071A94: ; 8071A94 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @08071BBC - b @08071E06 -@08071BBC: + beq _08071BBC + b _08071E06 +_08071BBC: ldrb r1, [r2, 0x4] movs r0, 0x64 muls r0, r1 @@ -191233,9 +191233,9 @@ sub_8071A94: ; 8071A94 movs r3, 0x1 bl sub_806ED40 ldr r1, [r5] - b @08071DC8 + b _08071DC8 .pool -@08071BF8: +_08071BF8: ldr r2, =0x02020630 ldr r3, [r5] ldrb r1, [r3, 0x1] @@ -191247,15 +191247,15 @@ sub_8071A94: ; 8071A94 ldr r1, [r0] ldr r0, =DummyObjectCallback 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 .pool -@08071C24: +_08071C24: ldr r0, [r5] ldrb r1, [r0, 0x4] movs r0, 0x64 @@ -191289,25 +191289,25 @@ sub_8071A94: ; 8071A94 ldrb r0, [r0, 0x8] movs r1, 0x3 bl CopyWindowToVram - b @08071E06 + b _08071E06 .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 @@ -191329,17 +191329,17 @@ sub_8071A94: ; 8071A94 movs r3, 0x2 bl sub_8072214 ldr r1, [r5] - b @08071DC8 + b _08071DC8 .pool -@08071CE8: +_08071CE8: ldr r0, [r5] ldrb r0, [r0, 0x8] bl IsTextPrinterActive 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 @@ -191353,26 +191353,26 @@ sub_8071A94: ; 8071A94 movs r3, 0 bl sub_81996C0 ldr r1, [r5] - b @08071DC8 + b _08071DC8 .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] @@ -191418,9 +191418,9 @@ sub_8071A94: ; 8071A94 adds r2, r7, 0 adds r3, r4, 0 bl do_choose_name_or_words_screen - b @08071E06 + b _08071E06 .pool -@08071DB4: +_08071DB4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -191428,22 +191428,22 @@ sub_8071A94: ; 8071A94 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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 .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] @@ -191457,7 +191457,7 @@ sub_8071A94: ; 8071A94 bl Free ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 -@08071E06: +_08071E06: bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks @@ -191483,14 +191483,14 @@ sub_8071E34: ; 8071E34 lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble @08071E54 + ble _08071E54 ldr r0, =sub_8071E8C str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x2E] - b @08071E84 + b _08071E84 .pool -@08071E54: +_08071E54: ldrh r0, [r4, 0x30] adds r0, 0x14 movs r1, 0xFF @@ -191504,14 +191504,14 @@ sub_8071E34: ; 8071E34 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 StartObjectImageAnim bl sub_8072140 -@08071E84: +_08071E84: pop {r4} pop {r0} bx r0 @@ -191528,21 +191528,21 @@ 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 str r0, [r4, 0x1C] strh r1, [r4, 0x2E] strh r1, [r4, 0x32] - b @08071EE8 + b _08071EE8 .pool -@08071EBC: +_08071EBC: ldrh r0, [r4, 0x30] adds r0, 0x14 movs r1, 0xFF @@ -191556,13 +191556,13 @@ sub_8071E8C: ; 8071E8C 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 StartObjectImageAnim -@08071EE8: +_08071EE8: pop {r4} pop {r0} bx r0 @@ -191579,14 +191579,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 str r0, [r4, 0x1C] strh r5, [r4, 0x2E] @@ -191613,9 +191613,9 @@ sub_8071EF0: ; 8071EF0 lsls r0, 2 adds r0, r3 strh r5, [r0, 0x26] - b @08071F9E + b _08071F9E .pool -@08071F5C: +_08071F5C: ldrh r0, [r4, 0x30] adds r0, 0x14 movs r1, 0xFF @@ -191629,7 +191629,7 @@ sub_8071EF0: ; 8071EF0 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0xF - bne @08071F90 + bne _08071F90 movs r0, 0x17 bl audio_play adds r0, r4, 0 @@ -191637,14 +191637,14 @@ sub_8071EF0: ; 8071EF0 bl StartObjectImageAnim 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 @@ -191660,12 +191660,12 @@ sub_8071FA4: ; 8071FA4 lsls r0, 16 asrs r0, 16 cmp r0, 0x32 - ble @08071FBE + ble _08071FBE ldr r0, =sub_8071FC8 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x2E] -@08071FBE: +_08071FBE: pop {r0} bx r0 .pool @@ -191679,7 +191679,7 @@ sub_8071FC8: ; 8071FC8 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne @08071FE8 + bne _08071FE8 movs r1, 0x1 negs r1, r1 ldr r0, =0x0000ffff @@ -191688,12 +191688,12 @@ sub_8071FC8: ; 8071FC8 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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 @@ -191702,8 +191702,8 @@ sub_8071FC8: ; 8071FC8 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] @@ -191714,7 +191714,7 @@ sub_8071FC8: ; 8071FC8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @08072032 + bne _08072032 movs r0, 0x71 bl audio_play adds r2, r5, 0 @@ -191726,7 +191726,7 @@ sub_8071FC8: ; 8071FC8 ldr r0, =sub_8072048 str r0, [r5, 0x1C] strh r4, [r5, 0x2E] -@08072032: +_08072032: add sp, 0x4 pop {r4,r5} pop {r0} @@ -191742,7 +191742,7 @@ sub_8072048: ; 8072048 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne @08072084 + bne _08072084 ldr r4, =0x02020630 ldr r3, =0x03000de0 ldr r0, [r3] @@ -191765,11 +191765,11 @@ sub_8072048: ; 8072048 adds r0, r4 movs r1, 0x1 bl StartObjectRotScalAnim -@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 @@ -191778,11 +191778,11 @@ sub_8072048: ; 8072048 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@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] @@ -191794,15 +191794,15 @@ sub_8072048: ; 8072048 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, =DummyObjectCallback str r0, [r5, 0x1C] -@080720CA: +_080720CA: adds r0, r1, 0x1 strh r0, [r5, 0x2E] add sp, 0x4 @@ -191827,17 +191827,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] @@ -191850,13 +191850,13 @@ sub_80720E8: ; 80720E8 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 RemoveObjectAndFreeTiles -@0807213A: +_0807213A: pop {r4} pop {r0} bx r0 @@ -192034,8 +192034,8 @@ sub_807228C: ; 807228C 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 @@ -192045,28 +192045,28 @@ sub_807228C: ; 807228C movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne @080722CC + bne _080722CC adds r0, r4, 0 bl GetMonAbility 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 .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 @@ -192114,7 +192114,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 @@ -192125,17 +192125,17 @@ sub_8072308: ; 8072308 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 @@ -192152,16 +192152,16 @@ sub_8072308: ; 8072308 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 @@ -192172,25 +192172,25 @@ sub_8072308: ; 8072308 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 @@ -192198,7 +192198,7 @@ sub_8072308: ; 8072308 ldrb r0, [r5] mov r8, r1 cmp r0, 0xFF - bne @080723EA + bne _080723EA lsls r1, r2, 1 adds r1, r7 ldrh r2, [r1] @@ -192217,8 +192217,8 @@ sub_8072308: ; 8072308 mov r5, r12 orrs r0, r5 strh r0, [r1] - b @0807241A -@080723EA: + b _0807241A +_080723EA: lsls r2, 1 adds r2, r7 ldrh r0, [r2] @@ -192243,7 +192243,7 @@ sub_8072308: ; 8072308 orrs r1, r0 strh r1, [r2] adds r3, r4, 0 -@0807241A: +_0807241A: movs r0, 0x80 lsls r0, 17 add r0, r8 @@ -192254,14 +192254,14 @@ sub_8072308: ; 8072308 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 @@ -192269,7 +192269,7 @@ sub_8072308: ; 8072308 ldrb r0, [r5] adds r3, r1, 0 cmp r0, 0xFF - bne @08072466 + bne _08072466 lsls r1, r2, 1 adds r1, r7 ldrh r2, [r1] @@ -192283,8 +192283,8 @@ sub_8072308: ; 8072308 ands r0, r2 orrs r0, r6 strh r0, [r1] - b @08072488 -@08072466: + b _08072488 +_08072466: lsls r2, 1 adds r2, r7 ldrh r0, [r2] @@ -192302,15 +192302,15 @@ sub_8072308: ; 8072308 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 @@ -192364,12 +192364,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, =gUnknown_0832C140 adds r0, r4, 0 movs r1, 0xF0 @@ -192413,9 +192413,9 @@ battle_make_oam_normal_battle: ; 80724DC ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] - b @080725BA + b _080725BA .pool -@08072574: +_08072574: ldr r4, =gUnknown_0832C170 adds r0, r4, 0 movs r1, 0xF0 @@ -192449,7 +192449,7 @@ battle_make_oam_normal_battle: ; 80724DC strh r0, [r2, 0x4] movs r0, 0x2 str r0, [sp] -@080725BA: +_080725BA: ldr r2, =0x02020630 lsls r0, r6, 4 adds r0, r6 @@ -192465,14 +192465,14 @@ battle_make_oam_normal_battle: ; 80724DC adds r0, r2 ldr r1, =sub_8072924 str r1, [r0] - b @08072718 + b _08072718 .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 @@ -192534,9 +192534,9 @@ battle_make_oam_normal_battle: ; 80724DC ldr r0, =sub_8072924 str r0, [r2] movs r0, 0x1 - b @08072716 + b _08072716 .pool -@08072694: +_08072694: mov r0, r10 bl battle_get_per_side_status adds r1, r0, 0 @@ -192598,9 +192598,9 @@ battle_make_oam_normal_battle: ; 80724DC ldr r0, =sub_8072924 str r0, [r2] movs r0, 0x2 -@08072716: +_08072716: str r0, [sp] -@08072718: +_08072718: ldr r0, =0x02024076 add r0, r10 ldrb r1, [r0] @@ -192789,11 +192789,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 @@ -192801,9 +192801,9 @@ sub_80728B4: ; 80728B4 adds r1, r2 ldrh r0, [r1, 0x20] adds r0, 0x10 - b @08072906 + b _08072906 .pool -@080728E4: +_080728E4: ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 @@ -192811,9 +192811,9 @@ sub_80728B4: ; 80728B4 adds r1, r2 ldrh r0, [r1, 0x20] adds r0, 0x10 - b @08072906 + b _08072906 .pool -@080728F8: +_080728F8: ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 @@ -192821,7 +192821,7 @@ sub_80728B4: ; 80728B4 adds r1, r2 ldrh r0, [r1, 0x20] adds r0, 0x8 -@08072906: +_08072906: strh r0, [r4, 0x20] ldrh r0, [r1, 0x22] strh r0, [r4, 0x22] @@ -193041,7 +193041,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 @@ -193051,7 +193051,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] @@ -193090,8 +193090,8 @@ sub_8072A88: ; 8072A88 mov r2, r8 ldrb r2, [r2] cmp r6, r2 - blt @08072AB2 -@08072B00: + blt _08072AB2 +_08072B00: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -193111,53 +193111,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] @@ -193218,21 +193218,21 @@ 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 .pool -@08072C18: +_08072C18: ldr r2, =0x06010400 adds r1, r4, r2 -@08072C1C: +_08072C1C: adds r0, r1, 0 adds r1, r5, 0 movs r2, 0x3 @@ -193273,17 +193273,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 @@ -193302,9 +193302,9 @@ heathbar_draw_hp: ; 8072C38 ldr r1, =0x06010b40 adds r0, r5, r1 adds r1, r4, 0 - b @08072CF8 + b _08072CF8 .pool -@08072CB8: +_08072CB8: mov r2, r9 lsls r1, r2, 16 asrs r1, 16 @@ -193334,14 +193334,14 @@ heathbar_draw_hp: ; 8072C38 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 .pool -@08072D10: +_08072D10: ldr r1, =gUnknown_0832C3C4 add r0, sp, 0x4 movs r2, 0x14 @@ -193359,43 +193359,43 @@ heathbar_draw_hp: ; 8072C38 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 .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 @@ -193419,7 +193419,7 @@ heathbar_draw_hp: ; 8072C38 adds r0, r2, r7 lsls r0, 2 adds r5, r0, r1 -@08072DB8: +_08072DB8: ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA @@ -193443,8 +193443,8 @@ heathbar_draw_hp: ; 8072C38 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 @@ -193484,7 +193484,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 @@ -193496,9 +193496,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 @@ -193512,7 +193512,7 @@ sub_8072E0C: ; 8072E0C 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 @@ -193543,9 +193543,9 @@ sub_8072E0C: ; 8072E0C adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b @080730B8 + b _080730B8 .pool -@08072EDC: +_08072EDC: lsls r1, r4, 16 asrs r1, 16 add r0, sp, 0x4 @@ -193576,9 +193576,9 @@ sub_8072E0C: ; 8072E0C bl sub_8075170 ldr r0, [sp, 0x28] bl sub_807512C - b @080730B8 + b _080730B8 .pool -@08072F28: +_08072F28: ldr r1, =gUnknown_0832C3D8 add r0, sp, 0x4 movs r2, 0x14 @@ -193597,9 +193597,9 @@ sub_8072E0C: ; 8072E0C 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 @@ -193619,10 +193619,10 @@ sub_8072E0C: ; 8072E0C bl ConvertIntToDecimalString mov r3, r8 cmp r3, 0 - bne @08072F82 + bne _08072F82 ldr r1, =gUnknown_085E8D3E bl CopyString -@08072F82: +_08072F82: ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA @@ -193635,14 +193635,14 @@ sub_8072E0C: ; 8072E0C 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 @@ -193663,9 +193663,9 @@ sub_8072E0C: ; 8072E0C adds r1, r3 ldr r2, =0x04000008 bl CpuSet - b @0807301A + b _0807301A .pool -@08072FF0: +_08072FF0: ldr r0, =0x020244d4 ldr r0, [r0] movs r1, 0xBA @@ -193686,16 +193686,16 @@ sub_8072E0C: ; 8072E0C 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 @@ -193725,14 +193725,14 @@ sub_8072E0C: ; 8072E0C adds r1, r5 ldr r2, =0x05000008 bl CpuSet - b @080730B8 + b _080730B8 .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 @@ -193751,7 +193751,7 @@ sub_8072E0C: ; 8072E0C adds r1, r2 ldr r2, =0x04000008 bl CpuSet -@080730B8: +_080730B8: add sp, 0x30 pop {r3-r5} mov r8, r3 @@ -193826,7 +193826,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] @@ -193835,36 +193835,36 @@ sub_80730D4: ; 80730D4 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 .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 @@ -193875,7 +193875,7 @@ sub_80730D4: ; 80730D4 lsrs r5, r0, 24 adds r7, 0x1 cmp r5, r8 - bcc @08073158 + bcc _08073158 movs r7, 0x1 ldr r0, [sp, 0x14] lsls r0, 4 @@ -193884,7 +193884,7 @@ sub_80730D4: ; 80730D4 add r1, r8 mov r9, r1 cmp r7, r9 - bge @08073236 + bge _08073236 ldr r1, =0x02020630 ldr r2, =0x04000008 mov r10, r2 @@ -193893,16 +193893,16 @@ sub_80730D4: ; 80730D4 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 @@ -193932,8 +193932,8 @@ sub_80730D4: ; 80730D4 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] @@ -193979,9 +193979,9 @@ sub_80730D4: ; 80730D4 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 @@ -193998,9 +193998,9 @@ sub_80730D4: ; 80730D4 adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b @080732F4 + b _080732F4 .pool -@080732D4: +_080732D4: ldr r0, [r5] movs r3, 0xBA lsls r3, 1 @@ -194016,11 +194016,11 @@ sub_80730D4: ; 80730D4 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 @@ -194045,14 +194045,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 @@ -194066,9 +194066,9 @@ sub_8073314: ; 8073314 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @08073354 - b @080735A8 -@08073354: + beq _08073354 + b _080735A8 +_08073354: mov r2, r9 lsls r0, r2, 24 lsrs r7, r0, 24 @@ -194077,20 +194077,20 @@ sub_8073314: ; 8073314 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] @@ -194122,23 +194122,23 @@ sub_8073314: ; 8073314 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 @@ -194181,9 +194181,9 @@ sub_8073314: ; 8073314 movs r1, 0x64 muls r0, r1 ldr r2, =0x020244ec - b @08073536 + b _08073536 .pool -@08073468: +_08073468: ldrb r0, [r6] bl draw_status_ailment_maybe ldrb r0, [r6] @@ -194209,17 +194209,17 @@ sub_8073314: ; 8073314 adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b @08073592 + b _08073592 .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] @@ -194228,9 +194228,9 @@ sub_8073314: ; 8073314 ldr r2, =0x02024744 adds r1, r2 bl sub_80730D4 - b @08073592 + b _08073592 .pool -@080734DC: +_080734DC: ldrb r1, [r6] lsls r0, r1, 4 adds r0, r1 @@ -194273,7 +194273,7 @@ sub_8073314: ; 8073314 movs r1, 0x64 muls r0, r1 ldr r2, =0x02024744 -@08073536: +_08073536: adds r0, r2 movs r1, 0x3A bl pokemon_getattr @@ -194283,9 +194283,9 @@ sub_8073314: ; 8073314 adds r0, r4, 0 movs r2, 0x1 bl sub_8072E0C - b @08073592 + b _08073592 .pool -@0807355C: +_0807355C: ldrb r0, [r6] bl draw_status_ailment_maybe ldrb r0, [r6] @@ -194302,7 +194302,7 @@ sub_8073314: ; 8073314 movs r1, 0x80 ands r0, r1 cmp r0, 0 - beq @08073592 + beq _08073592 ldrb r0, [r6] mov r2, r8 ldrh r1, [r2] @@ -194310,7 +194310,7 @@ sub_8073314: ; 8073314 adds r1, r4 movs r2, 0x4 bl healthbar_draw_field_maybe -@08073592: +_08073592: ldr r0, =0x03005d70 add r0, r9 ldrb r1, [r0] @@ -194322,7 +194322,7 @@ sub_8073314: ; 8073314 movs r2, 0x1 eors r1, r2 strh r1, [r0, 0x3C] -@080735A8: +_080735A8: movs r0, 0x2 add r8, r0 movs r1, 0x1 @@ -194330,9 +194330,9 @@ sub_8073314: ; 8073314 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 @@ -194363,18 +194363,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 @@ -194383,32 +194383,32 @@ sub_80735DC: ; 80735DC mov r10, r1 ldr r2, =0x0000fffb mov r8, r2 - b @0807366C + b _0807366C .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 .pool -@0807365C: +_0807365C: movs r1, 0x1 mov r9, r1 movs r5, 0x68 @@ -194417,7 +194417,7 @@ sub_80735DC: ; 80735DC mov r10, r2 movs r3, 0x5 mov r8, r3 -@0807366C: +_0807366C: ldr r0, =gUnknown_0832C334 bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0832C34C @@ -194458,7 +194458,7 @@ sub_80735DC: ; 80735DC 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] @@ -194469,13 +194469,13 @@ sub_80735DC: ; 80735DC movs r1, 0x10 orrs r0, r1 strb r0, [r7, 0x3] - b @08073706 + b _08073706 .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 @@ -194487,7 +194487,7 @@ sub_80735DC: ; 80735DC str r0, [sp, 0x18] movs r6, 0xA movs r5, 0 -@0807371C: +_0807371C: ldr r0, =gUnknown_0832C394 ldr r3, [sp, 0x20] ldr r1, =0xfffc0000 @@ -194502,7 +194502,7 @@ sub_80735DC: ; 80735DC strb r0, [r7] ldr r0, [sp, 0x10] cmp r0, 0 - bne @0807374C + bne _0807374C ldrb r0, [r7] lsls r1, r0, 4 adds r1, r0 @@ -194511,11 +194511,11 @@ sub_80735DC: ; 80735DC adds r1, r2 ldr r0, =sub_80741C8 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 @@ -194529,7 +194529,7 @@ sub_80735DC: ; 80735DC add r0, r10 mov r1, r9 strh r1, [r0, 0x26] -@0807376E: +_0807376E: ldrb r1, [r7] lsls r0, r1, 4 adds r0, r1 @@ -194541,7 +194541,7 @@ sub_80735DC: ; 80735DC strh r2, [r0, 0x2E] mov r3, r9 cmp r3, 0 - bne @080737C8 + bne _080737C8 ldrb r0, [r7] lsls r1, r0, 4 adds r1, r0 @@ -194563,9 +194563,9 @@ sub_80735DC: ; 80735DC lsls r0, 2 adds r0, r4 movs r1, 0x78 - b @0807380A + b _0807380A .pool -@080737C8: +_080737C8: ldrb r0, [r7] lsls r2, r0, 4 adds r2, r0 @@ -194599,7 +194599,7 @@ sub_80735DC: ; 80735DC lsls r0, 2 adds r0, r4 ldr r1, =0x0000ff88 -@0807380A: +_0807380A: strh r1, [r0, 0x24] ldrb r1, [r7] lsls r0, r1, 4 @@ -194615,22 +194615,22 @@ sub_80735DC: ; 80735DC 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 @@ -194642,10 +194642,10 @@ sub_80735DC: ; 80735DC 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 @@ -194667,11 +194667,11 @@ sub_80735DC: ; 80735DC adds r0, r6 movs r1, 0x1 strh r1, [r0, 0x3C] - b @080738E2 + b _080738E2 .pool -@080738A8: +_080738A8: cmp r0, 0 - bne @080738C0 + bne _080738C0 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -194681,11 +194681,11 @@ sub_80735DC: ; 80735DC 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 @@ -194695,13 +194695,13 @@ sub_80735DC: ; 80735DC 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 @@ -194709,9 +194709,9 @@ sub_80735DC: ; 80735DC 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 @@ -194723,11 +194723,11 @@ sub_80735DC: ; 80735DC 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] @@ -194754,11 +194754,11 @@ sub_80735DC: ; 80735DC strh r1, [r0, 0x3C] subs r1, 0x2 add r10, r1 - b @080739DE + b _080739DE .pool -@08073958: +_08073958: cmp r0, 0 - bne @08073970 + bne _08073970 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -194768,15 +194768,15 @@ sub_80735DC: ; 80735DC 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 @@ -194789,7 +194789,7 @@ sub_80735DC: ; 80735DC ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @080739B8 + beq _080739B8 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -194799,12 +194799,12 @@ sub_80735DC: ; 80735DC lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b @080739D0 + b _080739D0 .pool -@080739B8: +_080739B8: ldr r0, [r6, 0x4] cmp r0, 0 - beq @080739DC + beq _080739DC ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -194814,28 +194814,28 @@ sub_80735DC: ; 80735DC 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 @@ -194848,10 +194848,10 @@ sub_80735DC: ; 80735DC 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 @@ -194873,11 +194873,11 @@ sub_80735DC: ; 80735DC adds r0, r6 movs r1, 0x1 strh r1, [r0, 0x3C] - b @08073A92 + b _08073A92 .pool -@08073A58: +_08073A58: cmp r0, 0 - bne @08073A70 + bne _08073A70 ldrb r0, [r4] lsls r2, r0, 4 adds r2, r0 @@ -194887,11 +194887,11 @@ sub_80735DC: ; 80735DC 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 @@ -194901,13 +194901,13 @@ sub_80735DC: ; 80735DC 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 @@ -194915,9 +194915,9 @@ sub_80735DC: ; 80735DC 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 @@ -194930,11 +194930,11 @@ sub_80735DC: ; 80735DC 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] @@ -194960,11 +194960,11 @@ sub_80735DC: ; 80735DC movs r1, 0x1 strh r1, [r0, 0x3C] add r8, r1 - b @08073B92 + b _08073B92 .pool -@08073B08: +_08073B08: cmp r0, 0 - bne @08073B20 + bne _08073B20 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -194974,15 +194974,15 @@ sub_80735DC: ; 80735DC 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 @@ -194994,7 +194994,7 @@ sub_80735DC: ; 80735DC ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08073B6C + beq _08073B6C ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -195004,12 +195004,12 @@ sub_80735DC: ; 80735DC lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x3 - b @08073B84 + b _08073B84 .pool -@08073B6C: +_08073B6C: ldr r0, [r6, 0x4] cmp r0, 0 - beq @08073B90 + beq _08073B90 ldrb r0, [r5] lsls r2, r0, 4 adds r2, r0 @@ -195019,21 +195019,21 @@ sub_80735DC: ; 80735DC 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 movs r1, 0x5 bl AddTask @@ -195055,7 +195055,7 @@ sub_80735DC: ; 80735DC adds r0, r2, 0 adds r0, 0xE adds r1, r0 -@08073BC6: +_08073BC6: mov r0, sp add r0, r8 ldrb r0, [r0] @@ -195065,7 +195065,7 @@ sub_80735DC: ; 80735DC add r8, r5 mov r6, r8 cmp r6, 0x5 - ble @08073BC6 + ble _08073BC6 adds r0, r3, r4 lsls r0, 3 adds r0, r2 @@ -195074,7 +195074,7 @@ sub_80735DC: ; 80735DC 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] @@ -195090,7 +195090,7 @@ sub_80735DC: ; 80735DC ands r0, r2 orrs r0, r1 strb r0, [r3, 0x9] -@08073C0A: +_08073C0A: movs r0, 0x72 movs r1, 0 bl audio_play_and_stuff @@ -195131,7 +195131,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] @@ -195139,7 +195139,7 @@ sub_8073C30: ; 8073C30 adds r2, 0x2 adds r5, 0x1 cmp r5, 0x5 - ble @08073C5E + ble _08073C5E movs r1, 0xFD lsls r1, 6 movs r0, 0x50 @@ -195163,7 +195163,7 @@ sub_8073C30: ; 8073C30 negs r6, r6 mov r12, r3 movs r4, 0x4 -@08073CA0: +_08073CA0: mov r2, sp adds r0, r2, r5 ldrb r0, [r0] @@ -195178,7 +195178,7 @@ sub_8073C30: ; 8073C30 strb r0, [r1, 0x1] adds r5, 0x1 cmp r5, 0x5 - ble @08073CA0 + ble _08073CA0 ldr r2, [sp, 0x10] add r2, r10 lsls r2, 2 @@ -195191,9 +195191,9 @@ sub_8073C30: ; 8073C30 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 @@ -195201,7 +195201,7 @@ sub_8073C30: ; 8073C30 adds r3, 0x1C mov r4, sp movs r7, 0 -@08073CE8: +_08073CE8: ldr r0, [sp, 0x8] str r3, [sp, 0x14] bl battle_side_get_owner @@ -195209,7 +195209,7 @@ sub_8073C30: ; 8073C30 lsrs r2, r0, 24 ldr r3, [sp, 0x14] cmp r2, 0 - beq @08073D4C + beq _08073D4C movs r0, 0x5 subs r0, r5 mov r1, sp @@ -195243,9 +195243,9 @@ sub_8073C30: ; 8073C30 str r1, [r0] ldr r2, =0x02020630 mov r12, r2 - b @08073D82 + b _08073D82 .pool -@08073D4C: +_08073D4C: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -195273,12 +195273,12 @@ sub_8073C30: ; 8073C30 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 @@ -195306,9 +195306,9 @@ sub_8073C30: ; 8073C30 adds r0, r1 ldr r1, =task_battle_throw_own_ball str r1, [r0] - b @08073DEE + b _08073DEE .pool -@08073DE0: +_08073DE0: ldr r0, =0x03005e00 ldr r1, [sp, 0xC] add r1, r8 @@ -195316,7 +195316,7 @@ sub_8073C30: ; 8073C30 adds r1, r0 ldr r0, =sub_8073F98 str r0, [r1] -@08073DEE: +_08073DEE: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -195346,13 +195346,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 @@ -195361,14 +195361,14 @@ task_battle_throw_own_ball: ; 8073E08 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@08073E48: +_08073E48: movs r1, 0x26 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08073E54 + bne _08073E54 ldr r0, =sub_8073E64 str r0, [r4] -@08073E54: +_08073E54: pop {r4} pop {r0} bx r0 @@ -195395,14 +195395,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] @@ -195410,7 +195410,7 @@ sub_8073E64: ; 8073E64 adds r2, 0x2 adds r4, 0x1 cmp r4, 0x5 - ble @08073E96 + ble _08073E96 ldr r0, [r6] ldr r3, [r0, 0x8] ldrb r2, [r3, 0x9] @@ -195431,7 +195431,7 @@ sub_8073E64: ; 8073E64 movs r0, 0x1C ands r0, r1 cmp r0, 0 - bne @08073EFC + bne _08073EFC lsls r0, r5, 4 adds r0, r5 lsls r0, 2 @@ -195445,9 +195445,9 @@ sub_8073E64: ; 8073E64 lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeResources - b @08073F32 + b _08073F32 .pool -@08073EFC: +_08073EFC: lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -195471,10 +195471,10 @@ sub_8073E64: ; 8073E64 lsls r0, 2 adds r0, r5 bl RemoveObjectAndFreeTiles -@08073F32: +_08073F32: movs r4, 0x1 ldr r5, =0x02020630 -@08073F36: +_08073F36: mov r1, sp adds r0, r1, r4 ldrb r1, [r0] @@ -195485,14 +195485,14 @@ sub_8073E64: ; 8073E64 bl RemoveObjectAndFreeTiles adds r4, 0x1 cmp r4, 0x5 - ble @08073F36 - b @08073F8A + ble _08073F36 + b _08073F8A .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] @@ -195513,7 +195513,7 @@ sub_8073E64: ; 8073E64 bl SetGpuReg adds r0, r5, 0 bl remove_task -@08073F8A: +_08073F8A: add sp, 0x8 pop {r4-r7} pop {r0} @@ -195540,7 +195540,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 @@ -195549,19 +195549,19 @@ sub_8073F98: ; 8073F98 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg - b @0807406A + b _0807406A .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] @@ -195569,7 +195569,7 @@ sub_8073F98: ; 8073F98 adds r2, 0x2 adds r5, 0x1 cmp r5, 0x5 - ble @08073FE6 + ble _08073FE6 lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -195584,7 +195584,7 @@ sub_8073F98: ; 8073F98 adds r0, r4 bl RemoveObjectAndFreeResources movs r5, 0x1 -@08074016: +_08074016: mov r1, sp adds r0, r1, r5 ldrb r1, [r0] @@ -195595,14 +195595,14 @@ sub_8073F98: ; 8073F98 bl RemoveObjectAndFreeTiles adds r5, 0x1 cmp r5, 0x5 - ble @08074016 - b @0807406A + ble _08074016 + b _0807406A .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] @@ -195623,7 +195623,7 @@ sub_8073F98: ; 8073F98 bl SetGpuReg adds r0, r4, 0 bl remove_task -@0807406A: +_0807406A: add sp, 0x8 pop {r4-r7} pop {r0} @@ -195639,11 +195639,11 @@ sub_8074078: ; 8074078 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 @@ -195659,18 +195659,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 @@ -195688,11 +195688,11 @@ sub_80740C4: ; 80740C4 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 @@ -195705,55 +195705,55 @@ sub_80740C4: ; 80740C4 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 .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, =DummyObjectCallback str r0, [r4, 0x1C] -@0807414E: +_0807414E: pop {r4} pop {r0} bx r0 @@ -195768,11 +195768,11 @@ sub_8074158: ; 8074158 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] @@ -195784,17 +195784,17 @@ sub_8074158: ; 8074158 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 .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] @@ -195805,7 +195805,7 @@ sub_8074158: ; 8074158 movs r1, 0x80 lsls r1, 1 cmp r0, r1 - bls @080741BC + bls _080741BC adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -195814,7 +195814,7 @@ sub_8074158: ; 8074158 strb r0, [r2] ldr r0, =DummyObjectCallback str r0, [r3, 0x1C] -@080741BC: +_080741BC: pop {r4} pop {r0} bx r0 @@ -195871,10 +195871,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, =gSpeciesNames @@ -195882,23 +195882,23 @@ sub_80741E8: ; 80741E8 add r0, sp, 0x4 bl CompareString 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, =gUnknown_085ED238 - b @08074272 + b _08074272 .pool -@08074268: +_08074268: ldr r1, =gUnknown_085ED22E - b @08074272 + b _08074272 .pool -@08074270: +_08074270: ldr r1, =gUnknown_085ED233 -@08074272: +_08074272: adds r0, r5, 0 bl CopyString ldr r0, =0x02022e2c @@ -195923,7 +195923,7 @@ sub_80741E8: ; 80741E8 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 @@ -195934,24 +195934,24 @@ sub_80741E8: ; 80741E8 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 .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 @@ -195975,11 +195975,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 @@ -195992,7 +195992,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 @@ -196012,12 +196012,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 @@ -196034,9 +196034,9 @@ sub_8074310: ; 8074310 adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b @080743E6 + b _080743E6 .pool -@080743C4: +_080743C4: str r7, [sp] lsls r0, r4, 4 adds r0, r4 @@ -196053,7 +196053,7 @@ sub_8074310: ; 8074310 ldr r2, =0x05000008 mov r0, sp bl CpuSet -@080743E6: +_080743E6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -196088,7 +196088,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 @@ -196105,12 +196105,12 @@ 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 .pool -@08074468: +_08074468: ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -196124,11 +196124,11 @@ draw_status_ailment_maybe: ; 80743F8 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 @@ -196137,13 +196137,13 @@ draw_status_ailment_maybe: ; 80743F8 bl sub_80728A4 adds r6, r0, 0 movs r0, 0x2 - b @080745B8 + b _080745B8 .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 @@ -196152,12 +196152,12 @@ draw_status_ailment_maybe: ; 80743F8 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 @@ -196166,12 +196166,12 @@ draw_status_ailment_maybe: ; 80743F8 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 @@ -196180,12 +196180,12 @@ draw_status_ailment_maybe: ; 80743F8 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 @@ -196194,8 +196194,8 @@ draw_status_ailment_maybe: ; 80743F8 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 @@ -196210,7 +196210,7 @@ draw_status_ailment_maybe: ; 80743F8 add r0, r9 lsls r0, 2 adds r5, r0, r1 -@08074542: +_08074542: ldrh r1, [r5, 0x4] lsls r1, 22 lsrs r1, 22 @@ -196226,7 +196226,7 @@ draw_status_ailment_maybe: ; 80743F8 bl CpuSet adds r4, 0x1 cmp r4, 0x2 - ble @08074542 + ble _08074542 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -196235,7 +196235,7 @@ draw_status_ailment_maybe: ; 80743F8 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne @08074598 + bne _08074598 movs r0, 0x1 bl sub_80728A4 ldr r2, =0x02020630 @@ -196251,13 +196251,13 @@ draw_status_ailment_maybe: ; 80743F8 adds r1, r2 ldr r2, =0x04000010 bl CpuSet -@08074598: +_08074598: mov r0, r9 movs r1, 0x1 bl sub_8074310 - b @0807467A + b _0807467A .pool -@080745B8: +_080745B8: mov r1, r9 lsls r5, r1, 4 add r5, r9 @@ -196301,14 +196301,14 @@ draw_status_ailment_maybe: ; 80743F8 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] @@ -196318,7 +196318,7 @@ draw_status_ailment_maybe: ; 80743F8 movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne @08074672 + bne _08074672 movs r0, 0 bl sub_80728A4 mov r3, r10 @@ -196343,11 +196343,11 @@ draw_status_ailment_maybe: ; 80743F8 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 @@ -196368,88 +196368,88 @@ 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 .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 @@ -196578,14 +196578,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 @@ -196597,14 +196597,14 @@ healthbar_draw_field_maybe: ; 8074860 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 @@ -196613,9 +196613,9 @@ healthbar_draw_field_maybe: ; 8074860 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 @@ -196625,12 +196625,12 @@ healthbar_draw_field_maybe: ; 8074860 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 @@ -196640,12 +196640,12 @@ healthbar_draw_field_maybe: ; 8074860 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 @@ -196667,18 +196667,18 @@ healthbar_draw_field_maybe: ; 8074860 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 @@ -196729,45 +196729,45 @@ healthbar_draw_field_maybe: ; 8074860 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 .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 @@ -196776,12 +196776,12 @@ healthbar_draw_field_maybe: ; 8074860 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 @@ -196803,24 +196803,24 @@ healthbar_draw_field_maybe: ; 8074860 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 @@ -196846,7 +196846,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] @@ -196866,9 +196866,9 @@ sub_8074AA0: ; 8074AA0 bl sub_8074DB8 adds r4, r0, 0 adds r7, r5, 0 - b @08074B48 + b _08074B48 .pool -@08074AEC: +_08074AEC: ldr r2, =0x020244d0 mov r10, r2 ldr r0, [r2] @@ -196887,9 +196887,9 @@ sub_8074AA0: ; 8074AA0 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] @@ -196899,9 +196899,9 @@ sub_8074AA0: ; 8074AA0 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] @@ -196914,12 +196914,12 @@ sub_8074AA0: ; 8074AA0 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] @@ -196928,16 +196928,16 @@ sub_8074AA0: ; 8074AA0 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] @@ -196947,7 +196947,7 @@ sub_8074AA0: ; 8074AA0 adds r0, r1 movs r1, 0 str r1, [r0, 0x10] -@08074B86: +_08074B86: adds r0, r4, 0 add sp, 0x8 pop {r3-r5} @@ -196972,11 +196972,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] @@ -196999,18 +196999,18 @@ sub_8074B9C: ; 8074B9C 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] @@ -197026,7 +197026,7 @@ sub_8074B9C: ; 8074B9C lsls r0, 24 lsrs r4, r0, 24 cmp r5, 0x1 - bhi @08074C5C + bhi _08074C5C mov r0, r9 bl sub_80728A4 mov r1, sp @@ -197049,9 +197049,9 @@ sub_8074B9C: ; 8074B9C adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b @08074C8A + b _08074C8A .pool -@08074C5C: +_08074C5C: mov r0, r9 bl sub_80728A4 mov r1, sp @@ -197073,15 +197073,15 @@ sub_8074B9C: ; 8074B9C 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 .pool -@08074CA0: +_08074CA0: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0xC] @@ -197112,10 +197112,10 @@ sub_8074B9C: ; 8074B9C 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 @@ -197124,16 +197124,16 @@ sub_8074B9C: ; 8074B9C 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 @@ -197162,9 +197162,9 @@ sub_8074B9C: ; 8074B9C adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b @08074D94 + b _08074D94 .pool -@08074D5C: +_08074D5C: movs r0, 0xC bl sub_80728A4 mov r1, sp @@ -197191,13 +197191,13 @@ sub_8074B9C: ; 8074B9C 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 @@ -197226,103 +197226,103 @@ 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 .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} @@ -197341,64 +197341,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 @@ -197408,11 +197408,11 @@ sub_8074E8C: ; 8074E8C 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} @@ -197446,14 +197446,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 @@ -197493,7 +197493,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 @@ -197508,7 +197508,7 @@ sub_8074F88: ; 8074F88 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x5 - bls @08074FB4 + bls _08074FB4 adds r0, r7, 0 mov r1, r8 movs r2, 0x6 @@ -197529,14 +197529,14 @@ sub_8074FE8: ; 8074FE8 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 @@ -197553,9 +197553,9 @@ sub_8074FE8: ; 8074FE8 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} @@ -197578,11 +197578,11 @@ 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 @@ -197596,24 +197596,24 @@ sub_8075060: ; 8075060 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 @@ -197769,8 +197769,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 @@ -197781,8 +197781,8 @@ sub_8075198: ; 8075198 adds r5, 0x20 subs r4, 0x1 cmp r4, 0 - bne @080751BC -@080751D4: + bne _080751BC +_080751D4: pop {r4-r6} pop {r0} bx r0 @@ -197837,12 +197837,12 @@ sub_807521C: ; 807521C lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne @0807524E + bne _0807524E adds r0, r5, 0 bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0831C628 bl LoadCompressedObjectPaletteUsingHeap -@0807524E: +_0807524E: ldr r0, =sub_8075370 bl object_new_hidden_with_callback mov r8, r0 @@ -197971,7 +197971,7 @@ sub_8075370: ; 8075370 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @080753A8 + bne _080753A8 ldr r0, =gUnknown_0831C620 ldrh r0, [r0, 0x6] bl FreeObjectTilesByTag @@ -197981,15 +197981,15 @@ sub_8075370: ; 8075370 movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0 - bne @080753A4 + bne _080753A4 adds r0, r4, 0 bl RemoveObjectAndFreeTiles - b @080753A8 + b _080753A8 .pool -@080753A4: +_080753A4: ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@080753A8: +_080753A8: pop {r4} pop {r0} bx r0 @@ -198005,7 +198005,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] @@ -198018,7 +198018,7 @@ sub_80753B4: ; 80753B4 strh r1, [r0, 0x2E] adds r0, r3, 0 bl RemoveObjectAndFreeTiles -@080753DE: +_080753DE: pop {r0} bx r0 .pool @@ -198093,12 +198093,12 @@ 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 .pool -@08075488: +_08075488: ldrh r0, [r1, 0xC] mov r8, r0 ldrb r5, [r1, 0xE] @@ -198106,7 +198106,7 @@ sub_8075450: ; 8075450 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 @@ -198114,9 +198114,9 @@ sub_8075450: ; 8075450 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @080754C2 + b _080754C2 .pool -@080754B4: +_080754B4: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -198124,7 +198124,7 @@ sub_8075450: ; 8075450 movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -@080754C2: +_080754C2: adds r0, r1 movs r1, 0x26 bl pokemon_getattr @@ -198161,9 +198161,9 @@ sub_8075450: ; 8075450 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 @@ -198175,9 +198175,9 @@ sub_8075450: ; 8075450 adds r0, r6, r0 ldr r1, =sub_80761B4 str r1, [r0] - b @08075592 + b _08075592 .pool -@08075548: +_08075548: adds r0, r5, 0 movs r1, 0 bl sub_80A5C6C @@ -198200,16 +198200,16 @@ sub_8075450: ; 8075450 adds r0, r6, r0 ldr r1, =sub_8076398 str r1, [r0] - b @08075592 + b _08075592 .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 @@ -198220,12 +198220,12 @@ sub_8075450: ; 8075450 strh r0, [r4, 0x3A] ldr r2, [sp] cmp r2, 0 - bne @080755B8 + bne _080755B8 mov r0, r10 bl remove_task - b @08075602 + b _08075602 .pool -@080755B8: +_080755B8: movs r0, 0x22 strh r0, [r4, 0x2E] ldrb r0, [r5] @@ -198259,7 +198259,7 @@ sub_8075450: ; 8075450 str r1, [r0] movs r0, 0x3D bl audio_play -@08075602: +_08075602: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -198281,7 +198281,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 @@ -198346,7 +198346,7 @@ objc_0804ABD4: ; 8075620 bl remove_task ldr r0, =sub_80756D4 str r0, [r7, 0x1C] -@080756C0: +_080756C0: add sp, 0x4 pop {r3} mov r8, r3 @@ -198375,7 +198375,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 str r0, [r6, 0x1C] @@ -198409,7 +198409,7 @@ sub_80756E0: ; 80756E0 lsls r0, 2 adds r0, r4 strh r7, [r0, 0x30] -@0807573A: +_0807573A: pop {r4-r7} pop {r0} bx r0 @@ -198426,10 +198426,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 @@ -198445,7 +198445,7 @@ sub_807574C: ; 807574C ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge @080757BC + bge _080757BC adds r0, r4, 0 movs r1, 0x2 bl StartObjectImageAnim @@ -198466,9 +198466,9 @@ sub_807574C: ; 807574C strh r0, [r4, 0x38] ldr r0, =sub_80757E4 str r0, [r4, 0x1C] - b @080757DC + b _080757DC .pool -@080757BC: +_080757BC: ldrh r0, [r1, 0x30] adds r0, 0x60 strh r0, [r1, 0x30] @@ -198485,7 +198485,7 @@ sub_807574C: ; 807574C negs r0, r0 asrs r0, 8 strh r0, [r1, 0x26] -@080757DC: +_080757DC: pop {r4-r6} pop {r0} bx r0 @@ -198500,7 +198500,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 @@ -198508,7 +198508,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] @@ -198527,7 +198527,7 @@ sub_80757E4: ; 80757E4 strh r0, [r4, 0x26] ldr r0, =sub_8075838 str r0, [r4, 0x1C] -@0807582C: +_0807582C: pop {r4} pop {r0} bx r0 @@ -198543,11 +198543,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 @@ -198565,7 +198565,7 @@ sub_8075838: ; 8075838 lsls r1, 16 asrs r1, 16 cmp r1, 0x3F - ble @080758EE + ble _080758EE ldrh r0, [r4, 0x36] subs r0, 0xA strh r0, [r4, 0x36] @@ -198575,38 +198575,38 @@ sub_8075838: ; 8075838 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 .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 @@ -198623,14 +198623,14 @@ sub_8075838: ; 8075838 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 @@ -198643,18 +198643,18 @@ sub_8075838: ; 8075838 movs r2, 0x3C ldrsh r0, [r4, r2] cmp r0, 0 - bne @0807591C + bne _0807591C ldr r0, =sub_8075D14 str r0, [r4, 0x1C] - b @08075926 + b _08075926 .pool -@0807591C: +_0807591C: ldr r0, =sub_8075930 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] strh r5, [r4, 0x38] -@08075926: +_08075926: pop {r4,r5} pop {r0} bx r0 @@ -198671,7 +198671,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 @@ -198687,7 +198687,7 @@ sub_8075930: ; 8075930 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play -@08075964: +_08075964: pop {r4} pop {r0} bx r0 @@ -198702,21 +198702,21 @@ sub_8075970: ; 8075970 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 .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 @@ -198735,21 +198735,21 @@ sub_8075970: ; 8075970 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] @@ -198767,25 +198767,25 @@ sub_8075970: ; 8075970 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 @@ -198797,40 +198797,40 @@ sub_8075970: ; 8075970 movs r2, 0x3C ldrsh r1, [r4, r2] cmp r0, r1 - bne @08075A48 + bne _08075A48 ldr r0, =sub_8075D14 str r0, [r4, 0x1C] - b @08075AB6 + b _08075AB6 .pool -@08075A48: +_08075A48: cmp r1, 0x4 - bne @08075A5C + bne _08075A5C cmp r0, 0x3 - bne @08075A5C + bne _08075A5C ldr r0, =sub_8075FB4 str r0, [r4, 0x1C] - b @08075A62 + b _08075A62 .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] @@ -198843,20 +198843,20 @@ sub_8075970: ; 8075970 movs r1, 0x36 ldrsh r0, [r4, r1] cmp r0, 0 - bge @08075AA8 + bge _08075AA8 adds r0, r4, 0 movs r1, 0x2 bl StartObjectRotScalAnim - b @08075AB0 + b _08075AB0 .pool -@08075AA8: +_08075AA8: adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim -@08075AB0: +_08075AB0: movs r0, 0x17 bl audio_play -@08075AB6: +_08075AB6: pop {r4} pop {r0} bx r0 @@ -198889,49 +198889,49 @@ 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 .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 @@ -198941,9 +198941,9 @@ c3_0804B070: ; 8075ABC 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 @@ -198951,27 +198951,27 @@ c3_0804B070: ; 8075ABC mov r1, r12 adds r1, 0x1 strh r1, [r0, 0x26] - b @08075D04 + b _08075D04 .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 @@ -198982,9 +198982,9 @@ c3_0804B070: ; 8075ABC strh r1, [r0, 0x1C] movs r1, 0x14 strh r1, [r0, 0x26] - b @08075D04 + b _08075D04 .pool -@08075BF8: +_08075BF8: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -198993,24 +198993,24 @@ c3_0804B070: ; 8075ABC 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] @@ -199026,9 +199026,9 @@ c3_0804B070: ; 8075ABC strb r0, [r1, 0x1] adds r0, r4, 0 bl remove_task - b @08075D04 + b _08075D04 .pool -@08075C54: +_08075C54: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -199037,8 +199037,8 @@ c3_0804B070: ; 8075ABC 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 @@ -199047,15 +199047,15 @@ c3_0804B070: ; 8075ABC 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 @@ -199067,9 +199067,9 @@ c3_0804B070: ; 8075ABC ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b @08075D04 + b _08075D04 .pool -@08075CA8: +_08075CA8: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -199078,29 +199078,29 @@ c3_0804B070: ; 8075ABC 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] @@ -199116,7 +199116,7 @@ c3_0804B070: ; 8075ABC strb r0, [r1, 0x1] adds r0, r4, 0 bl remove_task -@08075D04: +_08075D04: pop {r3} mov r8, r3 pop {r4-r7} @@ -199178,14 +199178,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 @@ -199196,9 +199196,9 @@ sub_8075D14: ; 8075D14 adds r7, r1, r0 movs r4, 0x19 mov r10, r4 - b @08075DD4 + b _08075DD4 .pool -@08075DC0: +_08075DC0: ldr r0, =0x0202406e lsls r2, r5, 1 adds r0, r2, r0 @@ -199209,7 +199209,7 @@ sub_8075D14: ; 8075D14 adds r7, r1, r0 movs r0, 0xE7 mov r10, r0 -@08075DD4: +_08075DD4: mov r8, r2 adds r0, r7, 0 movs r1, 0xB @@ -199222,18 +199222,18 @@ sub_8075D14: ; 8075D14 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] @@ -199241,31 +199241,31 @@ sub_8075D14: ; 8075D14 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 .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] @@ -199273,30 +199273,30 @@ sub_8075D14: ; 8075D14 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @08075E80 -@08075E70: + bne _08075E80 +_08075E70: movs r4, 0 - b @08075EA2 + b _08075EA2 .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] @@ -199337,7 +199337,7 @@ sub_8075D14: ; 8075D14 strh r0, [r1, 0x12] strh r7, [r1, 0x14] strh r3, [r1, 0x26] -@08075EF4: +_08075EF4: ldr r4, =0x020241e4 movs r1, 0x3A ldrsh r0, [r6, r1] @@ -199357,7 +199357,7 @@ sub_8075D14: ; 8075D14 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08075F50 + bne _08075F50 movs r2, 0x3A ldrsh r0, [r6, r2] adds r0, r4 @@ -199369,9 +199369,9 @@ sub_8075D14: ; 8075D14 adds r1, 0x1C adds r0, r1 ldr r1, =sub_8039B58 - b @08075F66 + b _08075F66 .pool -@08075F50: +_08075F50: movs r1, 0x3A ldrsh r0, [r6, r1] adds r0, r4 @@ -199383,7 +199383,7 @@ sub_8075D14: ; 8075D14 adds r1, 0x1C adds r0, r1 ldr r1, =sub_8039E44 -@08075F66: +_08075F66: str r1, [r0] ldr r5, =0x020241e4 movs r2, 0x3A @@ -199464,14 +199464,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 @@ -199482,14 +199482,14 @@ sub_8075FD4: ; 8075FD4 ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge @08076040 + bge _08076040 adds r0, r1, 0 movs r1, 0 bl StartObjectRotScalAnim movs r7, 0x1 - b @0807605C + b _0807605C .pool -@08076040: +_08076040: ldr r2, =0xfffffee0 adds r0, r2, 0 ldrh r2, [r1, 0x30] @@ -199504,16 +199504,16 @@ sub_8075FD4: ; 8075FD4 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 @@ -199548,29 +199548,29 @@ sub_8075FD4: ; 8075FD4 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 @@ -199590,21 +199590,21 @@ 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 .pool -@08076130: +_08076130: ldr r0, =0x0000013b cmp r1, r0 - bne @08076196 + bne _08076196 ldr r5, =0x02020630 ldr r4, =0x020241e4 movs r1, 0x3A @@ -199637,7 +199637,7 @@ sub_80760F8: ; 80760F8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @08076196 + beq _08076196 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -199650,7 +199650,7 @@ sub_80760F8: ; 80760F8 negs r0, r0 ands r0, r2 strb r0, [r1] -@08076196: +_08076196: pop {r4-r7} pop {r0} bx r0 @@ -199708,13 +199708,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 @@ -199742,7 +199742,7 @@ sub_8076204: ; 8076204 adds r0, r5, 0 movs r1, 0x4 bl StartObjectRotScalAnim -@08076266: +_08076266: ldrh r4, [r5, 0x2E] adds r0, r5, 0 bl sub_80A6F3C @@ -199776,19 +199776,19 @@ sub_8076204: ; 8076204 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 @@ -199813,13 +199813,13 @@ sub_8076204: ; 8076204 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 @@ -199837,7 +199837,7 @@ sub_8076204: ; 8076204 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] @@ -199845,7 +199845,7 @@ sub_8076204: ; 8076204 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @08076358 + beq _08076358 movs r0, 0x3A ldrsh r4, [r5, r0] movs r0, 0x2 @@ -199853,18 +199853,18 @@ sub_8076204: ; 8076204 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne @08076358 + bne _08076358 ldr r0, =sub_8076374 - b @0807635A + b _0807635A .pool -@08076358: +_08076358: ldr r0, =sub_8075D14 -@0807635A: +_0807635A: str r0, [r5, 0x1C] adds r0, r5, 0 movs r1, 0 bl StartObjectRotScalAnim -@08076364: +_08076364: pop {r3} mov r8, r3 pop {r4-r7} @@ -199883,12 +199883,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 str r0, [r2, 0x1C] -@0807638E: +_0807638E: pop {r0} bx r0 .pool @@ -199904,13 +199904,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] @@ -199918,7 +199918,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 @@ -199926,15 +199926,15 @@ sub_8076398: ; 8076398 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne @080763E8 + bne _080763E8 ldr r0, =sub_8076374 - b @080763EA + b _080763EA .pool -@080763E8: +_080763E8: ldr r0, =sub_8075D14 -@080763EA: +_080763EA: str r0, [r5, 0x1C] -@080763EC: +_080763EC: pop {r4,r5} pop {r0} bx r0 @@ -200098,7 +200098,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 @@ -200114,14 +200114,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 StartObjectImageAnim @@ -200168,12 +200168,12 @@ sub_8076524: ; 8076524 lsls r0, 5 strh r0, [r4, 0x30] strh r5, [r6, 0x3C] - b @080765D4 + b _080765D4 .pool -@080765D0: +_080765D0: subs r0, r1, 0x1 strh r0, [r6, 0x30] -@080765D4: +_080765D4: pop {r3} mov r8, r3 pop {r4-r7} @@ -200200,14 +200200,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 @@ -200219,13 +200219,13 @@ sub_80765E0: ; 80765E0 lsls r0, 26 mov r8, r2 cmp r0, 0 - bge @08076634 + bge _08076634 adds r0, r5, 0 movs r1, 0 bl StartObjectRotScalAnim movs r1, 0x1 mov r12, r1 -@08076634: +_08076634: movs r2, 0x38 ldrsh r0, [r4, r2] movs r3, 0x20 @@ -200235,9 +200235,9 @@ sub_80765E0: ; 80765E0 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 @@ -200251,9 +200251,9 @@ sub_80765E0: ; 80765E0 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 @@ -200264,7 +200264,7 @@ sub_80765E0: ; 80765E0 movs r3, 0x3C ldrsh r0, [r4, r3] cmp r0, 0x7F - bgt @080766AC + bgt _080766AC ldr r1, =gUnknown_08329F40 lsls r0, r2, 24 lsrs r0, 23 @@ -200272,9 +200272,9 @@ sub_80765E0: ; 80765E0 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 @@ -200283,9 +200283,9 @@ sub_80765E0: ; 80765E0 strh r1, [r4, 0x3C] strh r0, [r5, 0x24] strh r0, [r5, 0x26] - b @080766BA + b _080766BA .pool -@080766AC: +_080766AC: ldrh r0, [r4, 0x38] strh r0, [r5, 0x20] ldrh r0, [r4, 0x3A] @@ -200293,19 +200293,19 @@ sub_80765E0: ; 80765E0 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 @@ -200316,24 +200316,24 @@ sub_80765E0: ; 80765E0 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 .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 RemoveObjectAndFreeResources -@0807670E: +_0807670E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -200436,7 +200436,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 @@ -200452,14 +200452,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 StartObjectImageAnim @@ -200496,12 +200496,12 @@ sub_80767D4: ; 80767D4 adds r0, r4, 0 bl AnimateObject strh r5, [r4, 0x30] - b @08076870 + b _08076870 .pool -@0807686C: +_0807686C: subs r0, r1, 0x1 strh r0, [r4, 0x30] -@08076870: +_08076870: pop {r3} mov r8, r3 pop {r4-r7} @@ -200519,10 +200519,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 @@ -200536,7 +200536,7 @@ sub_807687C: ; 807687C ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge @080768D8 + bge _080768D8 adds r0, r5, 0 movs r1, 0x2 bl StartObjectImageAnim @@ -200550,9 +200550,9 @@ sub_807687C: ; 807687C strh r0, [r5, 0x38] ldr r0, =sub_80768F0 str r0, [r5, 0x1C] - b @080768E8 + b _080768E8 .pool -@080768D8: +_080768D8: ldrh r0, [r4, 0x30] adds r0, 0x60 strh r0, [r4, 0x30] @@ -200561,7 +200561,7 @@ sub_807687C: ; 807687C negs r0, r0 asrs r0, 8 strh r0, [r4, 0x26] -@080768E8: +_080768E8: pop {r4,r5} pop {r0} bx r0 @@ -200576,10 +200576,10 @@ sub_80768F0: ; 80768F0 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @08076904 + beq _08076904 ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] -@08076904: +_08076904: pop {r0} bx r0 .pool @@ -200620,7 +200620,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] @@ -200633,7 +200633,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 @@ -200650,10 +200650,10 @@ sub_8076918: ; 8076918 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne @08076990 + bne _08076990 ldr r0, =sub_80769A8 str r0, [r4, 0x1C] -@08076990: +_08076990: pop {r4-r6} pop {r0} bx r0 @@ -200670,12 +200670,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 str r0, [r1, 0x1C] -@080769C2: +_080769C2: pop {r0} bx r0 .pool @@ -200695,10 +200695,10 @@ sub_80769CC: ; 80769CC strh r0, [r2, 0x26] ldr r0, [r2, 0x24] cmp r0, 0 - bne @080769EA + bne _080769EA ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] -@080769EA: +_080769EA: pop {r0} bx r0 .pool @@ -200759,12 +200759,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 RemoveObjectAndFreeTiles -@08076A70: +_08076A70: pop {r0} bx r0 .pool @@ -200783,22 +200783,22 @@ sub_8076A78: ; 8076A78 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne @08076AA0 + bne _08076AA0 adds r0, r5, 0 bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_0832C460 adds r0, r6, r0 bl LoadCompressedObjectPaletteUsingHeap -@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, =gUnknown_0832C400 lsls r0, r4, 3 adds r0, r1 @@ -200811,7 +200811,7 @@ sub_8076A78: ; 8076A78 ldr r2, =0x06010100 adds r1, r2 bl LZDecompressVram -@08076ACC: +_08076ACC: pop {r4-r6} pop {r0} bx r0 @@ -200847,7 +200847,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 @@ -200855,9 +200855,9 @@ sub_8076B14: ; 8076B14 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @08076B4E + b _08076B4E .pool -@08076B40: +_08076B40: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -200865,7 +200865,7 @@ sub_8076B14: ; 8076B14 movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec -@08076B4E: +_08076B4E: adds r0, r1 movs r1, 0x26 bl pokemon_getattr @@ -200884,18 +200884,18 @@ CheckForFlashMemory: ; 8076B68 bl IdentifyFlash lsls r0, 16 cmp r0, 0 - bne @08076B84 + bne _08076B84 ldr r1, =0x03005d88 movs r0, 0x1 str r0, [r1] bl StartFlashMemoryTimer - b @08076B8A + b _08076B8A .pool -@08076B84: +_08076B84: ldr r1, =0x03005d88 movs r0, 0 str r0, [r1] -@08076B8A: +_08076B8A: pop {r0} bx r0 .pool @@ -201137,7 +201137,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 @@ -201152,7 +201152,7 @@ copy_player_party_to_sav1: ; 8076D8C bl memcpy adds r4, 0x1 cmp r4, 0x5 - ble @08076DA0 + ble _08076DA0 pop {r4} pop {r0} bx r0 @@ -201172,7 +201172,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 @@ -201187,7 +201187,7 @@ copy_player_party_from_sav1: ; 8076DD4 bl memcpy adds r4, 0x1 cmp r4, 0x5 - ble @08076DEA + ble _08076DEA pop {r4,r5} pop {r0} bx r0 @@ -201207,7 +201207,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 @@ -201223,7 +201223,7 @@ save_serialize_npcs: ; 8076E1C adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge @08076E32 + bge _08076E32 pop {r3} mov r8, r3 pop {r4-r7} @@ -201245,7 +201245,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 @@ -201261,7 +201261,7 @@ save_deserialize_npcs: ; 8076E64 adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge @08076E7A + bge _08076E7A pop {r3} mov r8, r3 pop {r4-r7} @@ -201304,7 +201304,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC movs r3, 0xAC lsls r3, 3 ldr r4, =0x02031c58 -@08076EE8: +_08076EE8: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -201313,7 +201313,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC stm r4!, {r0} adds r2, 0x1 cmp r2, 0x1D - ble @08076EE8 + ble _08076EE8 movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -201321,7 +201321,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC lsls r3, 3 adds r4, r0, 0 adds r4, 0x78 -@08076F08: +_08076F08: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -201330,7 +201330,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC stm r4!, {r0} adds r2, 0x1 cmp r2, 0x1D - ble @08076F08 + ble _08076F08 movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -201338,7 +201338,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC lsls r3, 3 adds r4, r0, 0 adds r4, 0xF0 -@08076F28: +_08076F28: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -201347,7 +201347,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC stm r4!, {r0} adds r2, 0x1 cmp r2, 0xF - ble @08076F28 + ble _08076F28 movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -201356,7 +201356,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC adds r4, r0, r6 movs r3, 0xD2 lsls r3, 3 -@08076F4A: +_08076F4A: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -201365,7 +201365,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC stm r4!, {r0} adds r2, 0x1 cmp r2, 0x3F - ble @08076F4A + ble _08076F4A movs r2, 0 ldr r0, =0x02031c58 ldr r5, =0x03005d8c @@ -201374,7 +201374,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC adds r4, r0, r7 movs r3, 0xF2 lsls r3, 3 -@08076F6C: +_08076F6C: lsls r0, r2, 2 ldr r1, [r5] adds r1, r3 @@ -201383,7 +201383,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC stm r4!, {r0} adds r2, 0x1 cmp r2, 0x2D - ble @08076F6C + ble _08076F6C ldr r0, =0x02031c58 ldr r1, =0x03005d8c mov r8, r1 @@ -201394,7 +201394,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC ldr r6, =0x00002be0 mov r9, r6 movs r2, 0xF -@08076F92: +_08076F92: mov r7, r8 ldr r1, [r7] adds r1, r3 @@ -201410,7 +201410,7 @@ copy_bags_and_unk_data_from_save_blocks: ; 8076ECC adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge @08076F92 + bge _08076F92 mov r1, r10 ldr r0, [r1] adds r0, 0xAC @@ -201443,7 +201443,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 movs r3, 0xAC lsls r3, 3 ldr r4, =0x02031c58 -@08076FFC: +_08076FFC: ldr r0, [r5] lsls r1, r2, 2 adds r0, r3 @@ -201452,7 +201452,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 str r1, [r0] adds r2, 0x1 cmp r2, 0x1D - ble @08076FFC + ble _08076FFC movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xBB @@ -201460,7 +201460,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 ldr r0, =0x02031c58 adds r3, r0, 0 adds r3, 0x78 -@0807701C: +_0807701C: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -201469,7 +201469,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 str r1, [r0] adds r2, 0x1 cmp r2, 0x1D - ble @0807701C + ble _0807701C movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xCA @@ -201477,7 +201477,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 ldr r0, =0x02031c58 adds r3, r0, 0 adds r3, 0xF0 -@0807703C: +_0807703C: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -201486,7 +201486,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 str r1, [r0] adds r2, 0x1 cmp r2, 0xF - ble @0807703C + ble _0807703C movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xD2 @@ -201495,7 +201495,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 movs r6, 0x98 lsls r6, 1 adds r3, r0, r6 -@0807705E: +_0807705E: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -201504,7 +201504,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 str r1, [r0] adds r2, 0x1 cmp r2, 0x3F - ble @0807705E + ble _0807705E movs r2, 0 ldr r5, =0x03005d8c movs r4, 0xF2 @@ -201513,7 +201513,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 movs r7, 0x8C lsls r7, 2 adds r3, r0, r7 -@08077080: +_08077080: ldr r0, [r5] lsls r1, r2, 2 adds r0, r4 @@ -201522,7 +201522,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 str r1, [r0] adds r2, 0x1 cmp r2, 0x2D - ble @08077080 + ble _08077080 ldr r0, =0x03005d8c mov r9, r0 ldr r1, =0x00002be0 @@ -201530,7 +201530,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 ldr r4, =0x02031c58 movs r3, 0 movs r2, 0xF -@080770A0: +_080770A0: mov r5, r9 ldr r1, [r5] adds r1, r3 @@ -201548,7 +201548,7 @@ copy_bags_and_unk_data_to_save_blocks: ; 8076FE0 adds r3, 0x24 subs r2, 0x1 cmp r2, 0 - bge @080770A0 + bge _080770A0 mov r7, r8 ldr r0, [r7] adds r0, 0xAC @@ -201634,7 +201634,7 @@ sub_8077170: ; 8077170 ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D - beq @08077194 + beq _08077194 lsls r2, r3, 16 lsrs r2, 16 movs r0, 0 @@ -201642,16 +201642,16 @@ sub_8077170: ; 8077170 bl link_0800A448 lsls r0, 24 lsrs r0, 24 - b @080771A2 + b _080771A2 .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 @@ -201674,7 +201674,7 @@ sub_80771BC: ; 80771BC ldr r0, =0x02022c2c ldrb r0, [r0] cmp r0, 0x1D - bne @080771F0 + bne _080771F0 ldr r4, =0x03007880 ldr r0, =0x03004140 ldrb r0, [r0] @@ -201684,18 +201684,18 @@ sub_80771BC: ; 80771BC ldr r0, [r0] ldrh r0, [r0] cmp r0, 0 - bne @080771EC + bne _080771EC movs r0, 0x1 - b @080771F8 + b _080771F8 .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 @@ -201716,16 +201716,16 @@ 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 .pool -@0807722C: +_0807722C: bl sub_800A5B4 -@08077230: +_08077230: pop {r0} bx r0 thumb_func_end sub_8077210 @@ -201736,18 +201736,18 @@ sub_8077234: ; 8077234 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 .pool -@08077250: +_08077250: lsls r0, r4, 24 lsrs r0, 24 bl sub_800A5EC -@08077258: +_08077258: pop {r4} pop {r0} bx r0 @@ -201759,17 +201759,17 @@ sub_8077260: ; 8077260 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 .pool -@08077280: +_08077280: movs r0, 0 -@08077282: +_08077282: pop {r1} bx r1 thumb_func_end sub_8077260 @@ -201833,10 +201833,10 @@ sub_80772A4: ; 80772A4 bl InitWindows lsls r0, 16 cmp r0, 0 - beq @0807738C + beq _0807738C bl DeactivateAllTextPrinters movs r5, 0 -@08077310: +_08077310: lsls r4, r5, 24 lsrs r4, 24 adds r0, r4, 0 @@ -201846,7 +201846,7 @@ sub_80772A4: ; 80772A4 bl FillWindowPixelBuffer adds r5, 0x1 cmp r5, 0x11 - bls @08077310 + bls _08077310 movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -201893,7 +201893,7 @@ sub_80772A4: ; 80772A4 ldr r0, [r2] adds r0, 0xA8 strb r1, [r0] -@0807738C: +_0807738C: add sp, 0xC pop {r4,r5} pop {r0} @@ -201929,41 +201929,41 @@ 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 .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 AllocZeroed @@ -201976,21 +201976,21 @@ sub_80773D0: ; 80773D0 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 .pool -@080774A4: +_080774A4: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -201998,7 +201998,7 @@ sub_80773D0: ; 80773D0 strb r0, [r2, 0x8] movs r6, 0 movs r4, 0 -@080774B2: +_080774B2: movs r0, 0x64 muls r0, r6 ldr r1, =0x02024744 @@ -202013,7 +202013,7 @@ sub_80773D0: ; 80773D0 bl create_pokemon_set_level adds r6, 0x1 cmp r6, 0x5 - ble @080774B2 + ble _080774B2 movs r0, 0 bl sub_807A19C movs r0, 0 @@ -202021,7 +202021,7 @@ sub_80773D0: ; 80773D0 ldr r0, =0x03003124 ldrb r2, [r0] cmp r2, 0 - bne @0807754C + bne _0807754C ldr r1, =0x020229c6 ldr r5, =0x00001122 adds r0, r5, 0 @@ -202033,13 +202033,13 @@ sub_80773D0: ; 80773D0 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 .pool -@08077528: +_08077528: bl sub_8009734 ldr r0, =0x030022c0 movs r7, 0x87 @@ -202051,18 +202051,18 @@ sub_80773D0: ; 80773D0 ldr r0, =task00_08081A90 movs r1, 0x1 bl AddTask - b @08077B46 + b _08077B46 .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 .pool -@08077560: +_08077560: ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0xA8 @@ -202074,30 +202074,30 @@ sub_80773D0: ; 80773D0 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 .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 @@ -202107,37 +202107,37 @@ sub_80773D0: ; 80773D0 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 .pool -@080775D8: +_080775D8: ldr r1, =0x030022c0 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b @08077B22 + b _08077B22 .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 @@ -202155,25 +202155,25 @@ sub_80773D0: ; 80773D0 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 .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 @@ -202185,28 +202185,28 @@ sub_80773D0: ; 80773D0 movs r0, 0 movs r1, 0 bl sub_800DFB4 - b @08077B46 + b _08077B46 .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 .pool -@080776A8: +_080776A8: bl calc_enemy_party_count movs r0, 0 movs r1, 0 @@ -202230,10 +202230,10 @@ sub_80773D0: ; 80773D0 adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - bge @08077740 + bge _08077740 mov r8, r2 ldr r7, =gUnknown_0832DE24 -@080776E2: +_080776E2: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -202277,20 +202277,20 @@ sub_80773D0: ; 80773D0 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, =gUnknown_0832DE24 mov r8, r1 adds r7, r0, 0 adds r7, 0xC -@08077756: +_08077756: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -202336,15 +202336,15 @@ sub_80773D0: ; 80773D0 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 .pool -@080777E8: +_080777E8: bl sub_81B5D30 ldr r0, =0x0203229c ldr r1, [r0] @@ -202357,9 +202357,9 @@ sub_80773D0: ; 80773D0 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b @08077B22 + b _08077B22 .pool -@08077810: +_08077810: ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 @@ -202371,9 +202371,9 @@ sub_80773D0: ; 80773D0 movs r7, 0x87 lsls r7, 3 adds r1, r7 - b @08077B22 + b _08077B22 .pool -@08077834: +_08077834: ldr r0, =0x03005d90 ldr r0, [r0] ldr r5, =0x02032188 @@ -202423,17 +202423,17 @@ sub_80773D0: ; 80773D0 ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - b @08077B46 + b _08077B46 .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 @@ -202443,7 +202443,7 @@ sub_80773D0: ; 80773D0 add r5, sp, 0x10 adds r4, r0, 0 adds r4, 0x10 -@080778DE: +_080778DE: add r1, sp, 0x10 ldr r0, =gUnknown_0832DCAC ldm r0!, {r2,r3,r7} @@ -202462,7 +202462,7 @@ sub_80773D0: ; 80773D0 adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 - ble @080778DE + ble _080778DE bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -202480,7 +202480,7 @@ sub_80773D0: ; 80773D0 add r5, sp, 0x10 adds r4, r0, 0 adds r4, 0x88 -@0807792C: +_0807792C: add r1, sp, 0x10 ldr r0, =gUnknown_0832DCAC ldm r0!, {r2,r3,r7} @@ -202500,14 +202500,14 @@ sub_80773D0: ; 80773D0 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 .pool -@08077970: +_08077970: ldr r4, =gUnknown_0832DCAC add r1, sp, 0x10 adds r0, r4, 0 @@ -202544,7 +202544,7 @@ sub_80773D0: ; 80773D0 add r4, sp, 0x10 movs r5, 0xC0 lsls r5, 13 -@080779BC: +_080779BC: add r1, sp, 0x10 ldr r0, =gUnknown_0832DCAC ldm r0!, {r2,r3,r7} @@ -202566,7 +202566,7 @@ sub_80773D0: ; 80773D0 adds r5, r0 adds r6, 0x1 cmp r6, 0x5 - ble @080779BC + ble _080779BC ldr r0, =gUnknown_0832DC94 ldr r2, =gUnknown_0832DE24 ldrb r1, [r2] @@ -202596,9 +202596,9 @@ sub_80773D0: ; 80773D0 strb r0, [r1] movs r0, 0 bl rbox_fill_rectangle - b @08077B46 + b _08077B46 .pool -@08077A40: +_08077A40: movs r0, 0 bl sub_807A320 movs r0, 0 @@ -202619,9 +202619,9 @@ sub_80773D0: ; 80773D0 strb r0, [r1] ldr r0, =0x000001b3 bl song_play_for_text - b @08077B46 + b _08077B46 .pool -@08077A80: +_08077A80: movs r0, 0x1 bl sub_807A320 movs r0, 0x1 @@ -202633,21 +202633,21 @@ sub_80773D0: ; 80773D0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@08077A9A: +_08077A9A: movs r0, 0 bl sub_80782B8 - b @08077B1A + b _08077B1A .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 .pool -@08077ABC: +_08077ABC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -202659,9 +202659,9 @@ sub_80773D0: ; 80773D0 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b @08077B22 + b _08077B22 .pool -@08077ADC: +_08077ADC: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -202672,44 +202672,44 @@ sub_80773D0: ; 80773D0 movs r7, 0x87 lsls r7, 3 adds r1, r7 - b @08077B22 + b _08077B22 .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 .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 .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 str r0, [r3] ldr r0, =sub_807825C bl SetMainCallback2 -@08077B46: +_08077B46: bl RunTextPrinters bl run_active_tasks bl CallObjectCallbacks @@ -202737,93 +202737,93 @@ 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 .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 .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 .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 .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] @@ -202847,10 +202847,10 @@ sub_8077B74: ; 8077B74 adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - bge @08077D08 + bge _08077D08 mov r8, r4 ldr r7, =gUnknown_0832DE24 -@08077CA8: +_08077CA8: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -202895,20 +202895,20 @@ sub_8077B74: ; 8077B74 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, =gUnknown_0832DE24 mov r8, r1 adds r7, r0, 0 adds r7, 0xC -@08077D1E: +_08077D1E: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -202954,15 +202954,15 @@ sub_8077B74: ; 8077B74 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 .pool -@08077DB0: +_08077DB0: bl sub_81B5D30 ldr r0, =0x0203229c ldr r1, [r0] @@ -202975,9 +202975,9 @@ sub_8077B74: ; 8077B74 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b @080780D8 + b _080780D8 .pool -@08077DD8: +_08077DD8: ldr r0, =0x0203229c ldr r1, [r0] adds r0, r1, 0 @@ -202989,9 +202989,9 @@ sub_8077B74: ; 8077B74 movs r7, 0x87 lsls r7, 3 adds r1, r7 - b @080780D8 + b _080780D8 .pool -@08077DFC: +_08077DFC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r5, =0x02032188 @@ -203033,7 +203033,7 @@ sub_8077B74: ; 8077B74 movs r0, 0x87 lsls r0, 3 adds r1, r0 -@08077E58: +_08077E58: ldrb r0, [r1] adds r0, 0x1 movs r2, 0 @@ -203042,22 +203042,22 @@ sub_8077B74: ; 8077B74 ldr r0, [r0] adds r0, 0xA8 strb r2, [r0] - b @080780F6 + b _080780F6 .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 .pool -@08077EA0: +_08077EA0: ldr r0, =0x03005d90 ldr r1, [r0] movs r0, 0x1 @@ -203067,7 +203067,7 @@ sub_8077B74: ; 8077B74 add r5, sp, 0xC adds r4, r0, 0 adds r4, 0x10 -@08077EB4: +_08077EB4: add r1, sp, 0xC ldr r0, =gUnknown_0832DCAC ldm r0!, {r2,r3,r7} @@ -203086,7 +203086,7 @@ sub_8077B74: ; 8077B74 adds r4, 0x20 adds r6, 0x1 cmp r6, 0x2 - ble @08077EB4 + ble _08077EB4 bl link_get_multiplayer_id movs r1, 0x1 eors r0, r1 @@ -203104,7 +203104,7 @@ sub_8077B74: ; 8077B74 add r5, sp, 0xC adds r4, r0, 0 adds r4, 0x88 -@08077F02: +_08077F02: add r1, sp, 0xC ldr r0, =gUnknown_0832DCAC ldm r0!, {r2,r3,r7} @@ -203124,14 +203124,14 @@ sub_8077B74: ; 8077B74 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 .pool -@08077F48: +_08077F48: ldr r4, =gUnknown_0832DCAC add r1, sp, 0xC adds r0, r4, 0 @@ -203168,7 +203168,7 @@ sub_8077B74: ; 8077B74 add r4, sp, 0xC movs r5, 0xC0 lsls r5, 13 -@08077F94: +_08077F94: add r1, sp, 0xC ldr r0, =gUnknown_0832DCAC ldm r0!, {r2,r3,r7} @@ -203190,7 +203190,7 @@ sub_8077B74: ; 8077B74 adds r5, r0 adds r6, 0x1 cmp r6, 0x5 - ble @08077F94 + ble _08077F94 ldr r0, =0x0203229c ldr r1, [r0] adds r2, r1, 0 @@ -203198,16 +203198,16 @@ sub_8077B74: ; 8077B74 ldrb r1, [r2] adds r4, r0, 0 cmp r1, 0x5 - bhi @08077FE4 + bhi _08077FE4 ldr r0, =0x0203cf20 ldrb r0, [r0] - b @08077FEA + b _08077FEA .pool -@08077FE4: +_08077FE4: ldr r0, =0x0203cf20 ldrb r0, [r0] adds r0, 0x6 -@08077FEA: +_08077FEA: strb r0, [r2] ldr r0, =gUnknown_0832DC94 ldr r3, =gUnknown_0832DE24 @@ -203237,13 +203237,13 @@ sub_8077B74: ; 8077B74 adds r0, r7 movs r1, 0x10 strb r1, [r0] - b @080780F6 + b _080780F6 .pool -@08078038: +_08078038: movs r0, 0 bl sub_80782B8 - b @080780D0 -@08078040: + b _080780D0 +_08078040: movs r0, 0x1 bl sub_80782B8 ldr r2, =0x0203229c @@ -203257,9 +203257,9 @@ sub_8077B74: ; 8077B74 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @080780D8 + b _080780D8 .pool -@08078068: +_08078068: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -203282,9 +203282,9 @@ sub_8077B74: ; 8077B74 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @080780D8 + b _080780D8 .pool -@080780A4: +_080780A4: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -203295,36 +203295,36 @@ sub_8077B74: ; 8077B74 movs r5, 0x87 lsls r5, 3 adds r1, r5 - b @080780D8 + b _080780D8 .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 .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 bl SetMainCallback2 -@080780F6: +_080780F6: bl run_active_tasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad @@ -203361,7 +203361,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 @@ -203373,7 +203373,7 @@ sub_8078130: ; 8078130 adds r0, 0x6F movs r1, 0xA strb r1, [r0] -@08078160: +_08078160: add sp, 0x4 pop {r4} pop {r0} @@ -203389,7 +203389,7 @@ sub_807816C: ; 807816C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @080781C2 + bne _080781C2 ldr r1, =0x02032298 ldr r4, =0x0203229c ldr r2, [r4] @@ -203404,21 +203404,21 @@ 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 .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 @@ -203433,11 +203433,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 @@ -203450,13 +203450,13 @@ sub_80781C8: ; 80781C8 bl sub_800E084 ldr r0, =sub_807AE50 bl SetMainCallback2 - b @08078244 + b _08078244 .pool -@08078220: +_08078220: ldr r0, =0x03003124 ldrb r4, [r0] cmp r4, 0 - bne @08078244 + bne _08078244 ldr r0, =0x02032184 ldr r0, [r0] bl Free @@ -203467,7 +203467,7 @@ sub_80781C8: ; 80781C8 str r4, [r5] ldr r0, =sub_807AE50 bl SetMainCallback2 -@08078244: +_08078244: pop {r4,r5} pop {r0} bx r0 @@ -203519,17 +203519,17 @@ sub_80782B8: ; 80782B8 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, =gUnknown_08DDB3E4 movs r1, 0 movs r2, 0x60 @@ -203556,9 +203556,9 @@ sub_80782B8: ; 80782B8 movs r0, 0x2 movs r3, 0 bl LoadBgTilemap - b @0807837E + b _0807837E .pool -@08078324: +_08078324: ldr r1, =gUnknown_0832D2BC movs r2, 0x80 lsls r2, 4 @@ -203571,13 +203571,13 @@ sub_80782B8: ; 80782B8 bl sub_8079E44 movs r0, 0x1 bl CopyBgTilemapBufferToVram - b @0807837E + b _0807837E .pool -@0807834C: +_0807834C: movs r5, 0x80 lsls r5, 21 movs r4, 0x3 -@08078352: +_08078352: lsrs r0, r5, 24 movs r1, 0 bl SetGpuReg @@ -203586,7 +203586,7 @@ sub_80782B8: ; 80782B8 adds r5, r0 subs r4, 0x1 cmp r4, 0 - bge @08078352 + bge _08078352 movs r0, 0 bl ShowBg movs r0, 0x1 @@ -203595,7 +203595,7 @@ sub_80782B8: ; 80782B8 bl ShowBg movs r0, 0x3 bl ShowBg -@0807837E: +_0807837E: add sp, 0xC pop {r4,r5} pop {r0} @@ -203619,14 +203619,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] @@ -203643,20 +203643,20 @@ sub_8078388: ; 8078388 adds r0, 0x38 adds r0, r3 strb r7, [r0] - b @080783E6 + b _080783E6 .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] @@ -203673,16 +203673,16 @@ sub_8078388: ; 8078388 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 @@ -203702,16 +203702,16 @@ sub_8078438: ; 8078438 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 @@ -203729,40 +203729,40 @@ 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 .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 @@ -203777,43 +203777,43 @@ shedinja_maker_maybe: ; 8078458 ldr r0, [r3] adds r0, 0xA8 strb r2, [r0] - b @080787AA + b _080787AA .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 .pool -@08078524: +_08078524: bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b @080787A2 + b _080787A2 .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 .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 @@ -203826,33 +203826,33 @@ shedinja_maker_maybe: ; 8078458 bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b @080787A2 + b _080787A2 .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 .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 .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 @@ -203865,33 +203865,33 @@ shedinja_maker_maybe: ; 8078458 bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b @080787A2 + b _080787A2 .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 .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 .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 @@ -203904,9 +203904,9 @@ shedinja_maker_maybe: ; 8078458 bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b @080787A2 + b _080787A2 .pool -@08078644: +_08078644: ldr r0, =0x020228c4 ldr r1, =0x03005d8c ldr r1, [r1] @@ -203916,24 +203916,24 @@ shedinja_maker_maybe: ; 8078458 bl sub_8078438 ldr r0, =0x0203229c ldr r1, [r0] - b @080787A2 + b _080787A2 .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 .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 @@ -203946,9 +203946,9 @@ shedinja_maker_maybe: ; 8078458 bl sub_8077210 ldr r0, =0x0203229c ldr r1, [r0] - b @080787A2 + b _080787A2 .pool -@080786B4: +_080786B4: ldr r0, =0x020228c4 ldr r1, =0x03005d8c ldr r1, [r1] @@ -203958,22 +203958,22 @@ shedinja_maker_maybe: ; 8078458 bl sub_8078438 ldr r0, =0x0203229c ldr r1, [r0] - b @080787A2 + b _080787A2 .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 .pool -@080786F0: +_080786F0: bl sub_8077200 cmp r0, 0x3 - bne @080787AA + bne _080787AA ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0xA9 @@ -203987,27 +203987,27 @@ shedinja_maker_maybe: ; 8078458 bl sub_8078438 bl sub_8077210 ldr r1, [r4] - b @080787A2 + b _080787A2 .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 @@ -204016,20 +204016,20 @@ shedinja_maker_maybe: ; 8078458 ldr r1, =gUnknown_0832DF94 bl CompareStringWithoutExtendedControlCodes cmp r0, 0 - bne @08078766 + bne _08078766 adds r0, r4, 0 movs r1, 0x2 ldr r2, =gSpeciesNames + SPECIES_SHEDINJA * POKEMON_NAME_LENGTH 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 .pool -@08078784: +_08078784: ldr r2, =0x0203229c ldr r1, [r2] adds r1, 0xA8 @@ -204041,18 +204041,18 @@ shedinja_maker_maybe: ; 8078458 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} @@ -204087,61 +204087,61 @@ 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 .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 .pool -@08078834: +_08078834: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x78 strb r2, [r0] - b @0807885E + b _0807885E .pool -@08078844: +_08078844: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7A strb r2, [r0] - b @0807885E + b _0807885E .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 @@ -204149,27 +204149,27 @@ sub_80787E0: ; 80787E0 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 .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 .pool -@080788BC: +_080788BC: ldr r2, =0x0203229c ldr r1, [r2] movs r4, 0x81 @@ -204181,27 +204181,27 @@ sub_80787E0: ; 80787E0 strb r0, [r1] ldr r0, [r2] adds r0, 0x79 - b @080788DE + b _080788DE .pool -@080788D8: +_080788D8: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x7B -@080788DE: +_080788DE: movs r1, 0x1 strb r1, [r0] - b @080788F0 + b _080788F0 .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 @@ -204217,32 +204217,32 @@ 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 .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 .pool -@08078950: +_08078950: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -204256,12 +204256,12 @@ sub_8078900: ; 8078900 ldr r0, [r0] adds r0, 0x6F movs r1, 0xB - b @080789DA + b _080789DA .pool -@08078974: +_08078974: movs r0, 0x5 - b @080789CE -@08078978: + b _080789CE +_08078978: ldr r4, =0x0203229c ldr r1, [r4] ldrb r0, [r2, 0x2] @@ -204281,9 +204281,9 @@ sub_8078900: ; 8078900 ldr r0, [r4] adds r0, 0x6F movs r1, 0x7 - b @080789DA + b _080789DA .pool -@080789AC: +_080789AC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -204295,29 +204295,29 @@ sub_8078900: ; 8078900 ldr r0, [r0] adds r0, 0x6F movs r1, 0xA - b @080789DA + b _080789DA .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} @@ -204335,20 +204335,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 @@ -204373,12 +204373,12 @@ sub_80789FC: ; 80789FC strb r4, [r2] adds r0, 0x78 strb r4, [r0] - b @08078B44 + b _08078B44 .pool -@08078A64: +_08078A64: ldr r0, =0x00000201 cmp r1, r0 - bne @08078AB4 + bne _08078AB4 movs r0, 0x1 bl sub_807A19C ldr r1, [r6] @@ -204408,13 +204408,13 @@ sub_80789FC: ; 80789FC ldr r0, [r6] adds r0, 0x6F movs r1, 0x8 - b @08078B42 + b _08078B42 .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] @@ -204444,12 +204444,12 @@ sub_80789FC: ; 80789FC ldr r0, [r6] adds r0, 0x6F movs r1, 0x8 - b @08078B42 + b _08078B42 .pool -@08078B00: +_08078B00: ldr r0, =0x00000202 cmp r1, r0 - bne @08078B44 + bne _08078B44 adds r1, r2, 0 adds r1, 0x80 movs r5, 0 @@ -204478,25 +204478,25 @@ sub_80789FC: ; 80789FC 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 @@ -204519,19 +204519,19 @@ sub_80789FC: ; 80789FC 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] @@ -204556,7 +204556,7 @@ sub_80789FC: ; 80789FC adds r0, 0x6F movs r1, 0x8 strb r1, [r0] -@08078BDC: +_08078BDC: add sp, 0x4 pop {r4-r6} pop {r0} @@ -204605,20 +204605,20 @@ 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 @@ -204645,21 +204645,21 @@ 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 .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} @@ -204677,7 +204677,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 @@ -204705,9 +204705,9 @@ sub_8078CB8: ; 8078CB8 adds r0, r4 movs r1, 0xA0 strh r1, [r0, 0x22] - b @08078D58 + b _08078D58 .pool -@08078D10: +_08078D10: ldr r4, =0x0203229c ldr r0, [r4] adds r0, 0x34 @@ -204743,13 +204743,13 @@ sub_8078CB8: ; 8078CB8 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} @@ -204771,20 +204771,20 @@ 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 .pool -@08078DAC: +_08078DAC: ldr r0, [r4] adds r0, 0x78 movs r1, 0x1 strb r1, [r0] -@08078DB4: +_08078DB4: pop {r4} pop {r0} bx r0 @@ -204799,55 +204799,55 @@ 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 .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 .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 .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 @@ -204855,7 +204855,7 @@ sub_8078DBC: ; 8078DBC adds r0, 0x35 ldrb r0, [r0] cmp r0, 0x5 - bhi @08078E98 + bhi _08078E98 movs r0, 0x1 movs r1, 0x1 movs r2, 0xE @@ -204880,11 +204880,11 @@ sub_8078DBC: ; 8078DBC adds r0, 0x6F movs r1, 0x1 strb r1, [r0] - b @08078EE4 + b _08078EE4 .pool -@08078E98: +_08078E98: cmp r0, 0xB - bhi @08078EB6 + bhi _08078EB6 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -204896,10 +204896,10 @@ sub_8078DBC: ; 8078DBC adds r0, 0x6F movs r1, 0x2 strb r1, [r0] - b @08078EE4 -@08078EB6: + b _08078EE4 +_08078EB6: cmp r0, 0xC - bne @08078EE4 + bne _08078EE4 ldr r0, =gUnknown_0832DF8C movs r1, 0x1 movs r2, 0xE @@ -204919,7 +204919,7 @@ sub_8078DBC: ; 8078DBC adds r1, r2 movs r2, 0x18 bl sub_807A308 -@08078EE4: +_08078EE4: add sp, 0x4 pop {r4} pop {r0} @@ -204975,20 +204975,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 @@ -204999,9 +204999,9 @@ sub_8078F50: ; 8078F50 ldr r0, [r0] adds r0, 0x6F movs r1, 0x2 - b @08079028 + b _08079028 .pool -@08078F9C: +_08078F9C: ldr r0, =0x020244ec ldr r1, =0x020244e9 ldrb r1, [r1] @@ -205011,22 +205011,22 @@ sub_8078F50: ; 8078F50 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 .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 @@ -205041,28 +205041,28 @@ sub_8078F50: ; 8078F50 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b @08079028 + b _08079028 .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 @@ -205077,16 +205077,16 @@ sub_8079034: ; 8079034 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 .pool @@ -205101,14 +205101,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 @@ -205120,9 +205120,9 @@ sub_807905C: ; 807905C str r0, [sp] movs r0, 0x1 bl sub_81BF8EC - b @080790C0 + b _080790C0 .pool -@080790A4: +_080790A4: ldr r1, =0x02024744 subs r2, 0x6 lsls r2, 24 @@ -205136,9 +205136,9 @@ sub_807905C: ; 807905C str r0, [sp] movs r0, 0x1 bl sub_81BF8EC -@080790C0: +_080790C0: bl FreeAllWindowBuffers -@080790C4: +_080790C4: add sp, 0x4 pop {r0} bx r0 @@ -205159,20 +205159,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 @@ -205189,41 +205189,41 @@ sub_80790D4: ; 80790D4 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 .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 @@ -205241,10 +205241,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 @@ -205253,8 +205253,8 @@ sub_8079174: ; 8079174 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 @@ -205269,43 +205269,43 @@ sub_8079174: ; 8079174 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 .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 .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 .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} @@ -205319,50 +205319,50 @@ sub_8079218: ; 8079218 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 .pool -@08079250: +_08079250: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F movs r1, 0x11 -@08079258: +_08079258: strb r1, [r0] movs r0, 0x11 bl PutWindowTilemap - b @08079290 + b _08079290 .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 @@ -205370,7 +205370,7 @@ sub_8079218: ; 8079218 strb r1, [r0] movs r0, 0x11 bl PutWindowTilemap -@08079290: +_08079290: pop {r0} bx r0 .pool @@ -205386,10 +205386,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 PutWindowTilemap @@ -205406,8 +205406,8 @@ sub_807929C: ; 807929C ldrb r0, [r0] subs r0, 0x4 cmp r5, r0 - blt @080792B2 -@080792D8: + blt _080792B2 +_080792D8: pop {r4-r6} pop {r0} bx r0 @@ -205421,19 +205421,19 @@ sub_80792E4: ; 80792E4 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 @@ -205458,13 +205458,13 @@ sub_80792E4: ; 80792E4 movs r1, 0x64 strb r1, [r0] bl sub_807929C - b @08079356 + b _08079356 .pool -@0807934C: +_0807934C: movs r0, 0x5 bl audio_play bl sub_8078EF8 -@08079356: +_08079356: pop {r0} bx r0 thumb_func_end sub_80792E4 @@ -205475,7 +205475,7 @@ sub_807935C: ; 807935C 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 @@ -205487,7 +205487,7 @@ sub_807935C: ; 807935C adds r0, 0x7E ldrb r0, [r0] bl sub_807967C -@08079384: +_08079384: ldr r0, =0x0203229c ldr r0, [r0] adds r0, 0x6F @@ -205508,13 +205508,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 @@ -205534,7 +205534,7 @@ sub_80793C4: ; 80793C4 adds r0, 0xA8 ldrb r0, [r0] cmp r0, 0x78 - bls @080793F8 + bls _080793F8 ldr r0, =gUnknown_0832DF8C movs r1, 0x1 movs r2, 0xE @@ -205548,7 +205548,7 @@ sub_80793C4: ; 80793C4 adds r0, 0x6F movs r1, 0x3 strb r1, [r0] -@080793F8: +_080793F8: pop {r4} pop {r0} bx r0 @@ -205563,7 +205563,7 @@ sub_8079408: ; 8079408 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0807947C + beq _0807947C movs r0, 0x5 bl audio_play movs r0, 0 @@ -205573,7 +205573,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 @@ -205585,7 +205585,7 @@ sub_8079408: ; 8079408 adds r5, r0 adds r6, 0x1 cmp r6, 0x3 - ble @0807942E + ble _0807942E movs r0, 0 bl sub_8079F88 movs r0, 0x1 @@ -205609,7 +205609,7 @@ sub_8079408: ; 8079408 negs r1, r1 ands r1, r2 strb r1, [r0] -@0807947C: +_0807947C: pop {r4-r6} pop {r0} bx r0 @@ -205624,24 +205624,24 @@ sub_8079490: ; 8079490 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 .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 .pool @@ -205653,13 +205653,13 @@ sub_80794CC: ; 80794CC 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 @@ -205670,13 +205670,13 @@ sub_80794CC: ; 80794CC bl sub_800E084 ldr r0, =c2_8056854 bl SetMainCallback2 - b @0807953A + b _0807953A .pool -@08079518: +_08079518: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @0807953A + bne _0807953A ldr r0, =0x02032184 ldr r0, [r0] bl Free @@ -205686,7 +205686,7 @@ sub_80794CC: ; 80794CC bl FreeAllWindowBuffers ldr r0, =c2_8056854 bl SetMainCallback2 -@0807953A: +_0807953A: pop {r0} bx r0 .pool @@ -205699,17 +205699,17 @@ sub_8079550: ; 8079550 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 .pool @@ -205723,7 +205723,7 @@ sub_807957C: ; 807957C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0807959C + beq _0807959C ldr r0, =0x0000bbcc movs r1, 0 bl sub_8078C10 @@ -205732,7 +205732,7 @@ sub_807957C: ; 807957C adds r0, 0x6F movs r1, 0x64 strb r1, [r0] -@0807959C: +_0807959C: pop {r0} bx r0 .pool @@ -205746,84 +205746,84 @@ sub_80795AC: ; 80795AC 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 .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 @@ -205844,14 +205844,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 @@ -205877,10 +205877,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 @@ -205893,26 +205893,26 @@ sub_80796B4: ; 80796B4 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 .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 @@ -205925,7 +205925,7 @@ sub_80796B4: ; 80796B4 str r2, [sp, 0x64] ldrb r0, [r0] cmp r8, r0 - bcs @0807976A + bcs _0807976A ldr r0, =0x02020630 mov r8, r0 ldr r4, =0x0203229c @@ -205933,7 +205933,7 @@ sub_80796B4: ; 80796B4 add r0, r9 lsls r2, r0, 1 movs r3, 0x4 -@0807973E: +_0807973E: ldr r0, [r4] adds r1, r5, r2 adds r0, 0x28 @@ -205955,13 +205955,13 @@ sub_80796B4: ; 80796B4 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 @@ -205972,7 +205972,7 @@ sub_80796B4: ; 80796B4 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls @08079772 + bls _08079772 ldr r1, =0x02020630 mov r8, r1 ldr r2, =0x0203229c @@ -206077,13 +206077,13 @@ sub_80796B4: ; 80796B4 bl CopyBgTilemapBufferToVram ldr r1, [sp, 0x60] cmp r1, 0 - beq @08079868 - b @08079A24 -@08079868: + beq _08079868 + b _08079A24 +_08079868: bl sub_8079F74 - b @08079A24 + b _08079A24 .pool -@08079884: +_08079884: ldr r2, =0x02020630 ldr r1, [sp, 0x60] lsls r0, r1, 1 @@ -206102,14 +206102,14 @@ sub_80796B4: ; 80796B4 ldr r1, [r0] ldr r0, =sub_80D3014 cmp r1, r0 - beq @080798AC - b @08079A24 -@080798AC: + beq _080798AC + b _08079A24 +_080798AC: movs r0, 0x3 strb r0, [r3] - b @08079A24 + b _08079A24 .pool -@080798BC: +_080798BC: ldr r1, =gUnknown_0832C6C0 ldr r0, [sp, 0x60] lsls r2, r0, 4 @@ -206241,9 +206241,9 @@ sub_80796B4: ; 80796B4 bl CopyWindowToVram ldr r0, =0x0203229c ldr r1, [r0] - b @08079A1A + b _08079A1A .pool -@080799EC: +_080799EC: ldr r0, =gUnknown_0832DF99 lsls r1, r7, 1 adds r4, r1, r0 @@ -206266,13 +206266,13 @@ sub_80796B4: ; 80796B4 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 @@ -206293,7 +206293,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 @@ -206301,9 +206301,9 @@ sub_8079A3C: ; 8079A3C movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @08079A74 + b _08079A74 .pool -@08079A64: +_08079A64: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 @@ -206311,7 +206311,7 @@ sub_8079A3C: ; 8079A3C movs r1, 0x2 mov r2, sp bl pokemon_getattr -@08079A74: +_08079A74: adds r0, r4, 0 mov r1, sp bl CopyString_Limit10 @@ -206355,7 +206355,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 @@ -206364,19 +206364,19 @@ 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 .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 @@ -206387,18 +206387,18 @@ sub_8079AA4: ; 8079AA4 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls @08079ADE + bls _08079ADE ldr r1, =gUnknown_0832DABC adds r0, r6, 0 bl CopyString 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 @@ -206406,7 +206406,7 @@ sub_8079AA4: ; 8079AA4 adds r1, r0 adds r0, r6, 0 bl AppendString -@08079B3C: +_08079B3C: adds r0, r6, 0 ldr r1, =gUnknown_0832DAD2 bl AppendString @@ -206414,17 +206414,17 @@ sub_8079AA4: ; 8079AA4 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3 - bls @08079B20 - b @08079B6C + bls _08079B20 + b _08079B6C .pool -@08079B5C: +_08079B5C: ldr r1, =gUnknown_0832DABC adds r0, r6, 0 bl CopyString ldr r1, =gUnknown_0832DADF adds r0, r6, 0 bl AppendString -@08079B6C: +_08079B6C: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -206488,9 +206488,9 @@ sub_8079BE0: ; 8079BE0 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] @@ -206498,9 +206498,9 @@ sub_8079BE0: ; 8079BE0 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 @@ -206523,8 +206523,8 @@ sub_8079BE0: ; 8079BE0 adds r0, r6 ldrb r0, [r0] cmp r4, r0 - bcc @08079C02 -@08079C36: + bcc _08079C02 +_08079C36: add sp, 0x34 pop {r4-r7} pop {r0} @@ -206572,17 +206572,17 @@ sub_8079C4C: ; 8079C4C bl CopyBgTilemapBufferToVram mov r0, r8 cmp r0, 0 - bne @08079CB0 + bne _08079CB0 movs r0, 0x64 muls r0, r7 ldr r1, =0x020244ec - b @08079CB6 + b _08079CB6 .pool -@08079CB0: +_08079CB0: movs r0, 0x64 muls r0, r7 ldr r1, =0x02024744 -@08079CB6: +_08079CB6: adds r0, r1 movs r1, 0x38 movs r2, 0 @@ -206602,7 +206602,7 @@ sub_8079C4C: ; 8079C4C ldrb r0, [r0] str r2, [sp, 0x18] cmp r0, 0 - bne @08079D34 + bne _08079D34 adds r0, r6, 0 movs r1, 0xA bl __udivsi3 @@ -206611,7 +206611,7 @@ sub_8079C4C: ; 8079C4C mov r0, r10 lsls r3, r0, 5 cmp r2, 0 - beq @08079D08 + beq _08079D08 mov r1, r9 adds r0, r1, r3 lsls r0, 1 @@ -206622,7 +206622,7 @@ sub_8079C4C: ; 8079C4C adds r0, r2, 0 adds r0, 0x60 strh r0, [r1] -@08079D08: +_08079D08: ldr r4, [r4] mov r1, r9 adds r0, r1, r3 @@ -206639,9 +206639,9 @@ sub_8079C4C: ; 8079C4C lsrs r0, 24 adds r0, 0x70 strh r0, [r4] - b @08079D72 + b _08079D72 .pool -@08079D34: +_08079D34: mov r1, r10 lsls r0, r1, 5 mov r1, r9 @@ -206673,7 +206673,7 @@ sub_8079C4C: ; 8079C4C adds r0, r3, 0 orrs r0, r2 strh r0, [r1] -@08079D72: +_08079D72: ldr r0, =0x0203229c ldr r1, [r0] ldr r0, [sp, 0x18] @@ -206684,15 +206684,15 @@ sub_8079C4C: ; 8079C4C adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq @08079D94 + beq _08079D94 movs r2, 0x90 lsls r2, 3 - b @08079E16 + b _08079E16 .pool -@08079D94: +_08079D94: mov r0, r8 cmp r0, 0 - bne @08079DC0 + bne _08079DC0 movs r0, 0x64 adds r4, r7, 0 muls r4, r0 @@ -206706,9 +206706,9 @@ sub_8079C4C: ; 8079C4C movs r1, 0x2 add r2, sp, 0xC bl pokemon_getattr - b @08079DDE + b _08079DDE .pool -@08079DC0: +_08079DC0: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 @@ -206722,34 +206722,34 @@ sub_8079C4C: ; 8079C4C 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 .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 @@ -206787,7 +206787,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, =gUnknown_0832DE3E @@ -206795,7 +206795,7 @@ sub_8079E44: ; 8079E44 adds r5, r0, r1 ldr r1, =gUnknown_0832DE56 adds r4, r0, r1 -@08079E6A: +_08079E6A: lsls r1, r7, 24 lsrs r1, 24 ldrb r2, [r5] @@ -206815,8 +206815,8 @@ sub_8079E44: ; 8079E44 adds r0, r6 ldrb r0, [r0] cmp r7, r0 - blt @08079E6A -@08079E94: + blt _08079E6A +_08079E94: add sp, 0x8 pop {r4-r7} pop {r0} @@ -206841,7 +206841,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 @@ -206854,7 +206854,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 @@ -206915,8 +206915,8 @@ sub_8079EA8: ; 8079EA8 add r3, r12 ldrb r3, [r3] cmp r7, r3 - blt @08079EE0 -@08079F5A: + blt _08079EE0 +_08079F5A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -207041,7 +207041,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 @@ -207049,7 +207049,7 @@ sub_807A048: ; 807A048 adds r0, r2, r7 ldrb r0, [r0] cmp r0, 0 - bne @0807A090 + bne _0807A090 ldr r3, =0x000008d2 adds r0, r2, r3 strh r5, [r0] @@ -207063,13 +207063,13 @@ sub_807A048: ; 807A048 adds r0, r1 movs r1, 0x1 strb r1, [r0] - b @0807A096 + b _0807A096 .pool -@0807A090: +_0807A090: adds r3, 0x1 cmp r3, 0x3 - ble @0807A05C -@0807A096: + ble _0807A05C +_0807A096: pop {r4-r7} pop {r0} bx r0 @@ -207085,13 +207085,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 @@ -207103,7 +207103,7 @@ 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 @@ -207113,71 +207113,71 @@ sub_807A0C4: ; 807A0C4 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 .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 .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 .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 @@ -207187,10 +207187,10 @@ sub_807A0C4: ; 807A0C4 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 @@ -207247,7 +207247,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 @@ -207268,42 +207268,42 @@ 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 .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 LoadObjectPic ldr r1, =0x0203229c @@ -207311,45 +207311,45 @@ sub_807A1F0: ; 807A1F0 adds r2, r1, 0 adds r2, 0x72 strh r0, [r2] - b @0807A2DE + b _0807A2DE .pool -@0807A2B8: +_0807A2B8: mov r0, sp - b @0807A2D6 -@0807A2BC: + b _0807A2D6 +_0807A2BC: ldr r0, =gUnknown_0832DCE4 bl LoadTaggedObjectPalette - b @0807A2DA + b _0807A2DA .pool -@0807A2C8: +_0807A2C8: ldr r0, =gUnknown_0832DC44 bl LoadTaggedObjectPalette - b @0807A2DA + b _0807A2DA .pool -@0807A2D4: +_0807A2D4: ldr r0, =gUnknown_0832DC3C -@0807A2D6: +_0807A2D6: bl LoadObjectPic -@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 .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} @@ -207380,24 +207380,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 @@ -207408,7 +207408,7 @@ sub_807A320: ; 807A320 bl pokemon_getattr adds r1, r0, 0 cmp r1, 0x1 - bne @0807A380 + bne _0807A380 ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -207417,15 +207417,15 @@ sub_807A320: ; 807A320 ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b @0807A3B0 + b _0807A3B0 .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 @@ -207433,8 +207433,8 @@ sub_807A320: ; 807A320 ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b @0807A3B0 -@0807A39E: + b _0807A3B0 +_0807A39E: ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -207444,7 +207444,7 @@ sub_807A320: ; 807A320 adds r0, 0x51 adds r0, r5 mov r1, r9 -@0807A3B0: +_0807A3B0: strb r1, [r0] ldr r0, =0x0203229c adds r5, 0x1 @@ -207454,22 +207454,22 @@ sub_807A320: ; 807A320 add r0, r8 ldrb r0, [r0] cmp r7, r0 - blt @0807A34E - b @0807A458 + blt _0807A34E + b _0807A458 .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 @@ -207480,7 +207480,7 @@ sub_807A320: ; 807A320 bl pokemon_getattr adds r1, r0, 0 cmp r1, 0x1 - bne @0807A414 + bne _0807A414 ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -207489,15 +207489,15 @@ sub_807A320: ; 807A320 ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b @0807A444 + b _0807A444 .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 @@ -207505,8 +207505,8 @@ sub_807A320: ; 807A320 ldr r0, [r6] adds r0, 0x51 adds r0, r5 - b @0807A444 -@0807A432: + b _0807A444 +_0807A432: ldr r0, [r6] adds r0, 0x45 adds r0, r5 @@ -207516,7 +207516,7 @@ sub_807A320: ; 807A320 adds r0, 0x51 adds r0, r5 mov r1, r9 -@0807A444: +_0807A444: strb r1, [r0] ldr r0, =0x0203229c adds r5, 0x1 @@ -207526,8 +207526,8 @@ sub_807A320: ; 807A320 add r0, r8 ldrb r0, [r0] cmp r7, r0 - blt @0807A3E2 -@0807A458: + blt _0807A3E2 +_0807A458: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -207543,20 +207543,20 @@ sub_807A468: ; 807A468 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 @@ -207587,19 +207587,19 @@ sub_807A468: ; 807A468 adds r0, 0x36 ldrb r0, [r0] cmp r6, r0 - bcc @0807A488 - b @0807A52C + bcc _0807A488 + b _0807A52C .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 @@ -207630,8 +207630,8 @@ sub_807A468: ; 807A468 adds r0, 0x37 ldrb r0, [r0] cmp r6, r0 - bcc @0807A4E8 -@0807A52C: + bcc _0807A4E8 +_0807A52C: pop {r4-r7} pop {r0} bx r0 @@ -207644,7 +207644,7 @@ sub_807A53C: ; 807A53C mov r7, r8 push {r7} movs r5, 0 -@0807A544: +_0807A544: movs r4, 0 ldr r2, =0x0203229c ldr r0, [r2] @@ -207654,12 +207654,12 @@ sub_807A53C: ; 807A53C 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 @@ -207685,11 +207685,11 @@ sub_807A53C: ; 807A53C 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} @@ -207704,13 +207704,13 @@ sub_807A5B0: ; 807A5B0 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 @@ -207718,14 +207718,14 @@ sub_807A5B0: ; 807A5B0 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 @@ -207744,9 +207744,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 @@ -207761,31 +207761,31 @@ sub_807A5F4: ; 807A5F4 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 @@ -207801,39 +207801,39 @@ sub_807A5F4: ; 807A5F4 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 .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 @@ -207842,52 +207842,52 @@ sub_807A5F4: ; 807A5F4 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 @@ -207903,7 +207903,7 @@ sub_807A728: ; 807A728 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq @0807A7B4 + beq _0807A7B4 movs r4, 0 bl link_get_multiplayer_id ldr r5, =0x020229e8 @@ -207920,16 +207920,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 @@ -207942,9 +207942,9 @@ sub_807A728: ; 807A728 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 @@ -207957,16 +207957,16 @@ sub_807A728: ; 807A728 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne @0807A7B4 + bne _0807A7B4 movs r0, 0x2 - b @0807A7B6 + b _0807A7B6 .pool -@0807A7B0: +_0807A7B0: movs r0, 0x1 - b @0807A7B6 -@0807A7B4: + b _0807A7B6 +_0807A7B4: movs r0, 0 -@0807A7B6: +_0807A7B6: pop {r4-r7} pop {r1} bx r1 @@ -207982,17 +207982,17 @@ 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 @@ -208031,31 +208031,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, =gBaseStats lsls r1, r7, 3 subs r1, r7 @@ -208063,60 +208063,60 @@ sub_807A7E0: ; 807A7E0 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 .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 @@ -208142,26 +208142,26 @@ 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 @@ -208181,9 +208181,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 @@ -208193,73 +208193,73 @@ sub_807A918: ; 807A918 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 .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 @@ -208267,44 +208267,44 @@ sub_807A918: ; 807A918 ldrh r0, [r4] bl sub_806E3F8 cmp r0, 0 - bne @0807A9E0 + bne _0807A9E0 movs r0, 0x2 - b @0807AA1A + b _0807AA1A .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 .pool -@0807AA18: +_0807AA18: movs r0, 0x1 -@0807AA1A: +_0807AA1A: add sp, 0x18 pop {r3} mov r8, r3 @@ -208323,12 +208323,12 @@ 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 @@ -208345,18 +208345,18 @@ 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 @@ -208369,16 +208369,16 @@ sub_807AA7C: ; 807AA7C 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 @@ -208391,7 +208391,7 @@ sub_807AA7C: ; 807AA7C adds r1, 0x4 movs r2, 0x2 bl gpu_pal_apply -@0807AAB2: +_0807AAB2: pop {r0} bx r0 .pool @@ -208410,10 +208410,10 @@ sub_807AABC: ; 807AABC lsls r1, 16 asrs r1, 16 cmp r1, 0xA - bne @0807AADA + bne _0807AADA adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@0807AADA: +_0807AADA: pop {r0} bx r0 thumb_func_end sub_807AABC @@ -208431,10 +208431,10 @@ sub_807AAE0: ; 807AAE0 lsls r1, 16 asrs r1, 16 cmp r1, 0xA - bne @0807AAFE + bne _0807AAFE adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@0807AAFE: +_0807AAFE: pop {r0} bx r0 thumb_func_end sub_807AAE0 @@ -208449,12 +208449,12 @@ 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 @@ -208556,7 +208556,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] @@ -208567,11 +208567,11 @@ sub_807ABCC: ; 807ABCC ldrh r1, [r0] movs r0, 0x18 bl SetGpuReg - b @0807AC1C + b _0807AC1C .pool -@0807AC18: +_0807AC18: bl sub_807AB28 -@0807AC1C: +_0807AC1C: pop {r4} pop {r0} bx r0 @@ -208624,18 +208624,18 @@ 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 .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] @@ -208644,7 +208644,7 @@ sub_807AC64: ; 807AC64 movs r0, 0x96 lsls r0, 1 cmp r1, r0 - bls @0807ACC4 + bls _0807ACC4 bl sub_80097E8 ldr r0, =c2_800ACD4 bl SetMainCallback2 @@ -208659,7 +208659,7 @@ sub_807AC64: ; 807AC64 ldr r0, [r4] adds r0, 0x88 strb r2, [r0] -@0807ACC4: +_0807ACC4: ldr r0, [r5] adds r1, r0, 0 adds r1, 0x88 @@ -208678,15 +208678,15 @@ sub_807ACDC: ; 807ACDC ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @0807ACF0 + bne _0807ACF0 movs r0, 0 - b @0807ACF8 + b _0807ACF8 .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 @@ -208703,7 +208703,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 @@ -208712,9 +208712,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 @@ -208727,14 +208727,14 @@ sub_807ACFC: ; 807ACFC 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 .pool -@0807AD58: +_0807AD58: mov r0, r8 movs r1, 0x41 bl pokemon_getattr @@ -208745,7 +208745,7 @@ sub_807ACFC: ; 807ACFC bl pokemon_getattr adds r7, r0, 0 cmp r6, 0 - bne @0807AD94 + bne _0807AD94 lsls r0, r5, 3 ldr r1, =gMonFrontPicTable adds r0, r1 @@ -208756,9 +208756,9 @@ sub_807ACFC: ; 807ACFC adds r3, r7, 0 bl DecompressMonPic_DetectFrontOrBack_2 movs r4, 0 - b @0807ADB2 + b _0807ADB2 .pool -@0807AD94: +_0807AD94: lsls r0, r5, 3 ldr r1, =gMonFrontPicTable adds r0, r1 @@ -208773,7 +208773,7 @@ sub_807ACFC: ; 807ACFC adds r2, r5, 0 adds r3, r7, 0 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack -@0807ADB2: +_0807ADB2: mov r0, r8 bl sub_806E794 bl LoadCompressedObjectPalette @@ -208787,9 +208787,9 @@ sub_807ACFC: ; 807ACFC adds r1, 0x68 adds r1, r0 str r7, [r1] - b @0807AE36 + b _0807AE36 .pool -@0807ADE0: +_0807ADE0: mov r0, r8 bl sub_806E794 ldrh r0, [r0, 0x4] @@ -208830,7 +208830,7 @@ sub_807ACFC: ; 807ACFC adds r0, r3 ldr r1, =DummyObjectCallback str r1, [r0] -@0807AE36: +_0807AE36: pop {r3} mov r8, r3 pop {r4-r7} @@ -208850,41 +208850,41 @@ 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 .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 @@ -208939,13 +208939,13 @@ sub_807AE50: ; 807AE50 strh r5, [r0] adds r0, 0x4 strh r2, [r0] - b @0807B116 + b _0807B116 .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 @@ -208961,87 +208961,87 @@ sub_807AE50: ; 807AE50 strb r0, [r1] ldr r0, [r4] str r5, [r0, 0x64] - b @0807B116 + b _0807B116 .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 .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 .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 .pool -@0807B034: +_0807B034: ldr r2, =0x020322a0 ldr r0, [r2] adds r0, 0x72 @@ -209055,9 +209055,9 @@ sub_807AE50: ; 807AE50 strb r1, [r0] movs r0, 0 bl sub_807ACFC - b @0807B0DC + b _0807B0DC .pool -@0807B058: +_0807B058: movs r0, 0 movs r1, 0x1 bl sub_807ACFC @@ -209065,14 +209065,14 @@ sub_807AE50: ; 807AE50 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @0807B0E4 + b _0807B0E4 .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 @@ -209081,17 +209081,17 @@ sub_807AE50: ; 807AE50 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @0807B0E4 + b _0807B0E4 .pool -@0807B094: +_0807B094: bl sub_807BA94 ldr r0, =gUnknown_08338D18 bl LoadObjectPic ldr r0, =gUnknown_08338D20 bl LoadTaggedObjectPalette - b @0807B0DC + b _0807B0DC .pool -@0807B0B0: +_0807B0B0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -209105,41 +209105,41 @@ sub_807AE50: ; 807AE50 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @0807B0E4 + b _0807B0E4 .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 .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 bl SetMainCallback2 -@0807B116: +_0807B116: bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks @@ -209289,31 +209289,31 @@ 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 .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] @@ -209395,26 +209395,26 @@ sub_807B270: ; 807B270 adds r0, r1 movs r1, 0x5 strb r1, [r0] - b @0807B43E + b _0807B43E .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 ShowBg - b @0807B424 -@0807B3D0: + b _0807B424 +_0807B3D0: movs r0, 0x1 movs r1, 0x1 bl sub_807ACFC @@ -209426,26 +209426,26 @@ sub_807B270: ; 807B270 movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - b @0807B424 -@0807B3F0: + b _0807B424 +_0807B3F0: bl sub_807BA94 ldr r0, =gUnknown_08338D18 bl LoadObjectPic ldr r0, =gUnknown_08338D20 bl LoadTaggedObjectPalette - b @0807B424 + b _0807B424 .pool -@0807B40C: +_0807B40C: movs r0, 0 bl ShowBg - 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 @@ -209453,12 +209453,12 @@ sub_807B270: ; 807B270 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0807B43E + b _0807B43E .pool -@0807B438: +_0807B438: ldr r0, =sub_807B60C bl SetMainCallback2 -@0807B43E: +_0807B43E: bl run_active_tasks bl RunTextPrinters bl CallObjectCallbacks @@ -209486,7 +209486,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 @@ -209511,7 +209511,7 @@ sub_807B464: ; 807B464 movs r1, 0x3 adds r2, r5, 0 bl SetPokedexFlag -@0807B4B8: +_0807B4B8: pop {r4,r5} pop {r0} bx r0 @@ -209560,7 +209560,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 @@ -209570,7 +209570,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 @@ -209591,15 +209591,15 @@ sub_807B4D0: ; 807B4D0 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 @@ -209607,15 +209607,15 @@ sub_807B4D0: ; 807B4D0 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 @@ -209634,16 +209634,16 @@ sub_807B5B8: ; 807B5B8 adds r0, 0x93 ldrb r0, [r0] cmp r0, 0x1 - beq @0807B5D0 + beq _0807B5D0 cmp r0, 0x2 - beq @0807B5F6 - b @0807B600 + beq _0807B5F6 + b _0807B600 .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 @@ -209656,13 +209656,13 @@ sub_807B5B8: ; 807B5B8 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 @@ -209688,26 +209688,26 @@ sub_807B62C: ; 807B62C 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 .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 @@ -209738,7 +209738,7 @@ sub_807B62C: ; 807B62C lsls r2, 5 movs r7, 0x80 lsls r7, 24 -@0807B6AA: +_0807B6AA: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -209747,10 +209747,10 @@ sub_807B62C: ; 807B62C adds r4, r2 subs r5, r2 cmp r5, r2 - bhi @0807B6AA - b @0807BA4C + bhi _0807B6AA + b _0807BA4C .pool -@0807B6DC: +_0807B6DC: ldr r4, =0x020322a0 ldr r2, [r4] adds r1, r2, 0 @@ -209773,13 +209773,13 @@ sub_807B62C: ; 807B62C adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - beq @0807B724 + beq _0807B724 ldr r1, =gUnknown_083369A0 - b @0807B726 + b _0807B726 .pool -@0807B724: +_0807B724: ldr r1, =gUnknown_083359A0 -@0807B726: +_0807B726: ldr r2, =0x06002800 ldr r0, =0x040000d4 str r1, [r0] @@ -209798,7 +209798,7 @@ sub_807B62C: ; 807B62C lsls r2, 5 movs r7, 0x80 lsls r7, 24 -@0807B74A: +_0807B74A: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -209807,7 +209807,7 @@ sub_807B62C: ; 807B62C adds r4, r2 subs r5, r2 cmp r5, r2 - bhi @0807B74A + bhi _0807B74A str r3, [r1] str r4, [r1, 0x4] lsrs r0, r5, 1 @@ -209816,9 +209816,9 @@ sub_807B62C: ; 807B62C ldr r0, [r1, 0x8] movs r1, 0x92 lsls r1, 5 - b @0807B820 + b _0807B820 .pool -@0807B784: +_0807B784: ldr r0, =0x020322a0 ldr r2, [r0] adds r0, r2, 0 @@ -209830,7 +209830,7 @@ sub_807B62C: ; 807B62C adds r0, 0x18 ldrb r0, [r0] cmp r0, 0 - bne @0807B7C0 + bne _0807B7C0 ldr r1, =0x00001241 movs r0, 0 bl SetGpuReg @@ -209838,9 +209838,9 @@ sub_807B62C: ; 807B62C ldr r1, =0x06002800 bl LZ77UnCompVram movs r0, 0x8 - b @0807B7DA + b _0807B7DA .pool -@0807B7C0: +_0807B7C0: ldr r1, =0x00001241 movs r0, 0 bl SetGpuReg @@ -209853,13 +209853,13 @@ sub_807B62C: ; 807B62C 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 .pool -@0807B7F8: +_0807B7F8: ldr r0, =gUnknown_08337EA0 movs r1, 0x30 movs r2, 0x20 @@ -209877,12 +209877,12 @@ sub_807B62C: ; 807B62C strh r1, [r0] movs r1, 0xB2 lsls r1, 5 -@0807B820: +_0807B820: movs r0, 0 bl SetGpuReg - b @0807BA68 + b _0807BA68 .pool -@0807B840: +_0807B840: ldr r1, =0x00001441 movs r0, 0 bl SetGpuReg @@ -209919,7 +209919,7 @@ sub_807B62C: ; 807B62C lsls r2, 5 movs r7, 0x80 lsls r7, 24 -@0807B88C: +_0807B88C: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -209928,7 +209928,7 @@ sub_807B62C: ; 807B62C adds r4, r2 subs r5, r2 cmp r5, r2 - bhi @0807B88C + bhi _0807B88C str r3, [r1] str r4, [r1, 0x4] lsrs r0, r5, 1 @@ -209940,25 +209940,25 @@ sub_807B62C: ; 807B62C adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - beq @0807B8EC + beq _0807B8EC ldr r1, =gUnknown_083357A0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b @0807BA64 + b _0807BA64 .pool -@0807B8EC: +_0807B8EC: ldr r1, =gUnknown_083358A0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b @0807BA64 + b _0807BA64 .pool -@0807B90C: +_0807B90C: ldr r0, =0x020322a0 ldr r0, [r0] adds r1, r0, 0 @@ -209967,9 +209967,9 @@ sub_807B62C: ; 807B62C strh r2, [r1] adds r0, 0xE2 strh r2, [r0] - b @0807BA68 + b _0807BA68 .pool -@0807B924: +_0807B924: ldr r1, =0x00001441 movs r0, 0 bl SetGpuReg @@ -210011,7 +210011,7 @@ sub_807B62C: ; 807B62C lsls r2, 5 movs r7, 0x80 lsls r7, 24 -@0807B97A: +_0807B97A: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -210020,7 +210020,7 @@ sub_807B62C: ; 807B62C adds r4, r2 subs r5, r2 cmp r5, r2 - bhi @0807B97A + bhi _0807B97A str r3, [r1] str r4, [r1, 0x4] lsrs r0, r5, 1 @@ -210032,25 +210032,25 @@ sub_807B62C: ; 807B62C adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - beq @0807B9DC + beq _0807B9DC ldr r1, =gUnknown_083357A0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b @0807BA64 + b _0807BA64 .pool -@0807B9DC: +_0807B9DC: ldr r1, =gUnknown_083358A0 ldr r2, =0x06009000 ldr r0, =0x040000d4 str r1, [r0] str r2, [r0, 0x4] ldr r1, =0x80000080 - b @0807BA64 + b _0807BA64 .pool -@0807B9FC: +_0807B9FC: ldr r0, =0x020322a0 ldr r0, [r0] adds r1, r0, 0 @@ -210079,7 +210079,7 @@ sub_807B62C: ; 807B62C lsls r2, 5 movs r7, 0x80 lsls r7, 24 -@0807BA3A: +_0807BA3A: str r3, [r1] str r4, [r1, 0x4] str r6, [r1, 0x8] @@ -210088,8 +210088,8 @@ sub_807B62C: ; 807B62C 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 @@ -210102,10 +210102,10 @@ sub_807B62C: ; 807B62C 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 @@ -210141,7 +210141,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 @@ -210182,9 +210182,9 @@ sub_807BAD8: ; 807BAD8 ldr r0, =0x02021dc4 mov r1, sp bl CopyString_Limit10 - b @0807BBA4 + b _0807BBA4 .pool -@0807BB68: +_0807BB68: ldr r0, =0x020375e0 ldrh r0, [r0] lsls r4, r0, 4 @@ -210211,7 +210211,7 @@ sub_807BAD8: ; 807BAD8 ldr r0, =0x02021dc4 mov r1, sp bl CopyString_Limit10 -@0807BBA4: +_0807BBA4: add sp, 0x14 pop {r4,r5} pop {r0} @@ -210227,13 +210227,13 @@ sub_807BBC8: ; 807BBC8 adds r0, 0xFA ldrb r0, [r0] cmp r0, 0 - bne @0807BBE0 + bne _0807BBE0 bl sub_807CFC8 - b @0807BBE4 + b _0807BBE4 .pool -@0807BBE0: +_0807BBE0: bl sub_807BBEC -@0807BBE4: +_0807BBE4: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -210251,286 +210251,286 @@ 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 .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 @@ -210579,16 +210579,16 @@ sub_807BBEC: ; 807BBEC strh r0, [r1] ldr r0, =0x00000179 bl current_map_music_set - bl @0807CFB4 + bl _0807CFB4 .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 @@ -210603,9 +210603,9 @@ sub_807BBEC: ; 807BBEC ldrh r0, [r6] subs r0, 0x3 strh r0, [r6] - bl @0807CFB4 + bl _0807CFB4 .pool -@0807C0F8: +_0807C0F8: ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E @@ -210621,9 +210621,9 @@ sub_807BBEC: ; 807BBEC adds r1, 0x94 movs r0, 0xA strh r0, [r1] - bl @0807CFB4 + bl _0807CFB4 .pool -@0807C120: +_0807C120: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EE942 adds r0, r4, 0 @@ -210640,27 +210640,27 @@ sub_807BBEC: ; 807BBEC 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 .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] @@ -210698,9 +210698,9 @@ sub_807BBEC: ; 807BBEC adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - bl @0807CFB4 + bl _0807CFB4 .pool -@0807C1DC: +_0807C1DC: ldr r5, =0x02020630 ldr r0, [r7] adds r0, 0xD2 @@ -210714,9 +210714,9 @@ sub_807BBEC: ; 807BBEC ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @0807C1FC - bl @0807CFB4 -@0807C1FC: + beq _0807C1FC + bl _0807CFB4 +_0807C1FC: ldr r0, =gUnknown_08338D28 movs r1, 0x78 movs r2, 0x20 @@ -210743,9 +210743,9 @@ sub_807BBEC: ; 807BBEC adds r0, r5 bl RemoveObjectAndFreeTiles ldr r1, [r7] - bl @0807CF4C + bl _0807CF4C .pool -@0807C248: +_0807C248: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -210758,17 +210758,17 @@ sub_807BBEC: ; 807BBEC adds r0, 0x94 movs r1, 0x14 strh r1, [r0] - bl @0807CFB4 + bl _0807CFB4 .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 @@ -210777,9 +210777,9 @@ sub_807BBEC: ; 807BBEC movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - bl @0807CF48 + bl _0807CF48 .pool -@0807C29C: +_0807C29C: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -210787,23 +210787,23 @@ sub_807BBEC: ; 807BBEC 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 .pool -@0807C2D0: +_0807C2D0: ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 @@ -210812,13 +210812,13 @@ sub_807BBEC: ; 807BBEC 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 .pool -@0807C2F0: +_0807C2F0: movs r0, 0x1 bl sub_807B62C ldr r3, [r4] @@ -210832,20 +210832,20 @@ sub_807BBEC: ; 807BBEC adds r0, 0x1 strh r0, [r1] str r2, [r3, 0x64] -@0807C30C: +_0807C30C: ldr r0, =0x020322a0 ldr r4, [r0] - bl @0807CB5C + bl _0807CB5C .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, =gUnknown_08338E74 movs r1, 0x78 @@ -210856,9 +210856,9 @@ sub_807BBEC: ; 807BBEC adds r1, 0x91 strb r0, [r1] ldr r1, [r7] - bl @0807CF4C + bl _0807CF4C .pool -@0807C348: +_0807C348: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -210872,9 +210872,9 @@ sub_807BBEC: ; 807BBEC ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt @0807C368 - bl @0807CFB4 -@0807C368: + blt _0807C368 + bl _0807CFB4 +_0807C368: adds r0, r1, 0 bl RemoveObjectAndFreeTiles movs r1, 0xC8 @@ -210885,9 +210885,9 @@ sub_807BBEC: ; 807BBEC movs r0, 0x52 bl SetGpuReg ldr r1, [r7] - bl @0807CF4C + bl _0807CF4C .pool -@0807C390: +_0807C390: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xE0 @@ -210898,13 +210898,13 @@ sub_807BBEC: ; 807BBEC 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 @@ -210912,9 +210912,9 @@ sub_807BBEC: ; 807BBEC movs r0, 0xA4 lsls r0, 1 cmp r1, r0 - beq @0807C3C4 - bl @0807CFB4 -@0807C3C4: + beq _0807C3C4 + bl _0807CFB4 +_0807C3C4: ldr r0, =gUnknown_08338DFC movs r1, 0x80 movs r2, 0x41 @@ -210923,9 +210923,9 @@ sub_807BBEC: ; 807BBEC ldr r1, [r7] adds r1, 0x92 strb r0, [r1] - bl @0807CFB4 + bl _0807CFB4 .pool -@0807C3E0: +_0807C3E0: ldr r0, =gUnknown_08338D88 movs r1, 0x80 movs r2, 0x50 @@ -210954,9 +210954,9 @@ sub_807BBEC: ; 807BBEC movs r1, 0x1 bl StartObjectImageAnim ldr r1, [r4] - bl @0807CF4C + bl _0807CF4C .pool -@0807C434: +_0807C434: ldr r2, [r7] adds r1, r2, 0 adds r1, 0xE0 @@ -210966,17 +210966,17 @@ sub_807BBEC: ; 807BBEC 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 SetGpuReg - bl @0807CFB4 + bl _0807CFB4 .pool -@0807C460: +_0807C460: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -211009,16 +211009,16 @@ sub_807BBEC: ; 807BBEC 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 .pool -@0807C4B8: +_0807C4B8: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -211032,17 +211032,17 @@ sub_807BBEC: ; 807BBEC adds r0, 0x94 movs r1, 0x1E strh r1, [r0] - bl @0807CFB4 + bl _0807CFB4 .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] @@ -211063,9 +211063,9 @@ sub_807BBEC: ; 807BBEC movs r0, 0x2 bl sub_807B62C ldr r1, [r7] - bl @0807CF4C + bl _0807CF4C .pool -@0807C528: +_0807C528: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -211094,15 +211094,15 @@ sub_807BBEC: ; 807BBEC adds r1, 0x91 strb r0, [r1] ldr r1, [r4] - bl @0807CF4C + bl _0807CF4C .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 @@ -211111,7 +211111,7 @@ sub_807BBEC: ; 807BBEC ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@0807C592: +_0807C592: ldr r3, =0x02020630 ldr r0, =0x020322a0 ldr r2, [r0] @@ -211134,9 +211134,9 @@ sub_807BBEC: ; 807BBEC ldrh r1, [r0, 0x26] adds r1, 0x3 strh r1, [r0, 0x26] - bl @0807CFB4 + bl _0807CFB4 .pool -@0807C5D0: +_0807C5D0: ldr r5, =0x02020630 ldr r4, [r7] adds r2, r4, 0 @@ -211169,9 +211169,9 @@ sub_807BBEC: ; 807BBEC 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] @@ -211181,30 +211181,30 @@ sub_807BBEC: ; 807BBEC adds r0, r5 strh r2, [r0, 0x30] adds r1, r4, 0 - bl @0807CF4C + bl _0807CF4C .pool -@0807C630: +_0807C630: ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0x10 bl sub_80A2A20 - bl @0807CF48 + bl _0807CF48 .pool -@0807C644: +_0807C644: ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0 bl sub_80A2A20 - bl @0807CF48 + bl _0807CF48 .pool -@0807C658: +_0807C658: ldr r2, =0x0000ffff movs r0, 0x1 movs r1, 0x10 bl sub_80A2A20 - bl @0807CF48 + bl _0807CF48 .pool -@0807C66C: +_0807C66C: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0xF0 @@ -211212,7 +211212,7 @@ sub_807BBEC: ; 807BBEC bl sub_806E840 lsls r0, 24 cmp r0, 0 - bne @0807C6E4 + bne _0807C6E4 ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0x8E @@ -211254,9 +211254,9 @@ sub_807BBEC: ; 807BBEC adds r0, r4 movs r1, 0 bl StartObjectRotScalAnim - b @0807C6FA + b _0807C6FA .pool -@0807C6E4: +_0807C6E4: ldr r0, [r5] adds r0, 0x8E ldrb r1, [r0] @@ -211267,7 +211267,7 @@ sub_807BBEC: ; 807BBEC adds r0, r1 movs r1, 0 bl StartObjectRotScalAnim -@0807C6FA: +_0807C6FA: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8F @@ -211335,9 +211335,9 @@ sub_807BBEC: ; 807BBEC ands r2, r1 strb r2, [r0] ldr r1, [r5] - bl @0807CF4C + bl _0807CF4C .pool -@0807C794: +_0807C794: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -211370,10 +211370,10 @@ sub_807BBEC: ; 807BBEC 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 @@ -211387,9 +211387,9 @@ sub_807BBEC: ; 807BBEC 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] @@ -211436,9 +211436,9 @@ sub_807BBEC: ; 807BBEC movs r0, 0x1 movs r1, 0 bl sub_80A2A20 - b @0807CFB4 + b _0807CFB4 .pool -@0807C864: +_0807C864: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -211470,9 +211470,9 @@ sub_807BBEC: ; 807BBEC 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 @@ -211502,17 +211502,17 @@ sub_807BBEC: ; 807BBEC lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeTiles - b @0807CFB4 + b _0807CFB4 .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] @@ -211552,9 +211552,9 @@ sub_807BBEC: ; 807BBEC adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim - b @0807CFB4 + b _0807CFB4 .pool -@0807C964: +_0807C964: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -211562,8 +211562,8 @@ sub_807BBEC: ; 807BBEC 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 @@ -211573,12 +211573,12 @@ sub_807BBEC: ; 807BBEC movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0807C98C - b @0807CFB4 -@0807C98C: - b @0807CF48 + beq _0807C98C + b _0807CFB4 +_0807C98C: + b _0807CF48 .pool -@0807C994: +_0807C994: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -211612,13 +211612,13 @@ sub_807BBEC: ; 807BBEC 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 .pool -@0807C9E4: +_0807C9E4: ldr r1, [r7] adds r5, r1, 0 adds r5, 0xE0 @@ -211630,12 +211630,12 @@ sub_807BBEC: ; 807BBEC 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] @@ -211661,19 +211661,19 @@ sub_807BBEC: ; 807BBEC movs r1, 0 strh r0, [r2] str r1, [r3, 0x64] - b @0807CFB4 + b _0807CFB4 .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 @@ -211685,13 +211685,13 @@ sub_807BBEC: ; 807BBEC 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 @@ -211700,16 +211700,16 @@ sub_807BBEC: ; 807BBEC 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, =gUnknown_08338DFC movs r1, 0x80 movs r2, 0x41 @@ -211729,9 +211729,9 @@ sub_807BBEC: ; 807BBEC adds r0, r2 ldr r1, =sub_807AAE0 str r1, [r0] - b @0807CFB4 + b _0807CFB4 .pool -@0807CAC8: +_0807CAC8: ldr r0, =gUnknown_08338E74 movs r1, 0x78 movs r2, 0x50 @@ -211745,9 +211745,9 @@ sub_807BBEC: ; 807BBEC adds r0, 0x94 movs r1, 0x32 strh r1, [r0] - b @0807CFB4 + b _0807CFB4 .pool -@0807CAF0: +_0807CAF0: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -211761,9 +211761,9 @@ sub_807BBEC: ; 807BBEC ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt @0807CB0E - b @0807CFB4 -@0807CB0E: + blt _0807CB0E + b _0807CFB4 +_0807CB0E: adds r0, r1, 0 bl RemoveObjectAndFreeTiles movs r0, 0x6 @@ -211775,22 +211775,22 @@ sub_807BBEC: ; 807BBEC strh r0, [r1] movs r0, 0x9F bl audio_play - b @0807CFB4 + b _0807CFB4 .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 .pool -@0807CB4C: +_0807CB4C: movs r0, 0x80 lsls r0, 3 strh r0, [r2] @@ -211798,9 +211798,9 @@ sub_807BBEC: ; 807BBEC 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] @@ -211809,8 +211809,8 @@ sub_807BBEC: ; 807BBEC bl __divsi3 adds r4, 0xE8 strh r0, [r4] - b @0807CFB4 -@0807CB70: + b _0807CFB4 +_0807CB70: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -211823,17 +211823,17 @@ sub_807BBEC: ; 807BBEC adds r0, 0x94 movs r1, 0x3C strh r1, [r0] - b @0807CFB4 + b _0807CFB4 .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 @@ -211842,9 +211842,9 @@ sub_807BBEC: ; 807BBEC movs r1, 0x80 orrs r0, r1 strb r0, [r4, 0x8] - b @0807CF48 + b _0807CF48 .pool -@0807CBB8: +_0807CBB8: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -211856,9 +211856,9 @@ sub_807BBEC: ; 807BBEC str r1, [sp] movs r2, 0x10 movs r3, 0 - b @0807CF44 + b _0807CF44 .pool -@0807CBD4: +_0807CBD4: movs r1, 0xA2 lsls r1, 5 movs r0, 0 @@ -211868,12 +211868,12 @@ sub_807BBEC: ; 807BBEC movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0807CBEC - b @0807CFB4 -@0807CBEC: - b @0807CF48 + beq _0807CBEC + b _0807CFB4 +_0807CBEC: + b _0807CF48 .pool -@0807CBF4: +_0807CBF4: ldr r0, =gUnknown_08338D28 movs r2, 0x8 negs r2, r2 @@ -211942,9 +211942,9 @@ sub_807BBEC: ; 807BBEC adds r0, 0x1 strh r0, [r1] str r6, [r2, 0x64] - b @0807CFB4 + b _0807CFB4 .pool -@0807CC9C: +_0807CC9C: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0xD3 @@ -211965,9 +211965,9 @@ sub_807BBEC: ; 807BBEC movs r3, 0 bl pal_fade_maybe ldr r1, [r7] - b @0807CF4C + b _0807CF4C .pool -@0807CCD0: +_0807CCD0: ldr r2, =0x02020630 ldr r3, [r7] adds r0, r3, 0 @@ -211981,9 +211981,9 @@ sub_807BBEC: ; 807BBEC ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @0807CCEE - b @0807CFB4 -@0807CCEE: + beq _0807CCEE + b _0807CFB4 +_0807CCEE: adds r0, r3, 0 adds r0, 0xF2 ldrh r2, [r0] @@ -211996,9 +211996,9 @@ sub_807BBEC: ; 807BBEC ldr r3, [r3, 0x6C] bl DecompressMonPic_DetectFrontOrBack_2 ldr r1, [r7] - b @0807CF4C + b _0807CF4C .pool -@0807CD1C: +_0807CD1C: ldr r4, =0x02020630 ldr r2, [r7] adds r6, r2, 0 @@ -212084,9 +212084,9 @@ sub_807BBEC: ; 807BBEC adds r0, r4 bl RemoveObjectAndFreeTiles ldr r1, [r7] - b @0807CF4C + b _0807CF4C .pool -@0807CDDC: +_0807CDDC: movs r1, 0xAA lsls r1, 5 movs r0, 0 @@ -212105,58 +212105,58 @@ sub_807BBEC: ; 807BBEC adds r1, 0x94 movs r2, 0 movs r0, 0xA7 -@0807CE06: +_0807CE06: strh r0, [r1] str r2, [r3, 0x64] - b @0807CFB4 + b _0807CFB4 .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 .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 .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 @@ -212172,41 +212172,41 @@ sub_807BBEC: ; 807BBEC bl sub_807F1A8 ldr r0, [r7] str r5, [r0, 0x64] - b @0807CFB4 + b _0807CFB4 .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 .pool -@0807CEDC: +_0807CEDC: ldr r0, =0x020375e2 ldrb r0, [r0] movs r1, 0 @@ -212226,7 +212226,7 @@ sub_807BBEC: ; 807BBEC lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @0807CF48 + beq _0807CF48 ldrb r3, [r7] adds r0, r3, 0 muls r0, r6 @@ -212237,28 +212237,28 @@ sub_807BBEC: ; 807BBEC ldrb r2, [r1] adds r1, r4, 0 bl sub_813E1D4 - b @0807CF48 + b _0807CF48 .pool -@0807CF38: +_0807CF38: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 -@0807CF44: +_0807CF44: bl pal_fade_maybe -@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 .pool -@0807CF5C: +_0807CF5C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -212266,14 +212266,14 @@ sub_807BBEC: ; 807BBEC 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 FreeAllWindowBuffers movs r0, 0x3 bl GetBgTilemap @@ -212288,13 +212288,13 @@ sub_807BBEC: ; 807BBEC ldr r0, [r7] bl Free str r4, [r7] -@0807CFAA: +_0807CFAA: ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 bl sub_807E784 -@0807CFB4: +_0807CFB4: movs r0, 0 -@0807CFB6: +_0807CFB6: add sp, 0x14 pop {r4-r7} pop {r1} @@ -212313,286 +212313,286 @@ 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 .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 @@ -212641,16 +212641,16 @@ sub_807CFC8: ; 807CFC8 strh r0, [r1] ldr r0, =0x00000179 bl current_map_music_set - bl @0807E400 + bl _0807E400 .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 @@ -212665,9 +212665,9 @@ sub_807CFC8: ; 807CFC8 ldrh r0, [r6] subs r0, 0x3 strh r0, [r6] - bl @0807E400 + bl _0807E400 .pool -@0807D4D4: +_0807D4D4: ldr r2, =0x02020630 adds r0, r5, 0 adds r0, 0x8E @@ -212683,9 +212683,9 @@ sub_807CFC8: ; 807CFC8 adds r1, 0x94 movs r0, 0xA strh r0, [r1] - bl @0807E400 + bl _0807E400 .pool -@0807D4FC: +_0807D4FC: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EE942 adds r0, r4, 0 @@ -212702,27 +212702,27 @@ sub_807CFC8: ; 807CFC8 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 .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] @@ -212760,9 +212760,9 @@ sub_807CFC8: ; 807CFC8 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - bl @0807E400 + bl _0807E400 .pool -@0807D5B8: +_0807D5B8: ldr r5, =0x02020630 ldr r0, [r7] adds r0, 0xD2 @@ -212776,9 +212776,9 @@ sub_807CFC8: ; 807CFC8 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @0807D5D8 - bl @0807E400 -@0807D5D8: + beq _0807D5D8 + bl _0807E400 +_0807D5D8: ldr r0, =gUnknown_08338D28 movs r1, 0x78 movs r2, 0x20 @@ -212805,9 +212805,9 @@ sub_807CFC8: ; 807CFC8 adds r0, r5 bl RemoveObjectAndFreeTiles ldr r1, [r7] - bl @0807E398 + bl _0807E398 .pool -@0807D624: +_0807D624: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -212820,17 +212820,17 @@ sub_807CFC8: ; 807CFC8 adds r0, 0x94 movs r1, 0x14 strh r1, [r0] - bl @0807E400 + bl _0807E400 .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 @@ -212839,9 +212839,9 @@ sub_807CFC8: ; 807CFC8 movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - bl @0807E394 + bl _0807E394 .pool -@0807D678: +_0807D678: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -212849,23 +212849,23 @@ sub_807CFC8: ; 807CFC8 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 .pool -@0807D6AC: +_0807D6AC: ldr r4, =0x020322a0 ldr r0, [r4] adds r2, r0, 0 @@ -212874,13 +212874,13 @@ sub_807CFC8: ; 807CFC8 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 .pool -@0807D6CC: +_0807D6CC: movs r0, 0x1 bl sub_807B62C ldr r3, [r4] @@ -212893,20 +212893,20 @@ sub_807CFC8: ; 807CFC8 movs r0, 0x7C strh r0, [r1] str r2, [r3, 0x64] -@0807D6E6: +_0807D6E6: ldr r0, =0x020322a0 ldr r4, [r0] - bl @0807DFA8 + bl _0807DFA8 .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, =gUnknown_08338E8C @@ -212918,9 +212918,9 @@ sub_807CFC8: ; 807CFC8 adds r1, 0x91 strb r0, [r1] ldr r1, [r7] - bl @0807E398 + bl _0807E398 .pool -@0807D728: +_0807D728: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -212934,9 +212934,9 @@ sub_807CFC8: ; 807CFC8 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt @0807D748 - bl @0807E400 -@0807D748: + blt _0807D748 + bl _0807E400 +_0807D748: adds r0, r1, 0 bl RemoveObjectAndFreeTiles ldr r1, =0x00000452 @@ -212950,24 +212950,24 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x5 bl AddTask ldr r1, [r7] - bl @0807E398 + bl _0807E398 .pool -@0807D77C: +_0807D77C: ldr r0, =c3_08054588 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 .pool -@0807D7A4: +_0807D7A4: ldr r2, [r7] adds r0, r2, 0 adds r0, 0xE0 @@ -212978,12 +212978,12 @@ sub_807CFC8: ; 807CFC8 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, =gUnknown_08338D88 movs r1, 0x78 movs r2, 0x50 @@ -213023,9 +213023,9 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x1 bl StartObjectImageAnim ldr r1, [r4] - bl @0807E398 + bl _0807E398 .pool -@0807D830: +_0807D830: ldr r2, [r7] adds r1, r2, 0 adds r1, 0xE0 @@ -213035,17 +213035,17 @@ sub_807CFC8: ; 807CFC8 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 SetGpuReg - bl @0807E400 + bl _0807E400 .pool -@0807D85C: +_0807D85C: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -213078,16 +213078,16 @@ sub_807CFC8: ; 807CFC8 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 .pool -@0807D8B4: +_0807D8B4: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -213101,17 +213101,17 @@ sub_807CFC8: ; 807CFC8 adds r0, 0x94 movs r1, 0x1E strh r1, [r0] - bl @0807E400 + bl _0807E400 .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] @@ -213132,9 +213132,9 @@ sub_807CFC8: ; 807CFC8 movs r0, 0x2 bl sub_807B62C ldr r1, [r7] - bl @0807E398 + bl _0807E398 .pool -@0807D924: +_0807D924: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -213163,15 +213163,15 @@ sub_807CFC8: ; 807CFC8 adds r1, 0x91 strb r0, [r1] ldr r1, [r4] - bl @0807E398 + bl _0807E398 .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 @@ -213180,7 +213180,7 @@ sub_807CFC8: ; 807CFC8 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@0807D98E: +_0807D98E: ldr r3, =0x02020630 ldr r0, =0x020322a0 ldr r2, [r0] @@ -213203,9 +213203,9 @@ sub_807CFC8: ; 807CFC8 ldrh r1, [r0, 0x26] adds r1, 0x3 strh r1, [r0, 0x26] - bl @0807E400 + bl _0807E400 .pool -@0807D9CC: +_0807D9CC: ldr r5, =0x02020630 ldr r4, [r7] adds r2, r4, 0 @@ -213238,9 +213238,9 @@ sub_807CFC8: ; 807CFC8 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] @@ -213255,30 +213255,30 @@ sub_807CFC8: ; 807CFC8 adds r0, 0x1 strh r0, [r1] ldr r0, =c3_0805465C - b @0807DC5A + b _0807DC5A .pool -@0807DA38: +_0807DA38: ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 - bl @0807E394 + bl _0807E394 .pool -@0807DA4C: +_0807DA4C: ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 - bl @0807E394 + bl _0807E394 .pool -@0807DA60: +_0807DA60: ldr r2, =0x0000ffff movs r0, 0x8 movs r1, 0x10 bl sub_80A2A20 - bl @0807E394 + bl _0807E394 .pool -@0807DA74: +_0807DA74: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0xF0 @@ -213286,7 +213286,7 @@ sub_807CFC8: ; 807CFC8 bl sub_806E840 lsls r0, 24 cmp r0, 0 - bne @0807DAEC + bne _0807DAEC ldr r4, =0x02020630 ldr r2, [r5] adds r2, 0x8E @@ -213328,9 +213328,9 @@ sub_807CFC8: ; 807CFC8 adds r0, r4 movs r1, 0 bl StartObjectRotScalAnim - b @0807DB02 + b _0807DB02 .pool -@0807DAEC: +_0807DAEC: ldr r0, [r5] adds r0, 0x8E ldrb r1, [r0] @@ -213341,7 +213341,7 @@ sub_807CFC8: ; 807CFC8 adds r0, r1 movs r1, 0 bl StartObjectRotScalAnim -@0807DB02: +_0807DB02: ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8F @@ -213409,9 +213409,9 @@ sub_807CFC8: ; 807CFC8 ands r2, r1 strb r2, [r0] ldr r1, [r5] - bl @0807E398 + bl _0807E398 .pool -@0807DB9C: +_0807DB9C: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -213444,10 +213444,10 @@ sub_807CFC8: ; 807CFC8 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 @@ -213461,9 +213461,9 @@ sub_807CFC8: ; 807CFC8 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] @@ -213507,12 +213507,12 @@ sub_807CFC8: ; 807CFC8 orrs r1, r2 strb r1, [r0] ldr r0, =sub_807F39C -@0807DC5A: +_0807DC5A: movs r1, 0x5 bl AddTask - b @0807E400 + b _0807E400 .pool -@0807DC6C: +_0807DC6C: ldr r4, =0x02020630 ldr r2, [r7] adds r3, r2, 0 @@ -213544,9 +213544,9 @@ sub_807CFC8: ; 807CFC8 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 @@ -213576,17 +213576,17 @@ sub_807CFC8: ; 807CFC8 lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeTiles - b @0807E400 + b _0807E400 .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] @@ -213644,9 +213644,9 @@ sub_807CFC8: ; 807CFC8 adds r0, r5 movs r1, 0x1 bl StartObjectImageAnim - b @0807E400 + b _0807E400 .pool -@0807DD94: +_0807DD94: movs r1, 0x1 negs r1, r1 movs r0, 0 @@ -213654,8 +213654,8 @@ sub_807CFC8: ; 807CFC8 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 @@ -213665,12 +213665,12 @@ sub_807CFC8: ; 807CFC8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0807DDBC - b @0807E400 -@0807DDBC: - b @0807E394 + beq _0807DDBC + b _0807E400 +_0807DDBC: + b _0807E394 .pool -@0807DDC4: +_0807DDC4: ldr r2, =0x02020630 ldr r4, [r7] adds r3, r4, 0 @@ -213704,18 +213704,18 @@ sub_807CFC8: ; 807CFC8 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 .pool -@0807DE1C: +_0807DE1C: movs r1, 0xB2 lsls r1, 5 movs r0, 0 @@ -213735,7 +213735,7 @@ sub_807CFC8: ; 807CFC8 adds r0, 0x1 str r0, [r2, 0x64] cmp r0, 0xA - bne @0807DE60 + bne _0807DE60 ldr r0, =c3_08054588 movs r1, 0x5 bl AddTask @@ -213748,7 +213748,7 @@ sub_807CFC8: ; 807CFC8 adds r1, r2 movs r0, 0x1 strh r0, [r1, 0xC] -@0807DE60: +_0807DE60: ldr r1, [r4] adds r3, r1, 0 adds r3, 0xE0 @@ -213757,13 +213757,13 @@ sub_807CFC8: ; 807CFC8 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 .pool -@0807DE84: +_0807DE84: ldr r0, [r7] adds r0, 0x90 ldrb r1, [r0] @@ -213789,17 +213789,17 @@ sub_807CFC8: ; 807CFC8 movs r1, 0 strh r0, [r2] str r1, [r3, 0x64] - b @0807E400 + b _0807E400 .pool -@0807DEC0: +_0807DEC0: ldr r0, =c3_08054588 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 @@ -213807,19 +213807,19 @@ sub_807CFC8: ; 807CFC8 movs r0, 0x2E strh r0, [r1] str r3, [r2, 0x64] - b @0807E400 + b _0807E400 .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 @@ -213831,12 +213831,12 @@ sub_807CFC8: ; 807CFC8 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, =gUnknown_08338E74 movs r1, 0x78 movs r2, 0x50 @@ -213850,9 +213850,9 @@ sub_807CFC8: ; 807CFC8 adds r0, 0x94 movs r1, 0x32 strh r1, [r0] - b @0807E400 + b _0807E400 .pool -@0807DF3C: +_0807DF3C: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0x91 @@ -213866,9 +213866,9 @@ sub_807CFC8: ; 807CFC8 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - blt @0807DF5A - b @0807E400 -@0807DF5A: + blt _0807DF5A + b _0807E400 +_0807DF5A: adds r0, r1, 0 bl RemoveObjectAndFreeTiles movs r0, 0x6 @@ -213880,22 +213880,22 @@ sub_807CFC8: ; 807CFC8 strh r0, [r1] movs r0, 0x9F bl audio_play - b @0807E400 + b _0807E400 .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 .pool -@0807DF98: +_0807DF98: movs r0, 0x80 lsls r0, 3 strh r0, [r2] @@ -213903,9 +213903,9 @@ sub_807CFC8: ; 807CFC8 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] @@ -213914,8 +213914,8 @@ sub_807CFC8: ; 807CFC8 bl __divsi3 adds r4, 0xE8 strh r0, [r4] - b @0807E400 -@0807DFBC: + b _0807E400 +_0807DFBC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -213928,17 +213928,17 @@ sub_807CFC8: ; 807CFC8 adds r0, 0x94 movs r1, 0x3C strh r1, [r0] - b @0807E400 + b _0807E400 .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 @@ -213947,9 +213947,9 @@ sub_807CFC8: ; 807CFC8 movs r1, 0x80 orrs r0, r1 strb r0, [r4, 0x8] - b @0807E394 + b _0807E394 .pool -@0807E004: +_0807E004: ldr r2, =0x02037fd4 ldrb r1, [r2, 0x8] movs r0, 0x7F @@ -213961,9 +213961,9 @@ sub_807CFC8: ; 807CFC8 str r1, [sp] movs r2, 0x10 movs r3, 0 - b @0807E390 + b _0807E390 .pool -@0807E020: +_0807E020: movs r1, 0xA2 lsls r1, 5 movs r0, 0 @@ -213973,12 +213973,12 @@ sub_807CFC8: ; 807CFC8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0807E038 - b @0807E400 -@0807E038: - b @0807E394 + beq _0807E038 + b _0807E400 +_0807E038: + b _0807E394 .pool -@0807E040: +_0807E040: ldr r0, =gUnknown_08338D28 movs r2, 0x8 negs r2, r2 @@ -214047,9 +214047,9 @@ sub_807CFC8: ; 807CFC8 adds r0, 0x1 strh r0, [r1] str r6, [r2, 0x64] - b @0807E400 + b _0807E400 .pool -@0807E0E8: +_0807E0E8: ldr r2, =0x02020630 ldr r0, [r7] adds r0, 0xD3 @@ -214070,9 +214070,9 @@ sub_807CFC8: ; 807CFC8 movs r3, 0 bl pal_fade_maybe ldr r1, [r7] - b @0807E398 + b _0807E398 .pool -@0807E11C: +_0807E11C: ldr r2, =0x02020630 ldr r3, [r7] adds r0, r3, 0 @@ -214086,9 +214086,9 @@ sub_807CFC8: ; 807CFC8 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @0807E13A - b @0807E400 -@0807E13A: + beq _0807E13A + b _0807E400 +_0807E13A: adds r0, r3, 0 adds r0, 0xF2 ldrh r2, [r0] @@ -214101,9 +214101,9 @@ sub_807CFC8: ; 807CFC8 ldr r3, [r3, 0x6C] bl DecompressMonPic_DetectFrontOrBack_2 ldr r1, [r7] - b @0807E398 + b _0807E398 .pool -@0807E168: +_0807E168: ldr r4, =0x02020630 ldr r2, [r7] adds r6, r2, 0 @@ -214189,9 +214189,9 @@ sub_807CFC8: ; 807CFC8 adds r0, r4 bl RemoveObjectAndFreeTiles ldr r1, [r7] - b @0807E398 + b _0807E398 .pool -@0807E228: +_0807E228: movs r1, 0xAA lsls r1, 5 movs r0, 0 @@ -214210,58 +214210,58 @@ sub_807CFC8: ; 807CFC8 adds r1, 0x94 movs r2, 0 movs r0, 0xA7 -@0807E252: +_0807E252: strh r0, [r1] str r2, [r3, 0x64] - b @0807E400 + b _0807E400 .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 .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 .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 @@ -214277,41 +214277,41 @@ sub_807CFC8: ; 807CFC8 bl sub_807F1A8 ldr r0, [r7] str r5, [r0, 0x64] - b @0807E400 + b _0807E400 .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 .pool -@0807E328: +_0807E328: ldr r0, =0x020375e2 ldrb r0, [r0] movs r1, 0 @@ -214331,7 +214331,7 @@ sub_807CFC8: ; 807CFC8 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @0807E394 + beq _0807E394 ldrb r3, [r7] adds r0, r3, 0 muls r0, r6 @@ -214342,28 +214342,28 @@ sub_807CFC8: ; 807CFC8 ldrb r2, [r1] adds r1, r4, 0 bl sub_813E1D4 - b @0807E394 + b _0807E394 .pool -@0807E384: +_0807E384: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 -@0807E390: +_0807E390: bl pal_fade_maybe -@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 .pool -@0807E3A8: +_0807E3A8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -214371,14 +214371,14 @@ sub_807CFC8: ; 807CFC8 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 FreeAllWindowBuffers movs r0, 0x3 bl GetBgTilemap @@ -214393,13 +214393,13 @@ sub_807CFC8: ; 807CFC8 ldr r0, [r7] bl Free str r4, [r7] -@0807E3F6: +_0807E3F6: ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 bl sub_807E784 -@0807E400: +_0807E400: movs r0, 0 -@0807E402: +_0807E402: add sp, 0x14 pop {r4-r7} pop {r1} @@ -214418,19 +214418,19 @@ 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 .pool -@0807E434: +_0807E434: movs r0, 0x4 strb r0, [r1] ldr r1, =0x03002700 movs r0, 0x1 - b @0807E4B2 + b _0807E4B2 .pool -@0807E444: +_0807E444: ldr r0, =0x030061e8 ldr r1, =sub_807EB50 mov r8, r1 @@ -214447,7 +214447,7 @@ c2_08053788: ; 807E414 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @0807E494 + beq _0807E494 ldrb r3, [r7] adds r0, r3, 0 muls r0, r6 @@ -214458,31 +214458,31 @@ c2_08053788: ; 807E414 ldrb r2, [r1] adds r1, r4, 0 bl sub_813E1D4 - b @0807E4AE + b _0807E4AE .pool -@0807E494: +_0807E494: bl sub_8077260 cmp r0, 0 - beq @0807E4A8 + beq _0807E4A8 ldr r0, =sub_807F464 bl SetMainCallback2 - b @0807E4AE + b _0807E4AE .pool -@0807E4A8: +_0807E4A8: mov r0, r8 bl SetMainCallback2 -@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 CallObjectCallbacks bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably @@ -214505,31 +214505,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 bl SetMainCallback2 -@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 @@ -214537,16 +214537,16 @@ sub_807E4DC: ; 807E4DC 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 @@ -214576,7 +214576,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 @@ -214591,14 +214591,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 @@ -214606,12 +214606,12 @@ sub_807E55C: ; 807E55C movs r1, 0x34 ldrsh r0, [r5, r1] cmp r0, 0x4 - bne @0807E5CE + bne _0807E5CE movs r0, 0x1 strh r0, [r5, 0x3C] ldr r0, =DummyObjectCallback str r0, [r5, 0x1C] -@0807E5CE: +_0807E5CE: pop {r4,r5} pop {r0} bx r0 @@ -214636,17 +214636,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 @@ -214665,7 +214665,7 @@ sub_807E5D8: ; 807E5D8 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@0807E636: +_0807E636: add sp, 0x4 pop {r4} pop {r0} @@ -214680,18 +214680,18 @@ sub_807E64C: ; 807E64C movs r1, 0x30 ldrsh r0, [r4, r1] cmp r0, 0x14 - bne @0807E660 + bne _0807E660 adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim -@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, =gUnknown_08339024 movs r2, 0x2E ldrsh r0, [r4, r2] @@ -214707,7 +214707,7 @@ sub_807E64C: ; 807E64C lsls r0, 16 asrs r0, 16 cmp r0, 0x17 - bne @0807E69E + bne _0807E69E adds r0, r4, 0 bl RemoveObjectAndFreeTiles ldr r0, =0x020322a0 @@ -214715,7 +214715,7 @@ sub_807E64C: ; 807E64C adds r0, 0x94 movs r1, 0xE strh r1, [r0] -@0807E69E: +_0807E69E: pop {r4} pop {r0} bx r0 @@ -214730,7 +214730,7 @@ sub_807E6AC: ; 807E6AC 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] @@ -214739,36 +214739,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, =gUnknown_08339024 movs r2, 0x2E ldrsh r0, [r4, r2] @@ -214785,10 +214785,10 @@ sub_807E6AC: ; 807E6AC lsls r0, 16 asrs r0, 16 cmp r0, 0x6C - bne @0807E72C + bne _0807E72C ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@0807E72C: +_0807E72C: pop {r4} pop {r0} bx r0 @@ -214987,11 +214987,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 @@ -215012,15 +215012,15 @@ sub_807E7E8: ; 807E7E8 adds r0, r6, 0 movs r1, 0xC bl pokemon_setattr - b @0807E960 + b _0807E960 .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 @@ -215045,14 +215045,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 @@ -215092,7 +215092,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 @@ -215100,11 +215100,11 @@ sub_807E9D4: ; 807E9D4 bl pokemon_getattr lsls r0, 16 lsrs r0, 16 - b @0807EA0A + b _0807EA0A .pool -@0807EA08: +_0807EA08: movs r0, 0 -@0807EA0A: +_0807EA0A: pop {r4-r6} pop {r1} bx r1 @@ -215130,7 +215130,7 @@ sub_807EA2C: ; 807EA2C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - bne @0807EA96 + bne _0807EA96 ldr r5, =0x020322a0 ldr r0, [r5] adds r0, 0x8E @@ -215161,7 +215161,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 @@ -215169,10 +215169,10 @@ sub_807EA2C: ; 807EA2C strh r1, [r2] adds r0, 0x93 strb r6, [r0] -@0807EA90: +_0807EA90: ldr r0, =sub_807EACC bl SetMainCallback2 -@0807EA96: +_0807EA96: bl sub_807B5B8 bl sub_807E4DC bl run_active_tasks @@ -215194,15 +215194,15 @@ sub_807EACC: ; 807EACC lsrs r4, r0, 24 bl sub_8077260 cmp r0, 0 - beq @0807EAEC + beq _0807EAEC ldr r0, =c2_08053788 bl SetMainCallback2 - b @0807EB2C + b _0807EB2C .pool -@0807EAEC: +_0807EAEC: bl sub_807E4DC cmp r4, 0 - bne @0807EB2C + bne _0807EB2C ldr r4, =0x020322a0 ldr r2, [r4] adds r0, r2, 0 @@ -215210,7 +215210,7 @@ sub_807EACC: ; 807EACC ldrh r1, [r0] ldr r0, =0x00000101 cmp r1, r0 - bne @0807EB2C + bne _0807EB2C adds r1, r2, 0 adds r1, 0x74 ldr r0, =0x0000dcba @@ -215229,7 +215229,7 @@ sub_807EACC: ; 807EACC ldr r0, [r4] adds r0, 0x73 strb r1, [r0] -@0807EB2C: +_0807EB2C: bl run_active_tasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad @@ -215251,120 +215251,120 @@ 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 .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 @@ -215373,9 +215373,9 @@ sub_807EB50: ; 807EB50 strb r0, [r1] ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EF6D2 - b @0807EDA6 + b _0807EDA6 .pool -@0807ED2C: +_0807ED2C: movs r0, 0 bl sub_8077288 ldr r0, =0x030022c0 @@ -215384,16 +215384,16 @@ sub_807EB50: ; 807EB50 adds r0, r1 movs r2, 0 movs r1, 0x64 - b @0807EE88 + b _0807EE88 .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 @@ -215401,34 +215401,34 @@ sub_807EB50: ; 807EB50 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 .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 .pool -@0807ED98: +_0807ED98: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 @@ -215436,26 +215436,26 @@ sub_807EB50: ; 807EB50 strb r0, [r1] ldr r4, =0x02021fc4 ldr r1, =gUnknown_082C8959 -@0807EDA6: +_0807EDA6: adds r0, r4, 0 bl ExpandStringRefs movs r0, 0 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - b @0807F03A + b _0807F03A .pool -@0807EDC0: +_0807EDC0: bl InUnionRoom 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 @@ -215470,7 +215470,7 @@ sub_807EB50: ; 807EB50 ldr r1, [r1] movs r0, 0x2 bl sub_801B990 -@0807EDF6: +_0807EDF6: bl sub_8076D5C bl sub_8153380 ldr r1, =0x030022c0 @@ -215481,29 +215481,29 @@ sub_807EB50: ; 807EB50 adds r0, 0x1 movs r2, 0 strb r0, [r1] - b @0807EE8A + b _0807EE8A .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 .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 @@ -215511,9 +215511,9 @@ sub_807EB50: ; 807EB50 adds r0, r1 movs r1, 0x4 strb r1, [r0] - b @0807F03A + b _0807F03A .pool -@0807EE5C: +_0807EE5C: ldr r0, =0x020322a0 ldr r0, [r0] str r1, [r0, 0x64] @@ -215523,9 +215523,9 @@ sub_807EB50: ; 807EB50 adds r0, r2 movs r1, 0x33 strb r1, [r0] - b @0807F03A + b _0807F03A .pool -@0807EE78: +_0807EE78: bl sub_81533E0 ldr r0, =0x030022c0 movs r1, 0x87 @@ -215533,28 +215533,28 @@ sub_807EB50: ; 807EB50 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 .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 @@ -215564,27 +215564,27 @@ sub_807EB50: ; 807EB50 lsls r0, 16 lsrs r0, 16 str r0, [r4, 0x64] - b @0807EEDA + b _0807EEDA .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 .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 @@ -215593,18 +215593,18 @@ sub_807EB50: ; 807EB50 adds r0, r1 movs r1, 0x2A strb r1, [r0] - b @0807F03A + b _0807F03A .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 @@ -215612,16 +215612,16 @@ sub_807EB50: ; 807EB50 adds r0, r2 movs r1, 0x5 strb r1, [r0] - b @0807F03A + b _0807F03A .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 @@ -215630,12 +215630,12 @@ sub_807EB50: ; 807EB50 strb r0, [r1] movs r0, 0x2 bl sub_8077288 - b @0807F03A + b _0807F03A .pool -@0807EF64: +_0807EF64: bl sub_8077294 cmp r0, 0 - beq @0807F03A + beq _0807F03A movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -215643,89 +215643,89 @@ sub_807EB50: ; 807EB50 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 .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 cmp r1, r0 - bne @0807EFD8 + bne _0807EFD8 movs r0, 0x3 bl sub_8077288 - b @0807EFDC + b _0807EFDC .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 .pool -@0807EFF0: +_0807EFF0: ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @0807F028 + beq _0807F028 ldr r1, [r2, 0x8] ldr r0, =sub_80773AC 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 bl SetMainCallback2 - b @0807F03A + b _0807F03A .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 bl SetMainCallback2 -@0807F03A: +_0807F03A: bl sub_800B33C lsls r0, 24 cmp r0, 0 - bne @0807F048 + bne _0807F048 bl run_active_tasks -@0807F048: +_0807F048: bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably @@ -215746,7 +215746,7 @@ c2_080543C4: ; 807F068 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @0807F0BE + bne _0807F0BE bl FreeAllWindowBuffers movs r0, 0x3 bl GetBgTilemap @@ -215765,13 +215765,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 SetMainCallback2 -@0807F0BE: +_0807F0BE: bl run_active_tasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad @@ -215813,7 +215813,7 @@ sub_807F110: ; 807F110 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0807F134 + bne _0807F134 ldr r0, =sub_807B270 bl SetMainCallback2 ldr r1, =0x03005dac @@ -215821,7 +215821,7 @@ sub_807F110: ; 807F110 str r0, [r1] adds r0, r4, 0 bl remove_task -@0807F134: +_0807F134: pop {r4} pop {r0} bx r0 @@ -215833,7 +215833,7 @@ 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 @@ -215854,12 +215854,12 @@ sub_807F14C: ; 807F14C 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 FlagSet -@0807F18A: +_0807F18A: pop {r4,r5} pop {r0} bx r0 @@ -215947,37 +215947,37 @@ 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, =gUnknown_08337AA0 adds r0, r1 - b @0807F25E + b _0807F25E .pool -@0807F254: +_0807F254: movs r0, 0x80 lsls r0, 1 cmp r1, r0 - bne @0807F26C -@0807F25C: + bne _0807F26C +_0807F25C: ldr r0, =gUnknown_08337EA0 -@0807F25E: +_0807F25E: movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply - b @0807F27A + b _0807F27A .pool -@0807F26C: +_0807F26C: lsls r0, r2, 1 ldr r1, =gUnknown_08337CA0 adds r0, r1 movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply -@0807F27A: +_0807F27A: ldr r0, =gUnknown_08339090 movs r2, 0 ldrsh r1, [r4, r2] @@ -215985,14 +215985,14 @@ c3_08054588: ; 807F210 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, =gUnknown_08339090 @@ -216003,7 +216003,7 @@ c3_08054588: ; 807F210 adds r0, r1 ldrb r0, [r0] cmp r2, r0 - bne @0807F2D8 + bne _0807F2D8 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -216015,16 +216015,16 @@ c3_08054588: ; 807F210 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne @0807F2DE + bne _0807F2DE adds r0, r5, 0 bl remove_task - b @0807F2DE + b _0807F2DE .pool -@0807F2D8: +_0807F2D8: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] -@0807F2DE: +_0807F2DE: pop {r4,r5} pop {r0} bx r0 @@ -216044,7 +216044,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 @@ -216070,7 +216070,7 @@ c3_0805465C: ; 807F2E4 movs r0, 0x48 movs r1, 0x13 bl SetGpuReg -@0807F336: +_0807F336: ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r0, 0 @@ -216109,10 +216109,10 @@ c3_0805465C: ; 807F2E4 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 @@ -216133,7 +216133,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 @@ -216149,7 +216149,7 @@ sub_807F39C: ; 807F39C movs r0, 0x48 movs r1, 0x13 bl SetGpuReg -@0807F3D8: +_0807F3D8: ldr r4, =0x020322a0 ldr r0, [r4] adds r1, r0, 0 @@ -216175,7 +216175,7 @@ sub_807F39C: ; 807F39C adds r0, 0xFB ldrb r0, [r0] cmp r0, 0x78 - beq @0807F44C + beq _0807F44C ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] @@ -216193,21 +216193,21 @@ sub_807F39C: ; 807F39C 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 .pool -@0807F44C: +_0807F44C: movs r1, 0x80 lsls r1, 6 movs r0, 0 bl ResetGpuRegBits adds r0, r6, 0 bl remove_task -@0807F45C: +_0807F45C: pop {r4-r6} pop {r0} bx r0 @@ -216224,31 +216224,31 @@ 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 .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 @@ -216262,9 +216262,9 @@ sub_807F464: ; 807F464 adds r1, r4, 0 movs r2, 0 bl sub_807F1A8 - b @0807F70C + b _0807F70C .pool -@0807F4E8: +_0807F4E8: movs r0, 0 bl sub_8077288 ldr r0, =0x030022c0 @@ -216273,14 +216273,14 @@ sub_807F464: ; 807F464 adds r0, r1 movs r2, 0 movs r1, 0x2 - b @0807F5BC + b _0807F5BC .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 @@ -216302,40 +216302,40 @@ sub_807F464: ; 807F464 ldr r0, =0x020322a0 ldr r0, [r0] str r5, [r0, 0x64] - b @0807F70C + b _0807F70C .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 .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 .pool -@0807F590: +_0807F590: ldr r0, =0x020322a0 ldr r0, [r0] str r1, [r0, 0x64] @@ -216345,9 +216345,9 @@ sub_807F464: ; 807F464 adds r0, r2 movs r1, 0x3 strb r1, [r0] - b @0807F70C + b _0807F70C .pool -@0807F5AC: +_0807F5AC: bl sub_81533E0 ldr r0, =0x030022c0 movs r1, 0x87 @@ -216355,27 +216355,27 @@ sub_807F464: ; 807F464 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 .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 @@ -216385,27 +216385,27 @@ sub_807F464: ; 807F464 lsls r0, 16 lsrs r0, 16 str r0, [r4, 0x64] - b @0807F60E + b _0807F60E .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 .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 @@ -216414,16 +216414,16 @@ sub_807F464: ; 807F464 adds r0, r1 movs r1, 0x8 strb r1, [r0] - b @0807F70C + b _0807F70C .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 @@ -216431,16 +216431,16 @@ sub_807F464: ; 807F464 adds r0, r2 movs r1, 0x9 strb r1, [r0] - b @0807F70C + b _0807F70C .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 @@ -216449,12 +216449,12 @@ sub_807F464: ; 807F464 strb r0, [r1] movs r0, 0x2 bl sub_8077288 - b @0807F70C + b _0807F70C .pool -@0807F694: +_0807F694: bl sub_8077294 cmp r0, 0 - beq @0807F70C + beq _0807F70C movs r0, 0x3 bl play_sound_effect movs r0, 0x1 @@ -216470,20 +216470,20 @@ sub_807F464: ; 807F464 adds r0, r1 movs r1, 0xB strb r1, [r0] - b @0807F70C + b _0807F70C .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 @@ -216492,24 +216492,24 @@ sub_807F464: ; 807F464 adds r0, r2 movs r1, 0xC strb r1, [r0] - b @0807F70C + b _0807F70C .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 bl SetMainCallback2 -@0807F70C: +_0807F70C: bl sub_800B33C lsls r0, 24 cmp r0, 0 - bne @0807F71A + bne _0807F71A bl run_active_tasks -@0807F71A: +_0807F71A: bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably @@ -216603,28 +216603,28 @@ sub_807F7D8: ; 807F7D8 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 .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, =gUnknown_08D91598 adds r0, r5, 0 bl sub_8034974 @@ -216639,9 +216639,9 @@ sub_807F7D8: ; 807F7D8 adds r0, r5, 0 bl LZDecompressWram ldr r1, [r4] - b @0807F966 + b _0807F966 .pool -@0807F854: +_0807F854: ldr r1, =gUnknown_083390F4 movs r2, 0x80 lsls r2, 3 @@ -216655,9 +216655,9 @@ sub_807F7D8: ; 807F7D8 lsls r2, 1 movs r1, 0 bl gpu_pal_apply - b @0807F962 + b _0807F962 .pool -@0807F880: +_0807F880: ldr r0, [r5] ldr r1, =0x000011bc adds r0, r1 @@ -216672,9 +216672,9 @@ sub_807F7D8: ; 807F7D8 movs r3, 0 bl LoadBgTiles ldr r1, [r5] - b @0807F966 + b _0807F966 .pool -@0807F8AC: +_0807F8AC: ldr r0, =gUnknown_08D91DB8 ldr r1, [r5] ldr r2, =0x000011bc @@ -216682,9 +216682,9 @@ sub_807F7D8: ; 807F7D8 ldr r1, [r1] bl LZDecompressWram ldr r1, [r5] - b @0807F966 + b _0807F966 .pool -@0807F8C8: +_0807F8C8: ldr r0, [r5] ldr r1, =0x000011bc adds r0, r1 @@ -216699,9 +216699,9 @@ sub_807F7D8: ; 807F7D8 movs r3, 0 bl LoadBgTiles ldr r1, [r5] - b @0807F966 + b _0807F966 .pool -@0807F8F4: +_0807F8F4: ldr r0, =gUnknown_08D927EC ldr r1, [r5] ldr r2, =0x000011bc @@ -216709,9 +216709,9 @@ sub_807F7D8: ; 807F7D8 ldr r1, [r1] bl LZDecompressWram ldr r1, [r5] - b @0807F966 + b _0807F966 .pool -@0807F910: +_0807F910: ldr r0, [r5] ldr r1, =0x000011bc adds r0, r1 @@ -216728,32 +216728,32 @@ sub_807F7D8: ; 807F7D8 movs r0, 0x1 bl CopyBgTilemapBufferToVram ldr r1, [r5] - b @0807F966 + b _0807F966 .pool -@0807F940: +_0807F940: ldr r0, =gUnknown_083394F4 movs r1, 0x80 movs r2, 0x20 bl gpu_pal_apply - b @0807F962 + b _0807F962 .pool -@0807F950: +_0807F950: ldr r0, =gUnknown_08339AC0 bl LoadObjectPic ldr r0, =gUnknown_08339BD8 bl LoadObjectPic ldr r0, =gUnknown_08339B38 bl LoadObjectPic -@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 .pool -@0807F980: +_0807F980: ldr r0, =gUnknown_08339C24 bl LoadObjectPic ldr r0, =gUnknown_08339C58 @@ -216772,11 +216772,11 @@ sub_807F7D8: ; 807F7D8 movs r0, 0 strb r0, [r1, 0x1] movs r0, 0x1 - b @0807F9CA + b _0807F9CA .pool -@0807F9C8: +_0807F9C8: movs r0, 0 -@0807F9CA: +_0807F9CA: pop {r4,r5} pop {r1} bx r1 @@ -216834,17 +216834,17 @@ sub_807FA34: ; 807FA34 bl InitWindows lsls r0, 16 cmp r0, 0 - beq @0807FA74 + beq _0807FA74 bl DeactivateAllTextPrinters movs r4, 0 -@0807FA4A: +_0807FA4A: lsls r0, r4, 24 lsrs r0, 24 movs r1, 0 bl FillWindowPixelBuffer adds r4, 0x1 cmp r4, 0x4 - ble @0807FA4A + ble _0807FA4A movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -216856,7 +216856,7 @@ sub_807FA34: ; 807FA34 bl FillBgTilemapBufferRect_Palette0 movs r0, 0xE0 bl sub_81978B0 -@0807FA74: +_0807FA74: add sp, 0x8 pop {r4} pop {r0} @@ -216870,12 +216870,12 @@ sub_807FA80: ; 807FA80 ldr r4, =0x020322a4 ldr r0, [r4] cmp r0, 0 - bne @0807FA94 + bne _0807FA94 movs r0, 0x8F lsls r0, 5 bl AllocZeroed str r0, [r4] -@0807FA94: +_0807FA94: ldr r0, [r4] adds r0, 0x63 movs r1, 0 @@ -216905,25 +216905,25 @@ 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 .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 SetGpuReg @@ -216987,19 +216987,19 @@ sub_807FAC8: ; 807FAC8 strh r2, [r0] strb r1, [r3, 0x1] bl sub_8082D28 - b @0807FCE2 + b _0807FCE2 .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, =gUnknown_083399C8 ldr r6, =0x020322a4 -@0807FBBE: +_0807FBBE: ldrb r1, [r5] ldrb r2, [r5, 0x1] ldr r0, =gUnknown_08339AD8 @@ -217026,25 +217026,25 @@ sub_807FAC8: ; 807FAC8 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 bl SetVBlankCallback - b @0807FCA0 + b _0807FCA0 .pool -@0807FC38: +_0807FC38: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -217053,18 +217053,18 @@ sub_807FAC8: ; 807FAC8 movs r3, 0 bl pal_fade_maybe 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 .pool -@0807FC64: +_0807FC64: ldr r4, [r6] ldr r0, =0x000011b8 adds r4, r0 @@ -217077,11 +217077,11 @@ sub_807FAC8: ; 807FAC8 adds r1, r5, 0 bl sub_808417C cmp r0, 0 - beq @0807FCE2 + beq _0807FCE2 ldr r1, [r6] - b @0807FCA4 + b _0807FCA4 .pool -@0807FC90: +_0807FC90: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -217089,16 +217089,16 @@ sub_807FAC8: ; 807FAC8 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@0807FCA0: +_0807FCA0: ldr r0, =0x020322a4 ldr r1, [r0] -@0807FCA4: +_0807FCA4: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0807FCE2 + b _0807FCE2 .pool -@0807FCB0: +_0807FCB0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -217106,7 +217106,7 @@ sub_807FAC8: ; 807FAC8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @0807FCE2 + bne _0807FCE2 bl FreeAllWindowBuffers movs r0, 0x2 bl UnsetBgTilemap @@ -217119,7 +217119,7 @@ sub_807FAC8: ; 807FAC8 ldr r0, =0x020322a4 ldr r0, [r0] strb r4, [r0] -@0807FCE2: +_0807FCE2: bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl RunTextPrinters @@ -217153,7 +217153,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] @@ -217164,14 +217164,14 @@ sub_807FD08: ; 807FD08 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @0807FD50 + ble _0807FD50 adds r0, r4, 0 bl RemoveObjectAndFreeTiles - 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] @@ -217310,24 +217310,24 @@ sub_807FE54: ; 807FE54 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 .pool -@0807FE7C: +_0807FE7C: ldr r0, =0x03005d98 strb r5, [r0] ldr r0, =0x020322a4 @@ -217345,28 +217345,28 @@ sub_807FE54: ; 807FE54 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @0807FEC8 + bne _0807FEC8 adds r0, r4, 0 adds r0, 0x1C ldr r1, =gUnknown_083397D0 ldr r1, [r1, 0xC] bl CopyString - b @0807FED4 + b _0807FED4 .pool -@0807FEC8: +_0807FEC8: adds r0, r4, 0 adds r0, 0x1C ldr r1, =gUnknown_083397D0 ldr r1, [r1] bl CopyString -@0807FED4: +_0807FED4: ldr r1, =0x020229e8 movs r0, 0x2 strh r0, [r1, 0x1A] strh r0, [r1, 0x36] - b @0807FF88 + b _0807FF88 .pool -@0807FEE8: +_0807FEE8: ldr r0, =0x03005d98 strb r5, [r0] ldr r0, =0x020322a4 @@ -217394,9 +217394,9 @@ sub_807FE54: ; 807FE54 strh r5, [r0, 0x36] adds r0, 0x52 strh r5, [r0] - b @0807FF88 + b _0807FF88 .pool -@0807FF3C: +_0807FF3C: ldr r0, =0x03005d98 strb r5, [r0] ldr r0, =0x020322a4 @@ -217431,7 +217431,7 @@ sub_807FE54: ; 807FE54 strh r1, [r0] adds r0, 0x1C strh r1, [r0] -@0807FF88: +_0807FF88: pop {r4-r6} pop {r0} bx r0 @@ -217447,12 +217447,12 @@ sub_807FFA4: ; 807FFA4 ldr r4, =0x020322a4 ldr r0, [r4] cmp r0, 0 - bne @0807FFC0 + bne _0807FFC0 movs r0, 0x8F lsls r0, 5 bl AllocZeroed str r0, [r4] -@0807FFC0: +_0807FFC0: ldr r0, [r4] movs r1, 0 strb r1, [r0] @@ -217464,7 +217464,7 @@ sub_807FFA4: ; 807FFA4 movs r2, 0 ldr r5, =0x020375e0 movs r3, 0 -@0807FFD6: +_0807FFD6: ldr r0, [r4] lsls r1, r2, 1 adds r0, 0x74 @@ -217472,20 +217472,20 @@ sub_807FFA4: ; 807FFA4 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 bl SetMainCallback2 - b @0808000E + b _0808000E .pool -@08080008: +_08080008: ldr r0, =sub_80808D4 bl SetMainCallback2 -@0808000E: +_0808000E: pop {r4,r5} pop {r0} bx r0 @@ -217501,40 +217501,40 @@ 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 .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 @@ -217549,7 +217549,7 @@ sub_8080018: ; 8080018 movs r6, 0 movs r7, 0x92 lsls r7, 1 -@080800B2: +_080800B2: ldr r0, [r2] lsls r1, r5, 1 adds r0, 0x64 @@ -217559,7 +217559,7 @@ sub_8080018: ; 8080018 adds r1, r5 lsls r1, 1 movs r3, 0x2 -@080800C4: +_080800C4: ldr r0, [r2] adds r0, r7 adds r0, r1 @@ -217567,10 +217567,10 @@ sub_8080018: ; 8080018 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 @@ -217582,28 +217582,28 @@ sub_8080018: ; 8080018 strh r0, [r1] strb r2, [r4, 0x1] ldr r1, [r3] - b @080804FC + b _080804FC .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 .pool -@08080120: +_08080120: movs r5, 0 ldr r4, =gUnknown_083399C8 ldr r6, =0x020322a4 -@08080126: +_08080126: ldrb r1, [r4] ldrb r2, [r4, 0x1] ldr r0, =gUnknown_08339AD8 @@ -217630,26 +217630,26 @@ sub_8080018: ; 8080018 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 .pool -@0808019C: +_0808019C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -217657,20 +217657,20 @@ sub_8080018: ; 8080018 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - 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 .pool -@080801C8: +_080801C8: ldr r4, =0x020322a4 ldr r0, [r4] ldr r3, =0x000011b8 @@ -217687,9 +217687,9 @@ sub_8080018: ; 8080018 lsls r1, 1 adds r0, r1 str r2, [r0] - b @08080546 + b _08080546 .pool -@080801F8: +_080801F8: ldr r4, =0x020322a4 ldr r1, [r4] ldrb r0, [r1] @@ -217719,26 +217719,26 @@ sub_8080018: ; 8080018 lsls r3, 1 adds r0, r3 str r6, [r0] - b @08080546 + b _08080546 .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 @@ -217748,9 +217748,9 @@ sub_8080018: ; 8080018 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 @@ -217760,16 +217760,16 @@ sub_8080018: ; 8080018 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 .pool -@080802AC: +_080802AC: ldr r0, [r7] lsls r4, r5, 4 adds r0, r4, r0 @@ -217789,16 +217789,16 @@ sub_8080018: ; 8080018 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 .pool -@080802EC: +_080802EC: ldrb r1, [r4] lsls r1, 1 adds r0, r2, 0 @@ -217808,8 +217808,8 @@ sub_8080018: ; 8080018 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] @@ -217828,15 +217828,15 @@ sub_8080018: ; 8080018 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 @@ -217851,9 +217851,9 @@ sub_8080018: ; 8080018 movs r2, 0x8A lsls r2, 1 adds r1, r2 - b @080804FC + b _080804FC .pool -@0808035C: +_0808035C: ldr r3, [r2] movs r0, 0x84 lsls r0, 1 @@ -217862,9 +217862,9 @@ sub_8080018: ; 8080018 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 @@ -217873,7 +217873,7 @@ sub_8080018: ; 8080018 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bcc @080803B8 + bcc _080803B8 ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] @@ -217894,13 +217894,13 @@ sub_8080018: ; 8080018 adds r1, r0 adds r2, 0x4A strh r1, [r2] - b @080803BE + b _080803BE .pool -@080803B8: +_080803B8: ldrb r0, [r3] subs r0, 0x1 strb r0, [r3] -@080803BE: +_080803BE: ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0x84 @@ -217908,15 +217908,15 @@ sub_8080018: ; 8080018 adds r0, r1 movs r1, 0 str r1, [r0] - b @08080546 + b _08080546 .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] @@ -217931,9 +217931,9 @@ sub_8080018: ; 8080018 bl audio_play movs r0, 0x2 bl ShowBg - b @08080546 + b _08080546 .pool -@08080408: +_08080408: movs r1, 0x80 lsls r1, 3 movs r0, 0 @@ -217957,7 +217957,7 @@ sub_8080018: ; 8080018 lsls r0, 16 lsrs r0, 16 cmp r0, 0xFF - bls @0808048C + bls _0808048C movs r0, 0xC movs r1, 0x2 bl SetGpuRegBits @@ -217995,15 +217995,15 @@ sub_8080018: ; 8080018 bl audio_play bl sub_808074C bl sub_80807BC -@0808048C: +_0808048C: ldr r0, [r4] - b @080804BE + b _080804BE .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 @@ -218014,44 +218014,44 @@ sub_8080018: ; 8080018 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 .pool -@080804D0: +_080804D0: ldr r0, =gUnknown_08339C2C movs r2, 0x10 negs r2, r2 movs r1, 0x78 movs r3, 0x3 bl AddObjectToFront - b @080804F8 + b _080804F8 .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 .pool -@08080508: +_08080508: ldr r5, =0x020322a4 ldr r3, [r5] adds r1, r3, 0 @@ -218070,17 +218070,17 @@ sub_8080018: ; 8080018 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 @@ -218185,26 +218185,26 @@ 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 .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 @@ -218221,45 +218221,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, =gUnknown_08339CA0 mov r9, r0 adds r0, r5, 0 @@ -218267,7 +218267,7 @@ sub_8080674: ; 8080674 lsls r0, 16 lsrs r0, 16 mov r8, r0 -@080806DC: +_080806DC: lsls r0, r6, 1 adds r0, r6 adds r0, r4, r0 @@ -218278,11 +218278,11 @@ sub_8080674: ; 8080674 bl FlagGet 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 @@ -218293,11 +218293,11 @@ sub_8080674: ; 8080674 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 @@ -218309,8 +218309,8 @@ sub_8080674: ; 8080674 lsls r4, 16 lsrs r4, 16 cmp r4, r7 - blt @080806DC -@08080734: + blt _080806DC +_08080734: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -218327,7 +218327,7 @@ sub_808074C: ; 808074C ldr r7, =0x020322a4 movs r6, 0xFF ldr r5, =gUnknown_083399D0 -@08080756: +_08080756: ldr r3, [r7] lsls r2, r4, 1 adds r0, r3, 0 @@ -218348,14 +218348,14 @@ sub_808074C: ; 808074C 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 @@ -218363,18 +218363,18 @@ sub_808074C: ; 808074C 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 @@ -218394,16 +218394,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 @@ -218411,7 +218411,7 @@ sub_80807BC: ; 80807BC adds r3, r0, r5 ldrh r0, [r3] cmp r0, 0xFF - beq @080808B6 + beq _080808B6 adds r1, r2, 0 adds r1, 0x50 ldrh r3, [r3] @@ -218465,7 +218465,7 @@ sub_80807BC: ; 80807BC mov r5, r8 ldrh r0, [r0] cmp r10, r0 - bne @08080890 + bne _08080890 lsls r2, 24 lsrs r2, 24 mov r0, r9 @@ -218476,9 +218476,9 @@ sub_80807BC: ; 80807BC add r1, sp, 0x8 movs r3, 0x1 bl sub_80840D4 - b @080808A6 + b _080808A6 .pool -@08080890: +_08080890: lsls r2, 24 lsrs r2, 24 mov r1, r9 @@ -218489,20 +218489,20 @@ sub_80807BC: ; 80807BC add r1, sp, 0x8 movs r3, 0x1 bl sub_80840D4 -@080808A6: +_080808A6: lsrs r4, r5, 24 adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram -@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 @@ -218522,40 +218522,40 @@ 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 .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 @@ -218582,7 +218582,7 @@ sub_80808D4: ; 80808D4 mov r12, r0 movs r7, 0x92 lsls r7, 1 -@0808098E: +_0808098E: ldr r0, [r5] lsls r1, r4, 1 adds r0, 0x64 @@ -218592,7 +218592,7 @@ sub_80808D4: ; 80808D4 adds r1, r4 lsls r1, 1 movs r2, 0x2 -@080809A0: +_080809A0: ldr r0, [r5] adds r0, r7 adds r0, r1 @@ -218600,10 +218600,10 @@ sub_80808D4: ; 80808D4 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 @@ -218617,28 +218617,28 @@ sub_80808D4: ; 80808D4 mov r2, r12 strh r0, [r2] ldr r1, [r4] - b @08080CB2 + b _08080CB2 .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 .pool -@08080A04: +_08080A04: movs r4, 0 ldr r5, =gUnknown_083399C8 ldr r6, =0x020322a4 -@08080A0A: +_08080A0A: ldrb r1, [r5] ldrb r2, [r5, 0x1] ldr r0, =gUnknown_08339AD8 @@ -218665,10 +218665,10 @@ sub_80808D4: ; 80808D4 adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble @08080A0A - b @08080CAE + ble _08080A0A + b _08080CAE .pool -@08080A58: +_08080A58: movs r0, 0x1 negs r0, r0 movs r4, 0 @@ -218687,9 +218687,9 @@ sub_80808D4: ; 80808D4 lsls r3, 1 adds r0, r3 str r4, [r0] - b @08080DAE + b _08080DAE .pool -@08080A84: +_08080A84: ldr r4, =0x020322a4 ldr r1, [r4] movs r5, 0x84 @@ -218699,23 +218699,23 @@ sub_80808D4: ; 80808D4 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 .pool -@08080ABC: +_08080ABC: ldr r2, =0x020322a4 ldr r1, [r2] movs r3, 0 @@ -218726,9 +218726,9 @@ sub_80808D4: ; 80808D4 lsls r1, 1 adds r0, r1 strb r3, [r0] - b @08080DAE + b _08080DAE .pool -@08080AD8: +_08080AD8: lsls r1, 1 adds r0, r3, 0 adds r0, 0x74 @@ -218737,8 +218737,8 @@ sub_80808D4: ; 80808D4 lsls r1, r4, 24 lsrs r1, 24 bl sub_807FD90 - b @08080B16 -@08080AEC: + b _08080B16 +_08080AEC: movs r4, 0 ldr r2, =gUnknown_083399D0 ldr r0, =0x020322a4 @@ -218753,15 +218753,15 @@ sub_80808D4: ; 80808D4 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 @@ -218776,9 +218776,9 @@ sub_80808D4: ; 80808D4 movs r0, 0x8A lsls r0, 1 adds r1, r0 - b @08080CB2 + b _08080CB2 .pool -@08080B3C: +_08080B3C: ldr r3, [r2] movs r2, 0x84 lsls r2, 1 @@ -218787,9 +218787,9 @@ sub_80808D4: ; 80808D4 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 @@ -218798,7 +218798,7 @@ sub_80808D4: ; 80808D4 ldrb r0, [r0] ldrb r1, [r4] cmp r0, r1 - bcc @08080B94 + bcc _08080B94 ldr r2, =gUnknown_083399DC ldr r1, =gUnknown_083399E4 ldrb r0, [r4] @@ -218816,12 +218816,12 @@ sub_80808D4: ; 80808D4 strh r1, [r0] ldrb r0, [r3] adds r0, 0x1 - b @08080B98 + b _08080B98 .pool -@08080B94: +_08080B94: ldrb r0, [r3] subs r0, 0x1 -@08080B98: +_08080B98: strb r0, [r3] ldr r0, =0x020322a4 ldr r0, [r0] @@ -218830,9 +218830,9 @@ sub_80808D4: ; 80808D4 adds r0, r3 movs r1, 0 str r1, [r0] - b @08080DAE + b _08080DAE .pool -@08080BB0: +_08080BB0: ldr r4, =0x020322a4 ldr r1, [r4] ldrb r0, [r1] @@ -218848,9 +218848,9 @@ sub_80808D4: ; 80808D4 bl sub_8082CB4 movs r0, 0x2 bl ShowBg - b @08080DAE + b _08080DAE .pool -@08080BDC: +_08080BDC: movs r1, 0x80 lsls r1, 3 movs r0, 0 @@ -218874,7 +218874,7 @@ sub_80808D4: ; 80808D4 lsls r0, 16 lsrs r0, 16 cmp r0, 0xFF - bls @08080C5C + bls _08080C5C ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] @@ -218911,50 +218911,50 @@ sub_80808D4: ; 80808D4 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 .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 .pool -@08080CA0: +_08080CA0: ldr r0, =gUnknown_08339C2C movs r2, 0x10 negs r2, r2 movs r1, 0x78 movs r3, 0x3 bl AddObjectToFront -@08080CAE: +_08080CAE: ldr r0, =0x020322a4 ldr r1, [r0] -@08080CB2: +_08080CB2: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08080DAE + b _08080DAE .pool -@08080CC4: +_08080CC4: bl sub_8080DF8 ldr r5, =0x020322a4 ldr r4, [r5] @@ -218979,13 +218979,13 @@ sub_80808D4: ; 80808D4 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0x1 - bne @08080D44 + bne _08080D44 movs r0, 0xD0 lsls r0, 2 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @08080D30 + bne _08080D30 ldr r0, =sub_8081224 movs r1, 0xA bl AddTask @@ -218993,9 +218993,9 @@ sub_80808D4: ; 80808D4 movs r3, 0x90 lsls r3, 1 adds r1, r3 - b @08080D42 + b _08080D42 .pool -@08080D30: +_08080D30: ldr r0, =gUnknown_083399EC ldr r0, [r0] movs r1, 0xA @@ -219004,21 +219004,21 @@ sub_80808D4: ; 80808D4 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, =gUnknown_083399EC -@08080D5A: +_08080D5A: ldm r6!, {r0} lsrs r1, r5, 24 bl AddTask @@ -219036,14 +219036,14 @@ sub_80808D4: ; 80808D4 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] @@ -219051,13 +219051,13 @@ sub_80808D4: ; 80808D4 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 @@ -219090,7 +219090,7 @@ sub_8080DF8: ; 8080DF8 movs r0, 0 ldr r1, =0x03003090 movs r2, 0x3 -@08080E02: +_08080E02: strh r0, [r3] strh r0, [r3, 0x4] strh r0, [r1] @@ -219098,7 +219098,7 @@ sub_8080DF8: ; 8080DF8 adds r1, 0x10 subs r2, 0x1 cmp r2, 0 - bge @08080E02 + bge _08080E02 pop {r0} bx r0 .pool @@ -219122,7 +219122,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] @@ -219133,7 +219133,7 @@ sub_8080E20: ; 8080E20 strh r0, [r1] adds r0, r3, 0 bl remove_task -@08080E58: +_08080E58: pop {r4} pop {r0} bx r0 @@ -219181,9 +219181,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 @@ -219193,15 +219193,15 @@ sub_8080EA4: ; 8080EA4 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 @@ -219216,85 +219216,85 @@ sub_8080EA4: ; 8080EA4 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 .pool -@08080F2C: +_08080F2C: ldr r1, =0x03003090 ldr r0, =0x00005432 -@08080F30: +_08080F30: strh r0, [r1, 0x14] ldr r0, =0x00005432 - b @08080F9E + b _08080F9E .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 .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 .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 .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 @@ -219326,10 +219326,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 @@ -219339,12 +219339,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 @@ -219359,68 +219359,68 @@ 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 .pool -@08081078: +_08081078: ldr r1, =0x03003090 ldr r0, =0x00005432 strh r0, [r1, 0x24] - b @080810B0 + b _080810B0 .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 .pool -@080810CC: +_080810CC: ldr r0, =0x03003090 ldr r1, =0x00004523 strh r1, [r0, 0x24] movs r0, 0x1 strh r0, [r2, 0x8] - b @080810EE + b _080810EE .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 @@ -219452,10 +219452,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 @@ -219465,12 +219465,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 @@ -219484,70 +219484,70 @@ 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 .pool -@0808119C: +_0808119C: ldr r1, =0x03003090 ldr r0, =0x00005432 strh r0, [r1, 0x34] - b @080811DE + b _080811DE .pool -@080811AC: +_080811AC: cmp r2, 0x3C - bls @080811C0 + bls _080811C0 ldr r1, =0x03003090 ldr r0, =0x00004523 - b @080811D0 + b _080811D0 .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 .pool -@080811F8: +_080811F8: ldr r0, =0x03003090 ldr r1, =0x00004523 strh r1, [r0, 0x34] movs r0, 0x1 strh r0, [r2, 0x8] - b @0808121A + b _0808121A .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 @@ -219568,7 +219568,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 @@ -219577,15 +219577,15 @@ 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 .pool -@08081270: +_08081270: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -219593,7 +219593,7 @@ sub_8081224: ; 8081224 adds r1, r0 movs r0, 0 strh r0, [r1, 0x8] -@0808127E: +_0808127E: pop {r4} pop {r0} bx r0 @@ -219641,7 +219641,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 @@ -219655,12 +219655,12 @@ sub_8081288: ; 8081288 str r0, [r4] movs r0, 0x28 bl audio_play - b @08081358 + b _08081358 .pool -@08081314: +_08081314: ldr r0, =0x00005432 cmp r7, r0 - bne @0808133C + bne _0808133C lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -219670,12 +219670,12 @@ sub_8081288: ; 8081288 bl StartObjectImageAnim movs r0, 0x1F bl audio_play - b @08081358 + b _08081358 .pool -@0808133C: +_0808133C: ldr r0, =0x00002345 cmp r8, r0 - bne @08081358 + bne _08081358 lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -219685,7 +219685,7 @@ sub_8081288: ; 8081288 bl StartObjectImageAnim movs r0, 0x20 bl audio_play -@08081358: +_08081358: bl sub_8082E84 pop {r3} mov r8, r3 @@ -219704,21 +219704,21 @@ 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 .pool -@08081398: +_08081398: ldr r0, =0x00005432 cmp r5, r0 - beq @0808143C - b @080814A0 + beq _0808143C + b _080814A0 .pool -@080813A4: +_080813A4: ldr r7, =0x020322a4 ldr r4, [r7] adds r5, r4, 0 @@ -219728,7 +219728,7 @@ sub_8081370: ; 8081370 ldrsh r1, [r5, r0] ldr r0, =0x000005db cmp r1, r0 - bgt @080813E0 + bgt _080813E0 ldr r1, =gUnknown_08339CC3 adds r0, r4, 0 adds r0, 0x7C @@ -219740,9 +219740,9 @@ sub_8081370: ; 8081370 bl __divsi3 adds r0, r6, r0 strh r0, [r5] - b @080814A0 + b _080814A0 .pool -@080813E0: +_080813E0: ldr r1, =gUnknown_08339CC3 adds r0, r4, 0 adds r0, 0x7C @@ -219781,9 +219781,9 @@ sub_8081370: ; 8081370 lsrs r1, 16 adds r0, r4, 0 bl sub_80832BC - b @080814A0 + b _080814A0 .pool -@0808143C: +_0808143C: ldr r0, =0x020322a4 ldr r2, [r0] adds r4, r2, 0 @@ -219793,7 +219793,7 @@ sub_8081370: ; 8081370 ldrsh r1, [r4, r0] ldr r0, =0x000005db cmp r1, r0 - bgt @080814A0 + bgt _080814A0 ldr r1, =gUnknown_08339CC3 adds r0, r2, 0 adds r0, 0x7C @@ -219804,9 +219804,9 @@ sub_8081370: ; 8081370 lsls r0, 1 bl __divsi3 adds r0, r5, r0 - b @0808149E + b _0808149E .pool -@08081474: +_08081474: ldr r0, =0x020322a4 ldr r0, [r0] adds r4, r0, 0 @@ -219825,11 +219825,11 @@ sub_8081370: ; 8081370 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 @@ -219848,27 +219848,27 @@ 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 .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 @@ -219884,18 +219884,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 @@ -219903,27 +219903,27 @@ sub_80814F4: ; 80814F4 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 @@ -219935,7 +219935,7 @@ sub_80814F4: ; 80814F4 mov r8, r0 ldr r0, =0x00005432 mov r10, r0 -@08081562: +_08081562: mov r1, r8 ldrh r0, [r1] ldr r1, =0x00004444 @@ -219943,9 +219943,9 @@ sub_80814F4: ; 80814F4 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 @@ -219956,7 +219956,7 @@ sub_80814F4: ; 80814F4 ldrh r4, [r0, 0x4] ldr r1, =0x00004523 cmp r4, r1 - bne @080815F4 + bne _080815F4 adds r0, r1, 0 bl sub_8081370 ldr r0, [r6] @@ -219974,11 +219974,11 @@ sub_80814F4: ; 80814F4 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 @@ -219990,11 +219990,11 @@ sub_80814F4: ; 80814F4 add r1, r9 ldrh r0, [r1] adds r0, 0x1 - b @0808165E + b _0808165E .pool -@080815F4: +_080815F4: cmp r4, r10 - bne @08081632 + bne _08081632 mov r0, r10 bl sub_8081370 ldr r0, [r6] @@ -220020,11 +220020,11 @@ sub_80814F4: ; 80814F4 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 @@ -220040,25 +220040,25 @@ sub_80814F4: ; 80814F4 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 @@ -220067,7 +220067,7 @@ sub_80814F4: ; 80814F4 ldrsh r1, [r2, r0] ldr r0, =0x000005dc cmp r1, r0 - ble @080816C8 + ble _080816C8 adds r0, r1, 0 ldr r2, =0xfffffd12 adds r0, r2 @@ -220081,14 +220081,14 @@ sub_80814F4: ; 80814F4 lsrs r1, 16 ldr r0, =0x03007420 bl MPlayTempoControl - b @080816D2 + b _080816D2 .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] @@ -220105,23 +220105,23 @@ sub_80814F4: ; 80814F4 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 @@ -220130,8 +220130,8 @@ sub_80814F4: ; 80814F4 adds r0, 0x7C ldrb r0, [r0] cmp r7, r0 - blt @08081710 -@08081722: + blt _08081710 +_08081722: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -220151,11 +220151,11 @@ sub_8081744: ; 8081744 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 @@ -220166,38 +220166,38 @@ sub_8081744: ; 8081744 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 .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 @@ -220225,25 +220225,25 @@ sub_8081744: ; 8081744 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne @08081810 + bne _08081810 ldr r1, =0x03003110 ldr r0, =0x00004523 - b @08081828 + b _08081828 .pool -@08081810: +_08081810: cmp r0, 0x1 - bne @08081824 + bne _08081824 ldr r1, =0x03003110 ldr r0, =0x00005432 - b @08081828 + b _08081828 .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] @@ -220252,7 +220252,7 @@ sub_8081744: ; 8081744 lsls r0, 24 lsrs r0, 24 cmp r0, 0x5 - bls @0808185A + bls _0808185A ldr r0, [r3] adds r1, r0, 0 adds r1, 0x4C @@ -220260,26 +220260,26 @@ sub_8081744: ; 8081744 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 @@ -220287,7 +220287,7 @@ sub_8081744: ; 8081744 movs r1, 0x1 eors r0, r1 strb r0, [r2] -@0808187E: +_0808187E: pop {r4-r6} pop {r0} bx r0 @@ -220306,10 +220306,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 @@ -220339,21 +220339,21 @@ sub_8081898: ; 8081898 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 bl SetMainCallback2 -@0808191A: +_0808191A: ldr r0, =0x020322a4 ldr r1, [r0] movs r2, 0x8E @@ -220395,33 +220395,33 @@ 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 CompareString 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 .pool -@080819B0: +_080819B0: movs r0, 0 -@080819B2: +_080819B2: pop {r4,r5} pop {r1} bx r1 @@ -220443,56 +220443,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 @@ -220503,122 +220503,122 @@ sub_80819B8: ; 80819B8 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 @@ -220633,81 +220633,81 @@ sub_80819B8: ; 80819B8 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 .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 @@ -220775,23 +220775,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] @@ -220800,12 +220800,12 @@ sub_8081BE0: ; 8081BE0 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] @@ -220827,54 +220827,54 @@ sub_8081BE0: ; 8081BE0 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 .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 @@ -220885,7 +220885,7 @@ sub_8081BE0: ; 8081BE0 ldr r4, =0x020322d0 str r3, [r4] movs r6, 0x4 -@08081CD6: +_08081CD6: movs r0, 0 ldrsh r5, [r7, r0] adds r0, r5, 0 @@ -220903,25 +220903,25 @@ sub_8081BE0: ; 8081BE0 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 @@ -220939,14 +220939,14 @@ sub_8081BE0: ; 8081BE0 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 @@ -220961,38 +220961,38 @@ sub_8081BE0: ; 8081BE0 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 .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] @@ -221008,7 +221008,7 @@ sub_8081BE0: ; 8081BE0 strb r0, [r4, 0x6] movs r6, 0 adds r2, r7, 0 -@08081DDE: +_08081DDE: ldr r5, [sp, 0x4] adds r1, r5, r6 ldrh r0, [r2] @@ -221016,7 +221016,7 @@ sub_8081BE0: ; 8081BE0 adds r2, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble @08081DDE + ble _08081DDE add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -221059,151 +221059,151 @@ sub_8081E20: ; 8081E20 movs r2, 0 ldr r5, =0x00000383 cmp r1, r5 - bhi @08081E48 + bhi _08081E48 movs r2, 0x5 - b @08081E9A + b _08081E9A .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 .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 .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 .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 .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 .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 .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 .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 .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 .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 .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 .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 .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 @@ -221220,18 +221220,18 @@ sub_8081F94: ; 8081F94 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 .pool -@08081FB8: +_08081FB8: ldr r2, =0x00002fff -@08081FBA: +_08081FBA: adds r0, r2, 0 strh r0, [r1] pop {r0} @@ -221249,48 +221249,48 @@ 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 .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 .pool -@0808204C: +_0808204C: ldr r0, =0x020322a4 ldr r0, [r0] movs r1, 0x90 @@ -221302,14 +221302,14 @@ sub_8081FC8: ; 8081FC8 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 .pool -@08082078: +_08082078: ldr r4, =0x020322a4 ldr r1, [r4] adds r1, 0x4C @@ -221318,7 +221318,7 @@ sub_8081FC8: ; 8081FC8 strh r0, [r1] lsls r0, 16 cmp r0, 0 - bgt @080820C6 + bgt _080820C6 bl sub_8009F8C ldr r2, [r4] adds r1, r2, 0 @@ -221328,17 +221328,17 @@ sub_8081FC8: ; 8081FC8 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 .pool -@080820B0: +_080820B0: adds r1, r2, 0 adds r1, 0x63 movs r0, 0x5 -@080820B6: +_080820B6: strb r0, [r1] ldr r0, =0x020322a4 ldr r1, [r0] @@ -221346,31 +221346,31 @@ sub_8081FC8: ; 8081FC8 strb r0, [r1] ldr r0, =0x03007630 bl MPlayStop_rev01 -@080820C6: +_080820C6: bl sub_807F738 - b @0808249E + b _0808249E .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 @@ -221393,13 +221393,13 @@ sub_8081FC8: ; 8081FC8 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 @@ -221414,11 +221414,11 @@ sub_8081FC8: ; 8081FC8 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 @@ -221429,14 +221429,14 @@ sub_8081FC8: ; 8081FC8 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 .pool -@0808218C: +_0808218C: ldr r4, =0x020322a4 ldr r3, [r4] movs r0, 0xCC @@ -221459,19 +221459,19 @@ sub_8081FC8: ; 8081FC8 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 .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] @@ -221482,11 +221482,11 @@ sub_8081FC8: ; 8081FC8 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] @@ -221504,13 +221504,13 @@ sub_8081FC8: ; 8081FC8 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 @@ -221523,14 +221523,14 @@ sub_8081FC8: ; 8081FC8 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 .pool -@08082254: +_08082254: ldr r2, =0x020223c4 ldr r0, =0x020322a4 ldr r3, [r0] @@ -221543,36 +221543,36 @@ sub_8081FC8: ; 8081FC8 adds r1, r3, r4 ldr r0, [r2] str r0, [r1] - b @0808249E + b _0808249E .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 berry_blender_related 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 .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 @@ -221586,13 +221586,13 @@ sub_8081FC8: ; 8081FC8 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 .pool -@080822E4: +_080822E4: ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x9E @@ -221604,26 +221604,26 @@ sub_8081FC8: ; 8081FC8 movs r3, 0 bl sub_81996C0 ldr r1, [r4] - b @0808245C + b _0808245C .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 @@ -221635,7 +221635,7 @@ sub_8081FC8: ; 8081FC8 adds r0, 0x1 strb r0, [r1] movs r4, 0 -@0808233E: +_0808233E: ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r4, 1 @@ -221643,21 +221643,21 @@ sub_8081FC8: ; 8081FC8 adds r0, r1 ldrh r0, [r0] cmp r0, 0xFF - beq @0808235C + beq _0808235C adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram -@0808235C: +_0808235C: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @0808233E - b @0808249E + bls _0808233E + b _0808249E .pool -@0808236C: +_0808236C: ldr r1, =0x020322a4 ldr r0, [r1] adds r0, 0x9E @@ -221668,7 +221668,7 @@ sub_8081FC8: ; 8081FC8 adds r0, 0x1 strb r0, [r1] movs r4, 0 -@08082380: +_08082380: ldr r0, =0x020322a4 ldr r0, [r0] lsls r1, r4, 1 @@ -221676,21 +221676,21 @@ sub_8081FC8: ; 8081FC8 adds r0, r1 ldrh r0, [r0] cmp r0, 0xFF - beq @0808239E + beq _0808239E adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram -@0808239E: +_0808239E: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @08082380 - b @0808249E + bls _08082380 + b _0808249E .pool -@080823B0: +_080823B0: ldr r6, =0x03003110 adds r0, r6, 0 bl sub_8081F94 @@ -221700,44 +221700,44 @@ sub_8081FC8: ; 8081FC8 adds r0, 0x9E ldrb r5, [r0] cmp r5, 0 - bne @0808241C + bne _0808241C movs r0, 0x4 bl IsBagPocketNonEmpty 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 .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 .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 .pool -@0808241C: +_0808241C: adds r1, r2, 0 adds r1, 0x70 movs r0, 0x1 @@ -221745,13 +221745,13 @@ sub_8081FC8: ; 8081FC8 ldr r0, =0x00008888 strh r0, [r6, 0x2] subs r1, 0xD - b @0808245E + b _0808245E .pool -@08082430: +_08082430: ldr r0, =0x03005d98 ldrb r0, [r0] cmp r0, 0 - beq @08082458 + beq _08082458 ldr r0, =sub_8082924 bl SetMainCallback2 ldr r2, =0x020322a4 @@ -221760,20 +221760,20 @@ sub_8081FC8: ; 8081FC8 movs r1, 0 strb r1, [r0] ldr r0, [r2] - b @0808249C + b _0808249C .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 .pool -@0808246C: +_0808246C: ldr r6, =0x020322a4 ldr r4, [r6] ldr r0, =0x000011b8 @@ -221787,7 +221787,7 @@ sub_8081FC8: ; 8081FC8 adds r1, r5, 0 bl sub_808417C cmp r0, 0 - beq @0808249E + beq _0808249E ldr r0, =sub_8082644 bl SetMainCallback2 ldr r0, [r6] @@ -221795,9 +221795,9 @@ sub_8081FC8: ; 8081FC8 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] @@ -221841,25 +221841,25 @@ 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 .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] @@ -221867,13 +221867,13 @@ sub_80824FC: ; 80824FC lsls r3, 1 adds r1, r2, r3 movs r0, 0x1 - b @0808260C + b _0808260C .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 @@ -221885,15 +221885,15 @@ sub_80824FC: ; 80824FC ldr r1, =0x03002700 movs r0, 0x1 strb r0, [r1] - b @0808263C + b _0808263C .pool -@08082584: +_08082584: bl sub_8153430 ldr r0, =0x020322a4 ldr r2, [r0] - b @08082602 + b _08082602 .pool -@08082594: +_08082594: ldr r1, [r4] movs r2, 0x84 lsls r2, 1 @@ -221902,7 +221902,7 @@ sub_80824FC: ; 80824FC adds r0, 0x1 str r0, [r1] cmp r0, 0xA - bne @0808263C + bne _0808263C bl sub_800ADF8 ldr r1, [r4] movs r3, 0xD0 @@ -221911,17 +221911,17 @@ sub_80824FC: ; 80824FC 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 @@ -221929,9 +221929,9 @@ sub_80824FC: ; 80824FC adds r0, r1 movs r1, 0x5 str r1, [r0] - b @0808263C + b _0808263C .pool -@080825E4: +_080825E4: ldr r0, =0x020322a4 ldr r1, [r0] movs r3, 0x84 @@ -221943,25 +221943,25 @@ sub_80824FC: ; 80824FC adds r1, r0 movs r0, 0x3 str r0, [r1] - b @0808263C + b _0808263C .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 @@ -221970,16 +221970,16 @@ sub_80824FC: ; 80824FC 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 .pool -@0808263C: +_0808263C: movs r0, 0 -@0808263E: +_0808263E: pop {r4} pop {r1} bx r1 @@ -221995,66 +221995,66 @@ 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 .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 .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 .pool -@080826EC: +_080826EC: ldr r0, [r6] adds r0, 0x63 movs r1, 0x3 @@ -222071,9 +222071,9 @@ sub_8082644: ; 8082644 adds r0, r4, 0 bl CopyString ldr r1, =gUnknown_083398DD - b @08082740 + b _08082740 .pool -@0808271C: +_0808271C: ldr r1, [r6] adds r1, 0x63 ldrb r0, [r1] @@ -222091,12 +222091,12 @@ sub_8082644: ; 8082644 adds r0, r4, 0 bl CopyString ldr r1, =gUnknown_083398B0 -@08082740: +_08082740: adds r0, r4, 0 bl AppendString - b @080828DC + b _080828DC .pool -@08082754: +_08082754: ldr r4, [r6] ldr r0, =0x000011b8 adds r4, r0 @@ -222109,18 +222109,18 @@ sub_8082644: ; 8082644 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 .pool -@0808278C: +_0808278C: ldr r4, [r6] movs r2, 0x84 lsls r2, 1 @@ -222129,16 +222129,16 @@ sub_8082644: ; 8082644 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 @@ -222146,15 +222146,15 @@ sub_8082644: ; 8082644 movs r2, 0 bl sub_808417C bl sub_800ADF8 - b @080828BA + b _080828BA .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 @@ -222171,32 +222171,32 @@ sub_8082644: ; 8082644 lsls r1, 1 adds r0, r1 str r2, [r0] - b @080828DC + b _080828DC .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 .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 @@ -222206,9 +222206,9 @@ sub_8082644: ; 8082644 bl pal_fade_maybe ldr r0, =0x020322a4 ldr r1, [r0] - b @080828BC + b _080828BC .pool -@0808284C: +_0808284C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -222216,14 +222216,14 @@ sub_8082644: ; 8082644 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 FreeAllWindowBuffers movs r0, 0x2 bl UnsetBgTilemap @@ -222234,16 +222234,16 @@ sub_8082644: ; 8082644 str r4, [r6] ldr r0, =sub_807FA80 bl SetMainCallback2 - b @080828DC + b _080828DC .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 @@ -222252,27 +222252,27 @@ sub_8082644: ; 8082644 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 bl SetMainCallback2 -@080828DC: +_080828DC: bl sub_8082AD4 ldr r0, =0x020322a4 ldr r1, [r0] @@ -222308,59 +222308,59 @@ 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 .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 @@ -222373,9 +222373,9 @@ sub_8082924: ; 8082924 ldr r0, =0x02021fc4 ldr r1, =gUnknown_08339896 bl CopyString - b @08082A92 + b _08082A92 .pool -@080829D4: +_080829D4: ldr r1, [r6] adds r1, 0x63 ldrb r0, [r1] @@ -222389,9 +222389,9 @@ sub_8082924: ; 8082924 ldr r0, =0x02021fc4 ldr r1, =gUnknown_08339858 bl CopyString - b @08082A92 + b _08082A92 .pool -@08082A00: +_08082A00: ldr r4, [r6] ldr r2, =0x000011b8 adds r4, r2 @@ -222404,14 +222404,14 @@ sub_8082924: ; 8082924 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 .pool -@08082A30: +_08082A30: movs r0, 0x3 bl sub_80A2390 ldr r0, =0x020322a4 @@ -222420,28 +222420,28 @@ sub_8082924: ; 8082924 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08082A92 + b _08082A92 .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 bl SetMainCallback2 - b @08082A76 + b _08082A76 .pool -@08082A70: +_08082A70: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 -@08082A76: +_08082A76: bl FreeAllWindowBuffers movs r0, 0x2 bl UnsetBgTilemap @@ -222452,7 +222452,7 @@ sub_8082924: ; 8082924 bl Free movs r0, 0 str r0, [r4] -@08082A92: +_08082A92: bl sub_8082AD4 ldr r0, =0x020322a4 ldr r1, [r0] @@ -222484,9 +222484,9 @@ sub_8082AD4: ; 8082AD4 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 @@ -222494,29 +222494,29 @@ sub_8082AD4: ; 8082AD4 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 .pool -@08082B24: +_08082B24: ldr r0, =0x0000aaaa -@08082B26: +_08082B26: cmp r3, r0 - beq @08082B38 + beq _08082B38 ldr r2, =0x020322a4 - b @08082B48 + b _08082B48 .pool -@08082B38: +_08082B38: ldr r2, =0x020322a4 ldr r0, [r2] adds r1, r0, 0 @@ -222525,47 +222525,47 @@ sub_8082AD4: ; 8082AD4 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 .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 .pool -@08082B9C: +_08082B9C: ldr r6, =0x03003090 lsls r4, r5, 4 adds r0, r4, r6 @@ -222575,55 +222575,55 @@ sub_8082AD4: ; 8082AD4 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 .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 .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 @@ -222631,27 +222631,27 @@ sub_8082AD4: ; 8082AD4 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 .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 @@ -222659,8 +222659,8 @@ sub_8082AD4: ; 8082AD4 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 @@ -222668,12 +222668,12 @@ sub_8082AD4: ; 8082AD4 lsls r0, 24 lsrs r0, 24 cmp r5, r0 - bne @08082C90 + bne _08082C90 ldr r0, =0x00002222 strh r0, [r4, 0x2] - b @08082CA4 + b _08082CA4 .pool -@08082C90: +_08082C90: ldr r0, =0x00001111 strh r0, [r4, 0x2] ldr r0, =0x020322a4 @@ -222684,7 +222684,7 @@ sub_8082AD4: ; 8082AD4 ldrh r0, [r0] strh r0, [r4, 0x4] strh r5, [r4, 0x6] -@08082CA4: +_08082CA4: pop {r4-r7} pop {r0} bx r0 @@ -222760,20 +222760,20 @@ sub_8082D28: ; 8082D28 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 @@ -222796,9 +222796,9 @@ sub_8082D28: ; 8082D28 lsls r1, 1 adds r0, r3, r1 bl sub_8082CB4 - b @08082DEA + b _08082DEA .pool -@08082D90: +_08082D90: ldr r3, =0x03003090 ldrh r0, [r3] movs r1, 0xFF @@ -222807,7 +222807,7 @@ sub_8082D28: ; 8082D28 movs r0, 0x88 lsls r0, 7 cmp r1, r0 - bne @08082DEA + bne _08082DEA ldr r0, =0x020322a4 ldr r2, [r0] ldrh r0, [r3, 0xA] @@ -222823,9 +222823,9 @@ sub_8082D28: ; 8082D28 lsls r1, 1 adds r0, r2, r1 bl sub_8082CB4 - b @08082DEA + b _08082DEA .pool -@08082DCC: +_08082DCC: ldr r0, =0x020322a4 ldr r1, [r0] adds r2, r1, 0 @@ -222840,7 +222840,7 @@ sub_8082D28: ; 8082D28 lsls r4, 1 adds r0, r1, r4 bl sub_8082CB4 -@08082DEA: +_08082DEA: pop {r4} pop {r0} bx r0 @@ -222896,17 +222896,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 @@ -222915,10 +222915,10 @@ sub_8082E3C: ; 8082E3C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @08082E80 + beq _08082E80 adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@08082E80: +_08082E80: pop {r0} bx r0 thumb_func_end sub_8082E3C @@ -222937,7 +222937,7 @@ sub_8082E84: ; 8082E84 ands r1, r0 adds r0, r1, 0x1 cmp r0, 0 - beq @08082F40 + beq _08082F40 ldr r0, =gUnknown_08329F40 mov r9, r0 ldr r2, =0x02020630 @@ -222946,7 +222946,7 @@ sub_8082E84: ; 8082E84 movs r3, 0x1F mov r8, r3 movs r7, 0x10 -@08082EB0: +_08082EB0: bl GenerateRandomNumber ldr r1, =0x020322a4 ldr r4, [r1] @@ -222969,18 +222969,18 @@ sub_8082E84: ; 8082E84 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 @@ -223015,8 +223015,8 @@ sub_8082E84: ; 8082E84 str r0, [r5] subs r6, 0x1 cmp r6, 0 - bne @08082EB0 -@08082F40: + bne _08082EB0 +_08082F40: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -223046,10 +223046,10 @@ sub_8082F68: ; 8082F68 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @08082F94 + beq _08082F94 adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@08082F94: +_08082F94: pop {r4} pop {r0} bx r0 @@ -223072,20 +223072,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 RemoveObjectAndFreeTiles -@08082FD4: +_08082FD4: pop {r0} bx r0 .pool @@ -223125,24 +223125,24 @@ sub_8083010: ; 8083010 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] @@ -223150,29 +223150,29 @@ sub_8083010: ; 8083010 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 @@ -223180,7 +223180,7 @@ sub_8083010: ; 8083010 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne @080830A0 + bne _080830A0 adds r0, r4, 0 bl RemoveObjectAndFreeTiles ldr r0, =gUnknown_08339C60 @@ -223189,9 +223189,9 @@ sub_8083010: ; 8083010 movs r1, 0x78 movs r3, 0x2 bl AddObjectToFront - b @080830B2 + b _080830B2 .pool -@080830A0: +_080830A0: movs r0, 0 strh r0, [r4, 0x2E] ldr r0, =0x0000fff0 @@ -223200,7 +223200,7 @@ sub_8083010: ; 8083010 lsrs r1, 24 adds r0, r4, 0 bl StartObjectImageAnim -@080830B2: +_080830B2: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] pop {r4} @@ -223216,24 +223216,24 @@ sub_80830C0: ; 80830C0 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] @@ -223241,27 +223241,27 @@ sub_80830C0: ; 80830C0 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] @@ -223269,7 +223269,7 @@ sub_80830C0: ; 80830C0 strb r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@08083130: +_08083130: ldrh r0, [r4, 0x30] strh r0, [r4, 0x26] pop {r4} @@ -223292,13 +223292,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 .pool @@ -223315,13 +223315,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 @@ -223330,26 +223330,26 @@ sub_8083170: ; 8083170 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 @@ -223360,9 +223360,9 @@ sub_8083170: ; 8083170 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 @@ -223372,15 +223372,15 @@ sub_8083170: ; 8083170 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 @@ -223395,10 +223395,10 @@ sub_8083210: ; 8083210 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 @@ -223419,11 +223419,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 @@ -223438,7 +223438,7 @@ sub_8083230: ; 8083230 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x4 - bls @08083250 + bls _08083250 ldr r2, =0x06006458 mov r0, sp ldr r3, =0x00008072 @@ -223482,7 +223482,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 @@ -223491,7 +223491,7 @@ sub_80832BC: ; 80832BC lsrs r1, r4, 17 subs r0, r1 strh r0, [r6] -@080832E0: +_080832E0: pop {r4-r6} pop {r0} bx r0 @@ -223505,18 +223505,18 @@ sub_80832E8: ; 80832E8 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 @@ -223549,14 +223549,14 @@ sub_8083334: ; 8083334 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 @@ -223564,22 +223564,22 @@ sub_8083334: ; 8083334 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 @@ -223595,7 +223595,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 @@ -223603,7 +223603,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] @@ -223626,11 +223626,11 @@ sub_8083380: ; 8083380 adds r0, r2, r4 ldr r0, [r0] cmp r0, 0x14 - beq @080833DC + beq _080833DC movs r0, 0 - b @080833F0 + b _080833F0 .pool -@080833DC: +_080833DC: movs r1, 0x8E lsls r1, 1 adds r0, r2, r1 @@ -223641,7 +223641,7 @@ sub_8083380: ; 8083380 adds r0, r2, r3 strh r1, [r0] movs r0, 0x1 -@080833F0: +_080833F0: pop {r4,r5} pop {r1} bx r1 @@ -223686,9 +223686,9 @@ UpdateBerryBlenderRecord: ; 8083418 ldrh r1, [r1] ldrh r0, [r2] cmp r0, r1 - bcs @0808343E + bcs _0808343E strh r1, [r2] -@0808343E: +_0808343E: pop {r0} bx r0 .pool @@ -223707,25 +223707,25 @@ berry_blender_related: ; 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 .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 @@ -223736,8 +223736,8 @@ berry_blender_related: ; 8083450 adds r0, r1 movs r1, 0x11 str r1, [r0] - b @08083898 -@080834AE: + b _08083898 +_080834AE: ldr r1, [r4] movs r3, 0x84 lsls r3, 1 @@ -223746,13 +223746,13 @@ berry_blender_related: ; 8083450 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 @@ -223761,11 +223761,11 @@ berry_blender_related: ; 8083450 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 @@ -223781,16 +223781,16 @@ berry_blender_related: ; 8083450 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 .pool -@08083518: +_08083518: ldr r4, =gUnknown_083398F5 movs r0, 0x1 adds r1, r4, 0 @@ -223814,21 +223814,21 @@ berry_blender_related: ; 8083450 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 @@ -223910,8 +223910,8 @@ berry_blender_related: ; 8083450 adds r0, 0x7C ldrb r0, [r0] cmp r6, r0 - bcc @08083564 -@0808361A: + bcc _08083564 +_0808361A: ldr r1, =gUnknown_0833992E movs r3, 0xFF mov r10, r3 @@ -224052,46 +224052,46 @@ berry_blender_related: ; 8083450 movs r0, 0x5 movs r1, 0x2 bl CopyWindowToVram - b @08083898 + b _08083898 .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 .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 @@ -224099,12 +224099,12 @@ berry_blender_related: ; 8083450 adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram -@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] @@ -224145,13 +224145,13 @@ berry_blender_related: ; 8083450 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 .pool -@0808386C: +_0808386C: ldr r4, [r4] ldr r0, =0x000011b8 adds r5, r4, r0 @@ -224164,14 +224164,14 @@ berry_blender_related: ; 8083450 adds r1, r4, 0 bl sub_808417C cmp r0, 0 - beq @08083898 + beq _08083898 bl UpdateBerryBlenderRecord movs r0, 0x1 - b @0808389A + b _0808389A .pool -@08083898: +_08083898: movs r0, 0 -@0808389A: +_0808389A: add sp, 0x4C pop {r3-r5} mov r8, r3 @@ -224260,16 +224260,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 @@ -224281,18 +224281,18 @@ sub_808395C: ; 808395C 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 @@ -224316,9 +224316,9 @@ sub_80839B4: ; 80839B4 adds r1, r2, 0 add r3, sp, 0x4 mov r10, r3 - b @080839E4 + b _080839E4 .pool -@080839D4: +_080839D4: mov r4, sp adds r0, r4, r5 strb r5, [r0] @@ -224327,17 +224327,17 @@ sub_80839B4: ; 80839B4 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 @@ -224350,7 +224350,7 @@ sub_80839B4: ; 80839B4 movs r1, 0x94 lsls r1, 1 adds r6, r0, r1 -@08083A10: +_08083A10: lsls r4, r5, 2 add r4, r9 lsls r3, r5, 1 @@ -224389,8 +224389,8 @@ sub_80839B4: ; 80839B4 mov r1, r12 ldrb r1, [r1] cmp r5, r1 - bcc @08083A10 -@08083A5E: + bcc _08083A10 +_08083A5E: ldr r4, =0x020322a4 ldr r0, [r4] adds r0, 0x7C @@ -224403,11 +224403,11 @@ sub_80839B4: ; 80839B4 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 @@ -224422,41 +224422,41 @@ sub_80839B4: ; 80839B4 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 .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 @@ -224464,8 +224464,8 @@ sub_80839B4: ; 80839B4 adds r0, 0x7C ldrb r0, [r0] cmp r5, r0 - bcc @08083AD2 -@08083AF2: + bcc _08083AD2 +_08083AF2: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -224490,25 +224490,25 @@ 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 .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 @@ -224519,8 +224519,8 @@ sub_8083B08: ; 8083B08 adds r0, r1 movs r1, 0xFF str r1, [r0] - b @08083E12 -@08083B66: + b _08083E12 +_08083B66: ldr r1, [r2] movs r3, 0x84 lsls r3, 1 @@ -224529,13 +224529,13 @@ sub_8083B08: ; 8083B08 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 @@ -224544,13 +224544,13 @@ sub_8083B08: ; 8083B08 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 @@ -224653,14 +224653,14 @@ sub_8083B08: ; 8083B08 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 @@ -224779,9 +224779,9 @@ sub_8083B08: ; 8083B08 adds r0, 0x7C ldrb r0, [r0] cmp r2, r0 - bcs @08083D8A - b @08083C84 -@08083D8A: + bcs _08083D8A + b _08083C84 +_08083D8A: movs r0, 0x5 bl PutWindowTilemap movs r0, 0x5 @@ -224794,9 +224794,9 @@ sub_8083B08: ; 8083B08 adds r2, r1, r3 movs r0, 0 str r0, [r2] - b @08083DF8 + b _08083DF8 .pool -@08083DC8: +_08083DC8: ldr r2, [r2] movs r0, 0x84 lsls r0, 1 @@ -224805,37 +224805,37 @@ sub_8083B08: ; 8083B08 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 .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 @@ -224893,7 +224893,7 @@ ShowBerryBlenderRecordWindow: ; 8083E24 movs r6, 0 movs r7, 0xA4 lsls r7, 22 -@08083E8A: +_08083E8A: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r6, 1 @@ -224946,7 +224946,7 @@ ShowBerryBlenderRecordWindow: ; 8083E24 adds r7, r0 adds r6, 0x1 cmp r6, 0x2 - ble @08083E8A + ble _08083E8A ldrb r0, [r4] bl PutWindowTilemap ldrb r0, [r4] @@ -224973,17 +224973,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 @@ -224993,7 +224993,7 @@ sub_8083F3C: ; 8083F3C bl song_play_for_text adds r0, r5, 0 bl remove_task -@08083F82: +_08083F82: pop {r4,r5} pop {r0} bx r0 @@ -225032,7 +225032,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 @@ -225041,9 +225041,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] @@ -225086,10 +225086,10 @@ sub_8083F94: ; 8083F94 bl sub_80ECC04 lsls r0, 24 cmp r0, 0 - bne @080840BA - b @080840C4 + bne _080840BA + b _080840C4 .pool -@08084058: +_08084058: mov r0, r8 ldr r2, [r0] movs r1, 0xD2 @@ -225101,9 +225101,9 @@ sub_8083F94: ; 8083F94 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 @@ -225135,14 +225135,14 @@ sub_8083F94: ; 8083F94 bl sub_80ECC04 lsls r0, 24 cmp r0, 0 - beq @080840C4 -@080840BA: + beq _080840C4 +_080840BA: movs r0, 0x1 - b @080840C6 + b _080840C6 .pool -@080840C4: +_080840C4: movs r0, 0 -@080840C6: +_080840C6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -225170,46 +225170,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 @@ -225218,7 +225218,7 @@ sub_80840D4: ; 80840D4 lsrs r1, 24 adds r0, r6, 0 bl FillWindowPixelBuffer -@08084148: +_08084148: movs r0, 0 str r0, [sp] movs r0, 0x1 @@ -225255,11 +225255,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 @@ -225280,20 +225280,20 @@ sub_808417C: ; 808417C ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b @080841DA -@080841C6: + b _080841DA +_080841C6: movs r0, 0x4 bl IsTextPrinterActive 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} @@ -225330,9 +225330,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 .pool @@ -225353,7 +225353,7 @@ gametime_increment: ; 808423C ldr r0, =0x03000e08 ldrb r0, [r0] cmp r0, 0x1 - bne @08084294 + bne _08084294 ldr r2, =0x03005d90 ldr r0, [r2] ldrb r1, [r0, 0x12] @@ -225363,7 +225363,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] @@ -225372,7 +225372,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] @@ -225381,7 +225381,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] @@ -225390,9 +225390,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 .pool @@ -225452,14 +225452,14 @@ sub_80842F4: ; 80842F4 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 @@ -225562,7 +225562,7 @@ sub_80843C0: ; 80843C0 mov r12, r0 ldr r4, =0x00002e90 ldr r3, =gUnknown_08339D1C -@080843D0: +_080843D0: mov r1, r12 ldr r0, [r1] lsls r1, r2, 5 @@ -225577,7 +225577,7 @@ sub_80843C0: ; 80843C0 stm r0!, {r5,r6} adds r2, 0x1 cmp r2, 0xC - ble @080843D0 + ble _080843D0 pop {r4-r7} pop {r0} bx r0 @@ -225664,12 +225664,12 @@ NewGameInitData: ; 80844A0 ldr r0, =0x03006210 ldrh r0, [r0] cmp r0, 0 - beq @080844AE + beq _080844AE cmp r0, 0x2 - bne @080844B2 -@080844AE: + bne _080844B2 +_080844AE: bl GameFreakRTC_Reset -@080844B2: +_080844B2: ldr r1, =0x020322d4 movs r0, 0x1 strb r0, [r1] @@ -225894,14 +225894,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 VarSet ldr r0, =0x00004037 movs r1, 0 bl VarSet -@08084764: +_08084764: pop {r4} pop {r0} bx r0 @@ -225926,14 +225926,14 @@ sub_8084788: ; 8084788 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 @@ -225946,22 +225946,22 @@ sav12_xor_increment: ; 80847C4 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 .pool -@080847E4: +_080847E4: ldr r1, =0x00ffffff -@080847E6: +_080847E6: adds r0, r4, 0 bl sav12_xor_set -@080847EC: +_080847EC: pop {r4} pop {r0} bx r0 @@ -225974,7 +225974,7 @@ sub_80847F8: ; 80847F8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x33 - bhi @08084828 + bhi _08084828 ldr r0, =0x03005d8c ldr r2, [r0] lsls r0, r1, 2 @@ -225987,11 +225987,11 @@ sub_80847F8: ; 80847F8 ldr r0, [r2] ldr r1, [r1] eors r0, r1 - b @0808482A + b _0808482A .pool -@08084828: +_08084828: movs r0, 0 -@0808482A: +_0808482A: pop {r1} bx r1 thumb_func_end sub_80847F8 @@ -226003,7 +226003,7 @@ sav12_xor_set: ; 8084830 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x33 - bhi @08084854 + bhi _08084854 ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r2, 2 @@ -226016,7 +226016,7 @@ sav12_xor_set: ; 8084830 ldr r0, [r0] eors r0, r3 str r0, [r1] -@08084854: +_08084854: pop {r0} bx r0 .pool @@ -226028,7 +226028,7 @@ sub_8084864: ; 8084864 adds r5, r0, 0 movs r4, 0 ldr r6, =0x03005d8c -@0808486C: +_0808486C: lsls r1, r4, 2 ldr r0, =0x0000159c adds r1, r0 @@ -226040,7 +226040,7 @@ sub_8084864: ; 8084864 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3F - bls @0808486C + bls _0808486C pop {r4-r6} pop {r0} bx r0 @@ -226095,14 +226095,14 @@ CopyFieldObjectTemplateCoordsToSav1: ; 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 .pool @@ -226123,20 +226123,20 @@ update_saveblock1_field_object_coords: ; 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 .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 @@ -226155,19 +226155,19 @@ update_saveblock1_field_object_movement_behavior: ; 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 .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 @@ -226198,17 +226198,17 @@ get_mapdata_header: ; 80849A8 ldr r0, [r0] ldrh r1, [r0, 0x32] cmp r1, 0 - bne @080849BC + bne _080849BC movs r0, 0 - b @080849C6 + b _080849C6 .pool -@080849BC: +_080849BC: ldr r0, =gUnknown_08481DD4 subs r1, 0x1 lsls r1, 2 adds r1, r0 ldr r0, [r1] -@080849C6: +_080849C6: pop {r1} bx r1 .pool @@ -226288,28 +226288,28 @@ 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 @@ -226429,12 +226429,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 @@ -226445,24 +226445,24 @@ update_camera_pos_from_warpid: ; 8084B5C adds r1, r0 ldrh r0, [r1, 0x2] strh r0, [r2, 0x2] - b @08084BCC + b _08084BCC .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] @@ -226477,7 +226477,7 @@ update_camera_pos_from_warpid: ; 8084B5C adds r0, r1 asrs r0, 1 strh r0, [r3, 0x2] -@08084BCC: +_08084BCC: pop {r4,r5} pop {r0} bx r0 @@ -226628,7 +226628,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 @@ -226642,7 +226642,7 @@ sub_8084CCC: ; 8084CCC asrs r4, 24 str r4, [sp] bl warp1_set -@08084CFA: +_08084CFA: add sp, 0x4 pop {r4} pop {r0} @@ -226672,7 +226672,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 @@ -226689,7 +226689,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} @@ -226722,13 +226722,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 @@ -226746,7 +226746,7 @@ sub_8084D5C: ; 8084D5C asrs r4, 24 str r4, [sp] bl sub_8084DD4 -@08084DC4: +_08084DC4: add sp, 0x4 pop {r4-r7} pop {r0} @@ -226889,16 +226889,16 @@ 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 .pool -@08084EF0: +_08084EF0: movs r0, 0 ldrsb r0, [r4, r0] movs r1, 0x1 @@ -226911,7 +226911,7 @@ sub_8084EBC: ; 8084EBC asrs r4, 24 str r4, [sp] bl warp1_set -@08084F0A: +_08084F0A: add sp, 0x4 pop {r4-r6} pop {r0} @@ -226974,7 +226974,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 @@ -226991,7 +226991,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} @@ -227021,27 +227021,27 @@ sub_8084FC0: ; 8084FC0 ldr r3, [r0] ldr r1, [r0, 0x4] cmp r1, 0 - bne @08084FDC - b @08084FF0 + bne _08084FDC + b _08084FF0 .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 @@ -227060,7 +227060,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] @@ -227074,21 +227074,21 @@ 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 .pool -@08085048: +_08085048: bl warp1_set_to_warp2 -@0808504C: +_0808504C: movs r0, 0x1 -@0808504E: +_0808504E: add sp, 0x4 pop {r4,r5} pop {r1} @@ -227153,9 +227153,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 CopyFieldObjectTemplatesToSav1 @@ -227178,13 +227178,13 @@ mliX_load_map: ; 8085098 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 @@ -227194,14 +227194,14 @@ mliX_load_map: ; 8085098 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 AddMapNamePopUpWindowTask -@08085150: +_08085150: add sp, 0x4 pop {r4-r6} pop {r0} @@ -227219,24 +227219,24 @@ 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 .pool -@08085190: +_08085190: bl InTrainerHill cmp r0, 0 - beq @0808519E + beq _0808519E bl sub_81D5DF8 - b @080851A2 -@0808519E: + b _080851A2 +_0808519E: bl CopyFieldObjectTemplatesToSav1 -@080851A2: +_080851A2: ldr r4, =0x02037318 ldrb r0, [r4, 0x17] bl is_light_level_1_2_3_5_or_6 @@ -227264,16 +227264,16 @@ mli0_load_map: ; 8085160 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 FlagReset -@08085200: +_08085200: bl update_sav1_flash_used_on_map bl sav1_reset_battle_music_maybe bl mapheader_run_script_with_tag_x3 @@ -227282,31 +227282,31 @@ mli0_load_map: ; 8085160 ldrh r1, [r4, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne @08085234 + bne _08085234 movs r0, 0 bl battle_pyramid_map_load_related - b @08085246 + b _08085246 .pool -@08085234: +_08085234: bl InTrainerHill cmp r0, 0 - beq @08085242 + beq _08085242 bl trainer_hill_map_load_related - b @08085246 -@08085242: + b _08085246 +_08085242: bl not_trainer_hill_battle_pyramid -@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 @@ -227333,37 +227333,37 @@ walkrun_find_lowest_active_bit_in_bitfield: ; 8085278 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @08085298 + beq _08085298 movs r0, 0x2 - b @080852CA + b _080852CA .pool -@08085298: +_08085298: movs r0, 0x4 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @080852A8 + beq _080852A8 movs r0, 0x4 - b @080852CA -@080852A8: + b _080852CA +_080852A8: movs r0, 0x8 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @080852B8 + beq _080852B8 movs r0, 0x8 - b @080852CA -@080852B8: + b _080852CA +_080852B8: movs r0, 0x10 bl TestPlayerAvatarFlags 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} @@ -227418,45 +227418,45 @@ sub_808532C: ; 808532C lsls r2, 24 lsrs r4, r2, 24 cmp r4, 0x8 - beq @08085348 + beq _08085348 ldr r0, =0x0000088d bl FlagGet 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 .pool -@08085354: +_08085354: lsls r0, r5, 24 lsrs r0, 24 bl MetatileBehavior_IsSurfableWaterOrUnderwater 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 @@ -227476,10 +227476,10 @@ sub_808538C: ; 808538C bl FlagGet 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 @@ -227487,78 +227487,78 @@ sub_808538C: ; 808538C 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 MetatileBehavior_IsSouthArrowWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080853F0 -@080853E8: + bne _080853F0 +_080853E8: movs r0, 0x2 - b @08085448 + b _08085448 .pool -@080853F0: +_080853F0: adds r0, r5, 0 bl MetatileBehavior_IsNorthArrowWarp lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @08085442 + beq _08085442 adds r0, r5, 0 bl MetatileBehavior_IsWestArrowWarp 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 MetatileBehavior_IsEastArrowWarp 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 MetatileBehavior_IsLadder 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 @@ -227591,13 +227591,13 @@ sav1_map_is_biking_allowed: ; 8085474 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0808548C + beq _0808548C movs r0, 0x1 - b @0808548E + b _0808548E .pool -@0808548C: +_0808548C: movs r0, 0 -@0808548E: +_0808548E: pop {r1} bx r1 thumb_func_end sav1_map_is_biking_allowed @@ -227608,27 +227608,27 @@ update_sav1_flash_used_on_map: ; 8085494 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 .pool -@080854B0: +_080854B0: ldr r0, =0x00000888 bl FlagGet 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 .pool -@080854D0: +_080854D0: ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =gUnknown_0854FE78 @@ -227636,7 +227636,7 @@ update_sav1_flash_used_on_map: ; 8085494 subs r0, 0x1 adds r1, 0x30 strb r0, [r1] -@080854DE: +_080854DE: pop {r0} bx r0 .pool @@ -227647,14 +227647,14 @@ sub_80854EC: ; 80854EC push {lr} adds r1, r0, 0 cmp r1, 0 - blt @080854FC + blt _080854FC ldr r0, =gUnknown_0854FE78 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 @@ -227712,41 +227712,41 @@ sub_8085558: ; 8085558 bl FlagGet 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 VarGet 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 .pool -@080855AC: +_080855AC: movs r0, 0 -@080855AE: +_080855AE: pop {r4} pop {r1} bx r1 @@ -227761,22 +227761,22 @@ 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 .pool -@080855E0: +_080855E0: movs r0, 0x1 -@080855E2: +_080855E2: pop {r4} pop {r1} bx r1 @@ -227790,21 +227790,21 @@ sub_80855E8: ; 80855E8 bl VarGet 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 .pool -@08085610: +_08085610: movs r0, 0x1 -@08085612: +_08085612: pop {r4} pop {r1} bx r1 @@ -227819,30 +227819,30 @@ sub_8085618: ; 8085618 bl VarGet lsls r0, 16 cmp r0, 0 - beq @0808564C + beq _0808564C adds r0, r4, 0 bl VarGet 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 .pool -@08085654: +_08085654: movs r0, 0x1 -@08085656: +_08085656: pop {r4,r5} pop {r1} bx r1 @@ -227856,37 +227856,37 @@ warp_target_get_music: ; 808565C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne @08085674 + bne _08085674 ldr r0, =0x0000ffff - b @080856CE + b _080856CE .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 .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 .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 @@ -227897,11 +227897,11 @@ warp_target_get_music: ; 808565C 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 @@ -227916,16 +227916,16 @@ 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 .pool -@080856FC: +_080856FC: ldr r4, =0x03005d8c ldr r0, [r4] adds r0, 0x4 @@ -227934,23 +227934,23 @@ sav1_map_get_music: ; 80856D4 lsrs r1, r0, 16 ldr r0, =0x00007fff cmp r1, r0 - beq @0808571C + beq _0808571C adds r0, r1, 0 - b @08085730 + b _08085730 .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 @@ -227965,25 +227965,25 @@ 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 .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 .pool -@08085770: +_08085770: movs r0, 0xB4 lsls r0, 1 -@08085774: +_08085774: pop {r1} bx r1 thumb_func_end warp1_target_get_music @@ -228004,43 +228004,43 @@ sub_8085784: ; 8085784 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 .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 .pool -@080857C8: +_080857C8: movs r0, 0x8 bl TestPlayerAvatarFlags 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 @@ -228074,7 +228074,7 @@ sub_8085810: ; 8085810 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 @@ -228083,41 +228083,41 @@ 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 TestPlayerAvatarFlags 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 TestPlayerAvatarFlags 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 .pool -@08085888: +_08085888: adds r0, r4, 0 movs r1, 0x8 bl sub_80A2F88 -@08085890: +_08085890: pop {r4-r6} pop {r0} bx r0 @@ -228134,13 +228134,13 @@ 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 @@ -228155,14 +228155,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 @@ -228178,12 +228178,12 @@ 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 @@ -228202,21 +228202,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 VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne @08085972 + bne _08085972 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x0000ffff @@ -228224,22 +228224,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 @@ -228277,7 +228277,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] @@ -228289,8 +228289,8 @@ sub_80859BC: ; 80859BC bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, 24 cmp r0, 0 - beq @08085A2C -@080859F0: + beq _08085A2C +_080859F0: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -228316,7 +228316,7 @@ sub_80859BC: ; 80859BC adds r1, r4, 0 movs r3, 0x1 bl sub_80A32C0 -@08085A2C: +_08085A2C: add sp, 0x4 pop {r4} pop {r0} @@ -228335,32 +228335,32 @@ 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 .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 .pool -@08085A84: +_08085A84: movs r0, 0x1 - b @08085B1E -@08085A88: + b _08085B1E +_08085A88: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -228372,8 +228372,8 @@ wild_encounter_related: ; 8085A3C 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 @@ -228381,14 +228381,14 @@ wild_encounter_related: ; 8085A3C 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 @@ -228396,16 +228396,16 @@ wild_encounter_related: ; 8085A3C movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne @08085AB6 + bne _08085AB6 adds r0, r4, 0 bl GetMonAbility 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 @@ -228420,20 +228420,20 @@ wild_encounter_related: ; 8085A3C bl __divsi3 strh r0, [r7] movs r0, 0x3 - b @08085B1E + b _08085B1E .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 @@ -228451,21 +228451,21 @@ 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 .pool -@08085B5C: +_08085B5C: ldr r0, =0x02032306 bl wild_pokemon_rand_for_map -@08085B62: +_08085B62: ldr r1, =0x02032304 strh r0, [r1] pop {r0} @@ -228537,21 +228537,21 @@ is_light_level_1_2_3_5_or_6: ; 8085BD0 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 @@ -228562,19 +228562,19 @@ is_light_level_1_2_3_or_6: ; 8085BF4 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 @@ -228588,12 +228588,12 @@ 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 @@ -228726,27 +228726,27 @@ overworld_free_bg_tilemaps: ; 8085D34 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 @@ -228769,13 +228769,13 @@ is_c1_link_related_active: ; 8085D8C ldr r1, [r0] ldr r0, =c1_link_related cmp r1, r0 - beq @08085DA4 + beq _08085DA4 movs r0, 0 - b @08085DA6 + b _08085DA6 .pool -@08085DA4: +_08085DA4: movs r0, 0x1 -@08085DA6: +_08085DA6: pop {r1} bx r1 thumb_func_end is_c1_link_related_active @@ -228802,20 +228802,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 HideMapNamePopUpWindow - 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} @@ -228829,11 +228829,11 @@ c1_overworld: ; 8085E04 ldr r1, [r2, 0x4] ldr r0, =c2_overworld 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 .pool @@ -228872,15 +228872,15 @@ c2_overworld: ; 8085E5C 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 SetFieldVBlankCallback -@08085E7C: +_08085E7C: pop {r4} pop {r0} bx r0 @@ -228909,38 +228909,38 @@ map_post_load_hook_exec: ; 8085EA0 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 .pool -@08085EBC: +_08085EBC: movs r1, 0 str r1, [r4] ldr r0, =0x03005dac str r1, [r0] - b @08085EEA + b _08085EEA .pool -@08085ECC: +_08085ECC: ldr r0, =0x03005dac ldr r0, [r0] cmp r0, 0 - beq @08085EE0 + beq _08085EE0 bl _call_via_r0 - b @08085EE4 + b _08085EE4 .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 @@ -228990,7 +228990,7 @@ c2_whiteout: ; 8085F58 lsls r0, 24 lsrs r0, 24 cmp r0, 0x77 - bls @08085FB0 + bls _08085FB0 bl sub_808631C bl sub_80A2F30 bl ResetSafariZoneFlag_ @@ -229011,7 +229011,7 @@ c2_whiteout: ; 8085F58 bl set_callback1 ldr r0, =c2_overworld bl SetMainCallback2 -@08085FB0: +_08085FB0: add sp, 0x4 pop {r0} bx r0 @@ -229060,24 +229060,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 SetFieldVBlankCallback ldr r0, =c1_overworld bl set_callback1 ldr r0, =c2_overworld bl SetMainCallback2 -@08086062: +_08086062: pop {r4} pop {r0} bx r0 @@ -229104,14 +229104,14 @@ c2_80567AC: ; 8086098 ldr r0, =0x030026f8 bl map_loading_iteration_3 cmp r0, 0 - beq @080860B8 + beq _080860B8 bl SetFieldVBlankCallback ldr r0, =c1_link_related bl set_callback1 bl sub_8086C2C ldr r0, =c2_overworld bl SetMainCallback2 -@080860B8: +_080860B8: pop {r0} bx r0 .pool @@ -229122,16 +229122,16 @@ 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 bl SetMainCallback2 - b @080860EA + b _080860EA .pool -@080860E0: +_080860E0: bl sub_808631C ldr r0, =c2_exit_to_overworld_2_local bl SetMainCallback2 -@080860EA: +_080860EA: pop {r0} bx r0 .pool @@ -229143,11 +229143,11 @@ c2_exit_to_overworld_2_local: ; 80860F4 ldr r0, =0x030026f8 bl sub_8086638 cmp r0, 0 - beq @0808610A + beq _0808610A bl SetFieldVBlankCallback ldr r0, =c2_overworld bl SetMainCallback2 -@0808610A: +_0808610A: pop {r0} bx r0 .pool @@ -229158,14 +229158,14 @@ 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 bl SetMainCallback2 -@08086132: +_08086132: pop {r0} bx r0 .pool @@ -229182,15 +229182,15 @@ c2_8056854: ; 8086140 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @08086174 + beq _08086174 ldr r1, =0x03005dac ldr r0, =sub_80AF314 - b @08086178 + b _08086178 .pool -@08086174: +_08086174: ldr r1, =0x03005dac ldr r0, =sub_80AF214 -@08086178: +_08086178: str r0, [r1] bl script_env_1_init bl script_env_2_disable @@ -229260,14 +229260,14 @@ sub_8086204: ; 8086204 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 AddMapNamePopUpWindowTask -@08086222: +_08086222: bl sub_80AF3C8 pop {r0} bx r0 @@ -229283,9 +229283,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 GetCurrentTrainerHillMapId @@ -229295,20 +229295,20 @@ sub_8086230: ; 8086230 ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne @08086278 + bne _08086278 bl sub_81AA2F8 - b @0808628A + b _0808628A .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 CopyFieldObjectTemplateCoordsToSav1 -@0808628A: +_0808628A: bl sub_809757C bl sub_809E7B0 bl sub_8084788 @@ -229316,35 +229316,35 @@ sub_8086230: ; 8086230 ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne @080862B0 + bne _080862B0 movs r0, 0x1 bl battle_pyramid_map_load_related - b @080862BE + b _080862BE .pool -@080862B0: +_080862B0: cmp r4, 0 - beq @080862BA + beq _080862BA bl trainer_hill_map_load_related - 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 bl SetMainCallback2 - b @08086308 + b _08086308 .pool -@080862F4: +_080862F4: bl sub_80EDB44 ldr r0, =0x03005dac ldr r1, =sub_8086204 @@ -229352,7 +229352,7 @@ sub_8086230: ; 8086230 ldr r0, =c1_overworld bl set_callback1 bl c2_exit_to_overworld_2_switch -@08086308: +_08086308: pop {r4} pop {r0} bx r0 @@ -229367,20 +229367,20 @@ sub_808631C: ; 808631C 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 EnableInterrupts movs r0, 0x2 bl DisableInterrupts - b @08086362 + b _08086362 .pool -@08086348: +_08086348: ldr r4, =0x04000208 ldrh r3, [r4] strh r0, [r4] @@ -229394,7 +229394,7 @@ sub_808631C: ; 808631C orrs r0, r1 strh r0, [r2] strh r3, [r4] -@08086362: +_08086362: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -229435,28 +229435,28 @@ sub_80863B0: ; 80863B0 bl sub_81A9E6C lsls r0, 24 cmp r0, 0 - beq @080863D4 + beq _080863D4 bl door_upload_tiles ldr r2, =gUnknown_08339DBC ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 - b @080863F0 + b _080863F0 .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, =gUnknown_08339DBC ldr r0, [r2] ldr r1, [r2, 0x4] ldr r2, [r2, 0x8] bl sub_80BA038 -@080863F0: +_080863F0: pop {r0} bx r0 .pool @@ -229468,116 +229468,116 @@ map_loading_iteration_3: ; 80863F8 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 .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 .pool -@080864A8: +_080864A8: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram - b @08086506 + b _08086506 .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 .pool -@080864D4: +_080864D4: bl DrawWholeMapView - 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 .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 @@ -229591,116 +229591,116 @@ load_map_stuff: ; 808651C 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 .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 .pool -@080865BC: +_080865BC: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram - b @08086622 + b _08086622 .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 .pool -@080865E8: +_080865E8: bl DrawWholeMapView - 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 AddMapNamePopUpWindowTask - b @08086622 + b _08086622 .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 @@ -229712,46 +229712,46 @@ sub_8086638: ; 8086638 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 @@ -229763,113 +229763,113 @@ map_loading_iteration_2_link: ; 8086698 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 .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 .pool -@08086734: +_08086734: ldr r0, =0x02037318 ldr r0, [r0] bl copy_map_tileset2_to_vram - b @08086792 + b _08086792 .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 .pool -@08086760: +_08086760: bl DrawWholeMapView - 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 .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 SetFieldVBlankCallback 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 @@ -229879,12 +229879,12 @@ map_loading_iteration_2_link: ; 8086698 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 @@ -229930,7 +229930,7 @@ sub_80867D8: ; 80867D8 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@08086816: +_08086816: strh r6, [r4] mov r0, sp str r0, [r1] @@ -229940,7 +229940,7 @@ sub_80867D8: ; 80867D8 adds r2, r5 subs r3, r5 cmp r3, r5 - bhi @08086816 + bhi _08086816 strh r6, [r4] mov r0, sp str r0, [r1] @@ -230083,21 +230083,21 @@ sub_8086988: ; 8086988 bl ResetCameraUpdateInfo bl InstallCameraPanAheadCallback 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 FieldEffectActiveListClear 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} @@ -230273,9 +230273,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 @@ -230302,8 +230302,8 @@ sub_8086B14: ; 8086B14 ldr r0, =0x03005db8 ldrb r0, [r0] cmp r6, r0 - bcc @08086B44 -@08086B7E: + bcc _08086B44 +_08086B7E: bl sub_8086C40 add sp, 0x4 pop {r3} @@ -230321,9 +230321,9 @@ sub_8086B9C: ; 8086B9C 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 @@ -230338,8 +230338,8 @@ sub_8086B9C: ; 8086B9C ldr r0, =0x03005db8 ldrb r0, [r0] cmp r4, r0 - bcc @08086BAA -@08086BCA: + bcc _08086BAA +_08086BCA: pop {r4,r5} pop {r0} bx r0 @@ -230352,14 +230352,14 @@ c1_link_related: ; 8086BD8 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 @@ -230373,7 +230373,7 @@ c1_link_related: ; 8086BD8 lsrs r0, 16 bl sub_8086FA0 bl sub_8086C40 -@08086C14: +_08086C14: pop {r4} pop {r0} bx r0 @@ -230418,7 +230418,7 @@ sub_8086C64: ; 8086C64 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @08086C82 + beq _08086C82 ldr r1, =0x03000e19 ldrb r0, [r1] adds r0, 0x1 @@ -230426,9 +230426,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 .pool @@ -230440,11 +230440,11 @@ sub_8086C90: ; 8086C90 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 .pool @@ -230459,23 +230459,23 @@ 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 .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 @@ -230490,23 +230490,23 @@ 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 .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 @@ -230528,14 +230528,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] @@ -230543,195 +230543,195 @@ sub_8086D18: ; 8086D18 strb r0, [r5] ldrb r0, [r6, 0x1] cmp r0, 0 - bne @08086D58 - b @08086F26 -@08086D58: + bne _08086D58 + b _08086F26 +_08086D58: ldr r0, =sub_80870F8 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087530 - b @08086F26 + b _08086F26 .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 bl c1_link_related_func_set bl sub_8087584 - b @08086F26 + b _08086F26 .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 .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 bl c1_link_related_func_set bl sub_808751C - b @08086EB2 + b _08086EB2 .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 bl c1_link_related_func_set bl sub_808754C - b @08086EB2 + b _08086EB2 .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 bl c1_link_related_func_set adds r0, r4, 0 bl sub_8087568 - b @08086EB2 + b _08086EB2 .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 bl c1_link_related_func_set bl sub_8087510 - b @08086EB2 + b _08086EB2 .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 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 .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 .pool -@08086EE8: +_08086EE8: ldr r0, =0x03000e10 adds r0, r7, r0 movs r1, 0x82 strb r1, [r0] - b @08086F26 + b _08086F26 .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 bl c1_link_related_func_set - b @08086F26 + b _08086F26 .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 @@ -230753,7 +230753,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] @@ -230770,12 +230770,12 @@ sub_8086F38: ; 8086F38 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] @@ -230783,7 +230783,7 @@ sub_8086F38: ; 8086F38 adds r7, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @08086F4C + ble _08086F4C add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -230803,42 +230803,42 @@ 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 .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 @@ -230853,49 +230853,49 @@ sub_808700C: ; 808700C movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @08087024 + beq _08087024 movs r0, 0x13 - b @08087064 + b _08087064 .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 @@ -230907,31 +230907,31 @@ sub_8087068: ; 8087068 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 @@ -230941,11 +230941,11 @@ 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 @@ -230958,27 +230958,27 @@ sub_80870B0: ; 80870B0 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 @@ -231001,11 +231001,11 @@ sub_80870F8: ; 80870F8 lsrs r0, 24 movs r4, 0x11 cmp r0, 0x1 - beq @08087110 + beq _08087110 movs r4, 0x1A ldr r0, =sub_80870EC bl c1_link_related_func_set -@08087110: +_08087110: adds r0, r4, 0 pop {r4} pop {r1} @@ -231019,12 +231019,12 @@ sub_808711C: ; 808711C 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 bl c1_link_related_func_set -@08087134: +_08087134: adds r0, r4, 0 pop {r4} pop {r1} @@ -231038,12 +231038,12 @@ sub_8087140: ; 8087140 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 bl c1_link_related_func_set -@08087158: +_08087158: adds r0, r4, 0 pop {r4} pop {r1} @@ -231067,23 +231067,23 @@ sub_8087170: ; 8087170 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 bl c1_link_related_func_set movs r0, 0x1D - b @080871A6 + b _080871A6 .pool -@080871A0: +_080871A0: bl sub_8086C64 -@080871A4: +_080871A4: movs r0, 0x11 -@080871A6: +_080871A6: pop {r1} bx r1 thumb_func_end sub_8087170 @@ -231112,18 +231112,18 @@ sub_80871C4: ; 80871C4 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, =gUnknown_08277513 bl script_env_1_execute_new_script ldr r0, =sub_80871C0 bl c1_link_related_func_set -@080871EA: +_080871EA: movs r0, 0x11 pop {r1} bx r1 @@ -231153,47 +231153,47 @@ sub_8087214: ; 8087214 movs r0, 0x83 bl sub_8086CE0 cmp r0, 0x1 - beq @08087250 + beq _08087250 ldr r0, =0x03000e14 ldr r2, [r0] ldr r1, =sub_8087170 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 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 .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 @@ -231260,9 +231260,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 @@ -231307,15 +231307,15 @@ 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 @@ -231325,15 +231325,15 @@ 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 @@ -231344,13 +231344,13 @@ sub_8087370: ; 8087370 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 @@ -231361,23 +231361,23 @@ sub_8087388: ; 8087388 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 MetatileBehavior_IsSouthArrowWarp 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 @@ -231390,12 +231390,12 @@ sub_80873B4: ; 80873B4 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] @@ -231440,37 +231440,37 @@ sub_80873B4: ; 80873B4 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, =gUnknown_0827749C - b @08087476 + b _08087476 .pool -@08087450: +_08087450: adds r0, r2, 0 bl sub_80B39D4 cmp r0, 0 - bne @08087464 + bne _08087464 ldr r0, =gUnknown_0827747E - b @08087476 + b _08087476 .pool -@08087464: +_08087464: ldr r0, =gUnknown_0827748D - b @08087476 + b _08087476 .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} @@ -231483,51 +231483,51 @@ sub_8087480: ; 8087480 adds r1, r0, 0 ldr r0, =gUnknown_08277388 cmp r1, r0 - beq @080874C6 + beq _080874C6 ldr r0, =gUnknown_082773A3 cmp r1, r0 - beq @08087508 + beq _08087508 ldr r0, =gUnknown_082773BE cmp r1, r0 - beq @080874C6 + beq _080874C6 ldr r0, =gUnknown_082773D9 cmp r1, r0 - beq @08087508 + beq _08087508 ldr r0, =gUnknown_0827741D cmp r1, r0 - beq @080874C6 + beq _080874C6 ldr r0, =gUnknown_08277432 cmp r1, r0 - beq @08087508 + beq _08087508 ldr r0, =gUnknown_08277447 cmp r1, r0 - beq @080874C6 + beq _080874C6 ldr r0, =gUnknown_0827745C cmp r1, r0 - beq @08087508 + beq _08087508 ldr r0, =gUnknown_08277374 cmp r1, r0 - beq @080874C6 + beq _080874C6 ldr r0, =gUnknown_0827737E cmp r1, r0 - beq @08087508 + beq _08087508 ldr r0, =gUnknown_082773F5 cmp r1, r0 - bne @080874F8 -@080874C6: + bne _080874F8 +_080874C6: movs r0, 0xA - b @0808750A + b _0808750A .pool -@080874F8: +_080874F8: ldr r0, =gUnknown_082773FF cmp r1, r0 - beq @08087508 + beq _08087508 movs r0, 0 - b @0808750A + b _0808750A .pool -@08087508: +_08087508: movs r0, 0x9 -@0808750A: +_0808750A: pop {r1} bx r1 thumb_func_end sub_8087480 @@ -231608,24 +231608,24 @@ 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 .pool -@080875B8: +_080875B8: ldr r1, =0x03000e18 movs r0, 0 -@080875BC: +_080875BC: strb r0, [r1] ldrb r0, [r1] -@080875C0: +_080875C0: pop {r1} bx r1 .pool @@ -231636,45 +231636,45 @@ 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 cmp r1, r0 - beq @08087614 + beq _08087614 ldr r0, =sub_80870F8 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 .pool -@0808762C: +_0808762C: movs r0, 0 -@0808762E: +_0808762E: pop {r1} bx r1 thumb_func_end sub_80875C8 @@ -231684,25 +231684,25 @@ 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 cmp r1, r0 - beq @08087664 -@08087658: + beq _08087664 +_08087658: movs r0, 0 - b @08087666 + b _08087666 .pool -@08087664: +_08087664: movs r0, 0x1 -@08087666: +_08087666: pop {r1} bx r1 thumb_func_end sub_8087634 @@ -231713,16 +231713,16 @@ sub_808766C: ; 808766C 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 .pool -@08087688: +_08087688: movs r0, 0 -@0808768A: +_0808768A: pop {r1} bx r1 thumb_func_end sub_808766C @@ -231733,19 +231733,19 @@ sub_8087690: ; 8087690 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 .pool -@080876B0: +_080876B0: ldr r0, =0x03005000 ldr r1, =0x00000c1a adds r0, r1 ldrb r0, [r0] -@080876B8: +_080876B8: pop {r1} bx r1 .pool @@ -231907,7 +231907,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 @@ -231915,7 +231915,7 @@ sub_80877DC: ; 80877DC ldr r0, =0x02037350 adds r1, r0 strb r2, [r1, 0x19] -@080877FE: +_080877FE: pop {r0} bx r0 .pool @@ -231936,7 +231936,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 @@ -231944,7 +231944,7 @@ sub_808780C: ; 808780C ldr r1, =0x02020630 adds r0, r1 bl RemoveObjectAndFreeTiles -@08087838: +_08087838: movs r0, 0 strb r0, [r5] ldrb r1, [r4] @@ -232060,18 +232060,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 @@ -232081,22 +232081,22 @@ sub_808790C: ; 808790C 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 .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 @@ -232120,16 +232120,16 @@ 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 .pool -@080879A4: +_080879A4: ldr r4, =gUnknown_08339E00 ldr r1, =gUnknown_08339DC8 ldrb r0, [r5, 0x3] @@ -232146,7 +232146,7 @@ sub_808796C: ; 808796C adds r0, r5, 0 adds r1, r6, 0 bl _call_via_r2 -@080879C8: +_080879C8: pop {r4-r6} pop {r0} bx r0 @@ -232229,7 +232229,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 @@ -232244,10 +232244,10 @@ sub_8087A20: ; 8087A20 adds r0, r5, 0 bl FieldObjectUpdateZCoord movs r0, 0x1 - b @08087A80 -@08087A7E: + b _08087A80 +_08087A7E: movs r0, 0 -@08087A80: +_08087A80: add sp, 0x4 pop {r4-r6} pop {r1} @@ -232295,12 +232295,12 @@ sub_8087AA8: ; 8087AA8 bl MoveCoords 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 @@ -232315,40 +232315,40 @@ 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 .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 @@ -232373,13 +232373,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 @@ -232389,37 +232389,37 @@ npc_080587EC: ; 8087B40 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 .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 MapGridIsImpassableAt lsls r0, 24 lsrs r0, 24 -@08087BBE: +_08087BBE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -232448,42 +232448,42 @@ 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 .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 @@ -232492,7 +232492,7 @@ sub_8087BCC: ; 8087BCC movs r3, 0 bl AddPseudoFieldObject strb r0, [r4, 0x4] -@08087C56: +_08087C56: ldrb r1, [r4, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -232511,7 +232511,7 @@ sub_8087BCC: ; 8087BCC negs r0, r0 ands r0, r1 strb r0, [r4] -@08087C7A: +_08087C7A: add sp, 0x4 pop {r4,r5} pop {r0} @@ -232557,7 +232557,7 @@ sub_8087C8C: ; 8087C8C strb r0, [r5, 0x5] ldrb r0, [r4, 0x3] cmp r0, 0 - bne @08087CF8 + bne _08087CF8 ldrb r0, [r6, 0x19] bl FieldObjectDirectionToImageAnimId adds r1, r0, 0 @@ -232565,9 +232565,9 @@ sub_8087C8C: ; 8087C8C lsrs r1, 24 adds r0, r5, 0 bl StartObjectImageAnim - b @08087D0A + b _08087D0A .pool -@08087CF8: +_08087CF8: ldrb r0, [r6, 0x19] bl get_go_image_anim_num adds r1, r0, 0 @@ -232575,14 +232575,14 @@ sub_8087C8C: ; 8087C8C lsrs r1, 24 adds r0, r5, 0 bl StartObjectImageAnimIfDifferent -@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 @@ -232600,7 +232600,7 @@ sub_8087C8C: ; 8087C8C ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -@08087D3C: +_08087D3C: pop {r4-r6} pop {r0} bx r0 @@ -232724,14 +232724,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} @@ -232761,14 +232761,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 @@ -232777,8 +232777,8 @@ map_copy_with_padding: ; 8087E70 adds r7, r6 subs r5, 0x1 cmp r5, 0 - bne @08087EA4 -@08087EB8: + bne _08087EA4 +_08087EB8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -232795,7 +232795,7 @@ mapheader_copy_mapdata_of_adjacent_maps: ; 8087EC8 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 @@ -232803,61 +232803,61 @@ 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 .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 @@ -232886,11 +232886,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] @@ -232905,8 +232905,8 @@ sub_8087F54: ; 8087F54 adds r6, r0 subs r4, 0x1 cmp r4, 0 - bne @08087F86 -@08087FA6: + bne _08087F86 +_08087FA6: pop {r3} mov r8, r3 pop {r4-r7} @@ -232922,7 +232922,7 @@ sub_8087FB8: ; 8087FB8 adds r3, r0, 0 adds r5, r1, 0 cmp r5, 0 - beq @08088012 + beq _08088012 ldr r0, [r5] ldr r4, [r0] adds r2, 0x7 @@ -232930,28 +232930,28 @@ 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 .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] @@ -232962,7 +232962,7 @@ sub_8087FB8: ; 8087FB8 adds r2, r5, 0 adds r3, r6, 0 bl sub_8087F54 -@08088012: +_08088012: add sp, 0xC pop {r4-r7} pop {r0} @@ -232976,35 +232976,35 @@ sub_8088020: ; 8088020 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 .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 @@ -233014,7 +233014,7 @@ sub_8088020: ; 8088020 adds r2, r5, 0 adds r3, r6, 0 bl sub_8087F54 -@08088074: +_08088074: add sp, 0xC pop {r4-r7} pop {r0} @@ -233028,35 +233028,35 @@ sub_8088080: ; 8088080 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 .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] @@ -233066,7 +233066,7 @@ sub_8088080: ; 8088080 adds r2, r5, 0 adds r3, r7, 0 bl sub_8087F54 -@080880D4: +_080880D4: add sp, 0xC pop {r4-r7} pop {r0} @@ -233081,7 +233081,7 @@ sub_80880E0: ; 80880E0 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] @@ -233089,28 +233089,28 @@ 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 .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] @@ -233120,7 +233120,7 @@ sub_80880E0: ; 80880E0 adds r2, r5, 0 movs r3, 0 bl sub_8087F54 -@08088138: +_08088138: add sp, 0xC pop {r4-r7} pop {r0} @@ -233135,16 +233135,16 @@ MapGridGetZCoordAt: ; 8088144 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 @@ -233152,9 +233152,9 @@ MapGridGetZCoordAt: ; 8088144 lsls r0, 1 adds r0, r1 ldrh r1, [r0] - b @08088196 + b _08088196 .pool -@08088174: +_08088174: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r2, 0x1 @@ -233172,16 +233172,16 @@ MapGridGetZCoordAt: ; 8088144 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 .pool -@080881A8: +_080881A8: movs r0, 0 -@080881AA: +_080881AA: pop {r4} pop {r1} bx r1 @@ -233194,16 +233194,16 @@ MapGridIsImpassableAt: ; 80881B0 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 @@ -233211,9 +233211,9 @@ MapGridIsImpassableAt: ; 80881B0 lsls r0, 1 adds r0, r1 ldrh r1, [r0] - b @08088202 + b _08088202 .pool -@080881E0: +_080881E0: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r2, 0x1 @@ -233231,19 +233231,19 @@ MapGridIsImpassableAt: ; 80881B0 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 .pool -@0808821C: +_0808821C: movs r0, 0x1 -@0808821E: +_0808821E: pop {r4} pop {r1} bx r1 @@ -233256,16 +233256,16 @@ MapGridGetMetatileIdAt: ; 8088224 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 @@ -233273,9 +233273,9 @@ MapGridGetMetatileIdAt: ; 8088224 lsls r0, 1 adds r0, r1 ldrh r4, [r0] - b @08088278 + b _08088278 .pool -@08088254: +_08088254: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r5, 0x1 @@ -233294,15 +233294,15 @@ MapGridGetMetatileIdAt: ; 8088224 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 .pool -@0808828C: +_0808828C: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r5, 0x1 @@ -233321,7 +233321,7 @@ MapGridGetMetatileIdAt: ; 8088224 adds r1, r2, 0 orrs r0, r1 ands r0, r4 -@080882B0: +_080882B0: pop {r4-r6} pop {r1} bx r1 @@ -233368,16 +233368,16 @@ MapGridSetMetatileIdAt: ; 80882F0 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] @@ -233391,7 +233391,7 @@ MapGridSetMetatileIdAt: ; 80882F0 ands r0, r5 orrs r2, r0 strh r2, [r1] -@08088328: +_08088328: pop {r4,r5} pop {r0} bx r0 @@ -233406,16 +233406,16 @@ MapGridSetMetatileEntryAt: ; 8088338 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 @@ -233423,7 +233423,7 @@ MapGridSetMetatileEntryAt: ; 8088338 lsls r0, 1 adds r0, r1 strh r5, [r0] -@08088364: +_08088364: pop {r4,r5} pop {r0} bx r0 @@ -233439,22 +233439,22 @@ GetBehaviorByMetatileId: ; 8088370 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 .pool -@08088394: +_08088394: ldr r0, =0x000003ff cmp r2, r0 - bls @080883A4 + bls _080883A4 movs r0, 0xFF - b @080883B6 + b _080883B6 .pool -@080883A4: +_080883A4: ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x14] @@ -233462,10 +233462,10 @@ GetBehaviorByMetatileId: ; 8088370 lsls r0, r3, 1 adds r0, r1 ldr r1, =0xfffffc00 -@080883B2: +_080883B2: adds r0, r1 ldrh r0, [r0] -@080883B6: +_080883B6: pop {r1} bx r1 .pool @@ -233491,18 +233491,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 @@ -233510,19 +233510,19 @@ save_serialize_map: ; 80883C4 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 @@ -233542,7 +233542,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] @@ -233551,15 +233551,15 @@ sub_8088438: ; 8088438 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 .pool -@0808846C: +_0808846C: movs r0, 0x1 -@0808846E: +_0808846E: pop {r4} pop {r1} bx r1 @@ -233598,7 +233598,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] @@ -233613,32 +233613,32 @@ 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 .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 @@ -233648,10 +233648,10 @@ mapdata_from_sav2: ; 808849C 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 @@ -233667,27 +233667,27 @@ mapdata_from_sav2: ; 808849C 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 @@ -233696,25 +233696,25 @@ mapdata_from_sav2: ; 808849C 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 sub_80D42B8 -@08088598: +_08088598: movs r0, 0x80 lsls r0, 9 adds r4, r0 @@ -233722,10 +233722,10 @@ mapdata_from_sav2: ; 808849C 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 @@ -233768,50 +233768,50 @@ 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 .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 @@ -233828,19 +233828,19 @@ sub_80885C4: ; 80885C4 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} @@ -233860,16 +233860,16 @@ GetMapBorderIdAt: ; 808869C 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 @@ -233879,10 +233879,10 @@ GetMapBorderIdAt: ; 808869C ldrh r1, [r0] ldr r0, =0x000003ff cmp r1, r0 - beq @08088770 - b @08088700 + beq _08088770 + b _08088700 .pool -@080886D8: +_080886D8: ldr r0, =0x02037318 ldr r3, [r0] adds r1, r4, 0x1 @@ -233902,68 +233902,68 @@ GetMapBorderIdAt: ; 808869C 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 .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 .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 .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 .pool -@0808877C: +_0808877C: movs r0, 0x2 - b @08088782 -@08088780: + b _08088782 +_08088780: movs r0, 0 -@08088782: +_08088782: pop {r4,r5} pop {r1} bx r1 @@ -234018,13 +234018,13 @@ CanCameraMoveInDirection: ; 80887B0 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @080887F0 + beq _080887F0 movs r0, 0x1 - b @080887F2 + b _080887F2 .pool -@080887F0: +_080887F0: movs r0, 0 -@080887F2: +_080887F2: pop {r4,r5} pop {r1} bx r1 @@ -234040,17 +234040,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 @@ -234058,9 +234058,9 @@ sub_80887F8: ; 80887F8 ldr r2, [r5, 0x4] ldrh r0, [r1, 0x2] subs r0, r2 - b @08088870 + b _08088870 .pool -@08088834: +_08088834: ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, [r3] @@ -234069,9 +234069,9 @@ sub_80887F8: ; 80887F8 ldr r2, [r5, 0x4] ldrh r0, [r1, 0x2] subs r0, r2 - b @08088870 + b _08088870 .pool -@0808884C: +_0808884C: ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, [r5, 0x4] @@ -234079,9 +234079,9 @@ sub_80887F8: ; 80887F8 subs r0, r2 strh r0, [r1] negs r0, r7 - b @08088870 + b _08088870 .pool -@08088860: +_08088860: ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, [r5, 0x4] @@ -234090,9 +234090,9 @@ sub_80887F8: ; 80887F8 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 @@ -234122,7 +234122,7 @@ CameraMove: ; 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] @@ -234131,9 +234131,9 @@ CameraMove: ; 808887C ldrh r0, [r1, 0x2] add r0, r9 strh r0, [r1, 0x2] - b @08088932 + b _08088932 .pool -@080888C4: +_080888C4: bl save_serialize_map bl sub_81BE72C ldr r1, =0x03005d8c @@ -234183,7 +234183,7 @@ CameraMove: ; 808887C strh r0, [r1, 0x2] mov r0, r8 bl sub_80885C4 -@08088932: +_08088932: ldr r0, =0x02037334 ldrb r0, [r0] lsls r0, 31 @@ -234214,11 +234214,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 @@ -234227,18 +234227,18 @@ sub_8088950: ; 8088950 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08088990 + bne _08088990 adds r0, r4, 0 - b @0808899A + b _0808899A .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 @@ -234262,9 +234262,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] @@ -234272,11 +234272,11 @@ sub_80889A8: ; 80889A8 ldr r2, [r0] ldr r3, [r5, 0x4] adds r0, r7, 0 - b @080889F2 + b _080889F2 .pool -@080889E0: +_080889E0: cmp r6, 0x4 - bgt @08088A00 + bgt _08088A00 ldr r0, =0x02037318 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -234284,15 +234284,15 @@ sub_80889A8: ; 80889A8 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 .pool -@08088A00: +_08088A00: movs r0, 0 -@08088A02: +_08088A02: pop {r3} mov r8, r3 pop {r4-r7} @@ -234307,23 +234307,23 @@ sub_8088A0C: ; 8088A0C 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 @@ -234333,14 +234333,14 @@ sub_8088A0C: ; 8088A0C 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 @@ -234355,27 +234355,27 @@ 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 @@ -234396,18 +234396,18 @@ sub_8088A8C: ; 8088A8C ldr r2, =0x02037318 ldr r0, [r2, 0xC] cmp r0, 0 - bne @08088AB4 - b @08088B2A + bne _08088AB4 + b _08088B2A .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 @@ -234415,61 +234415,61 @@ sub_8088A8C: ; 8088A8C 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 @@ -234540,18 +234540,18 @@ sub_8088B94: ; 8088B94 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 @@ -234564,9 +234564,9 @@ sub_8088B94: ; 8088B94 adds r2, r3, 0 orrs r1, r2 strh r1, [r0] - b @08088BE6 + b _08088BE6 .pool -@08088BD4: +_08088BD4: muls r1, r3 adds r1, r4, r1 ldr r0, [r2, 0x8] @@ -234576,7 +234576,7 @@ sub_8088B94: ; 8088B94 ldr r0, =0x0000f3ff ands r0, r2 strh r0, [r1] -@08088BE6: +_08088BE6: pop {r4,r5} pop {r0} bx r0 @@ -234593,16 +234593,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 @@ -234611,14 +234611,14 @@ sub_8088BF0: ; 8088BF0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @08088C2C -@08088C24: + beq _08088C2C +_08088C24: movs r0, 0 - b @08088C2E + b _08088C2E .pool -@08088C2C: +_08088C2C: movs r0, 0x1 -@08088C2E: +_08088C2E: pop {r1} bx r1 thumb_func_end sub_8088BF0 @@ -234636,18 +234636,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 LoadBgTiles - b @08088C70 -@08088C60: + b _08088C70 +_08088C60: ldr r1, [r3, 0x4] lsls r2, r6, 5 movs r0, 0 @@ -234655,7 +234655,7 @@ copy_tileset_patterns_to_vram: ; 8088C34 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} @@ -234675,18 +234675,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 LoadBgTiles - b @08088CB4 -@08088CA4: + b _08088CB4 +_08088CA4: ldr r1, [r3, 0x4] lsls r2, r6, 5 movs r0, 0 @@ -234694,7 +234694,7 @@ copy_tileset_patterns_to_vram2: ; 8088C78 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} @@ -234729,10 +234729,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 @@ -234752,10 +234752,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 @@ -234764,15 +234764,15 @@ apply_map_tileset_palette: ; 8088CC4 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 @@ -234850,7 +234850,7 @@ 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 @@ -234861,7 +234861,7 @@ 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 @@ -234873,11 +234873,11 @@ 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 @@ -234900,13 +234900,13 @@ sub_8088DF0: ; 8088DF0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @08088E0C + bne _08088E0C movs r0, 0 - b @08088E0E + b _08088E0E .pool -@08088E0C: +_08088E0C: movs r0, 0x1 -@08088E0E: +_08088E0E: pop {r1} bx r1 thumb_func_end sub_8088DF0 @@ -234917,12 +234917,12 @@ MetatileBehavior_IsJumpEast: ; 8088E14 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 MetatileBehavior_IsJumpEast @@ -234933,12 +234933,12 @@ MetatileBehavior_IsJumpWest: ; 8088E28 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 MetatileBehavior_IsJumpWest @@ -234949,12 +234949,12 @@ MetatileBehavior_IsJumpNorth: ; 8088E3C 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 MetatileBehavior_IsJumpNorth @@ -234965,12 +234965,12 @@ MetatileBehavior_IsJumpSouth: ; 8088E50 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 MetatileBehavior_IsJumpSouth @@ -234984,12 +234984,12 @@ 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 @@ -235000,15 +235000,15 @@ MetatileBehavior_IsSandOrDeepSand: ; 8088E80 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 MetatileBehavior_IsSandOrDeepSand @@ -235019,12 +235019,12 @@ MetatileBehavior_IsDeepSand: ; 8088E98 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 MetatileBehavior_IsDeepSand @@ -235035,23 +235035,23 @@ MetatileBehavior_IsReflective: ; 8088EAC 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 MetatileBehavior_IsReflective @@ -235062,12 +235062,12 @@ MetatileBehavior_IsIce: ; 8088ED4 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 MetatileBehavior_IsIce @@ -235078,12 +235078,12 @@ is_tile_x69_2_warp_door: ; 8088EE8 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 @@ -235094,15 +235094,15 @@ sub_8088EFC: ; 8088EFC 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 @@ -235116,12 +235116,12 @@ MetatileBehavior_IsEscalator: ; 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 MetatileBehavior_IsEscalator @@ -235132,12 +235132,12 @@ sub_8088F30: ; 8088F30 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 @@ -235148,12 +235148,12 @@ MetatileBehavior_IsLadder: ; 8088F44 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 MetatileBehavior_IsLadder @@ -235164,17 +235164,17 @@ sub_8088F58: ; 8088F58 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 @@ -235185,12 +235185,12 @@ sub_8088F74: ; 8088F74 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 @@ -235206,13 +235206,13 @@ MetatileBehavior_IsSurfableWaterOrUnderwater: ; 8088F88 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @08088FA4 + bne _08088FA4 movs r0, 0 - b @08088FA6 + b _08088FA6 .pool -@08088FA4: +_08088FA4: movs r0, 0x1 -@08088FA6: +_08088FA6: pop {r1} bx r1 thumb_func_end MetatileBehavior_IsSurfableWaterOrUnderwater @@ -235223,12 +235223,12 @@ MetatileBehavior_IsEastArrowWarp: ; 8088FAC 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 MetatileBehavior_IsEastArrowWarp @@ -235239,12 +235239,12 @@ MetatileBehavior_IsWestArrowWarp: ; 8088FC0 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 MetatileBehavior_IsWestArrowWarp @@ -235255,15 +235255,15 @@ MetatileBehavior_IsNorthArrowWarp: ; 8088FD4 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 MetatileBehavior_IsNorthArrowWarp @@ -235274,17 +235274,17 @@ MetatileBehavior_IsSouthArrowWarp: ; 8088FEC 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 MetatileBehavior_IsSouthArrowWarp @@ -235299,25 +235299,25 @@ sub_8089008: ; 8089008 bl MetatileBehavior_IsEastArrowWarp lsls r0, 24 cmp r0, 0 - bne @08089040 + bne _08089040 adds r0, r4, 0 bl MetatileBehavior_IsWestArrowWarp lsls r0, 24 cmp r0, 0 - bne @08089040 + bne _08089040 adds r0, r4, 0 bl MetatileBehavior_IsNorthArrowWarp lsls r0, 24 cmp r0, 0 - bne @08089040 + bne _08089040 adds r0, r4, 0 bl MetatileBehavior_IsSouthArrowWarp 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} @@ -235334,31 +235334,31 @@ 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 @@ -235370,12 +235370,12 @@ MetatileBehavior_IsIce_2: ; 808908C 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 MetatileBehavior_IsIce_2 @@ -235387,12 +235387,12 @@ MetatileBehavior_IsTrickHouseSlipperyFloor: ; 80890A0 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 MetatileBehavior_IsTrickHouseSlipperyFloor @@ -235403,12 +235403,12 @@ MetatileBehavior_0x05: ; 80890B4 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 MetatileBehavior_0x05 @@ -235420,12 +235420,12 @@ MetatileBehavior_IsWalkNorth: ; 80890C8 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 MetatileBehavior_IsWalkNorth @@ -235437,12 +235437,12 @@ MetatileBehavior_IsWalkSouth: ; 80890DC 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 MetatileBehavior_IsWalkSouth @@ -235454,12 +235454,12 @@ MetatileBehavior_IsWalkWest: ; 80890F0 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 MetatileBehavior_IsWalkWest @@ -235471,12 +235471,12 @@ MetatileBehavior_IsWalkEast: ; 8089104 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 MetatileBehavior_IsWalkEast @@ -235488,12 +235488,12 @@ MetatileBehavior_IsNorthwardCurrent: ; 8089118 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 MetatileBehavior_IsNorthwardCurrent @@ -235505,12 +235505,12 @@ MetatileBehavior_IsSouthwardCurrent: ; 808912C 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 MetatileBehavior_IsSouthwardCurrent @@ -235522,12 +235522,12 @@ MetatileBehavior_IsWestwardCurrent: ; 8089140 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 MetatileBehavior_IsWestwardCurrent @@ -235539,12 +235539,12 @@ MetatileBehavior_IsEastwardCurrent: ; 8089154 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 MetatileBehavior_IsEastwardCurrent @@ -235556,12 +235556,12 @@ MetatileBehavior_IsSlideNorth: ; 8089168 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 MetatileBehavior_IsSlideNorth @@ -235573,12 +235573,12 @@ MetatileBehavior_IsSlideSouth: ; 808917C 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 MetatileBehavior_IsSlideSouth @@ -235590,12 +235590,12 @@ MetatileBehavior_IsSlideWest: ; 8089190 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 MetatileBehavior_IsSlideWest @@ -235607,12 +235607,12 @@ MetatileBehavior_IsSlideEast: ; 80891A4 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 MetatileBehavior_IsSlideEast @@ -235623,12 +235623,12 @@ MetatileBehavior_IsCounter: ; 80891B8 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 MetatileBehavior_IsCounter @@ -235641,15 +235641,15 @@ is_tile_x86_and_npcunk2_is_x2: ; 80891CC 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 @@ -235660,12 +235660,12 @@ MetatileBehavior_IsPC: ; 80891E8 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 MetatileBehavior_IsPC @@ -235676,12 +235676,12 @@ is_tile_x84: ; 80891FC 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 @@ -235692,25 +235692,25 @@ sub_8089210: ; 8089210 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 @@ -235721,19 +235721,19 @@ sub_808923C: ; 808923C 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 @@ -235744,15 +235744,15 @@ sub_808925C: ; 808925C 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 @@ -235763,12 +235763,12 @@ is_tile_x98: ; 8089274 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 @@ -235779,12 +235779,12 @@ sub_8089288: ; 8089288 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 @@ -235795,12 +235795,12 @@ sub_808929C: ; 808929C 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 @@ -235811,12 +235811,12 @@ sub_80892B0: ; 80892B0 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 @@ -235827,12 +235827,12 @@ sub_80892C4: ; 80892C4 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 @@ -235843,12 +235843,12 @@ sub_80892D8: ; 80892D8 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 @@ -235859,12 +235859,12 @@ sub_80892EC: ; 80892EC 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 @@ -235875,12 +235875,12 @@ sub_8089300: ; 8089300 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 @@ -235890,12 +235890,12 @@ 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 @@ -235906,12 +235906,12 @@ sub_8089328: ; 8089328 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 @@ -235922,12 +235922,12 @@ sub_808933C: ; 808933C 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 @@ -235938,12 +235938,12 @@ sub_8089350: ; 8089350 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 @@ -235954,12 +235954,12 @@ sub_8089364: ; 8089364 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 @@ -235970,12 +235970,12 @@ sub_8089378: ; 8089378 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 @@ -235986,12 +235986,12 @@ sub_808938C: ; 808938C 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 @@ -236002,12 +236002,12 @@ sub_80893A0: ; 80893A0 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 @@ -236018,12 +236018,12 @@ sub_80893B4: ; 80893B4 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 @@ -236034,12 +236034,12 @@ sub_80893C8: ; 80893C8 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 @@ -236050,12 +236050,12 @@ sub_80893DC: ; 80893DC 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 @@ -236066,12 +236066,12 @@ sub_80893F0: ; 80893F0 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 @@ -236082,12 +236082,12 @@ sub_8089404: ; 8089404 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 @@ -236098,17 +236098,17 @@ MetatileBehavior_HasRipples: ; 8089418 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 MetatileBehavior_HasRipples @@ -236119,12 +236119,12 @@ MetatileBehavior_IsPuddle: ; 8089434 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 MetatileBehavior_IsPuddle @@ -236135,12 +236135,12 @@ MetatileBehavior_IsTallGrass: ; 8089448 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 MetatileBehavior_IsTallGrass @@ -236151,12 +236151,12 @@ MetatileBehavior_IsLongGrass: ; 808945C 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 MetatileBehavior_IsLongGrass @@ -236167,12 +236167,12 @@ MetatileBehavior_IsBerryTreeSoil: ; 8089470 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 MetatileBehavior_IsBerryTreeSoil @@ -236183,12 +236183,12 @@ MetatileBehavior_IsAsh: ; 8089484 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 MetatileBehavior_IsAsh @@ -236199,12 +236199,12 @@ MetatileBehavior_IsUnusedFootprintMetatile: ; 8089498 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 MetatileBehavior_IsUnusedFootprintMetatile @@ -236219,19 +236219,19 @@ 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 @@ -236247,27 +236247,27 @@ 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 @@ -236281,12 +236281,12 @@ 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 @@ -236300,18 +236300,18 @@ sub_808952C: ; 808952C bl MetatileBehavior_IsSurfableWaterOrUnderwater 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 @@ -236327,18 +236327,18 @@ 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 @@ -236350,12 +236350,12 @@ sub_8089588: ; 8089588 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 @@ -236366,12 +236366,12 @@ sub_808959C: ; 808959C 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 @@ -236386,15 +236386,15 @@ 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 @@ -236405,15 +236405,15 @@ sub_80895D0: ; 80895D0 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 @@ -236424,17 +236424,17 @@ MetatileBehavior_IsShallowFlowingWater: ; 80895E8 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 MetatileBehavior_IsShallowFlowingWater @@ -236445,12 +236445,12 @@ sub_8089604: ; 8089604 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 @@ -236461,12 +236461,12 @@ sub_8089618: ; 8089618 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 @@ -236477,17 +236477,17 @@ sub_808962C: ; 808962C 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 @@ -236498,15 +236498,15 @@ sub_8089648: ; 8089648 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 @@ -236520,17 +236520,17 @@ sub_8089660: ; 8089660 bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, 24 cmp r0, 0 - beq @08089682 + beq _08089682 adds r0, r4, 0 bl MetatileBehavior_IsWaterfall 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 @@ -236542,21 +236542,21 @@ MetatileBehavior_IsEastBlocked: ; 808968C 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 MetatileBehavior_IsEastBlocked @@ -236567,21 +236567,21 @@ MetatileBehavior_IsWestBlocked: ; 80896B0 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 MetatileBehavior_IsWestBlocked @@ -236592,19 +236592,19 @@ MetatileBehavior_IsNorthBlocked: ; 80896D4 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 MetatileBehavior_IsNorthBlocked @@ -236615,19 +236615,19 @@ MetatileBehavior_IsSouthBlocked: ; 80896F4 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 MetatileBehavior_IsSouthBlocked @@ -236638,12 +236638,12 @@ MetatileBehavior_IsShortGrass: ; 8089714 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 MetatileBehavior_IsShortGrass @@ -236654,12 +236654,12 @@ MetatileBehavior_IsHotSprings: ; 8089728 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 MetatileBehavior_IsHotSprings @@ -236671,12 +236671,12 @@ MetatileBehavior_IsWaterfall: ; 808973C 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 MetatileBehavior_IsWaterfall @@ -236687,12 +236687,12 @@ MetatileBehavior_IsFortreeBridge: ; 8089750 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 MetatileBehavior_IsFortreeBridge @@ -236703,12 +236703,12 @@ sub_8089764: ; 8089764 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 @@ -236719,12 +236719,12 @@ sub_8089778: ; 8089778 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 @@ -236735,12 +236735,12 @@ sub_808978C: ; 808978C 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 @@ -236751,12 +236751,12 @@ sub_80897A0: ; 80897A0 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 @@ -236770,12 +236770,12 @@ MetatileBehavior_IsPacifidlogLog: ; 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 MetatileBehavior_IsPacifidlogLog @@ -236786,12 +236786,12 @@ is_tile_x8C: ; 80897D0 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 @@ -236802,12 +236802,12 @@ is_tile_x85: ; 80897E4 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 @@ -236818,12 +236818,12 @@ is_tile_x8B: ; 80897F8 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 @@ -236834,12 +236834,12 @@ is_tile_xEA: ; 808980C 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 @@ -236850,12 +236850,12 @@ is_tile_x8A: ; 8089820 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 @@ -236866,12 +236866,12 @@ is_tile_x87: ; 8089834 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 @@ -236883,12 +236883,12 @@ MetatileBehavior_0xBB: ; 8089848 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 MetatileBehavior_0xBB @@ -236900,12 +236900,12 @@ MetatileBehavior_0xBC: ; 808985C 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 MetatileBehavior_0xBC @@ -236916,12 +236916,12 @@ sub_8089870: ; 8089870 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 @@ -236932,12 +236932,12 @@ is_role_x68: ; 8089884 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 @@ -236948,12 +236948,12 @@ MetatileBehavior_IsAquaHideoutWarp: ; 8089898 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 MetatileBehavior_IsAquaHideoutWarp @@ -236964,12 +236964,12 @@ sub_80898AC: ; 80898AC 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 @@ -236980,12 +236980,12 @@ sub_80898C0: ; 80898C0 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 @@ -236996,26 +236996,26 @@ MetatileBehavior_IsSurfableFishableWater: ; 80898D4 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 MetatileBehavior_IsSurfableFishableWater @@ -237026,12 +237026,12 @@ sub_8089904: ; 8089904 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 @@ -237042,12 +237042,12 @@ sub_8089918: ; 8089918 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 @@ -237058,12 +237058,12 @@ sub_808992C: ; 808992C 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 @@ -237075,12 +237075,12 @@ MetatileBehavior_IsMuddySlope: ; 8089940 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 MetatileBehavior_IsMuddySlope @@ -237091,12 +237091,12 @@ MetatileBehavior_IsBumpySlope: ; 8089954 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 MetatileBehavior_IsBumpySlope @@ -237107,12 +237107,12 @@ MetatileBehavior_IsIsolatedVerticalRail: ; 8089968 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 MetatileBehavior_IsIsolatedVerticalRail @@ -237123,12 +237123,12 @@ MetatileBehavior_IsIsolatedHorizontalRail: ; 808997C 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 MetatileBehavior_IsIsolatedHorizontalRail @@ -237139,12 +237139,12 @@ MetatileBehavior_IsVerticalRail: ; 8089990 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 MetatileBehavior_IsVerticalRail @@ -237155,12 +237155,12 @@ MetatileBehavior_IsHorizontalRail: ; 80899A4 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 MetatileBehavior_IsHorizontalRail @@ -237171,15 +237171,15 @@ MetatileBehavior_IsSeaweed: ; 80899B8 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 MetatileBehavior_IsSeaweed @@ -237190,21 +237190,21 @@ MetatileBehavior_IsRunningDisallowed: ; 80899D0 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 MetatileBehavior_IsPacifidlogLog 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 MetatileBehavior_IsRunningDisallowed @@ -237219,17 +237219,17 @@ 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 @@ -237240,12 +237240,12 @@ sub_8089A1C: ; 8089A1C 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 @@ -237256,12 +237256,12 @@ sub_8089A30: ; 8089A30 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 @@ -237272,12 +237272,12 @@ sub_8089A44: ; 8089A44 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 @@ -237288,12 +237288,12 @@ sub_8089A58: ; 8089A58 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 @@ -237304,12 +237304,12 @@ sub_8089A6C: ; 8089A6C 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 @@ -237320,12 +237320,12 @@ sub_8089A80: ; 8089A80 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 @@ -237336,12 +237336,12 @@ sub_8089A94: ; 8089A94 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 @@ -237352,12 +237352,12 @@ sub_8089AA8: ; 8089AA8 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 @@ -237368,12 +237368,12 @@ sub_8089ABC: ; 8089ABC 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 @@ -237386,15 +237386,15 @@ sub_8089AD0: ; 8089AD0 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 @@ -237407,15 +237407,15 @@ sub_8089AEC: ; 8089AEC 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 @@ -237426,12 +237426,12 @@ MetatileBehavior_IsQuestionnaire: ; 8089B08 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 MetatileBehavior_IsQuestionnaire @@ -237442,12 +237442,12 @@ MetatileBehavior_IsLongGrass2: ; 8089B1C 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 MetatileBehavior_IsLongGrass2 @@ -237458,12 +237458,12 @@ MetatileBehavior_IsLongGrassSouthEdge: ; 8089B30 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 MetatileBehavior_IsLongGrassSouthEdge @@ -237474,12 +237474,12 @@ MetatileBehavior_IsTrainerHillTimer: ; 8089B44 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 MetatileBehavior_IsTrainerHillTimer @@ -237638,35 +237638,35 @@ DrawWholeMapViewInternal: ; 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 @@ -237680,12 +237680,12 @@ DrawWholeMapViewInternal: ; 8089C60 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 @@ -237707,29 +237707,29 @@ RedrawMapSlicesForCameraUpdate: ; 8089CE4 ldr r0, =0x02037318 ldr r4, [r0] cmp r6, 0 - ble @08089CFC + ble _08089CFC adds r0, r5, 0 adds r1, r4, 0 bl RedrawMapSliceWest -@08089CFC: +_08089CFC: cmp r6, 0 - bge @08089D08 + bge _08089D08 adds r0, r5, 0 adds r1, r4, 0 bl RedrawMapSliceEast -@08089D08: +_08089D08: cmp r7, 0 - ble @08089D14 + ble _08089D14 adds r0, r5, 0 adds r1, r4, 0 bl RedrawMapSliceNorth -@08089D14: +_08089D14: cmp r7, 0 - bge @08089D20 + bge _08089D20 adds r0, r5, 0 adds r1, r4, 0 bl RedrawMapSliceSouth -@08089D20: +_08089D20: movs r0, 0x1 strb r0, [r5, 0x4] pop {r4-r7} @@ -237749,24 +237749,24 @@ RedrawMapSliceNorth: ; 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 @@ -237785,7 +237785,7 @@ RedrawMapSliceNorth: ; 8089D30 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls @08089D4C + bls _08089D4C pop {r4-r7} pop {r0} bx r0 @@ -237801,17 +237801,17 @@ RedrawMapSliceSouth: ; 8089D90 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] @@ -237827,7 +237827,7 @@ RedrawMapSliceSouth: ; 8089D90 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls @08089D9C + bls _08089D9C pop {r4-r7} pop {r0} bx r0 @@ -237844,17 +237844,17 @@ RedrawMapSliceEast: ; 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 @@ -237873,7 +237873,7 @@ RedrawMapSliceEast: ; 8089DDC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls @08089DEA + bls _08089DEA pop {r3} mov r8, r3 pop {r4-r7} @@ -237895,24 +237895,24 @@ RedrawMapSliceWest: ; 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 @@ -237932,7 +237932,7 @@ RedrawMapSliceWest: ; 8089E34 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls @08089E54 + bls _08089E54 pop {r3} mov r8, r3 pop {r4-r7} @@ -237954,7 +237954,7 @@ CurrentMapDrawMetatileAt: ; 8089EA0 bl MapPosToBgTilemapOffset adds r1, r0, 0 cmp r1, 0 - blt @08089ECC + blt _08089ECC ldr r0, =0x02037318 ldr r0, [r0] lsls r1, 16 @@ -237964,7 +237964,7 @@ CurrentMapDrawMetatileAt: ; 8089EA0 bl DrawMetatileAt movs r0, 0x1 strb r0, [r6, 0x4] -@08089ECC: +_08089ECC: pop {r4-r6} pop {r0} bx r0 @@ -237984,7 +237984,7 @@ DrawDoorMetatileAt: ; 8089EDC adds r2, r4, 0 bl MapPosToBgTilemapOffset cmp r0, 0 - blt @08089F04 + blt _08089F04 lsls r2, r0, 16 lsrs r2, 16 movs r0, 0x1 @@ -237992,7 +237992,7 @@ DrawDoorMetatileAt: ; 8089EDC bl DrawMetatile movs r0, 0x1 strb r0, [r6, 0x4] -@08089F04: +_08089F04: pop {r4-r6} pop {r0} bx r0 @@ -238019,24 +238019,24 @@ DrawMetatileAt: ; 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 .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 MapGridGetMetatileLayerTypeAt @@ -238062,15 +238062,15 @@ DrawMetatile: ; 8089F78 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 @@ -238097,9 +238097,9 @@ DrawMetatile: ; 8089F78 strh r2, [r1] adds r0, 0x42 strh r2, [r0] - b @0808A066 + b _0808A066 .pool -@08089FD0: +_08089FD0: ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 @@ -238140,9 +238140,9 @@ DrawMetatile: ; 8089F78 strh r1, [r0] adds r3, 0x42 strh r1, [r3] - b @0808A082 + b _0808A082 .pool -@0808A030: +_0808A030: ldr r0, =0x03005da4 ldr r0, [r0] lsls r3, r2, 1 @@ -238170,7 +238170,7 @@ DrawMetatile: ; 8089F78 adds r0, 0x42 ldrh r1, [r4, 0x6] strh r1, [r0] -@0808A066: +_0808A066: ldr r0, =0x03005da0 ldr r0, [r0] adds r3, r0 @@ -238185,7 +238185,7 @@ DrawMetatile: ; 8089F78 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 @@ -238210,34 +238210,34 @@ MapPosToBgTilemapOffset: ; 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 .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 @@ -238250,7 +238250,7 @@ CameraUpdateCallback: ; 808A0F4 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 @@ -238262,7 +238262,7 @@ CameraUpdateCallback: ; 808A0F4 movs r1, 0x34 ldrsh r0, [r0, r1] str r0, [r3, 0xC] -@0808A114: +_0808A114: pop {r0} bx r0 .pool @@ -238292,14 +238292,14 @@ InitCameraUpdateCallback: ; 808A134 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 RemoveObjectAndFreeTiles -@0808A150: +_0808A150: adds r0, r5, 0 bl AddCameraObject lsls r0, 24 @@ -238323,10 +238323,10 @@ CameraUpdate: ; 808A174 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 @@ -238335,55 +238335,55 @@ CameraUpdate: ; 808A174 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 @@ -238394,18 +238394,18 @@ CameraUpdate: ; 808A174 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 CameraMove @@ -238427,7 +238427,7 @@ CameraUpdate: ; 808A174 adds r1, r4, 0 adds r2, r5, 0 bl RedrawMapSlicesForCameraUpdate -@0808A24E: +_0808A24E: ldr r0, =0x03000e20 adds r1, r7, 0 mov r2, r8 @@ -238526,9 +238526,9 @@ UpdateCameraPanning: ; 808A314 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 @@ -238556,34 +238556,34 @@ CameraPanningCB_PanAhead: ; 808A360 ldr r0, =0x02037348 ldrb r0, [r0] cmp r0, 0 - bne @0808A374 + bne _0808A374 bl InstallCameraPanAheadCallback - b @0808A3FC + b _0808A3FC .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 .pool -@0808A394: +_0808A394: ldr r1, =0x03000e2c movs r0, 0 strb r0, [r1] -@0808A39A: +_0808A39A: bl player_get_direction_upper_nybble lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne @0808A3C4 + bne _0808A3C4 ldr r2, =0x03000e2a ldrh r3, [r2] movs r0, 0 @@ -238591,40 +238591,40 @@ CameraPanningCB_PanAhead: ; 808A360 movs r0, 0x8 negs r0, r0 cmp r1, r0 - ble @0808A3FC + ble _0808A3FC subs r0, r3, 0x2 - b @0808A3FA + b _0808A3FA .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 .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 .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 CameraPanningCB_PanAhead @@ -238635,23 +238635,23 @@ sub_808A400: ; 808A400 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 .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 .pool @@ -238665,7 +238665,7 @@ door_build_blockdef: ; 808A438 lsrs r5, r1, 16 movs r4, 0 adds r1, r6, 0 -@0808A444: +_0808A444: ldrb r0, [r2] lsls r0, 28 lsrs r3, r0, 16 @@ -238676,12 +238676,12 @@ door_build_blockdef: ; 808A438 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 @@ -238689,8 +238689,8 @@ door_build_blockdef: ; 808A438 adds r1, 0x2 adds r4, 0x1 cmp r4, 0x7 - ble @0808A462 -@0808A472: + ble _0808A462 +_0808A472: pop {r4-r6} pop {r0} bx r0 @@ -238708,7 +238708,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 @@ -238751,8 +238751,8 @@ door_patch_tilemap: ; 808A478 mov r1, r9 adds r2, r4, 0 bl DrawDoorMetatileAt - b @0808A522 -@0808A4F4: + b _0808A522 +_0808A4F4: movs r1, 0xFE lsls r1, 2 mov r0, sp @@ -238772,7 +238772,7 @@ door_patch_tilemap: ; 808A478 mov r1, r9 mov r2, sp bl DrawDoorMetatileAt -@0808A522: +_0808A522: add sp, 0x30 pop {r3,r4} mov r8, r3 @@ -238797,7 +238797,7 @@ sub_808A530: ; 808A530 bl CurrentMapDrawMetatileAt ldrb r0, [r4, 0x3] cmp r0, 0x2 - bne @0808A562 + bne _0808A562 adds r4, r5, 0x1 adds r0, r4, 0 adds r1, r7, 0 @@ -238805,7 +238805,7 @@ sub_808A530: ; 808A530 adds r0, r4, 0 adds r1, r6, 0 bl CurrentMapDrawMetatileAt -@0808A562: +_0808A562: pop {r4-r7} pop {r0} bx r0 @@ -238821,7 +238821,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 @@ -238829,7 +238829,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 @@ -238838,9 +238838,9 @@ sub_808A568: ; 808A568 adds r2, 0x7 adds r0, r4, 0 bl sub_808A530 - b @0808A5E2 + b _0808A5E2 .pool -@0808A5B0: +_0808A5B0: adds r0, r4, 0 adds r1, r5, 0 bl sub_808A400 @@ -238852,7 +238852,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 @@ -238862,7 +238862,7 @@ sub_808A568: ; 808A568 ldr r3, [r4, 0x8] adds r0, r4, 0 bl door_patch_tilemap -@0808A5E2: +_0808A5E2: pop {r4-r7} pop {r0} bx r0 @@ -238878,7 +238878,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 @@ -238889,7 +238889,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 @@ -238898,7 +238898,7 @@ sub_808A5F0: ; 808A5F0 adds r0, r5 ldrb r0, [r0] cmp r1, r0 - bne @0808A644 + bne _0808A644 movs r0, 0 strh r0, [r4, 0xA] ldrh r0, [r4, 0x8] @@ -238910,16 +238910,16 @@ sub_808A5F0: ; 808A5F0 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 @@ -238945,10 +238945,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 @@ -238959,13 +238959,13 @@ task50_overworld_door: ; 808A654 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 @@ -238977,21 +238977,21 @@ door_find: ; 808A6A0 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 @@ -239011,7 +239011,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 @@ -239033,12 +239033,12 @@ task_overworld_door_add_if_inactive: ; 808A6C4 strh r2, [r1, 0x4] lsls r0, 24 asrs r0, 24 - b @0808A71C + b _0808A71C .pool -@0808A718: +_0808A718: movs r0, 0x1 negs r0, r0 -@0808A71C: +_0808A71C: pop {r3} mov r8, r3 pop {r4-r7} @@ -239070,7 +239070,7 @@ sub_808A734: ; 808A734 bl door_find adds r4, r0, 0 cmp r4, 0 - beq @0808A76A + beq _0808A76A ldr r1, =gUnknown_08496F8C adds r0, r1, 0 bl door_frame_last @@ -239079,7 +239079,7 @@ sub_808A734: ; 808A734 adds r2, r5, 0 adds r3, r6, 0 bl sub_808A568 -@0808A76A: +_0808A76A: pop {r4-r6} pop {r0} bx r0 @@ -239104,28 +239104,28 @@ 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, =gUnknown_08496F8C adds r0, r2, 0 - b @0808A7B4 + b _0808A7B4 .pool -@0808A7B0: +_0808A7B0: ldr r1, =gUnknown_08496FB4 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 @@ -239147,19 +239147,19 @@ sub_808A7CC: ; 808A7CC adds r0, r4, 0 bl door_find cmp r0, 0 - beq @0808A800 + beq _0808A800 ldr r1, =gUnknown_08496FA0 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 .pool -@0808A800: +_0808A800: movs r0, 0x1 negs r0, r0 -@0808A804: +_0808A804: pop {r4-r6} pop {r1} bx r1 @@ -239178,15 +239178,15 @@ 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 @@ -239216,12 +239216,12 @@ sub_808A854: ; 808A854 bl sub_8088EFC lsls r0, 24 cmp r0, 0 - beq @0808A876 + beq _0808A876 ldr r0, =gUnknown_08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A734 -@0808A876: +_0808A876: pop {r4,r5} pop {r0} bx r0 @@ -239239,12 +239239,12 @@ sub_808A880: ; 808A880 bl sub_8088EFC lsls r0, 24 cmp r0, 0 - beq @0808A8A2 + beq _0808A8A2 ldr r0, =gUnknown_08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A728 -@0808A8A2: +_0808A8A2: pop {r4,r5} pop {r0} bx r0 @@ -239262,19 +239262,19 @@ sub_808A8AC: ; 808A8AC bl sub_8088EFC lsls r0, 24 cmp r0, 0 - beq @0808A8D8 + beq _0808A8D8 ldr r0, =gUnknown_08497174 adds r1, r4, 0 adds r2, r5, 0 bl sub_808A7CC lsls r0, 24 asrs r0, 24 - b @0808A8DC + b _0808A8DC .pool -@0808A8D8: +_0808A8D8: movs r0, 0x1 negs r0, r0 -@0808A8DC: +_0808A8DC: pop {r4,r5} pop {r1} bx r1 @@ -239291,19 +239291,19 @@ 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, =gUnknown_08497174 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 .pool -@0808A910: +_0808A910: movs r0, 0x1 negs r0, r0 -@0808A914: +_0808A914: pop {r4,r5} pop {r1} bx r1 @@ -239332,21 +239332,21 @@ 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 .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 @@ -239358,19 +239358,19 @@ sub_808A964: ; 808A964 bl FlagGet 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 .pool -@0808A990: +_0808A990: movs r0, 0 -@0808A992: +_0808A992: pop {r1} bx r1 thumb_func_end sub_808A964 @@ -239424,7 +239424,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 @@ -239433,20 +239433,20 @@ player_step: ; 808A9C0 bl TryInterruptFieldObjectSpecialAnim lsls r0, 24 cmp r0, 0 - bne @0808AA26 + bne _0808AA26 adds r0, r5, 0 bl npc_clear_strange_bits bl DoPlayerAvatarTransition bl TryDoMetatileBehaviorForcedMovment lsls r0, 24 cmp r0, 0 - bne @0808AA26 + bne _0808AA26 mov r0, r8 adds r1, r7, 0 adds r2, r6, 0 bl MovePlayerAvatarUsingKeypadInput bl PlayerAllowForcedMovementIfMovingSameDirection -@0808AA26: +_0808AA26: pop {r3} mov r8, r3 pop {r4-r7} @@ -239466,12 +239466,12 @@ TryInterruptFieldObjectSpecialAnim: ; 808AA38 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @0808AA92 + beq _0808AA92 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - bne @0808AA92 + bne _0808AA92 adds r0, r4, 0 bl FieldObjectGetSpecialAnim lsls r0, 24 @@ -239480,31 +239480,31 @@ TryInterruptFieldObjectSpecialAnim: ; 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 FieldObjectClearAnim - 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 @@ -239547,17 +239547,17 @@ MovePlayerAvatarUsingKeypadInput: ; 808AAC0 movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq @0808AAE8 + beq _0808AAE8 adds r0, r3, 0 adds r1, r4, 0 bl MovePlayerOnBike - b @0808AAF0 + b _0808AAF0 .pool -@0808AAE8: +_0808AAE8: adds r0, r3, 0 adds r1, r2, 0 bl MovePlayerNotOnBike -@0808AAF0: +_0808AAF0: pop {r4} pop {r0} bx r0 @@ -239570,12 +239570,12 @@ PlayerAllowForcedMovementIfMovingSameDirection: ; 808AAF8 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 .pool @@ -239609,7 +239609,7 @@ GetForcedMovementByMetatileBehavior: ; 808AB38 movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne @0808AB8A + bne _0808AB8A ldr r2, =0x02037350 ldrb r1, [r3, 0x5] lsls r0, r1, 3 @@ -239619,7 +239619,7 @@ GetForcedMovementByMetatileBehavior: ; 808AB38 ldrb r5, [r0, 0x1E] movs r4, 0 ldr r6, =gUnknown_084973FC -@0808AB58: +_0808AB58: lsls r0, r4, 2 adds r0, r6 ldr r1, [r0] @@ -239627,21 +239627,21 @@ GetForcedMovementByMetatileBehavior: ; 808AB38 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 .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 @@ -239655,7 +239655,7 @@ ForcedMovement_None: ; 808AB94 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @0808ABCE + beq _0808ABCE ldrb r1, [r4, 0x5] lsls r0, r1, 3 adds r0, r1 @@ -239677,7 +239677,7 @@ ForcedMovement_None: ; 808AB94 movs r0, 0xBF ands r0, r1 strb r0, [r4] -@0808ABCE: +_0808ABCE: movs r0, 0 pop {r4} pop {r1} @@ -239710,34 +239710,34 @@ DoForcedMovement: ; 808ABE0 orrs r0, r1 strb r0, [r6] cmp r4, 0 - beq @0808AC3C + beq _0808AC3C bl ForcedMovement_None cmp r4, 0x4 - bhi @0808AC24 + bhi _0808AC24 movs r0, 0 - b @0808AC48 + b _0808AC48 .pool -@0808AC24: +_0808AC24: cmp r7, 0x6 - bne @0808AC2E + bne _0808AC2E adds r0, r5, 0 bl PlayerJumpLedge -@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 @@ -239999,13 +239999,13 @@ ForcedMovement_MuddySlope: ; 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] @@ -240017,11 +240017,11 @@ ForcedMovement_MuddySlope: ; 808AE10 bl DoForcedMovement lsls r0, 24 lsrs r0, 24 - b @0808AE62 + b _0808AE62 .pool -@0808AE60: +_0808AE60: movs r0, 0 -@0808AE62: +_0808AE62: pop {r4} pop {r1} bx r1 @@ -240060,31 +240060,31 @@ CheckMovementInputNotOnBike: ; 808AE98 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 .pool -@0808AEB0: +_0808AEB0: bl player_get_direction_upper_nybble 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 .pool -@0808AECC: +_0808AECC: ldr r1, =0x02037590 movs r0, 0x2 -@0808AED0: +_0808AED0: strb r0, [r1, 0x2] -@0808AED2: +_0808AED2: pop {r4} pop {r1} bx r1 @@ -240127,58 +240127,58 @@ PlayerNotOnBikeMoving: ; 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 PlayerJumpLedge - b @0808AFB6 -@0808AF24: + b _0808AFB6 +_0808AF24: cmp r4, 0x4 - bne @0808AF3C + bne _0808AF3C adds r0, r5, 0 bl IsPlayerCollidingWithFarawayIslandMew lsls r0, 24 cmp r0, 0 - beq @0808AF3C + beq _0808AF3C adds r0, r5, 0 bl PlayerNotOnBikeCollideWithFarawayIslandMew - 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 PlayerNotOnBikeCollide - 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 PlayerGoSpeed1 - b @0808AFB6 + b _0808AFB6 .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 FlagGet lsls r0, 24 cmp r0, 0 - beq @0808AFB0 + beq _0808AFB0 ldr r2, =0x02037350 ldrb r1, [r4, 0x5] lsls r0, r1, 3 @@ -240188,19 +240188,19 @@ PlayerNotOnBikeMoving: ; 808AF00 ldrb r0, [r0, 0x1E] bl IsRunningDisallowed cmp r0, 0 - bne @0808AFB0 + bne _0808AFB0 adds r0, r5, 0 bl PlayerRun ldrb r1, [r4] movs r0, 0x80 orrs r0, r1 strb r0, [r4] - b @0808AFB6 + b _0808AFB6 .pool -@0808AFB0: +_0808AFB0: adds r0, r5, 0 bl PlayerGoSpeed0 -@0808AFB6: +_0808AFB6: pop {r4-r6} pop {r0} bx r0 @@ -240339,17 +240339,17 @@ CheckForFieldObjectCollision: ; 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 @@ -240361,30 +240361,30 @@ CheckForFieldObjectCollision: ; 808B094 bl ShouldJumpLedge 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 @@ -240392,19 +240392,19 @@ CheckForFieldObjectCollision: ; 808B094 adds r2, r4, 0 bl CheckForRotatingGatePuzzleCollision 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 check_acro_bike_metatile -@0808B14E: +_0808B14E: mov r0, sp ldrb r0, [r0] -@0808B152: +_0808B152: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -240437,25 +240437,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 check_acro_bike_metatile -@0808B1AE: +_0808B1AE: mov r0, sp ldrb r0, [r0] -@0808B1B2: +_0808B1B2: add sp, 0x4 pop {r4-r7} pop {r1} @@ -240477,7 +240477,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 @@ -240486,7 +240486,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 @@ -240494,15 +240494,15 @@ 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 .pool -@0808B20C: +_0808B20C: movs r0, 0 -@0808B20E: +_0808B20E: pop {r4-r6} pop {r1} bx r1 @@ -240521,12 +240521,12 @@ ShouldJumpLedge: ; 808B214 bl GetLedgeJumpDirection 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 ShouldJumpLedge @@ -240546,7 +240546,7 @@ sub_808B238: ; 808B238 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @0808B2D8 + beq _0808B2D8 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -240556,7 +240556,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 @@ -240564,7 +240564,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] @@ -240584,7 +240584,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] @@ -240596,16 +240596,16 @@ 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 .pool -@0808B2D8: +_0808B2D8: movs r0, 0 -@0808B2DA: +_0808B2DA: add sp, 0x4 pop {r4-r7} pop {r1} @@ -240621,7 +240621,7 @@ check_acro_bike_metatile: ; 808B2E4 lsrs r5, r2, 24 movs r4, 0 ldr r7, =gUnknown_0849749C -@0808B2F0: +_0808B2F0: lsls r0, r4, 2 adds r0, r7 ldr r1, [r0] @@ -240629,20 +240629,20 @@ check_acro_bike_metatile: ; 808B2E4 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq @0808B314 + beq _0808B314 ldr r0, =gUnknown_084974B0 adds r0, r4, r0 ldrb r0, [r0] strb r0, [r6] - b @0808B31E + b _0808B31E .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 @@ -240680,7 +240680,7 @@ IsPlayerCollidingWithFarawayIslandMew: ; 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 @@ -240691,42 +240691,42 @@ IsPlayerCollidingWithFarawayIslandMew: ; 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 .pool -@0808B3C0: +_0808B3C0: movs r0, 0 -@0808B3C2: +_0808B3C2: add sp, 0x4 pop {r4-r6} pop {r1} @@ -240756,13 +240756,13 @@ DoPlayerAvatarTransition: ; 808B3E8 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, =gUnknown_084974B8 lsls r2, r5, 2 adds r2, r0 @@ -240775,17 +240775,17 @@ DoPlayerAvatarTransition: ; 808B3E8 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 @@ -240962,27 +240962,27 @@ sub_808B578: ; 808B578 bl PlayerIsAnimActive lsls r0, 24 cmp r0, 0 - beq @0808B5B6 + beq _0808B5B6 bl PlayerCheckIfAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 - bne @0808B5A8 + bne _0808B5A8 bl player_is_anim_in_certain_ranges lsls r0, 24 cmp r0, 0 - bne @0808B5B6 + bne _0808B5B6 movs r0, 0x1 - b @0808B5B4 + b _0808B5B4 .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 @@ -241000,38 +241000,38 @@ player_is_anim_in_certain_ranges: ; 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 .pool -@0808B610: +_0808B610: movs r0, 0 -@0808B612: +_0808B612: pop {r1} bx r1 thumb_func_end player_is_anim_in_certain_ranges @@ -241042,17 +241042,17 @@ sub_808B618: ; 808B618 bl player_is_anim_in_certain_ranges 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 .pool -@0808B634: +_0808B634: movs r0, 0 -@0808B636: +_0808B636: pop {r1} bx r1 thumb_func_end sub_808B618 @@ -241155,7 +241155,7 @@ player_npc_set_state_and_x22_etc: ; 808B6E4 bl PlayerIsAnimActive lsls r0, 24 cmp r0, 0 - bne @0808B712 + bne _0808B712 adds r0, r4, 0 bl player_set_x22 ldr r0, =0x02037590 @@ -241167,7 +241167,7 @@ player_npc_set_state_and_x22_etc: ; 808B6E4 adds r0, r1 adds r1, r5, 0 bl FieldObjectSetSpecialAnim -@0808B712: +_0808B712: pop {r4,r5} pop {r0} bx r0 @@ -241375,14 +241375,14 @@ sub_808B864: ; 808B864 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 @@ -241396,7 +241396,7 @@ sub_808B864: ; 808B864 lsls r0, 24 lsrs r0, 24 bl sub_808B6BC -@0808B89A: +_0808B89A: pop {r4} pop {r0} bx r0 @@ -241605,9 +241605,9 @@ PlayCollisionSoundIfNotFacingWarp: ; 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 @@ -241628,11 +241628,11 @@ PlayCollisionSoundIfNotFacingWarp: ; 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} @@ -241715,9 +241715,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 @@ -241727,9 +241727,9 @@ plaer_get_pos_including_state_based_drift: ; 808BADC 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] @@ -241737,96 +241737,96 @@ plaer_get_pos_including_state_based_drift: ; 808BADC 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 .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 @@ -241961,11 +241961,11 @@ sub_808BCF4: ; 808BCF4 bl TestPlayerAvatarFlags 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 @@ -242046,25 +242046,25 @@ sub_808BDA8: ; 808BDA8 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 @@ -242077,25 +242077,25 @@ GetPlayerAvatarGenderByGraphicsId: ; 808BDD4 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 GetPlayerAvatarGenderByGraphicsId @@ -242108,25 +242108,25 @@ PartyHasMonWithSurf: ; 808BE00 bl TestPlayerAvatarFlags 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 @@ -242136,10 +242136,10 @@ PartyHasMonWithSurf: ; 808BE00 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 @@ -242154,17 +242154,17 @@ IsPlayerSurfingNorth: ; 808BE50 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne @0808BE6E + bne _0808BE6E movs r0, 0x8 bl TestPlayerAvatarFlags 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 IsPlayerSurfingNorth @@ -242207,12 +242207,12 @@ IsPlayerFacingSurfableFishableWater: ; 808BE74 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne @0808BEF4 + bne _0808BEF4 bl PlayerGetZCoord lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne @0808BEF4 + bne _0808BEF4 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -242224,13 +242224,13 @@ IsPlayerFacingSurfableFishableWater: ; 808BE74 bl MetatileBehavior_IsSurfableFishableWater lsls r0, 24 cmp r0, 0 - beq @0808BEF4 + beq _0808BEF4 movs r0, 0x1 - b @0808BEF6 + b _0808BEF6 .pool -@0808BEF4: +_0808BEF4: movs r0, 0 -@0808BEF6: +_0808BEF6: add sp, 0x4 pop {r4,r5} pop {r1} @@ -242279,25 +242279,25 @@ GetPlayerAvatarStateTransitionByGraphicsId: ; 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 .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 @@ -242316,26 +242316,26 @@ GetPlayerAvatarGraphicsIdByCurrentState: ; 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 .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 @@ -242487,7 +242487,7 @@ sub_808C0A8: ; 808C0A8 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @0808C100 + beq _0808C100 ldr r2, =0x02020630 ldrb r1, [r5, 0x5] lsls r0, r1, 3 @@ -242507,7 +242507,7 @@ sub_808C0A8: ; 808C0A8 ands r0, r2 orrs r0, r3 strb r0, [r1] -@0808C100: +_0808C100: pop {r4-r6} pop {r0} bx r0 @@ -242693,7 +242693,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 @@ -242703,11 +242703,11 @@ sub_808C280: ; 808C280 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] @@ -242723,9 +242723,9 @@ sub_808C280: ; 808C280 ldrsh r3, [r7, r1] adds r1, r6, 0 bl sub_8154298 - b @0808C302 + b _0808C302 .pool -@0808C2E8: +_0808C2E8: ldrh r1, [r4] adds r1, 0x1 strh r1, [r4] @@ -242735,10 +242735,10 @@ sub_808C280: ; 808C280 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 @@ -242789,7 +242789,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 @@ -242811,7 +242811,7 @@ taskFF_bump_boulder: ; 808C34C bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne @0808C360 + bne _0808C360 pop {r4-r6} pop {r0} bx r0 @@ -242847,28 +242847,28 @@ do_boulder_dust: ; 808C3C4 bl FieldObjectIsSpecialAnimActive lsls r0, 24 cmp r0, 0 - beq @0808C3DE + beq _0808C3DE adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished -@0808C3DE: +_0808C3DE: adds r0, r4, 0 bl FieldObjectIsSpecialAnimActive lsls r0, 24 cmp r0, 0 - beq @0808C3F0 + beq _0808C3F0 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished -@0808C3F0: +_0808C3F0: adds r0, r5, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - bne @0808C472 + bne _0808C472 adds r0, r4, 0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - bne @0808C472 + bne _0808C472 adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished adds r0, r4, 0 @@ -242914,7 +242914,7 @@ do_boulder_dust: ; 808C3C4 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -@0808C472: +_0808C472: movs r0, 0 pop {r4-r6} pop {r1} @@ -242931,12 +242931,12 @@ sub_808C484: ; 808C484 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 - beq @0808C4C6 + beq _0808C4C6 adds r0, r5, 0 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 - beq @0808C4C6 + beq _0808C4C6 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished adds r0, r5, 0 @@ -242950,7 +242950,7 @@ sub_808C484: ; 808C484 lsls r0, 24 lsrs r0, 24 bl remove_task -@0808C4C6: +_0808C4C6: movs r0, 0 pop {r4,r5} pop {r1} @@ -242985,7 +242985,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 @@ -243002,7 +243002,7 @@ sub_808C4F8: ; 808C4F8 bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne @0808C50A + bne _0808C50A pop {r4,r5} pop {r0} bx r0 @@ -243021,7 +243021,7 @@ sub_808C544: ; 808C544 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @0808C5A0 + beq _0808C5A0 movs r0, 0xA bl audio_play ldrb r0, [r4, 0x18] @@ -243039,7 +243039,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] @@ -243051,7 +243051,7 @@ sub_808C544: ; 808C544 lsls r0, 24 lsrs r0, 24 bl remove_task -@0808C5A0: +_0808C5A0: movs r0, 0 pop {r4-r6} pop {r1} @@ -243086,7 +243086,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 @@ -243103,7 +243103,7 @@ sub_808C5D0: ; 808C5D0 bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne @0808C5E2 + bne _0808C5E2 pop {r4,r5} pop {r0} bx r0 @@ -243145,7 +243145,7 @@ sub_808C644: ; 808C644 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @0808C6AC + beq _0808C6AC ldrb r0, [r5, 0x18] lsrs r0, 4 subs r0, 0x1 @@ -243160,28 +243160,28 @@ sub_808C644: ; 808C644 bl FieldObjectSetSpecialAnim 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 GetOppositeDirection 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} @@ -243204,7 +243204,7 @@ sub_808C6BC: ; 808C6BC bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @0808C6EC + beq _0808C6EC movs r1, 0xC ldrsh r0, [r5, r1] add r0, sp @@ -243213,7 +243213,7 @@ sub_808C6BC: ; 808C6BC bl FieldObjectSetSpecialAnim movs r0, 0x1 strh r0, [r5, 0x8] -@0808C6EC: +_0808C6EC: movs r0, 0 add sp, 0x8 pop {r4,r5} @@ -243231,7 +243231,7 @@ sub_808C6FC: ; 808C6FC bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @0808C740 + beq _0808C740 ldrb r0, [r4, 0xA] bl GetOppositeDirection lsls r0, 24 @@ -243251,7 +243251,7 @@ sub_808C6FC: ; 808C6FC lsls r0, 24 lsrs r0, 24 bl remove_task -@0808C740: +_0808C740: movs r0, 0 pop {r4,r5} pop {r1} @@ -243312,13 +243312,13 @@ taskFF_0805D1D4: ; 808C7A8 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @0808C7D4 + beq _0808C7D4 adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @0808C7FC -@0808C7D4: + beq _0808C7FC +_0808C7D4: ldrb r0, [r5, 0x1A] movs r1, 0x2 bl sub_81555AC @@ -243336,7 +243336,7 @@ taskFF_0805D1D4: ; 808C7A8 bl FieldObjectSetSpecialAnim ldr r0, =sub_808C814 str r0, [r4] -@0808C7FC: +_0808C7FC: pop {r4-r6} pop {r0} bx r0 @@ -243359,7 +243359,7 @@ sub_808C814: ; 808C814 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @0808C87A + beq _0808C87A movs r0, 0 bl GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 @@ -243388,7 +243388,7 @@ sub_808C814: ; 808C814 bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl remove_task -@0808C87A: +_0808C87A: pop {r4-r6} pop {r0} bx r0 @@ -243431,7 +243431,7 @@ Task_Fish: ; 808C8C0 adds r1, r0 lsls r1, 3 adds r4, r1, r2 -@0808C8D2: +_0808C8D2: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -243441,7 +243441,7 @@ Task_Fish: ; 808C8C0 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0808C8D2 + bne _0808C8D2 pop {r4,r5} pop {r0} bx r0 @@ -243543,11 +243543,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} @@ -243578,17 +243578,17 @@ fish3: ; 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} @@ -243614,31 +243614,31 @@ fish4: ; 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 .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] @@ -243646,14 +243646,14 @@ fish4: ; 808CA20 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 @@ -243668,9 +243668,9 @@ fish4: ; 808CA20 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} @@ -243689,26 +243689,26 @@ fish5: ; 808CABC bl GetFishingWildMonListHeader 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 GetMonAbility 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 @@ -243717,25 +243717,25 @@ fish5: ; 808CABC 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 .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 @@ -243752,7 +243752,7 @@ fish5: ; 808CABC lsrs r1, 24 adds r0, r4, 0 bl StartObjectImageAnim -@0808CB5C: +_0808CB5C: movs r0, 0x1 pop {r4-r6} pop {r1} @@ -243810,22 +243810,22 @@ fish7: ; 808CBA4 movs r2, 0 ldrsh r0, [r0, r2] cmp r1, r0 - blt @0808CBDC + blt _0808CBDC movs r0, 0xC - b @0808CBEC + b _0808CBEC .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} @@ -243852,9 +243852,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 @@ -243874,11 +243874,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} @@ -243930,20 +243930,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 RunTextPrinters movs r1, 0xA ldrsh r0, [r5, r1] cmp r0, 0 - bne @0808CD58 + bne _0808CD58 movs r0, 0 bl IsTextPrinterActive 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 @@ -243965,7 +243965,7 @@ fishA_wait_for_a_pressed: ; 808CCA8 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq @0808CD1A + beq _0808CD1A ldrb r0, [r7, 0x5] lsls r1, r0, 3 adds r1, r0 @@ -243975,7 +243975,7 @@ fishA_wait_for_a_pressed: ; 808CCA8 movs r1, 0 movs r2, 0 bl sub_8155604 -@0808CD1A: +_0808CD1A: ldr r2, =0x02020630 ldrb r1, [r7, 0x4] lsls r0, r1, 4 @@ -243995,14 +243995,14 @@ fishA_wait_for_a_pressed: ; 808CCA8 ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] - b @0808CD80 + b _0808CD80 .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] @@ -244018,7 +244018,7 @@ fishA_wait_for_a_pressed: ; 808CCA8 lsls r0, 24 lsrs r0, 24 bl remove_task -@0808CD80: +_0808CD80: movs r0, 0 pop {r3} mov r8, r3 @@ -244157,7 +244157,7 @@ fishE: ; 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 @@ -244178,7 +244178,7 @@ fishE: ; 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 @@ -244188,7 +244188,7 @@ fishE: ; 808CE8C movs r1, 0 movs r2, 0 bl sub_8155604 -@0808CEF2: +_0808CEF2: ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -244205,7 +244205,7 @@ fishE: ; 808CE8C ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -@0808CF12: +_0808CF12: movs r0, 0 pop {r3} mov r8, r3 @@ -244224,7 +244224,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 @@ -244239,7 +244239,7 @@ fishF: ; 808CF2C lsls r0, 24 lsrs r0, 24 bl remove_task -@0808CF68: +_0808CF68: movs r0, 0 pop {r1} bx r1 @@ -244279,7 +244279,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] @@ -244303,12 +244303,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] @@ -244323,37 +244323,37 @@ sub_808CF78: ; 808CF78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bhi @0808D022 + bhi _0808D022 movs r0, 0x8 strh r0, [r4, 0x24] bl player_get_direction_lower_nybble 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 @@ -244365,7 +244365,7 @@ sub_808CF78: ; 808CF78 ldrsh r2, [r4, r1] movs r1, 0x1 bl sub_8155604 -@0808D05E: +_0808D05E: pop {r4-r7} pop {r0} bx r0 @@ -244386,9 +244386,9 @@ sub_808D080: ; 808D080 ldr r1, =0x0203734c ldrb r0, [r1] cmp r0, 0 - bne @0808D08C + bne _0808D08C movs r0, 0x1 -@0808D08C: +_0808D08C: pop {r1} bx r1 .pool @@ -244423,23 +244423,23 @@ 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 .pool -@0808D0E8: +_0808D0E8: cmp r6, 0x2 - beq @0808D184 - b @0808D18A -@0808D0EE: + beq _0808D184 + b _0808D18A +_0808D0EE: adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @0808D18A + beq _0808D18A ldrb r0, [r4, 0x18] lsls r0, 28 lsrs r0, 28 @@ -244478,7 +244478,7 @@ sub_808D094: ; 808D094 ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -@0808D14A: +_0808D14A: adds r1, r5, 0x2 adds r0, r4, 0 bl sub_808D38C @@ -244500,16 +244500,16 @@ sub_808D094: ; 808D094 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 .pool -@0808D184: +_0808D184: adds r0, r2, 0 bl remove_task -@0808D18A: +_0808D18A: pop {r3} mov r8, r3 pop {r4-r7} @@ -244604,20 +244604,20 @@ 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 .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 @@ -244678,7 +244678,7 @@ sub_808D1FC: ; 808D1FC ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -@0808D2DE: +_0808D2DE: adds r1, r5, 0x2 adds r0, r4, 0 bl sub_808D38C @@ -244691,10 +244691,10 @@ sub_808D1FC: ; 808D1FC 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 @@ -244703,13 +244703,13 @@ sub_808D1FC: ; 808D1FC 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 .pool -@0808D31C: +_0808D31C: adds r1, r5, 0x2 adds r0, r4, 0 bl sub_808D38C @@ -244719,13 +244719,13 @@ sub_808D1FC: ; 808D1FC 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 @@ -244734,7 +244734,7 @@ sub_808D1FC: ; 808D1FC lsls r0, 24 lsrs r0, 24 cmp r6, r0 - bne @0808D37E + bne _0808D37E ldrb r1, [r4, 0x3] movs r0, 0x5 negs r0, r0 @@ -244757,7 +244757,7 @@ sub_808D1FC: ; 808D1FC bl CameraObjectReset1 mov r0, r8 bl remove_task -@0808D37E: +_0808D37E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -244775,19 +244775,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 FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 - beq @0808D3E4 + beq _0808D3E4 ldr r4, =gUnknown_084975BC ldrb r0, [r5, 0x18] lsls r0, 28 @@ -244807,13 +244807,13 @@ sub_808D38C: ; 808D38C lsrs r0, 28 adds r0, r4 ldrb r0, [r0] - b @0808D3EA + b _0808D3EA .pool -@0808D3E4: +_0808D3E4: ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 -@0808D3EA: +_0808D3EA: pop {r4-r6} pop {r1} bx r1 @@ -244843,7 +244843,7 @@ 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 @@ -244853,7 +244853,7 @@ npcs_clear_ids_and_state: ; 808D410 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls @0808D416 + bls _0808D416 pop {r4,r5} pop {r0} bx r0 @@ -244954,24 +244954,24 @@ sub_808D4F4: ; 808D4F4 movs r1, 0 ldr r2, =0x02037350 ldrb r0, [r2] - b @0808D518 + b _0808D518 .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 @@ -244988,12 +244988,12 @@ GetFieldObjectIdByLocalIdAndMap: ; 808D524 lsls r2, 24 lsrs r2, 24 cmp r0, 0xFE - bls @0808D53C + bls _0808D53C bl GetFieldObjectIdByLocalId - b @0808D540 -@0808D53C: + b _0808D540 +_0808D53C: bl GetFieldObjectIdByLocalIdAndMapInternal -@0808D540: +_0808D540: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -245016,12 +245016,12 @@ TryGetFieldObjectIdByLocalIdAndMap: ; 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 @@ -245037,7 +245037,7 @@ GetFieldObjectIdByXY: ; 808D574 asrs r4, r0, 16 lsls r1, 16 asrs r1, 16 -@0808D582: +_0808D582: lsls r0, r3, 3 adds r0, r3 lsls r0, 2 @@ -245045,22 +245045,22 @@ GetFieldObjectIdByXY: ; 808D574 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} @@ -245080,7 +245080,7 @@ GetFieldObjectIdByLocalIdAndMapInternal: ; 808D5B8 lsrs r2, 24 movs r1, 0 ldr r6, =0x02037350 -@0808D5CA: +_0808D5CA: lsls r0, r1, 3 adds r0, r1 lsls r0, 2 @@ -245088,27 +245088,27 @@ GetFieldObjectIdByLocalIdAndMapInternal: ; 808D5B8 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 .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 @@ -245122,7 +245122,7 @@ GetFieldObjectIdByLocalId: ; 808D608 lsrs r3, r0, 24 movs r2, 0 ldr r4, =0x02037350 -@0808D612: +_0808D612: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -245130,21 +245130,21 @@ GetFieldObjectIdByLocalId: ; 808D608 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 .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 @@ -245170,10 +245170,10 @@ InitFieldObjectStateFromTemplate: ; 808D644 bl GetAvailableFieldObjectSlot 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 @@ -245264,12 +245264,12 @@ InitFieldObjectStateFromTemplate: ; 808D644 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 @@ -245279,12 +245279,12 @@ InitFieldObjectStateFromTemplate: ; 808D644 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 @@ -245292,10 +245292,10 @@ InitFieldObjectStateFromTemplate: ; 808D644 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 @@ -245317,23 +245317,23 @@ sub_808D77C: ; 808D77C ldr r4, =0x02037318 ldr r0, [r4, 0x4] cmp r0, 0 - beq @0808D7FE + beq _0808D7FE bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0808D7A8 + beq _0808D7A8 bl sub_81AAA40 lsls r0, 24 lsrs r6, r0, 24 - b @0808D7CA + b _0808D7CA .pool -@0808D7A8: +_0808D7A8: bl InTrainerHill 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] @@ -245341,16 +245341,16 @@ sub_808D77C: ; 808D77C bl InitFieldObjectStateFromTemplate 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 @@ -245361,21 +245361,21 @@ sub_808D77C: ; 808D77C adds r4, r1, r0 ldrb r0, [r4] cmp r0, r8 - bne @0808D7F4 + bne _0808D7F4 ldrh r0, [r4, 0x14] bl FlagGet 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} @@ -245401,28 +245401,28 @@ GetAvailableFieldObjectSlot: ; 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 @@ -245430,19 +245430,19 @@ GetAvailableFieldObjectSlot: ; 808D810 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 .pool -@0808D870: +_0808D870: mov r0, r12 strb r2, [r0] ldr r1, =0x02037350 -@0808D876: +_0808D876: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -245450,24 +245450,24 @@ GetAvailableFieldObjectSlot: ; 808D810 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 @@ -245503,7 +245503,7 @@ RemoveFieldObjectByLocalIdAndMap: ; 808D8C4 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808D902 + bne _0808D902 mov r0, sp ldrb r0, [r0] bl GetFieldObjectFlagIdByFieldObjectId @@ -245518,7 +245518,7 @@ RemoveFieldObjectByLocalIdAndMap: ; 808D8C4 ldr r1, =0x02037350 adds r0, r1 bl RemoveFieldObject -@0808D902: +_0808D902: add sp, 0x4 pop {r0} bx r0 @@ -245566,23 +245566,23 @@ RemoveFieldObjectInternal: ; 808D90C sub_808D958: ; 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 RemoveFieldObject -@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 @@ -245618,10 +245618,10 @@ SpawnFieldObjectInternal: ; 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 @@ -245635,22 +245635,22 @@ SpawnFieldObjectInternal: ; 808D98C 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 .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 @@ -245658,15 +245658,15 @@ SpawnFieldObjectInternal: ; 808D98C 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 @@ -245680,7 +245680,7 @@ SpawnFieldObjectInternal: ; 808D98C lsrs r0, 24 mov r8, r0 cmp r0, 0x40 - bne @0808DA64 + bne _0808DA64 ldr r0, =0x02037350 mov r2, r9 adds r1, r4, r2 @@ -245692,9 +245692,9 @@ SpawnFieldObjectInternal: ; 808D98C ands r0, r2 strb r0, [r1] movs r0, 0x10 - b @0808DB2C + b _0808DB2C .pool -@0808DA64: +_0808DA64: mov r1, r8 lsls r0, r1, 4 add r0, r8 @@ -245771,7 +245771,7 @@ SpawnFieldObjectInternal: ; 808D98C strb r0, [r6, 0x1] lsls r0, 27 cmp r0, 0 - blt @0808DB16 + blt _0808DB16 ldrb r0, [r6, 0x18] lsls r0, 28 lsrs r0, 28 @@ -245781,7 +245781,7 @@ SpawnFieldObjectInternal: ; 808D98C lsrs r1, 24 adds r0, r4, 0 bl StartObjectImageAnim -@0808DB16: +_0808DB16: ldrb r0, [r6, 0xB] lsrs r0, 4 adds r1, r4, 0 @@ -245791,7 +245791,7 @@ SpawnFieldObjectInternal: ; 808D98C adds r1, r4, 0 bl sub_8096518 mov r0, r9 -@0808DB2C: +_0808DB2C: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -245859,11 +245859,11 @@ SpawnFieldObject: ; 808DB40 lsrs r2, r0, 24 adds r5, r2, 0 cmp r2, 0x10 - bne @0808DBBC + bne _0808DBBC movs r0, 0x10 - b @0808DBF2 + b _0808DBF2 .pool -@0808DBBC: +_0808DBBC: ldr r4, =0x02020630 ldr r1, =0x02037350 lsls r0, r2, 3 @@ -245881,7 +245881,7 @@ SpawnFieldObject: ; 808DB40 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 @@ -245889,9 +245889,9 @@ SpawnFieldObject: ; 808DB40 adds r0, r4 adds r1, r2, 0 bl SetSpriteOamTables_NoPriorityFromTable -@0808DBF0: +_0808DBF0: adds r0, r5, 0 -@0808DBF2: +_0808DBF2: add sp, 0x2C pop {r3,r4} mov r8, r3 @@ -246003,7 +246003,7 @@ show_sprite: ; 808DCAC bl GetFieldObjectTemplateByLocalIdAndMap adds r5, r0, 0 cmp r5, 0 - beq @0808DCF2 + beq _0808DCF2 mov r4, sp adds r4, 0x6 add r0, sp, 0x4 @@ -246021,10 +246021,10 @@ show_sprite: ; 808DCAC bl SpawnFieldObject 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} @@ -246127,10 +246127,10 @@ AddPseudoFieldObject: ; 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 @@ -246144,10 +246144,10 @@ AddPseudoFieldObject: ; 808DD68 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 @@ -246162,7 +246162,7 @@ AddPseudoFieldObject: ; 808DD68 movs r1, 0x80 orrs r0, r1 strb r0, [r4] -@0808DDF2: +_0808DDF2: adds r0, r5, 0 add sp, 0x4 pop {r3,r4} @@ -246238,7 +246238,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 @@ -246274,13 +246274,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] @@ -246294,27 +246294,27 @@ sprite_new: ; 808DE0C 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 .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 SetSpriteOamTables_NoPriorityFromTable adds r2, r5, 0 @@ -246325,7 +246325,7 @@ sprite_new: ; 808DE0C movs r0, 0x80 orrs r1, r0 strb r1, [r2] -@0808DF48: +_0808DF48: adds r0, r5, 0 adds r1, r7, 0 bl InitObjectPriorityByZCoord @@ -246340,7 +246340,7 @@ sprite_new: ; 808DE0C lsrs r1, 24 adds r0, r5, 0 bl StartObjectImageAnim -@0808DF6C: +_0808DF6C: adds r0, r6, 0 add sp, 0x20 pop {r3-r5} @@ -246370,7 +246370,7 @@ SpawnFieldObjectsInView: ; 808DF80 ldr r5, =0x02037318 ldr r0, [r5, 0x4] cmp r0, 0 - beq @0808E078 + beq _0808E078 ldr r0, =0x03005d8c ldr r2, [r0] ldrh r1, [r2] @@ -246391,25 +246391,25 @@ SpawnFieldObjectsInView: ; 808DF80 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0808DFE0 + beq _0808DFE0 bl sub_81AAA40 lsls r0, 24 lsrs r6, r0, 24 - b @0808DFF0 + b _0808DFF0 .pool -@0808DFE0: +_0808DFE0: bl InTrainerHill 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 @@ -246417,7 +246417,7 @@ SpawnFieldObjectsInView: ; 808DF80 lsls r0, r1, 16 asrs r0, 16 mov r8, r0 -@0808E004: +_0808E004: lsls r0, r5, 1 adds r0, r5 lsls r0, 3 @@ -246436,26 +246436,26 @@ SpawnFieldObjectsInView: ; 808DF80 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 FlagGet lsls r0, 24 cmp r0, 0 - bne @0808E06E + bne _0808E06E ldr r3, =0x03005d8c ldr r0, [r3] ldrb r1, [r0, 0x5] @@ -246469,13 +246469,13 @@ SpawnFieldObjectsInView: ; 808DF80 adds r0, r4, 0 asrs r3, 16 bl SpawnFieldObject -@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 @@ -246493,28 +246493,28 @@ RemoveFieldObjectsOutsideView: ; 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 @@ -246524,14 +246524,14 @@ RemoveFieldObjectsOutsideView: ; 808E08C ldr r1, =0x00010001 ands r0, r1 cmp r0, 0x1 - bne @0808E0D2 + bne _0808E0D2 adds r0, r2, 0 bl RemoveFieldObjectIfOutsideView -@0808E0D2: +_0808E0D2: lsls r0, r5, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls @0808E092 + bls _0808E092 pop {r4-r6} pop {r0} bx r0 @@ -246561,46 +246561,46 @@ RemoveFieldObjectIfOutsideView: ; 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 RemoveFieldObject -@0808E160: +_0808E160: pop {r4-r7} pop {r0} bx r0 @@ -246621,7 +246621,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 @@ -246629,17 +246629,17 @@ sub_808E16C: ; 808E16C 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} @@ -246666,22 +246666,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 @@ -246715,24 +246715,24 @@ sub_808E1B8: ; 808E1B8 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 .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 @@ -246740,7 +246740,7 @@ sub_808E1B8: ; 808E1B8 ldrh r0, [r5, 0x2] mov r1, r8 bl sub_808EAB0 -@0808E27E: +_0808E27E: mov r1, sp ldr r2, =0x0000ffff adds r0, r2, 0 @@ -246753,7 +246753,7 @@ sub_808E1B8: ; 808E1B8 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x40 - beq @0808E374 + beq _0808E374 lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -246805,19 +246805,19 @@ sub_808E1B8: ; 808E1B8 str r0, [r4, 0xC] ldrb r0, [r6, 0x6] cmp r0, 0xB - bne @0808E312 + bne _0808E312 mov r0, r9 adds r1, r7, 0 bl SetPlayerAvatarFieldObjectIdAndObjectId 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 SetSpriteOamTables_NoPriorityFromTable -@0808E31E: +_0808E31E: mov r0, r8 lsls r2, r0, 4 ldrb r1, [r4, 0x5] @@ -246837,10 +246837,10 @@ sub_808E1B8: ; 808E1B8 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 @@ -246850,7 +246850,7 @@ sub_808E1B8: ; 808E1B8 lsrs r1, 24 adds r0, r4, 0 bl StartObjectImageAnim -@0808E362: +_0808E362: adds r0, r6, 0 bl sub_808E38C ldrb r0, [r6, 0xB] @@ -246858,7 +246858,7 @@ sub_808E1B8: ; 808E1B8 adds r1, r4, 0 movs r2, 0x1 bl SetObjectSubpriorityByZCoord -@0808E374: +_0808E374: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -246951,22 +246951,22 @@ FieldObjectSetGraphicsId: ; 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 .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 @@ -246974,7 +246974,7 @@ FieldObjectSetGraphicsId: ; 808E3F8 ldrh r0, [r6, 0x2] adds r1, r5, 0 bl sub_808EAB0 -@0808E456: +_0808E456: ldr r0, [r6, 0x10] ldrb r2, [r0, 0x1] lsrs r2, 6 @@ -247052,9 +247052,9 @@ FieldObjectSetGraphicsId: ; 808E3F8 ldrb r0, [r7, 0x1] lsrs r0, 7 cmp r0, 0 - beq @0808E4F8 + beq _0808E4F8 bl CameraObjectReset1 -@0808E4F8: +_0808E4F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -247078,7 +247078,7 @@ sub_808E504: ; 808E504 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808E538 + bne _0808E538 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -247088,7 +247088,7 @@ sub_808E504: ; 808E504 adds r0, r1 adds r1, r4, 0 bl FieldObjectSetGraphicsId -@0808E538: +_0808E538: add sp, 0x4 pop {r4} pop {r0} @@ -247107,7 +247107,7 @@ FieldObjectTurn: ; 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 @@ -247130,7 +247130,7 @@ FieldObjectTurn: ; 808E544 adds r0, r5 movs r1, 0 bl SeekObjectImageAnim -@0808E58A: +_0808E58A: pop {r4-r6} pop {r0} bx r0 @@ -247154,7 +247154,7 @@ FieldObjectTurnByLocalIdAndMap: ; 808E594 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808E5C8 + bne _0808E5C8 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -247164,7 +247164,7 @@ FieldObjectTurnByLocalIdAndMap: ; 808E594 adds r0, r1 adds r1, r4, 0 bl FieldObjectTurn -@0808E5C8: +_0808E5C8: add sp, 0x4 pop {r4} pop {r0} @@ -247210,7 +247210,7 @@ get_berry_tree_graphics: ; 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 @@ -247230,9 +247230,9 @@ get_berry_tree_graphics: ; 808E5F4 lsls r0, 24 lsrs r6, r0, 24 cmp r4, 0x2B - bls @0808E648 + bls _0808E648 movs r4, 0 -@0808E648: +_0808E648: ldr r0, =gBerryTreeFieldObjectGraphicsIdTablePointers lsls r4, 2 adds r0, r4, r0 @@ -247259,7 +247259,7 @@ get_berry_tree_graphics: ; 808E5F4 adds r0, r7, 0 adds r1, r6, 0 bl StartObjectImageAnim -@0808E680: +_0808E680: pop {r4-r7} pop {r0} bx r0 @@ -247273,34 +247273,34 @@ GetFieldObjectGraphicsInfo: ; 808E694 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 VarGetFieldObjectGraphicsId adds r1, r0, 0 -@0808E6AC: +_0808E6AC: cmp r1, 0x45 - bne @0808E6C4 + bne _0808E6C4 bl sub_81201C8 lsls r0, 24 ldr r1, =gMauvilleOldManGraphicsInfoPointers lsrs r0, 22 adds r0, r1 ldr r0, [r0] - b @0808E6D2 + b _0808E6D2 .pool -@0808E6C4: +_0808E6C4: cmp r1, 0xEE - bls @0808E6CA + bls _0808E6CA movs r1, 0x5 -@0808E6CA: +_0808E6CA: ldr r0, =gFieldObjectGraphicsInfoPointers lsls r1, 2 adds r1, r0 ldr r0, [r1] -@0808E6D2: +_0808E6D2: pop {r1} bx r1 .pool @@ -247313,13 +247313,13 @@ FieldObjectHandleDynamicGraphicsId: ; 808E6DC 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 VarGetFieldObjectGraphicsId strb r0, [r4, 0x5] -@0808E6F2: +_0808E6F2: pop {r4} pop {r0} bx r0 @@ -247341,7 +247341,7 @@ npc_by_local_id_and_map_set_field_1_bit_x20: ; 808E6F8 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808E73A + bne _0808E73A ldr r2, =0x02037350 mov r0, sp ldrb r0, [r0] @@ -247359,7 +247359,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} @@ -247393,7 +247393,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 @@ -247403,7 +247403,7 @@ sub_808E75C: ; 808E75C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@0808E784: +_0808E784: pop {r0} bx r0 .pool @@ -247425,7 +247425,7 @@ sub_808E78C: ; 808E78C bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808E7D2 + bne _0808E7D2 mov r0, sp ldrb r0, [r0] lsls r2, r0, 3 @@ -247445,7 +247445,7 @@ sub_808E78C: ; 808E78C strb r1, [r2, 0x3] adds r0, 0x43 strb r4, [r0] -@0808E7D2: +_0808E7D2: add sp, 0x4 pop {r4} pop {r0} @@ -247467,7 +247467,7 @@ sub_808E7E4: ; 808E7E4 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808E820 + bne _0808E820 mov r0, sp ldrb r0, [r0] lsls r1, r0, 3 @@ -247484,7 +247484,7 @@ sub_808E7E4: ; 808E7E4 movs r2, 0x4 orrs r0, r2 strb r0, [r1] -@0808E820: +_0808E820: add sp, 0x4 pop {r0} bx r0 @@ -247510,7 +247510,7 @@ sub_808E82C: ; 808E82C bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808E870 + bne _0808E870 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -247526,7 +247526,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} @@ -247556,12 +247556,12 @@ sub_808E894: ; 808E894 lsrs r1, r0, 24 ldr r0, =0x000011ff cmp r1, r0 - beq @0808E8B2 + beq _0808E8B2 lsls r0, r1, 3 ldr r1, =gUnknown_0850BBC8 adds r0, r1 bl sub_808E8F4 -@0808E8B2: +_0808E8B2: pop {r0} bx r0 .pool @@ -247575,9 +247575,9 @@ sub_808E8C0: ; 808E8C0 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] @@ -247589,8 +247589,8 @@ sub_808E8C0: ; 808E8C0 adds r0, r5 ldrh r0, [r0] cmp r0, r6 - bne @0808E8D0 -@0808E8EA: + bne _0808E8D0 +_0808E8EA: pop {r4-r6} pop {r0} bx r0 @@ -247607,15 +247607,15 @@ sub_808E8F4: ; 808E8F4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne @0808E912 + bne _0808E912 adds r0, r4, 0 bl LoadTaggedObjectPalette lsls r0, 24 lsrs r0, 24 - b @0808E914 -@0808E912: + b _0808E914 +_0808E912: movs r0, 0xFF -@0808E914: +_0808E914: pop {r4} pop {r1} bx r1 @@ -247660,8 +247660,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 @@ -247670,8 +247670,8 @@ pal_patch_for_npc_range: ; 808E954 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc @0808E964 -@0808E978: + bcc _0808E964 +_0808E978: pop {r4-r6} pop {r0} bx r0 @@ -247689,19 +247689,19 @@ FindFieldObjectPaletteIndexByTag: ; 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 .pool -@0808E9B0: +_0808E9B0: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 @@ -247709,10 +247709,10 @@ FindFieldObjectPaletteIndexByTag: ; 808E980 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 @@ -247734,16 +247734,16 @@ npc_load_two_palettes__no_record: ; 808E9C8 ldrh r0, [r1] ldr r2, =0x000011ff cmp r0, r2 - beq @0808EA30 + beq _0808EA30 ldr r0, =gUnknown_084975C4 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 @@ -247754,9 +247754,9 @@ npc_load_two_palettes__no_record: ; 808E9C8 ldrh r0, [r0] ldrb r1, [r5] bl pal_patch_for_npc - b @0808EA30 + b _0808EA30 .pool -@0808EA20: +_0808EA20: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -247764,8 +247764,8 @@ npc_load_two_palettes__no_record: ; 808E9C8 adds r0, r1 ldrh r0, [r0] cmp r0, r6 - bne @0808E9EC -@0808EA30: + bne _0808E9EC +_0808EA30: pop {r4-r6} pop {r0} bx r0 @@ -247789,16 +247789,16 @@ npc_load_two_palettes__and_record: ; 808EA38 ldrh r0, [r1] ldr r2, =0x000011ff cmp r0, r2 - beq @0808EAA8 + beq _0808EAA8 ldr r0, =gUnknown_084975C4 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 @@ -247809,9 +247809,9 @@ npc_load_two_palettes__and_record: ; 808EA38 ldrh r0, [r0] ldrb r1, [r5] bl pal_patch_for_npc - b @0808EAA8 + b _0808EAA8 .pool -@0808EA98: +_0808EA98: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -247819,8 +247819,8 @@ npc_load_two_palettes__and_record: ; 808EA38 adds r0, r1 ldrh r0, [r0] cmp r0, r6 - bne @0808EA60 -@0808EAA8: + bne _0808EA60 +_0808EAA8: pop {r4-r6} pop {r0} bx r0 @@ -247952,9 +247952,9 @@ sub_808EB08: ; 808EB08 ldrb r0, [r6, 0x1] lsrs r0, 7 cmp r0, 0 - beq @0808EB9A + beq _0808EB9A bl CameraObjectReset1 -@0808EB9A: +_0808EB9A: pop {r3} mov r8, r3 pop {r4-r7} @@ -247982,7 +247982,7 @@ sub_808EBA8: ; 808EBA8 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808EBF0 + bne _0808EBF0 lsls r1, r5, 16 lsls r2, r4, 16 mov r0, sp @@ -247999,7 +247999,7 @@ sub_808EBA8: ; 808EBA8 adds r2, r3 asrs r2, 16 bl sub_808EB08 -@0808EBF0: +_0808EBF0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -248029,14 +248029,14 @@ UpdateFieldObjectCoordsForCameraUpdate: ; 808EC10 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 @@ -248044,7 +248044,7 @@ UpdateFieldObjectCoordsForCameraUpdate: ; 808EC10 ldrb r0, [r2] lsls r0, 31 cmp r0, 0 - beq @0808EC5E + beq _0808EC5E ldrh r0, [r2, 0xC] subs r0, r4 strh r0, [r2, 0xC] @@ -248063,13 +248063,13 @@ UpdateFieldObjectCoordsForCameraUpdate: ; 808EC10 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 @@ -248091,7 +248091,7 @@ GetFieldObjectIdByXYZ: ; 808EC78 movs r4, 0 ldr r0, =0x02037350 mov r8, r0 -@0808EC90: +_0808EC90: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -248100,32 +248100,32 @@ GetFieldObjectIdByXYZ: ; 808EC78 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 FieldObjectDoesZCoordMatch lsls r0, 24 cmp r0, 0 - beq @0808ECC8 + beq _0808ECC8 adds r0, r4, 0 - b @0808ECD4 + b _0808ECD4 .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} @@ -248143,18 +248143,18 @@ FieldObjectDoesZCoordMatch: ; 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 FieldObjectDoesZCoordMatch @@ -248339,7 +248339,7 @@ FindCameraObject: ; 808EE44 ldr r4, =0x02020630 adds r5, r4, 0 adds r5, 0x1C -@0808EE4E: +_0808EE4E: lsls r0, r3, 4 adds r0, r3 lsls r1, r0, 2 @@ -248349,23 +248349,23 @@ FindCameraObject: ; 808EE44 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq @0808EE78 + beq _0808EE78 adds r0, r1, r5 ldr r1, [r0] ldr r0, =ObjectCB_CameraObject cmp r1, r0 - bne @0808EE78 + bne _0808EE78 adds r0, r2, 0 - b @0808EE84 + b _0808EE84 .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 @@ -248378,13 +248378,13 @@ CameraObjectReset1: ; 808EE8C bl FindCameraObject 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 CameraObjectReset1 @@ -248397,10 +248397,10 @@ CameraObjectSetFollowedObjectId: ; 808EEA8 lsrs r4, r0, 24 bl FindCameraObject cmp r0, 0 - beq @0808EEBC + beq _0808EEBC strh r4, [r0, 0x2E] bl CameraObjectReset1 -@0808EEBC: +_0808EEBC: pop {r4} pop {r0} bx r0 @@ -248412,14 +248412,14 @@ CameraObjectGetFollowedObjectId: ; 808EEC4 push {lr} bl FindCameraObject 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 CameraObjectGetFollowedObjectId @@ -248450,7 +248450,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 @@ -248460,7 +248460,7 @@ sub_808EEEC: ; 808EEEC ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne @0808EF38 + bne _0808EF38 adds r0, r4, 0 mov r1, r12 movs r2, 0x44 @@ -248471,15 +248471,15 @@ sub_808EEEC: ; 808EEEC adds r0, r4, 0 adds r0, 0x43 strb r7, [r0] - b @0808EF42 + b _0808EF42 .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 @@ -248505,7 +248505,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 @@ -248517,7 +248517,7 @@ obj_unfreeze: ; 808EF50 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne @0808EFA8 + bne _0808EFA8 adds r0, r4, 0 mov r1, r12 movs r2, 0x44 @@ -248530,17 +248530,17 @@ obj_unfreeze: ; 808EF50 strb r7, [r0] lsls r0, r5, 24 lsrs r0, 24 - b @0808EFB6 + b _0808EFB6 .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} @@ -248565,7 +248565,7 @@ FieldObjectSetDirection: ; 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 @@ -248575,7 +248575,7 @@ FieldObjectSetDirection: ; 808EFC0 ands r0, r2 orrs r0, r1 strb r0, [r3, 0x18] -@0808EFF0: +_0808EFF0: lsls r2, r4, 4 ldrb r1, [r3, 0x18] movs r0, 0xF @@ -248675,7 +248675,7 @@ sub_808F080: ; 808F080 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808F0B4 + bne _0808F0B4 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -248684,11 +248684,11 @@ sub_808F080: ; 808F080 lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x7] - b @0808F0B6 + b _0808F0B6 .pool -@0808F0B4: +_0808F0B4: movs r0, 0xFF -@0808F0B6: +_0808F0B6: add sp, 0x4 pop {r1} bx r1 @@ -248722,7 +248722,7 @@ sub_808F0D4: ; 808F0D4 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808F108 + bne _0808F108 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -248731,11 +248731,11 @@ sub_808F0D4: ; 808F0D4 lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x1D] - b @0808F10A + b _0808F10A .pool -@0808F108: +_0808F108: movs r0, 0xFF -@0808F10A: +_0808F10A: add sp, 0x4 pop {r1} bx r1 @@ -248771,25 +248771,25 @@ GetFieldObjectTemplateByLocalIdAndMap: ; 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 .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 FindFieldObjectTemplateInArrayByLocalId @@ -248809,26 +248809,26 @@ FindFieldObjectTemplateInArrayByLocalId: ; 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 @@ -248845,21 +248845,21 @@ 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 .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] @@ -248867,18 +248867,18 @@ sub_808F1B4: ; 808F1B4 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 @@ -248892,14 +248892,14 @@ sub_808F208: ; 808F208 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 @@ -248911,9 +248911,9 @@ sub_808F228: ; 808F228 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 @@ -248926,9 +248926,9 @@ sub_808F23C: ; 808F23C 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 @@ -248949,7 +248949,7 @@ sub_808F254: ; 808F254 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @0808F282 + bne _0808F282 mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -248958,7 +248958,7 @@ sub_808F254: ; 808F254 ldr r1, =0x02037350 adds r0, r1 bl sub_808F208 -@0808F282: +_0808F282: add sp, 0x4 pop {r0} bx r0 @@ -248981,13 +248981,13 @@ sub_808F28C: ; 808F28C bl TryGetFieldObjectIdByLocalIdAndMap 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 @@ -248997,9 +248997,9 @@ sub_808F28C: ; 808F28C adds r0, r1 ldr r1, =gUnknown_082766A2 bl sub_808F228 - b @0808F2E8 + b _0808F2E8 .pool -@0808F2D4: +_0808F2D4: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -249009,7 +249009,7 @@ sub_808F28C: ; 808F28C adds r0, r1 ldr r1, =gUnknown_082766A6 bl sub_808F228 -@0808F2E8: +_0808F2E8: add sp, 0x4 pop {r4} pop {r0} @@ -249031,7 +249031,7 @@ npc_paltag_set_load: ; 808F2F8 ldr r2, =0x020375b4 strb r4, [r2] cmp r4, 0x1 - bne @0808F344 + bne _0808F344 ldr r1, =gUnknown_0850BE38 ldrb r0, [r2] lsls r0, 2 @@ -249043,9 +249043,9 @@ npc_paltag_set_load: ; 808F2F8 ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] - b @0808F356 + b _0808F356 .pool -@0808F344: +_0808F344: ldr r0, =gUnknown_0850BE38 ldrb r1, [r2] lsls r1, 2 @@ -249054,7 +249054,7 @@ npc_paltag_set_load: ; 808F2F8 movs r1, 0 movs r2, 0xA bl pal_patch_for_npc_range -@0808F356: +_0808F356: pop {r4} pop {r0} bx r0 @@ -249067,7 +249067,7 @@ npc_paltag_by_palslot: ; 808F360 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9 - bhi @0808F39C + bhi _0808F39C ldr r1, =gUnknown_0850BE38 ldr r0, =0x020375b4 ldrb r0, [r0] @@ -249075,38 +249075,38 @@ npc_paltag_by_palslot: ; 808F360 adds r0, r1 ldr r1, [r0] lsls r0, r2, 1 - b @0808F390 + b _0808F390 .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 .pool -@0808F39C: +_0808F39C: movs r3, 0 ldr r0, =gUnknown_0850BD78 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 @@ -249114,10 +249114,10 @@ npc_paltag_by_palslot: ; 808F360 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 @@ -249226,7 +249226,7 @@ sub_808F48C: ; 808F48C bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0808F4C0 + beq _0808F4C0 ldr r5, =gUnknown_0850D6DC bl GenerateRandomNumber movs r4, 0x3 @@ -249240,11 +249240,11 @@ sub_808F48C: ; 808F48C bl sub_8097978 strh r4, [r6, 0x30] movs r0, 0x1 - b @0808F4C2 + b _0808F4C2 .pool -@0808F4C0: +_0808F4C0: movs r0, 0 -@0808F4C2: +_0808F4C2: pop {r4-r6} pop {r1} bx r1 @@ -249258,14 +249258,14 @@ sub_808F4C8: ; 808F4C8 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 @@ -249297,10 +249297,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} @@ -249343,7 +249343,7 @@ sub_808F564: ; 808F564 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0808F582 + beq _0808F582 ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -249351,7 +249351,7 @@ sub_808F564: ; 808F564 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -@0808F582: +_0808F582: movs r0, 0 pop {r4,r5} pop {r1} @@ -249368,13 +249368,13 @@ FieldObjectIsTrainerAndCloseToPlayer: ; 808F58C bl TestPlayerAvatarFlags 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 @@ -249399,27 +249399,27 @@ FieldObjectIsTrainerAndCloseToPlayer: ; 808F58C 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} @@ -249436,20 +249436,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} @@ -249462,9 +249462,9 @@ sub_808F638: ; 808F638 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 @@ -249475,9 +249475,9 @@ sub_808F648: ; 808F648 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 @@ -249502,7 +249502,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 @@ -249511,11 +249511,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 @@ -249524,10 +249524,10 @@ sub_808F65C: ; 808F65C 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 @@ -249552,7 +249552,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 @@ -249561,11 +249561,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 @@ -249574,10 +249574,10 @@ sub_808F6B8: ; 808F6B8 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 @@ -249602,7 +249602,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 @@ -249611,11 +249611,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 @@ -249624,10 +249624,10 @@ sub_808F714: ; 808F714 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 @@ -249652,7 +249652,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 @@ -249661,11 +249661,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 @@ -249674,10 +249674,10 @@ sub_808F770: ; 808F770 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 @@ -249702,7 +249702,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 @@ -249710,7 +249710,7 @@ sub_808F7CC: ; 808F7CC bl sub_808F638 lsls r0, 24 lsrs r0, 24 -@0808F802: +_0808F802: pop {r4-r7} pop {r1} bx r1 @@ -249735,7 +249735,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 @@ -249743,7 +249743,7 @@ sub_808F808: ; 808F808 bl sub_808F638 lsls r0, 24 lsrs r0, 24 -@0808F83E: +_0808F83E: pop {r4-r7} pop {r1} bx r1 @@ -249768,7 +249768,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 @@ -249776,7 +249776,7 @@ sub_808F844: ; 808F844 bl sub_808F648 lsls r0, 24 lsrs r0, 24 -@0808F87A: +_0808F87A: pop {r4-r7} pop {r1} bx r1 @@ -249801,7 +249801,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 @@ -249809,7 +249809,7 @@ sub_808F880: ; 808F880 bl sub_808F648 lsls r0, 24 lsrs r0, 24 -@0808F8B6: +_0808F8B6: pop {r4-r7} pop {r1} bx r1 @@ -249825,10 +249825,10 @@ sub_808F8BC: ; 808F8BC bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -249850,19 +249850,19 @@ sub_808F8BC: ; 808F8BC 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, =gUnknown_0850D714 lsls r4, r6, 2 adds r4, r0 @@ -249879,7 +249879,7 @@ sub_808F8BC: ; 808F8BC bl _call_via_r4 lsls r0, 24 lsrs r0, 24 -@0808F938: +_0808F938: add sp, 0x4 pop {r4-r6} pop {r1} @@ -249970,7 +249970,7 @@ sub_808F9C8: ; 808F9C8 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0808F9FE + beq _0808F9FE ldr r4, =gUnknown_0850D6DC bl GenerateRandomNumber movs r5, 0x3 @@ -249988,7 +249988,7 @@ sub_808F9C8: ; 808F9C8 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@0808F9FE: +_0808F9FE: movs r0, 0 pop {r4-r7} pop {r1} @@ -250006,20 +250006,20 @@ sub_808FA0C: ; 808FA0C bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @0808FA2A + bne _0808FA2A adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -250042,14 +250042,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 FieldObjectSetDirection movs r0, 0x1 @@ -250140,7 +250140,7 @@ sub_808FB08: ; 808FB08 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0808FB3C + beq _0808FB3C ldr r5, =gUnknown_0850D6DC bl GenerateRandomNumber movs r4, 0x3 @@ -250154,11 +250154,11 @@ sub_808FB08: ; 808FB08 bl sub_8097978 strh r4, [r6, 0x30] movs r0, 0x1 - b @0808FB3E + b _0808FB3E .pool -@0808FB3C: +_0808FB3C: movs r0, 0 -@0808FB3E: +_0808FB3E: pop {r4-r6} pop {r1} bx r1 @@ -250173,14 +250173,14 @@ sub_808FB44: ; 808FB44 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 @@ -250214,9 +250214,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} @@ -250259,7 +250259,7 @@ sub_808FBE0: ; 808FBE0 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0808FBFE + beq _0808FBFE ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -250267,7 +250267,7 @@ sub_808FBE0: ; 808FBE0 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -@0808FBFE: +_0808FBFE: movs r0, 0 pop {r4,r5} pop {r1} @@ -250352,7 +250352,7 @@ sub_808FC8C: ; 808FC8C bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0808FCC0 + beq _0808FCC0 ldr r5, =gUnknown_0850D6DC bl GenerateRandomNumber movs r4, 0x3 @@ -250366,11 +250366,11 @@ sub_808FC8C: ; 808FC8C bl sub_8097978 strh r4, [r6, 0x30] movs r0, 0x1 - b @0808FCC2 + b _0808FCC2 .pool -@0808FCC0: +_0808FCC0: movs r0, 0 -@0808FCC2: +_0808FCC2: pop {r4-r6} pop {r1} bx r1 @@ -250384,14 +250384,14 @@ sub_808FCC8: ; 808FCC8 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 @@ -250424,9 +250424,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} @@ -250469,7 +250469,7 @@ sub_808FD64: ; 808FD64 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0808FD82 + beq _0808FD82 ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -250477,7 +250477,7 @@ sub_808FD64: ; 808FD64 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -@0808FD82: +_0808FD82: movs r0, 0 pop {r4,r5} pop {r1} @@ -250553,14 +250553,14 @@ sub_808FDFC: ; 808FDFC bl FieldObjectExecRegularAnim 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 @@ -250593,7 +250593,7 @@ FieldObjectCB_BerryTree: ; 808FE2C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @0808FE58 + bne _0808FE58 adds r0, r5, 0 adds r1, r4, 0 bl get_berry_tree_graphics @@ -250601,7 +250601,7 @@ FieldObjectCB_BerryTree: ; 808FE2C movs r0, 0x1 orrs r0, r1 strh r0, [r4, 0x3C] -@0808FE58: +_0808FE58: ldr r2, =FieldObjectCB2_BerryTree adds r0, r5, 0 adds r1, r4, 0 @@ -250652,16 +250652,16 @@ do_berry_tree_growth_sparkle_1: ; 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] @@ -250681,11 +250681,11 @@ do_berry_tree_growth_sparkle_1: ; 808FE90 movs r0, 0x17 bl FieldEffectStart strb r7, [r6] -@0808FEF6: +_0808FEF6: movs r0, 0 - b @0808FF42 + b _0808FF42 .pool -@0808FF00: +_0808FF00: ldrb r1, [r4, 0x1] movs r0, 0x21 negs r0, r0 @@ -250703,7 +250703,7 @@ do_berry_tree_growth_sparkle_1: ; 808FE90 adds r0, 0x2A ldrb r0, [r0] cmp r0, r7 - bne @0808FF3C + bne _0808FF3C adds r0, r4, 0 adds r1, r5, 0 bl get_berry_tree_graphics @@ -250713,12 +250713,12 @@ do_berry_tree_growth_sparkle_1: ; 808FE90 bl FieldObjectSetRegularAnim 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 @@ -250732,14 +250732,14 @@ sub_808FF48: ; 808FF48 bl FieldObjectExecRegularAnim 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 @@ -250814,10 +250814,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 get_berry_tree_graphics @@ -250826,7 +250826,7 @@ sub_808FFB4: ; 808FFB4 movs r0, 0 strh r0, [r4, 0x32] movs r0, 0x1 -@0808FFFE: +_0808FFFE: pop {r4} pop {r1} bx r1 @@ -250859,10 +250859,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] @@ -250870,7 +250870,7 @@ sub_8090004: ; 8090004 ands r0, r1 strh r0, [r4, 0x3C] movs r0, 0x1 -@08090048: +_08090048: pop {r4} pop {r1} bx r1 @@ -250955,7 +250955,7 @@ sub_80900D4: ; 80900D4 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809010A + beq _0809010A ldr r4, =gUnknown_0850D6DC bl GenerateRandomNumber movs r5, 0x3 @@ -250973,7 +250973,7 @@ sub_80900D4: ; 80900D4 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@0809010A: +_0809010A: movs r0, 0 pop {r4-r7} pop {r1} @@ -250990,20 +250990,20 @@ sub_8090118: ; 8090118 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090136 + bne _08090136 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -251025,14 +251025,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 FieldObjectSetDirection movs r0, 0x1 @@ -251123,7 +251123,7 @@ sub_8090214: ; 8090214 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809024A + beq _0809024A ldr r4, =gUnknown_0850D6DC bl GenerateRandomNumber movs r5, 0x3 @@ -251141,7 +251141,7 @@ sub_8090214: ; 8090214 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@0809024A: +_0809024A: movs r0, 0 pop {r4-r7} pop {r1} @@ -251158,20 +251158,20 @@ sub_8090258: ; 8090258 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090276 + bne _08090276 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -251193,14 +251193,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 FieldObjectSetDirection movs r0, 0x1 @@ -251291,7 +251291,7 @@ sub_8090354: ; 8090354 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809038A + beq _0809038A ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -251309,7 +251309,7 @@ sub_8090354: ; 8090354 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@0809038A: +_0809038A: movs r0, 0 pop {r4-r7} pop {r1} @@ -251326,20 +251326,20 @@ sub_8090398: ; 8090398 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @080903B6 + bne _080903B6 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -251361,14 +251361,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 FieldObjectSetDirection movs r0, 0x1 @@ -251459,7 +251459,7 @@ sub_8090494: ; 8090494 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @080904CA + beq _080904CA ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -251477,7 +251477,7 @@ sub_8090494: ; 8090494 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@080904CA: +_080904CA: movs r0, 0 pop {r4-r7} pop {r1} @@ -251494,20 +251494,20 @@ sub_80904D8: ; 80904D8 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @080904F6 + bne _080904F6 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -251529,14 +251529,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 FieldObjectSetDirection movs r0, 0x1 @@ -251627,7 +251627,7 @@ sub_80905D4: ; 80905D4 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809060A + beq _0809060A ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -251645,7 +251645,7 @@ sub_80905D4: ; 80905D4 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@0809060A: +_0809060A: movs r0, 0 pop {r4-r7} pop {r1} @@ -251662,20 +251662,20 @@ sub_8090618: ; 8090618 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090636 + bne _08090636 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -251697,14 +251697,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 FieldObjectSetDirection movs r0, 0x1 @@ -251795,7 +251795,7 @@ sub_8090714: ; 8090714 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809074A + beq _0809074A ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -251813,7 +251813,7 @@ sub_8090714: ; 8090714 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@0809074A: +_0809074A: movs r0, 0 pop {r4-r7} pop {r1} @@ -251830,20 +251830,20 @@ sub_8090758: ; 8090758 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090776 + bne _08090776 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -251865,14 +251865,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 FieldObjectSetDirection movs r0, 0x1 @@ -251963,7 +251963,7 @@ sub_8090854: ; 8090854 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809088A + beq _0809088A ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -251981,7 +251981,7 @@ sub_8090854: ; 8090854 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@0809088A: +_0809088A: movs r0, 0 pop {r4-r7} pop {r1} @@ -251998,20 +251998,20 @@ sub_8090898: ; 8090898 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @080908B6 + bne _080908B6 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -252033,14 +252033,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 FieldObjectSetDirection movs r0, 0x1 @@ -252131,7 +252131,7 @@ sub_8090994: ; 8090994 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @080909CA + beq _080909CA ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -252149,7 +252149,7 @@ sub_8090994: ; 8090994 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@080909CA: +_080909CA: movs r0, 0 pop {r4-r7} pop {r1} @@ -252166,20 +252166,20 @@ sub_80909D8: ; 80909D8 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @080909F6 + bne _080909F6 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -252201,14 +252201,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 FieldObjectSetDirection movs r0, 0x1 @@ -252299,7 +252299,7 @@ sub_8090AD4: ; 8090AD4 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @08090B0A + beq _08090B0A ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -252317,7 +252317,7 @@ sub_8090AD4: ; 8090AD4 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@08090B0A: +_08090B0A: movs r0, 0 pop {r4-r7} pop {r1} @@ -252334,20 +252334,20 @@ sub_8090B18: ; 8090B18 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090B36 + bne _08090B36 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -252369,14 +252369,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 FieldObjectSetDirection movs r0, 0x1 @@ -252467,7 +252467,7 @@ sub_8090C14: ; 8090C14 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @08090C4A + beq _08090C4A ldr r4, =gUnknown_0850D6EC bl GenerateRandomNumber movs r5, 0x3 @@ -252485,7 +252485,7 @@ sub_8090C14: ; 8090C14 ands r0, r1 strb r0, [r6] strh r5, [r7, 0x30] -@08090C4A: +_08090C4A: movs r0, 0 pop {r4-r7} pop {r1} @@ -252502,20 +252502,20 @@ sub_8090C58: ; 8090C58 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090C76 + bne _08090C76 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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 @@ -252537,14 +252537,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 FieldObjectSetDirection movs r0, 0x1 @@ -252622,13 +252622,13 @@ sub_8090D40: ; 8090D40 bl FieldObjectExecRegularAnim 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} @@ -252644,16 +252644,16 @@ sub_8090D64: ; 8090D64 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090D82 + bne _08090D82 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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} @@ -252677,13 +252677,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 FieldObjectSetDirection movs r0, 0 @@ -252762,13 +252762,13 @@ sub_8090E44: ; 8090E44 bl FieldObjectExecRegularAnim 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} @@ -252784,16 +252784,16 @@ sub_8090E68: ; 8090E68 bl sub_809797C lsls r0, 24 cmp r0, 0 - bne @08090E86 + bne _08090E86 adds r0, r4, 0 bl FieldObjectIsTrainerAndCloseToPlayer 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} @@ -252816,13 +252816,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 FieldObjectSetDirection movs r0, 0 @@ -252897,12 +252897,12 @@ sub_8090F30: ; 8090F30 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0 - beq @08090F52 + beq _08090F52 adds r0, r1, 0 bl GetOppositeDirection lsls r0, 24 lsrs r1, r0, 24 -@08090F52: +_08090F52: adds r0, r4, 0 bl FieldObjectSetDirection movs r0, 0x2 @@ -252924,11 +252924,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] @@ -252939,7 +252939,7 @@ sub_8090F68: ; 8090F68 lsrs r1, 24 adds r0, r4, 0 bl FieldObjectSetDirection -@08090F98: +_08090F98: ldrb r1, [r4, 0x18] lsrs r1, 4 adds r0, r4, 0 @@ -252952,7 +252952,7 @@ sub_8090F68: ; 8090F68 lsls r0, 24 lsrs r6, r0, 24 cmp r5, 0x1 - bne @08090FEE + bne _08090FEE adds r1, r4, 0 adds r1, 0x21 ldrb r0, [r1] @@ -252977,16 +252977,16 @@ sub_8090F68: ; 8090F68 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 GetStepInPlaceDelay16AnimId lsls r0, 24 lsrs r6, r0, 24 -@08091000: +_08091000: adds r0, r4, 0 adds r1, r7, 0 adds r2, r6, 0 @@ -253012,7 +253012,7 @@ sub_8091020: ; 8091020 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809103E + beq _0809103E ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -253020,7 +253020,7 @@ sub_8091020: ; 8091020 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -@0809103E: +_0809103E: movs r0, 0 pop {r4,r5} pop {r1} @@ -253053,14 +253053,14 @@ MoveFieldObjectInNextDirectionInSequence: ; 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] @@ -253080,7 +253080,7 @@ MoveFieldObjectInNextDirectionInSequence: ; 809105C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080910D8 + bne _080910D8 ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] @@ -253100,16 +253100,16 @@ MoveFieldObjectInNextDirectionInSequence: ; 809105C 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 GetStepInPlaceDelay16AnimId lsls r0, 24 lsrs r6, r0, 24 -@080910EA: +_080910EA: adds r0, r4, 0 mov r1, r8 adds r2, r6, 0 @@ -253138,7 +253138,7 @@ sub_8091110: ; 8091110 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @0809112E + beq _0809112E ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -253146,7 +253146,7 @@ sub_8091110: ; 8091110 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -@0809112E: +_0809112E: movs r0, 0 pop {r4,r5} pop {r1} @@ -253203,16 +253203,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 @@ -253276,16 +253276,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 @@ -253349,16 +253349,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 @@ -253422,16 +253422,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 @@ -253496,16 +253496,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 @@ -253569,16 +253569,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 @@ -253642,16 +253642,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 @@ -253715,16 +253715,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 @@ -253788,16 +253788,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 @@ -253861,16 +253861,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 @@ -253934,16 +253934,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 @@ -254007,16 +254007,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 @@ -254080,16 +254080,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 @@ -254153,16 +254153,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 @@ -254226,16 +254226,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 @@ -254299,16 +254299,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 @@ -254372,16 +254372,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 @@ -254445,16 +254445,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 @@ -254518,16 +254518,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 @@ -254591,16 +254591,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 @@ -254664,16 +254664,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 @@ -254737,16 +254737,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 @@ -254810,16 +254810,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 @@ -254883,16 +254883,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 @@ -254952,10 +254952,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_lower_nybble strb r0, [r4] -@08091EB4: +_08091EB4: movs r0, 0x1 strh r0, [r5, 0x30] pop {r4,r5} @@ -254978,15 +254978,15 @@ 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 .pool -@08091EEC: +_08091EEC: ldr r5, =gUnknown_0850DA64 bl player_get_x22 adds r4, r0, 0 @@ -255004,7 +255004,7 @@ sub_8091EC0: ; 8091EC0 bl _call_via_r4 lsls r0, 24 lsrs r0, 24 -@08091F14: +_08091F14: pop {r4-r7} pop {r1} bx r1 @@ -255019,7 +255019,7 @@ sub_8091F20: ; 8091F20 bl FieldObjectExecRegularAnim lsls r0, 24 cmp r0, 0 - beq @08091F3E + beq _08091F3E ldrb r0, [r4] movs r1, 0x3 negs r1, r1 @@ -255027,7 +255027,7 @@ sub_8091F20: ; 8091F20 strb r1, [r4] movs r0, 0x1 strh r0, [r5, 0x30] -@08091F3E: +_08091F3E: movs r0, 0 pop {r4,r5} pop {r1} @@ -255090,11 +255090,11 @@ sub_8091F94: ; 8091F94 bl FieldObjectIsFarawayIslandMew 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, =gUnknown_085055CD ldrb r0, [r4, 0x6] @@ -255120,9 +255120,9 @@ sub_8091F94: ; 8091F94 adds r0, r4, 0 adds r1, r7, 0 bl FieldObjectSetRegularAnim - b @08092084 + b _08092084 .pool -@08091FFC: +_08091FFC: ldr r1, =gUnknown_085055CD ldrb r0, [r4, 0x6] adds r0, r1 @@ -255133,7 +255133,7 @@ sub_8091F94: ; 8091F94 adds r2, r5, 0 bl state_to_direction adds r5, r0, 0 -@08092012: +_08092012: mov r6, sp adds r6, 0x2 adds r0, r4, 0 @@ -255159,10 +255159,10 @@ sub_8091F94: ; 8091F94 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] @@ -255174,8 +255174,8 @@ sub_8091F94: ; 8091F94 bl _call_via_r8 lsls r0, 24 cmp r0, 0 - bne @08092084 -@08092070: + bne _08092084 +_08092070: adds r0, r5, 0 bl GetFaceDirectionAnimId adds r2, r0, 0 @@ -255184,7 +255184,7 @@ sub_8091F94: ; 8091F94 adds r0, r4, 0 adds r1, r7, 0 bl FieldObjectSetRegularAnim -@08092084: +_08092084: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -255247,10 +255247,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] @@ -255262,8 +255262,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 GetFaceDirectionAnimId adds r2, r0, 0 @@ -255272,7 +255272,7 @@ sub_80920A4: ; 80920A4 adds r0, r4, 0 adds r1, r7, 0 bl FieldObjectSetRegularAnim -@0809213E: +_0809213E: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -255335,10 +255335,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] @@ -255350,8 +255350,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 GetFaceDirectionAnimId adds r2, r0, 0 @@ -255360,7 +255360,7 @@ sub_809215C: ; 809215C adds r0, r4, 0 adds r1, r7, 0 bl FieldObjectSetRegularAnim -@080921F6: +_080921F6: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -255423,10 +255423,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] @@ -255438,8 +255438,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 GetFaceDirectionAnimId adds r2, r0, 0 @@ -255448,7 +255448,7 @@ sub_8092214: ; 8092214 adds r0, r4, 0 adds r1, r7, 0 bl FieldObjectSetRegularAnim -@080922AE: +_080922AE: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -255546,10 +255546,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] @@ -255561,8 +255561,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 GetFaceDirectionAnimId adds r2, r0, 0 @@ -255571,7 +255571,7 @@ sub_8092314: ; 8092314 adds r0, r4, 0 adds r1, r7, 0 bl FieldObjectSetRegularAnim -@080923AE: +_080923AE: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -255641,10 +255641,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] @@ -255656,8 +255656,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 GetFaceDirectionAnimId adds r2, r0, 0 @@ -255666,7 +255666,7 @@ oac_hopping: ; 80923CC adds r0, r4, 0 adds r1, r7, 0 bl FieldObjectSetRegularAnim -@08092474: +_08092474: ldrb r0, [r4] movs r1, 0x2 orrs r0, r1 @@ -255733,15 +255733,15 @@ 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 .pool -@08092504: +_08092504: ldr r5, =gUnknown_0850DA64 bl player_get_x22 adds r4, r0, 0 @@ -255759,7 +255759,7 @@ mss_08062EA4: ; 80924D8 bl _call_via_r4 lsls r0, 24 lsrs r0, 24 -@0809252C: +_0809252C: pop {r4-r7} pop {r1} bx r1 @@ -255782,14 +255782,14 @@ FieldObjectCB_TreeDisguise: ; 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 @@ -255804,7 +255804,7 @@ FieldObjectCB_TreeDisguise: ; 809253C ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -@08092584: +_08092584: movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 3 @@ -255845,14 +255845,14 @@ FieldObjectCB_MountainDisguise: ; 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 @@ -255867,7 +255867,7 @@ FieldObjectCB_MountainDisguise: ; 80925B8 ldrh r0, [r5, 0x3C] adds r0, 0x1 strh r0, [r5, 0x3C] -@08092600: +_08092600: movs r0, 0x2E ldrsh r1, [r5, r0] lsls r0, r1, 3 @@ -255893,7 +255893,7 @@ FieldObjectCB_Hidden1: ; 8092628 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 @@ -255919,7 +255919,7 @@ FieldObjectCB_Hidden1: ; 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 @@ -255970,10 +255970,10 @@ sub_80926B8: ; 80926B8 bl FieldObjectExecRegularAnim 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} @@ -256287,14 +256287,14 @@ sub_809290C: ; 809290C bl FieldObjectExecRegularAnim 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 @@ -256502,22 +256502,22 @@ sub_8092A4C: ; 8092A4C push {lr} adds r2, r0, 0 ldr r1, =gUnknown_085094AC - b @08092A64 + b _08092A64 .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 @@ -256532,7 +256532,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] @@ -256541,25 +256541,25 @@ 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 SeekObjectImageAnim -@08092AB2: +_08092AB2: pop {r4} pop {r0} bx r0 @@ -256575,7 +256575,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] @@ -256583,19 +256583,19 @@ 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 SeekObjectImageAnim -@08092AF0: +_08092AF0: pop {r4} pop {r0} bx r0 @@ -256613,24 +256613,24 @@ 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 @@ -256745,23 +256745,23 @@ npc_block_way: ; 8092BC8 bl IsCoordOutsideFieldObjectMovementRect 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 MapGridIsImpassableAt lsls r0, 24 cmp r0, 0 - bne @08092C40 + bne _08092C40 adds r0, r5, 0 adds r1, r4, 0 bl GetMapBorderIdAt 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 @@ -256769,19 +256769,19 @@ npc_block_way: ; 8092BC8 bl IsMetatileDirectionallyImpassable 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 CanCameraMoveInDirection 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 @@ -256796,22 +256796,22 @@ npc_block_way: ; 8092BC8 bl IsZCoordMismatchAt 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 CheckForCollisionBetweenFieldObjects 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 @@ -256854,14 +256854,14 @@ sub_8092C8C: ; 8092C8C bl MapGridIsImpassableAt lsls r0, 24 cmp r0, 0 - bne @08092D04 + bne _08092D04 adds r0, r6, 0 adds r1, r5, 0 bl GetMapBorderIdAt 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 @@ -256869,19 +256869,19 @@ sub_8092C8C: ; 8092C8C bl IsMetatileDirectionallyImpassable 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 CanCameraMoveInDirection 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 @@ -256896,24 +256896,24 @@ sub_8092C8C: ; 8092C8C bl IsZCoordMismatchAt 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 CheckForCollisionBetweenFieldObjects 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 @@ -256937,7 +256937,7 @@ IsCoordOutsideFieldObjectMovementRect: ; 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] @@ -256950,17 +256950,17 @@ IsCoordOutsideFieldObjectMovementRect: ; 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] @@ -256973,17 +256973,17 @@ IsCoordOutsideFieldObjectMovementRect: ; 8092D58 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 @@ -257007,7 +257007,7 @@ IsMetatileDirectionallyImpassable: ; 8092DC8 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08092E0A + bne _08092E0A ldr r4, =gUnknown_0850DB6C adds r4, r5, r4 lsls r0, r6, 16 @@ -257021,14 +257021,14 @@ IsMetatileDirectionallyImpassable: ; 8092DC8 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq @08092E18 -@08092E0A: + beq _08092E18 +_08092E0A: movs r0, 0x1 - b @08092E1A + b _08092E1A .pool -@08092E18: +_08092E18: movs r0, 0 -@08092E1A: +_08092E1A: pop {r4-r7} pop {r1} bx r1 @@ -257044,7 +257044,7 @@ CheckForCollisionBetweenFieldObjects: ; 8092E20 movs r4, 0 lsls r2, 16 asrs r5, r2, 16 -@08092E2E: +_08092E2E: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -257053,29 +257053,29 @@ CheckForCollisionBetweenFieldObjects: ; 8092E20 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 @@ -257085,18 +257085,18 @@ CheckForCollisionBetweenFieldObjects: ; 8092E20 bl AreZCoordsCompatible lsls r0, 24 cmp r0, 0 - beq @08092E88 + beq _08092E88 movs r0, 0x1 - b @08092E94 + b _08092E94 .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 @@ -257116,7 +257116,7 @@ sub_8092E9C: ; 8092E9C bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08092EE8 + bne _08092EE8 ldr r3, =0x02020630 ldr r2, =0x02037350 mov r0, sp @@ -257134,13 +257134,13 @@ sub_8092E9C: ; 8092E9C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @08092EE8 + beq _08092EE8 movs r0, 0x1 - b @08092EEA + b _08092EEA .pool -@08092EE8: +_08092EE8: movs r0, 0 -@08092EEA: +_08092EEA: add sp, 0x4 pop {r1} bx r1 @@ -257160,7 +257160,7 @@ sub_8092EF0: ; 8092EF0 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08092F2E + bne _08092F2E ldr r3, =0x02020630 ldr r2, =0x02037350 mov r0, sp @@ -257178,7 +257178,7 @@ sub_8092EF0: ; 8092EF0 movs r0, 0x4 orrs r0, r2 strh r0, [r1, 0x3C] -@08092F2E: +_08092F2E: add sp, 0x4 pop {r0} bx r0 @@ -257248,40 +257248,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 @@ -257347,35 +257347,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] @@ -257455,30 +257455,30 @@ GetFieldObjectMovingCameraOffset: ; 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 .pool @@ -257511,12 +257511,12 @@ FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive: ; 809318C 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 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive @@ -257529,15 +257529,15 @@ FieldObjectIsSpecialAnimActive: ; 80931A4 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 FieldObjectIsSpecialAnimActive @@ -257553,7 +257553,7 @@ FieldObjectSetSpecialAnim: ; 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] @@ -257571,11 +257571,11 @@ FieldObjectSetSpecialAnim: ; 80931C0 adds r0, r2 strh r6, [r0, 0x32] movs r0, 0 - b @08093202 + b _08093202 .pool -@08093200: +_08093200: movs r0, 0x1 -@08093202: +_08093202: pop {r4-r6} pop {r1} bx r1 @@ -257605,10 +257605,10 @@ FieldObjectClearAnimIfSpecialAnimActive: ; 8093224 ldrb r0, [r1] lsls r0, 25 cmp r0, 0 - bge @08093236 + bge _08093236 adds r0, r1, 0 bl FieldObjectClearAnim -@08093236: +_08093236: pop {r0} bx r0 thumb_func_end FieldObjectClearAnimIfSpecialAnimActive @@ -257650,12 +257650,12 @@ FieldObjectCheckIfSpecialAnimFinishedOrInactive: ; 8093270 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 FieldObjectCheckIfSpecialAnimFinishedOrInactive @@ -257669,12 +257669,12 @@ FieldObjectClearAnimIfSpecialAnimFinished: ; 8093284 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 FieldObjectClearAnimIfSpecialAnimActive -@0809329E: +_0809329E: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -257689,12 +257689,12 @@ FieldObjectGetSpecialAnim: ; 80932A8 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 FieldObjectGetSpecialAnim @@ -257714,24 +257714,24 @@ FieldObjectStep: ; 80932C0 bl FieldObjectIsSpecialAnimActive lsls r0, 24 cmp r0, 0 - beq @080932EA + beq _080932EA adds r0, r4, 0 adds r1, r5, 0 bl FieldObjectExecSpecialAnim - 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 DoGroundEffects_OnBeginStep @@ -257764,9 +257764,9 @@ GetFaceDirectionAnimId: ; 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] @@ -257789,9 +257789,9 @@ GetSimpleGoAnimId: ; 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] @@ -257814,9 +257814,9 @@ GetGoSpeed0AnimId: ; 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] @@ -257839,9 +257839,9 @@ GetGoSpeed1AnimId: ; 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] @@ -257864,9 +257864,9 @@ GetGoSpeed2AnimId: ; 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] @@ -257889,9 +257889,9 @@ GetGoSpeed3AnimId: ; 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] @@ -257914,9 +257914,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] @@ -257939,9 +257939,9 @@ GetRunAnimId: ; 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] @@ -257964,9 +257964,9 @@ GetJumpLedgeAnimId: ; 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] @@ -257989,9 +257989,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] @@ -258014,9 +258014,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] @@ -258039,9 +258039,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] @@ -258064,9 +258064,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] @@ -258089,9 +258089,9 @@ GetStepInPlaceDelay32AnimId: ; 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] @@ -258114,9 +258114,9 @@ GetStepInPlaceDelay16AnimId: ; 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] @@ -258139,9 +258139,9 @@ GetStepInPlaceDelay8AnimId: ; 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] @@ -258164,9 +258164,9 @@ GetStepInPlaceDelay4AnimId: ; 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] @@ -258211,9 +258211,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] @@ -258235,9 +258235,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] @@ -258259,9 +258259,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] @@ -258283,9 +258283,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] @@ -258307,9 +258307,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] @@ -258331,9 +258331,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] @@ -258355,9 +258355,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] @@ -258379,9 +258379,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] @@ -258403,9 +258403,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] @@ -258427,9 +258427,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] @@ -258455,15 +258455,15 @@ GetOppositeDirection: ; 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 .pool -@08093828: +_08093828: adds r0, r4, 0 -@0809382A: +_0809382A: add sp, 0x8 pop {r4} pop {r1} @@ -258496,17 +258496,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, =gUnknown_0850DC3F @@ -258515,7 +258515,7 @@ state_to_direction: ; 809384C adds r0, r1 adds r0, r2 ldrb r0, [r0] -@08093882: +_08093882: pop {r4} pop {r1} bx r1 @@ -258541,12 +258541,12 @@ FieldObjectExecSpecialAnim: ; 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 @@ -258574,17 +258574,17 @@ FieldObjectExecRegularAnim: ; 80938C4 bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne @080938F4 + bne _080938F4 movs r0, 0 - b @080938FE + b _080938FE .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 @@ -258723,18 +258723,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 @@ -258833,10 +258833,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] @@ -258850,7 +258850,7 @@ npc_obj_ministep_stop_on_arrival: ; 8093AB8 orrs r0, r1 strb r0, [r2] movs r0, 0x1 -@08093AEA: +_08093AEA: pop {r4,r5} pop {r1} bx r1 @@ -258947,10 +258947,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] @@ -258964,7 +258964,7 @@ an_walk_any_2: ; 8093B8C orrs r0, r1 strb r0, [r2] movs r0, 0x1 -@08093BBE: +_08093BBE: pop {r4,r5} pop {r1} bx r1 @@ -258994,14 +258994,14 @@ sub_8093BE4: ; 8093BE4 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 @@ -259031,14 +259031,14 @@ sub_8093C24: ; 8093C24 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 @@ -259068,14 +259068,14 @@ sub_8093C64: ; 8093C64 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 @@ -259105,14 +259105,14 @@ sub_8093CA4: ; 8093CA4 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 @@ -259144,14 +259144,14 @@ sub_8093CE4: ; 8093CE4 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 @@ -259181,14 +259181,14 @@ sub_8093D24: ; 8093D24 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 @@ -259218,14 +259218,14 @@ sub_8093D64: ; 8093D64 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 @@ -259255,14 +259255,14 @@ sub_8093DA4: ; 8093DA4 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 @@ -259294,14 +259294,14 @@ sub_8093DE4: ; 8093DE4 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 @@ -259332,14 +259332,14 @@ sub_8093E24: ; 8093E24 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 @@ -259370,14 +259370,14 @@ sub_8093E64: ; 8093E64 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 @@ -259408,14 +259408,14 @@ sub_8093EA4: ; 8093EA4 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 @@ -259446,14 +259446,14 @@ sub_8093EE4: ; 8093EE4 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 @@ -259484,14 +259484,14 @@ sub_8093F24: ; 8093F24 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 @@ -259522,14 +259522,14 @@ sub_8093F64: ; 8093F64 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 @@ -259560,14 +259560,14 @@ sub_8093FA4: ; 8093FA4 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 @@ -259719,7 +259719,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 @@ -259728,7 +259728,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] @@ -259766,12 +259766,12 @@ sub_80940C4: ; 80940C4 movs r1, 0x10 orrs r0, r1 strb r0, [r6] - b @08094178 + b _08094178 .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] @@ -259786,7 +259786,7 @@ sub_80940C4: ; 80940C4 movs r1, 0x40 orrs r0, r1 strb r0, [r2] -@08094178: +_08094178: mov r0, r8 add sp, 0x10 pop {r3} @@ -259827,12 +259827,12 @@ sub_80941B0: ; 80941B0 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 @@ -259844,12 +259844,12 @@ sub_80941C8: ; 80941C8 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 @@ -259863,12 +259863,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 GetOppositeDirection @@ -259887,9 +259887,9 @@ sub_80941E0: ; 80941E0 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 @@ -259926,10 +259926,10 @@ sub_809425C: ; 809425C 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 @@ -259938,7 +259938,7 @@ sub_809425C: ; 809425C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08094280: +_08094280: pop {r4,r5} pop {r1} bx r1 @@ -259975,10 +259975,10 @@ sub_80942B4: ; 80942B4 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 @@ -259987,7 +259987,7 @@ sub_80942B4: ; 80942B4 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@080942D8: +_080942D8: pop {r4,r5} pop {r1} bx r1 @@ -260024,10 +260024,10 @@ sub_809430C: ; 809430C 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 @@ -260036,7 +260036,7 @@ sub_809430C: ; 809430C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08094330: +_08094330: pop {r4,r5} pop {r1} bx r1 @@ -260073,10 +260073,10 @@ sub_8094364: ; 8094364 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 @@ -260085,7 +260085,7 @@ sub_8094364: ; 8094364 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08094388: +_08094388: pop {r4,r5} pop {r1} bx r1 @@ -260107,14 +260107,14 @@ sub_8094398: ; 8094398 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 @@ -260234,14 +260234,14 @@ sub_8094474: ; 8094474 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 @@ -260272,14 +260272,14 @@ sub_80944B4: ; 80944B4 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 @@ -260310,14 +260310,14 @@ sub_80944F4: ; 80944F4 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 @@ -260348,14 +260348,14 @@ sub_8094534: ; 8094534 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 @@ -260408,10 +260408,10 @@ sub_809459C: ; 809459C 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 @@ -260421,7 +260421,7 @@ sub_809459C: ; 809459C orrs r0, r1 strb r0, [r2] movs r0, 0x1 -@080945C0: +_080945C0: pop {r1} bx r1 thumb_func_end sub_809459C @@ -260436,7 +260436,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] @@ -260450,7 +260450,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 @@ -260934,14 +260934,14 @@ sub_80949A0: ; 80949A0 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 @@ -260972,14 +260972,14 @@ sub_80949E0: ; 80949E0 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 @@ -261010,14 +261010,14 @@ sub_8094A20: ; 8094A20 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 @@ -261048,14 +261048,14 @@ sub_8094A60: ; 8094A60 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 @@ -261086,14 +261086,14 @@ sub_8094AA0: ; 8094AA0 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 @@ -261124,14 +261124,14 @@ sub_8094AE0: ; 8094AE0 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 @@ -261162,14 +261162,14 @@ sub_8094B20: ; 8094B20 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 @@ -261200,14 +261200,14 @@ sub_8094B60: ; 8094B60 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 @@ -261238,14 +261238,14 @@ sub_8094BA0: ; 8094BA0 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 @@ -261276,14 +261276,14 @@ sub_8094BE0: ; 8094BE0 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 @@ -261314,14 +261314,14 @@ sub_8094C20: ; 8094C20 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 @@ -261352,14 +261352,14 @@ sub_8094C60: ; 8094C60 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 @@ -261391,14 +261391,14 @@ sub_8094CA0: ; 8094CA0 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 @@ -261428,14 +261428,14 @@ sub_8094CE0: ; 8094CE0 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 @@ -261465,14 +261465,14 @@ sub_8094D20: ; 8094D20 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 @@ -261502,14 +261502,14 @@ sub_8094D60: ; 8094D60 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 @@ -261561,14 +261561,14 @@ sub_8094DC4: ; 8094DC4 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 @@ -261625,10 +261625,10 @@ sub_8094E38: ; 8094E38 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] @@ -261636,7 +261636,7 @@ sub_8094E38: ; 8094E38 ands r0, r1 strb r0, [r4] movs r0, 0x1 -@08094E5A: +_08094E5A: pop {r4,r5} pop {r1} bx r1 @@ -261667,10 +261667,10 @@ sub_8094E80: ; 8094E80 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] @@ -261678,7 +261678,7 @@ sub_8094E80: ; 8094E80 ands r0, r1 strb r0, [r4] movs r0, 0x1 -@08094EA2: +_08094EA2: pop {r4,r5} pop {r1} bx r1 @@ -261709,10 +261709,10 @@ sub_8094EC8: ; 8094EC8 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] @@ -261720,7 +261720,7 @@ sub_8094EC8: ; 8094EC8 ands r0, r1 strb r0, [r4] movs r0, 0x1 -@08094EEA: +_08094EEA: pop {r4,r5} pop {r1} bx r1 @@ -261751,10 +261751,10 @@ sub_8094F10: ; 8094F10 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] @@ -261762,7 +261762,7 @@ sub_8094F10: ; 8094F10 ands r0, r1 strb r0, [r4] movs r0, 0x1 -@08094F32: +_08094F32: pop {r4,r5} pop {r1} bx r1 @@ -261781,7 +261781,7 @@ sub_8094F38: ; 8094F38 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08094F82 + bne _08094F82 movs r1, 0x10 ldrsh r0, [r5, r1] movs r2, 0x12 @@ -261804,7 +261804,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 @@ -261827,7 +261827,7 @@ sub_8094F94: ; 8094F94 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08094FE6 + bne _08094FE6 movs r1, 0x10 ldrsh r0, [r5, r1] movs r2, 0x12 @@ -261853,7 +261853,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 @@ -261917,10 +261917,10 @@ sub_8095044: ; 8095044 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 @@ -261929,7 +261929,7 @@ sub_8095044: ; 8095044 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095068: +_08095068: pop {r4,r5} pop {r1} bx r1 @@ -261966,10 +261966,10 @@ sub_809509C: ; 809509C 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 @@ -261978,7 +261978,7 @@ sub_809509C: ; 809509C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@080950C0: +_080950C0: pop {r4,r5} pop {r1} bx r1 @@ -262015,10 +262015,10 @@ sub_80950F4: ; 80950F4 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 @@ -262027,7 +262027,7 @@ sub_80950F4: ; 80950F4 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095118: +_08095118: pop {r4,r5} pop {r1} bx r1 @@ -262064,10 +262064,10 @@ sub_809514C: ; 809514C 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 @@ -262076,7 +262076,7 @@ sub_809514C: ; 809514C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095170: +_08095170: pop {r4,r5} pop {r1} bx r1 @@ -262113,10 +262113,10 @@ sub_80951A4: ; 80951A4 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 @@ -262125,7 +262125,7 @@ sub_80951A4: ; 80951A4 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@080951C8: +_080951C8: pop {r4,r5} pop {r1} bx r1 @@ -262162,10 +262162,10 @@ sub_80951FC: ; 80951FC 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 @@ -262174,7 +262174,7 @@ sub_80951FC: ; 80951FC movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095220: +_08095220: pop {r4,r5} pop {r1} bx r1 @@ -262211,10 +262211,10 @@ sub_8095254: ; 8095254 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 @@ -262223,7 +262223,7 @@ sub_8095254: ; 8095254 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095278: +_08095278: pop {r4,r5} pop {r1} bx r1 @@ -262260,10 +262260,10 @@ sub_80952AC: ; 80952AC 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 @@ -262272,7 +262272,7 @@ sub_80952AC: ; 80952AC movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@080952D0: +_080952D0: pop {r4,r5} pop {r1} bx r1 @@ -262309,10 +262309,10 @@ sub_8095304: ; 8095304 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 @@ -262321,7 +262321,7 @@ sub_8095304: ; 8095304 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095328: +_08095328: pop {r4,r5} pop {r1} bx r1 @@ -262358,10 +262358,10 @@ sub_809535C: ; 809535C 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 @@ -262370,7 +262370,7 @@ sub_809535C: ; 809535C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095380: +_08095380: pop {r4,r5} pop {r1} bx r1 @@ -262407,10 +262407,10 @@ sub_80953B4: ; 80953B4 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 @@ -262419,7 +262419,7 @@ sub_80953B4: ; 80953B4 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@080953D8: +_080953D8: pop {r4,r5} pop {r1} bx r1 @@ -262456,10 +262456,10 @@ sub_809540C: ; 809540C 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 @@ -262468,7 +262468,7 @@ sub_809540C: ; 809540C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095430: +_08095430: pop {r4,r5} pop {r1} bx r1 @@ -262645,17 +262645,17 @@ sub_8095548: ; 8095548 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 @@ -262665,12 +262665,12 @@ sub_8095548: ; 8095548 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 @@ -262683,14 +262683,14 @@ sub_809558C: ; 809558C 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 @@ -262720,13 +262720,13 @@ sub_80955C8: ; 80955C8 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} @@ -262752,14 +262752,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} @@ -262790,13 +262790,13 @@ sub_8095644: ; 8095644 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} @@ -262822,14 +262822,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} @@ -262965,10 +262965,10 @@ sub_8095774: ; 8095774 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] @@ -262978,7 +262978,7 @@ sub_8095774: ; 8095774 movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -@08095798: +_08095798: pop {r4} pop {r1} bx r1 @@ -263017,10 +263017,10 @@ sub_80957D4: ; 80957D4 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] @@ -263030,7 +263030,7 @@ sub_80957D4: ; 80957D4 movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -@080957F8: +_080957F8: pop {r4} pop {r1} bx r1 @@ -263070,10 +263070,10 @@ sub_8095834: ; 8095834 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] @@ -263083,7 +263083,7 @@ sub_8095834: ; 8095834 movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -@08095858: +_08095858: pop {r4} pop {r1} bx r1 @@ -263123,10 +263123,10 @@ sub_8095894: ; 8095894 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] @@ -263136,7 +263136,7 @@ sub_8095894: ; 8095894 movs r0, 0x2 strh r0, [r4, 0x32] movs r0, 0x1 -@080958B8: +_080958B8: pop {r4} pop {r1} bx r1 @@ -263480,10 +263480,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] @@ -263497,7 +263497,7 @@ sub_8095B0C: ; 8095B0C orrs r0, r1 strb r0, [r2] movs r0, 0x1 -@08095B3E: +_08095B3E: pop {r4,r5} pop {r1} bx r1 @@ -263528,14 +263528,14 @@ sub_8095B64: ; 8095B64 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 @@ -263605,10 +263605,10 @@ sub_8095BF4: ; 8095BF4 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 @@ -263617,7 +263617,7 @@ sub_8095BF4: ; 8095BF4 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095C18: +_08095C18: pop {r4,r5} pop {r1} bx r1 @@ -263654,10 +263654,10 @@ sub_8095C4C: ; 8095C4C 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 @@ -263666,7 +263666,7 @@ sub_8095C4C: ; 8095C4C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095C70: +_08095C70: pop {r4,r5} pop {r1} bx r1 @@ -263703,10 +263703,10 @@ sub_8095CA4: ; 8095CA4 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 @@ -263715,7 +263715,7 @@ sub_8095CA4: ; 8095CA4 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095CC8: +_08095CC8: pop {r4,r5} pop {r1} bx r1 @@ -263752,10 +263752,10 @@ sub_8095CFC: ; 8095CFC 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 @@ -263764,7 +263764,7 @@ sub_8095CFC: ; 8095CFC movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095D20: +_08095D20: pop {r4,r5} pop {r1} bx r1 @@ -263801,10 +263801,10 @@ sub_8095D54: ; 8095D54 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 @@ -263813,7 +263813,7 @@ sub_8095D54: ; 8095D54 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095D78: +_08095D78: pop {r4,r5} pop {r1} bx r1 @@ -263850,10 +263850,10 @@ sub_8095DAC: ; 8095DAC 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 @@ -263862,7 +263862,7 @@ sub_8095DAC: ; 8095DAC movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095DD0: +_08095DD0: pop {r4,r5} pop {r1} bx r1 @@ -263899,10 +263899,10 @@ sub_8095E04: ; 8095E04 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 @@ -263911,7 +263911,7 @@ sub_8095E04: ; 8095E04 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095E28: +_08095E28: pop {r4,r5} pop {r1} bx r1 @@ -263948,10 +263948,10 @@ sub_8095E5C: ; 8095E5C 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 @@ -263960,7 +263960,7 @@ sub_8095E5C: ; 8095E5C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095E80: +_08095E80: pop {r4,r5} pop {r1} bx r1 @@ -263997,10 +263997,10 @@ sub_8095EB4: ; 8095EB4 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 @@ -264009,7 +264009,7 @@ sub_8095EB4: ; 8095EB4 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095ED8: +_08095ED8: pop {r4,r5} pop {r1} bx r1 @@ -264046,10 +264046,10 @@ sub_8095F0C: ; 8095F0C 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 @@ -264058,7 +264058,7 @@ sub_8095F0C: ; 8095F0C movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095F30: +_08095F30: pop {r4,r5} pop {r1} bx r1 @@ -264095,10 +264095,10 @@ sub_8095F64: ; 8095F64 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 @@ -264107,7 +264107,7 @@ sub_8095F64: ; 8095F64 movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095F88: +_08095F88: pop {r4,r5} pop {r1} bx r1 @@ -264144,10 +264144,10 @@ sub_8095FBC: ; 8095FBC 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 @@ -264156,7 +264156,7 @@ sub_8095FBC: ; 8095FBC movs r0, 0x2 strh r0, [r5, 0x32] movs r0, 0x1 -@08095FE0: +_08095FE0: pop {r4,r5} pop {r1} bx r1 @@ -264326,14 +264326,14 @@ sub_8096120: ; 8096120 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 @@ -264364,14 +264364,14 @@ sub_8096160: ; 8096160 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 @@ -264402,14 +264402,14 @@ sub_80961A0: ; 80961A0 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 @@ -264440,14 +264440,14 @@ sub_80961E0: ; 80961E0 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 @@ -264503,14 +264503,14 @@ sub_8096250: ; 8096250 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 @@ -264541,14 +264541,14 @@ sub_8096290: ; 8096290 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 @@ -264579,14 +264579,14 @@ sub_80962D0: ; 80962D0 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 @@ -264617,14 +264617,14 @@ sub_8096310: ; 8096310 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 @@ -264682,14 +264682,14 @@ sub_8096388: ; 8096388 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 @@ -264720,14 +264720,14 @@ sub_80963C8: ; 80963C8 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 @@ -264758,14 +264758,14 @@ sub_8096408: ; 8096408 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 @@ -264796,14 +264796,14 @@ sub_8096448: ; 8096448 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 @@ -264844,15 +264844,15 @@ sub_8096494: ; 8096494 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 @@ -264883,14 +264883,14 @@ npc_obj_transfer_image_anim_pause_flag: ; 80964CC 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 @@ -264903,7 +264903,7 @@ sub_80964E8: ; 80964E8 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] @@ -264918,7 +264918,7 @@ sub_80964E8: ; 80964E8 negs r1, r1 ands r0, r1 strb r0, [r4, 0x1] -@08096510: +_08096510: pop {r4} pop {r0} bx r0 @@ -264958,7 +264958,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 @@ -264985,9 +264985,9 @@ sub_8096530: ; 8096530 adds r0, r1 ldrh r2, [r2] adds r0, r2 - b @080965BC + b _080965BC .pool -@08096594: +_08096594: ldrh r1, [r4, 0x24] ldrh r0, [r4, 0x20] adds r1, r0 @@ -265008,7 +265008,7 @@ sub_8096530: ; 8096530 lsls r0, 24 asrs r0, 24 adds r0, r1 -@080965BC: +_080965BC: lsls r0, 16 lsrs r2, r0, 16 ldrh r0, [r6, 0x8] @@ -265022,35 +265022,35 @@ sub_8096530: ; 8096530 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 @@ -265071,12 +265071,12 @@ 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 @@ -265228,11 +265228,11 @@ GetGroundEffectFlags_Reflection: ; 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 @@ -265246,15 +265246,15 @@ GetGroundEffectFlags_Reflection: ; 8096750 ldr r0, [r0] orrs r1, r0 str r1, [r5] - b @080967A2 + b _080967A2 .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} @@ -265270,12 +265270,12 @@ GetGroundEffectFlags_TallGrassOnSpawn: ; 80967AC bl MetatileBehavior_IsTallGrass 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 @@ -265290,12 +265290,12 @@ GetGroundEffectFlags_TallGrassOnBeginStep: ; 80967CC bl MetatileBehavior_IsTallGrass 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 @@ -265310,12 +265310,12 @@ GetGroundEffectFlags_LongGrassOnSpawn: ; 80967EC bl MetatileBehavior_IsLongGrass 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 @@ -265330,12 +265330,12 @@ GetGroundEffectFlags_LongGrassOnBeginStep: ; 809680C bl MetatileBehavior_IsLongGrass 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 @@ -265351,29 +265351,29 @@ GetGroundEffectFlags_Tracks: ; 809682C bl MetatileBehavior_IsDeepSand 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 MetatileBehavior_IsSandOrDeepSand lsls r0, 24 cmp r0, 0 - bne @0809685E + bne _0809685E ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsUnusedFootprintMetatile 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 @@ -265389,16 +265389,16 @@ GetGroundEffectFlags_SandHeap: ; 809686C bl MetatileBehavior_IsDeepSand lsls r0, 24 cmp r0, 0 - beq @080968AA + beq _080968AA ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsDeepSand 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 @@ -265410,14 +265410,14 @@ GetGroundEffectFlags_SandHeap: ; 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 @@ -265433,28 +265433,28 @@ GetGroundEffectFlags_ShallowFlowingWater: ; 80968BC bl MetatileBehavior_IsShallowFlowingWater lsls r0, 24 cmp r0, 0 - beq @080968DA + beq _080968DA ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsShallowFlowingWater lsls r0, 24 cmp r0, 0 - bne @080968F2 -@080968DA: + bne _080968F2 +_080968DA: ldrb r0, [r4, 0x1E] bl MetatileBehavior_IsPacifidlogLog lsls r0, 24 cmp r0, 0 - beq @08096910 + beq _08096910 ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsPacifidlogLog 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 @@ -265465,14 +265465,14 @@ GetGroundEffectFlags_ShallowFlowingWater: ; 80968BC 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 @@ -265488,18 +265488,18 @@ GetGroundEffectFlags_Puddle: ; 8096920 bl MetatileBehavior_IsPuddle lsls r0, 24 cmp r0, 0 - beq @08096948 + beq _08096948 ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsPuddle 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 @@ -265514,13 +265514,13 @@ GetGroundEffectFlags_Ripple: ; 8096950 bl MetatileBehavior_HasRipples 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 @@ -265536,16 +265536,16 @@ GetGroundEffectFlags_ShortGrass: ; 8096970 bl MetatileBehavior_IsShortGrass lsls r0, 24 cmp r0, 0 - beq @080969AE + beq _080969AE ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsShortGrass 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 @@ -265557,14 +265557,14 @@ GetGroundEffectFlags_ShortGrass: ; 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 @@ -265580,16 +265580,16 @@ GetGroundEffectFlags_HotSprings: ; 80969C0 bl MetatileBehavior_IsHotSprings lsls r0, 24 cmp r0, 0 - beq @080969FE + beq _080969FE ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsHotSprings 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 @@ -265601,14 +265601,14 @@ GetGroundEffectFlags_HotSprings: ; 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 @@ -265623,13 +265623,13 @@ GetGroundEffectFlags_Seaweed: ; 8096A10 bl MetatileBehavior_IsSeaweed 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 @@ -265647,11 +265647,11 @@ GetGroundEffectFlags_JumpLanding: ; 8096A30 ldr r1, =0x02000020 ands r0, r1 cmp r0, 0x20 - bne @08096A82 + bne _08096A82 movs r5, 0 ldr r0, =gUnknown_0850E5E4 mov r8, r0 -@08096A4A: +_08096A4A: lsls r4, r5, 2 mov r0, r8 adds r1, r4, r0 @@ -265660,22 +265660,22 @@ GetGroundEffectFlags_JumpLanding: ; 8096A30 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - beq @08096A78 + beq _08096A78 ldr r0, =gUnknown_0850E5FC adds r0, r4, r0 ldr r1, [r6] ldr r0, [r0] orrs r1, r0 str r1, [r6] - b @08096A82 + b _08096A82 .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} @@ -265710,12 +265710,12 @@ FieldObjectCheckForReflectiveSurface: ; 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 @@ -265732,7 +265732,7 @@ FieldObjectCheckForReflectiveSurface: ; 8096A8C lsrs r0, 24 mov r9, r4 cmp r0, 0 - bne @08096BCA + bne _08096BCA movs r1, 0x14 ldrsh r0, [r5, r1] movs r2, 0x16 @@ -265746,18 +265746,18 @@ FieldObjectCheckForReflectiveSurface: ; 8096A8C 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 @@ -265774,7 +265774,7 @@ FieldObjectCheckForReflectiveSurface: ; 8096A8C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @08096BCA + bne _08096BCA movs r1, 0x10 ldrsh r0, [r5, r1] subs r0, r4 @@ -265789,7 +265789,7 @@ FieldObjectCheckForReflectiveSurface: ; 8096A8C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @08096BCA + bne _08096BCA movs r1, 0x14 ldrsh r0, [r5, r1] adds r0, r4 @@ -265804,7 +265804,7 @@ FieldObjectCheckForReflectiveSurface: ; 8096A8C lsls r0, 24 lsrs r0, 24 cmp r0, 0 - bne @08096BCA + bne _08096BCA movs r1, 0x14 ldrsh r0, [r5, r1] subs r0, r4 @@ -265819,13 +265819,13 @@ FieldObjectCheckForReflectiveSurface: ; 8096A8C 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 @@ -265833,11 +265833,11 @@ FieldObjectCheckForReflectiveSurface: ; 8096A8C 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 @@ -265858,20 +265858,20 @@ GetReflectionTypeByMetatileBehavior: ; 8096BDC bl MetatileBehavior_IsIce lsls r0, 24 cmp r0, 0 - beq @08096BF2 + beq _08096BF2 movs r0, 0x1 - b @08096C04 -@08096BF2: + b _08096C04 +_08096BF2: adds r0, r4, 0 bl MetatileBehavior_IsReflective 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 @@ -265888,13 +265888,13 @@ GetLedgeJumpDirection: ; 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 @@ -265913,16 +265913,16 @@ GetLedgeJumpDirection: ; 8096C0C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @08096C5C -@08096C52: + beq _08096C5C +_08096C52: movs r0, 0 - b @08096C62 + b _08096C62 .pool -@08096C5C: +_08096C5C: adds r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 -@08096C62: +_08096C62: pop {r4} pop {r1} bx r1 @@ -265937,17 +265937,17 @@ FieldObjectSetSpriteOamTableForLongGrass: ; 8096C68 ldrb r0, [r5] lsls r0, 27 cmp r0, 0 - blt @08096CBC + blt _08096CBC ldrb r0, [r5, 0x1E] bl MetatileBehavior_IsLongGrass lsls r0, 24 cmp r0, 0 - beq @08096CBC + beq _08096CBC ldrb r0, [r5, 0x1F] bl MetatileBehavior_IsLongGrass lsls r0, 24 cmp r0, 0 - beq @08096CBC + beq _08096CBC adds r4, 0x42 ldrb r1, [r4] movs r6, 0x40 @@ -265963,14 +265963,14 @@ FieldObjectSetSpriteOamTableForLongGrass: ; 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 @@ -265987,7 +265987,7 @@ IsZCoordMismatchAt: ; 8096CC4 lsls r2, 16 lsrs r1, r2, 16 cmp r4, 0 - beq @08096CF2 + beq _08096CF2 lsls r0, 16 asrs r0, 16 lsls r1, 16 @@ -265996,17 +265996,17 @@ IsZCoordMismatchAt: ; 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 @@ -266021,7 +266021,7 @@ FieldObjectUpdateZCoordAndPriority: ; 8096D00 ldrb r0, [r4, 0x3] lsls r0, 29 cmp r0, 0 - blt @08096D4E + blt _08096D4E adds r0, r4, 0 bl FieldObjectUpdateZCoord ldr r1, =gUnknown_0850E644 @@ -266053,7 +266053,7 @@ FieldObjectUpdateZCoordAndPriority: ; 8096D00 ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] -@08096D4E: +_08096D4E: pop {r4,r5} pop {r0} bx r0 @@ -266132,9 +266132,9 @@ FieldObjectUpdateZCoord: ; 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 @@ -266145,14 +266145,14 @@ FieldObjectUpdateZCoord: ; 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 @@ -266204,12 +266204,12 @@ FieldObjectUpdateSubpriority: ; 8096E54 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 SetObjectSubpriorityByZCoord -@08096E6A: +_08096E6A: pop {r0} bx r0 thumb_func_end FieldObjectUpdateSubpriority @@ -266223,17 +266223,17 @@ AreZCoordsCompatible: ; 8096E70 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 AreZCoordsCompatible @@ -266524,7 +266524,7 @@ DoTracksGroundEffect_BikeTireTracks: ; 8097094 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] @@ -266551,7 +266551,7 @@ DoTracksGroundEffect_BikeTireTracks: ; 8097094 str r0, [r2, 0x10] movs r0, 0x23 bl FieldEffectStart -@080970D6: +_080970D6: pop {r4} pop {r0} bx r0 @@ -266622,11 +266622,11 @@ GroundEffect_JumpOnTallGrass: ; 8097110 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - bne @0809715A + bne _0809715A adds r0, r5, 0 adds r1, r6, 0 bl GroundEffect_SpawnOnTallGrass -@0809715A: +_0809715A: add sp, 0x4 pop {r4-r7} pop {r0} @@ -266788,35 +266788,35 @@ DoFlaggedGroundEffects: ; 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, =gUnknown_0850E674 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} @@ -266834,7 +266834,7 @@ filters_out_some_ground_effects: ; 80972BC ldrb r0, [r2] lsls r0, 27 cmp r0, 0 - bge @080972EA + bge _080972EA ldrb r1, [r2, 0x2] movs r0, 0x5 negs r0, r0 @@ -266851,7 +266851,7 @@ filters_out_some_ground_effects: ; 80972BC ldr r1, =0xfff9f7bd ands r0, r1 str r0, [r3] -@080972EA: +_080972EA: pop {r0} bx r0 .pool @@ -266865,12 +266865,12 @@ FilterOutStepOnPuddleGroundEffectIfJumping: ; 80972F4 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 .pool @@ -266886,7 +266886,7 @@ DoGroundEffects_OnSpawn: ; 8097310 ldrb r0, [r4] lsls r0, 29 cmp r0, 0 - bge @08097354 + bge _08097354 movs r0, 0 str r0, [sp] adds r0, r4, 0 @@ -266909,7 +266909,7 @@ DoGroundEffects_OnSpawn: ; 8097310 negs r1, r1 ands r0, r1 strb r0, [r4] -@08097354: +_08097354: add sp, 0x4 pop {r4,r5} pop {r0} @@ -266926,7 +266926,7 @@ DoGroundEffects_OnBeginStep: ; 809735C ldrb r0, [r4] lsls r0, 29 cmp r0, 0 - bge @080973A8 + bge _080973A8 movs r0, 0 str r0, [sp] adds r0, r4, 0 @@ -266952,7 +266952,7 @@ DoGroundEffects_OnBeginStep: ; 809735C negs r1, r1 ands r0, r1 strb r0, [r4] -@080973A8: +_080973A8: add sp, 0x4 pop {r4,r5} pop {r0} @@ -266969,7 +266969,7 @@ DoGroundEffects_OnFinishStep: ; 80973B0 ldrb r0, [r4] lsls r0, 28 cmp r0, 0 - bge @080973FC + bge _080973FC movs r0, 0 str r0, [sp] adds r0, r4, 0 @@ -266995,7 +266995,7 @@ DoGroundEffects_OnFinishStep: ; 80973B0 negs r1, r1 ands r0, r1 strb r0, [r4] -@080973FC: +_080973FC: add sp, 0x4 pop {r4,r5} pop {r0} @@ -267012,7 +267012,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 @@ -267069,11 +267069,11 @@ sub_8097404: ; 8097404 orrs r1, r2 strb r1, [r0] movs r0, 0 - b @0809748E + b _0809748E .pool -@0809748C: +_0809748C: movs r0, 0x1 -@0809748E: +_0809748E: pop {r4,r5} pop {r1} bx r1 @@ -267085,7 +267085,7 @@ 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 @@ -267093,19 +267093,19 @@ player_bitmagic: ; 8097494 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 @@ -267119,9 +267119,9 @@ sub_80974D0: ; 80974D0 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 @@ -267129,19 +267129,19 @@ sub_80974D0: ; 80974D0 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 @@ -267158,7 +267158,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 @@ -267195,7 +267195,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 @@ -267207,7 +267207,7 @@ 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 @@ -267215,15 +267215,15 @@ sub_809757C: ; 809757C 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 @@ -267361,7 +267361,7 @@ obj_npc_ministep: ; 8097674 movs r3, 0 ldrsh r0, [r0, r3] cmp r1, r0 - bge @080976D4 + bge _080976D4 ldr r1, =gUnknown_0850E754 lsls r0, r2, 2 adds r0, r1 @@ -267388,13 +267388,13 @@ 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 .pool -@080976D4: +_080976D4: movs r0, 0 -@080976D6: +_080976D6: pop {r4,r5} pop {r1} bx r1 @@ -267421,7 +267421,7 @@ sub_80976EC: ; 80976EC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @0809770C + bne _0809770C ldrh r1, [r4, 0x34] lsls r1, 24 lsrs r1, 24 @@ -267430,19 +267430,19 @@ 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 @@ -267490,19 +267490,19 @@ sub_8097758: ; 8097758 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 @@ -267511,8 +267511,8 @@ sub_8097758: ; 8097758 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 @@ -267530,8 +267530,8 @@ sub_8097758: ; 8097758 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 @@ -267540,8 +267540,8 @@ sub_8097758: ; 8097758 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 @@ -267556,13 +267556,13 @@ sub_8097758: ; 8097758 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 @@ -267570,20 +267570,20 @@ sub_8097758: ; 8097758 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} @@ -267643,13 +267643,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 @@ -267676,15 +267676,15 @@ sub_809785C: ; 809785C 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} @@ -267711,18 +267711,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 @@ -267749,15 +267749,15 @@ sub_80978E4: ; 80978E4 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} @@ -267782,12 +267782,12 @@ sub_809797C: ; 809797C 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 @@ -267822,12 +267822,12 @@ sub_80979BC: ; 80979BC 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 @@ -267852,7 +267852,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] @@ -267881,9 +267881,9 @@ sub_80979D4: ; 80979D4 lsls r0, 16 lsrs r5, r0, 16 adds r2, r3, 0 - b @08097A6A + b _08097A6A .pool -@08097A3C: +_08097A3C: mov r0, r12 ldrh r1, [r0, 0x24] ldrh r2, [r0, 0x20] @@ -267907,7 +267907,7 @@ sub_80979D4: ; 80979D4 lsls r0, 16 lsrs r5, r0, 16 adds r4, r3, 0 -@08097A6A: +_08097A6A: ldrb r0, [r4] lsls r0, 24 asrs r0, 25 @@ -267923,39 +267923,39 @@ sub_80979D4: ; 80979D4 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 @@ -267987,7 +267987,7 @@ 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 @@ -267996,18 +267996,18 @@ sub_8097AF0: ; 8097AF0 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @08097B16 + beq _08097B16 ldr r1, [r2, 0x1C] ldr r0, =sub_8097AC8 cmp r1, r0 - bne @08097B16 + bne _08097B16 adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@08097B16: +_08097B16: adds r5, 0x44 subs r4, 0x1 cmp r4, 0 - bge @08097AF6 + bge _08097AF6 pop {r4,r5} pop {r0} bx r0 @@ -268022,7 +268022,7 @@ sub_8097B2C: ; 8097B2C movs r3, 0 ldr r6, =0x02020630 movs r4, 0 -@08097B38: +_08097B38: adds r2, r4, r6 adds r0, r2, 0 adds r0, 0x3E @@ -268030,26 +268030,26 @@ sub_8097B2C: ; 8097B2C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @08097B68 + beq _08097B68 ldr r1, [r2, 0x1C] ldr r0, =sub_8097AC8 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 .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 @@ -268066,7 +268066,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 @@ -268079,7 +268079,7 @@ sub_8097B78: ; 8097B78 lsrs r1, 24 adds r0, r4, 0 bl StartObjectImageAnim -@08097BAA: +_08097BAA: pop {r4,r5} pop {r0} bx r0 @@ -268096,7 +268096,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 @@ -268129,14 +268129,14 @@ 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 .pool -@08097C20: +_08097C20: adds r0, r4, 0 bl SetSpriteOamTables_NoPriorityFromTable adds r2, r4, 0 @@ -268147,11 +268147,11 @@ sub_8097BB4: ; 8097BB4 movs r0, 0x80 orrs r1, r0 strb r1, [r2] -@08097C36: +_08097C36: adds r0, r4, 0 movs r1, 0 bl StartObjectImageAnim -@08097C3E: +_08097C3E: pop {r4,r5} pop {r0} bx r0 @@ -268168,9 +268168,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 @@ -268178,16 +268178,16 @@ sub_8097C44: ; 8097C44 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x32] - b @08097C80 + b _08097C80 .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 @@ -268203,10 +268203,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 @@ -268216,11 +268216,11 @@ sub_8097C8C: ; 8097C8C 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 .pool @@ -268237,7 +268237,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 @@ -268246,7 +268246,7 @@ sub_8097CC4: ; 8097CC4 movs r0, 0 strh r4, [r1, 0x34] strh r0, [r1, 0x36] -@08097CEA: +_08097CEA: pop {r4} pop {r0} bx r0 @@ -268260,16 +268260,16 @@ sub_8097CF4: ; 8097CF4 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 @@ -268279,13 +268279,13 @@ sub_8097CF4: ; 8097CF4 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 @@ -268297,27 +268297,27 @@ sub_8097D30: ; 8097D30 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 .pool @@ -268330,28 +268330,28 @@ sub_8097D68: ; 8097D68 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 @@ -268365,7 +268365,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 @@ -268374,14 +268374,14 @@ 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 .pool -@08097DC8: +_08097DC8: movs r0, 0x1 -@08097DCA: +_08097DCA: pop {r1} bx r1 thumb_func_end sub_8097D9C @@ -268413,13 +268413,13 @@ DoShadowFieldEffect: ; 8097DF8 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 DoShadowFieldEffect @@ -268468,7 +268468,7 @@ sub_8097E50: ; 8097E50 ldr r1, [r0] adds r6, r0, 0 cmp r1, 0 - bne @08097E80 + bne _08097E80 movs r0, 0x14 bl AllocZeroed str r0, [r6] @@ -268477,42 +268477,42 @@ sub_8097E50: ; 8097E50 ldr r1, [r6] movs r0, 0x1 strb r0, [r1, 0x10] - b @08097ECC + b _08097ECC .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] @@ -268522,19 +268522,19 @@ sub_8097E50: ; 8097E50 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] @@ -268557,14 +268557,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 @@ -268574,16 +268574,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 GetFieldObjectGraphicsInfo ldrb r1, [r0, 0xC] @@ -268606,7 +268606,7 @@ sub_8097EF0: ; 8097EF0 negs r0, r0 ands r0, r1 strb r0, [r2] -@08097F68: +_08097F68: movs r0, 0x1 pop {r3} mov r8, r3 @@ -268624,22 +268624,22 @@ sub_8097F78: ; 8097F78 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 .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 @@ -268698,21 +268698,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 @@ -268755,11 +268755,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 @@ -268767,19 +268767,19 @@ sub_8098074: ; 8098074 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 @@ -268809,11 +268809,11 @@ 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 @@ -268839,11 +268839,11 @@ sub_8098108: ; 8098108 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 @@ -268890,41 +268890,41 @@ 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 .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 @@ -268950,9 +268950,9 @@ task_del_textbox: ; 80981D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @080981E4 + beq _080981E4 bl remove_task -@080981E4: +_080981E4: pop {r0} bx r0 .pool @@ -268965,18 +268965,18 @@ box_related_two__2: ; 80981EC 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 .pool -@0809820C: +_0809820C: movs r0, 0 -@0809820E: +_0809820E: pop {r4} pop {r1} bx r1 @@ -268990,12 +268990,12 @@ sub_8098214: ; 8098214 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 @@ -269009,7 +269009,7 @@ sub_8098238: ; 8098238 ldr r5, =0x020375bc ldrb r0, [r5] cmp r0, 0 - bne @08098270 + bne _08098270 ldr r0, =0x02021fc4 adds r1, r4, 0 bl ExpandStringRefs @@ -269021,11 +269021,11 @@ sub_8098238: ; 8098238 movs r0, 0x2 strb r0, [r5] movs r0, 0x1 - b @08098272 + b _08098272 .pool -@08098270: +_08098270: movs r0, 0 -@08098272: +_08098272: pop {r4,r5} pop {r1} bx r1 @@ -269038,18 +269038,18 @@ box_related_two__3: ; 8098278 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 .pool -@08098298: +_08098298: movs r0, 0 -@0809829A: +_0809829A: pop {r1} bx r1 thumb_func_end box_related_two__3 @@ -269074,16 +269074,16 @@ sub_80982B8: ; 80982B8 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 .pool -@080982D4: +_080982D4: movs r0, 0 -@080982D6: +_080982D6: pop {r1} bx r1 thumb_func_end sub_80982B8 @@ -269146,13 +269146,13 @@ sub_809833C: ; 809833C ldr r0, =0x020375bc ldrb r0, [r0] cmp r0, 0 - beq @08098350 + beq _08098350 movs r0, 0 - b @08098352 + b _08098352 .pool -@08098350: +_08098350: movs r0, 0x1 -@08098352: +_08098352: pop {r1} bx r1 thumb_func_end sub_809833C @@ -269190,13 +269190,13 @@ walkrun_is_standing_still: ; 8098388 ldr r0, =0x02037590 ldrb r0, [r0, 0x3] cmp r0, 0x1 - beq @0809839C + beq _0809839C movs r0, 0x1 - b @0809839E + b _0809839E .pool -@0809839C: +_0809839C: movs r0, 0 -@0809839E: +_0809839E: pop {r1} bx r1 thumb_func_end walkrun_is_standing_still @@ -269209,11 +269209,11 @@ sub_80983A4: ; 80983A4 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 @@ -269226,14 +269226,14 @@ sub_80983C4: ; 80983C4 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 .pool -@080983E0: +_080983E0: movs r0, 0 -@080983E2: +_080983E2: pop {r1} bx r1 thumb_func_end sub_80983C4 @@ -269263,19 +269263,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] @@ -269286,23 +269286,23 @@ sub_8098400: ; 8098400 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 @@ -269316,14 +269316,14 @@ sub_809847C: ; 809847C 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 .pool -@08098498: +_08098498: movs r0, 0 -@0809849A: +_0809849A: pop {r1} bx r1 thumb_func_end sub_809847C @@ -269348,7 +269348,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 @@ -269358,7 +269358,7 @@ sub_80984A0: ; 80984A0 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0xA] -@080984DE: +_080984DE: pop {r4,r5} pop {r0} bx r0 @@ -269401,10 +269401,10 @@ sub_8098524: ; 8098524 ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq @08098542 + beq _08098542 adds r0, r1, 0 bl FieldObjectClearAnimIfSpecialAnimFinished -@08098542: +_08098542: movs r0, 0xFF movs r1, 0 movs r2, 0 @@ -269473,19 +269473,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 @@ -269494,23 +269494,23 @@ sub_80985BC: ; 80985BC 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 @@ -269530,7 +269530,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 @@ -269562,12 +269562,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 @@ -269587,14 +269587,14 @@ sub_8098630: ; 8098630 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 .pool -@080986E0: +_080986E0: adds r0, r4, 0 bl sub_80974D0 ldr r0, =sub_80985BC @@ -269616,12 +269616,12 @@ sub_8098630: ; 8098630 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 @@ -269638,14 +269638,14 @@ sub_8098734: ; 8098734 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 .pool -@08098750: +_08098750: movs r0, 0 -@08098752: +_08098752: pop {r1} bx r1 thumb_func_end sub_8098734 @@ -269656,15 +269656,15 @@ sub_8098758: ; 8098758 lsls r0, 24 lsrs r0, 24 cmp r0, 0x13 - bhi @08098770 + bhi _08098770 lsls r0, 3 ldr r1, =gUnknown_0851021C adds r0, r1 - b @08098772 + b _08098772 .pool -@08098770: +_08098770: ldr r0, =gUnknown_0851021C -@08098772: +_08098772: pop {r1} bx r1 .pool @@ -270248,35 +270248,35 @@ stdpal_get: ; 8098C18 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 .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, =gUnknown_0851017C adds r0, r1 @@ -270344,22 +270344,22 @@ 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 @@ -270398,55 +270398,55 @@ script_main_handler: ; 8098D10 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, =gUnknown_085102BC ldr r0, [r0] cmp r2, r0 - bne @08098D6C -@08098D64: + bne _08098D6C +_08098D64: swi 0x2 - b @08098D64 + b _08098D64 .pool -@08098D6C: +_08098D6C: ldrb r1, [r2] adds r0, r2, 0x1 str r0, [r4, 0x8] @@ -270455,17 +270455,17 @@ script_main_handler: ; 8098D10 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 @@ -270480,7 +270480,7 @@ script_stack_push: ; 8098D98 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 @@ -270490,10 +270490,10 @@ 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 @@ -270505,7 +270505,7 @@ script_stack_pop: ; 8098DC0 adds r2, r0, 0 ldrb r0, [r2] cmp r0, 0 - beq @08098DDC + beq _08098DDC subs r0, 0x1 strb r0, [r2] ldrb r1, [r2] @@ -270514,10 +270514,10 @@ 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 @@ -270635,13 +270635,13 @@ script_env_context_is_running: ; 8098E78 ldr r0, =0x03000e38 ldrb r0, [r0] cmp r0, 0 - beq @08098E8C + beq _08098E8C movs r0, 0 - b @08098E8E + b _08098E8E .pool -@08098E8C: +_08098E8C: movs r0, 0x1 -@08098E8E: +_08098E8E: pop {r1} bx r1 thumb_func_end script_env_context_is_running @@ -270667,25 +270667,25 @@ script_env_2_run_current_script: ; 8098EBC 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 .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 @@ -270747,13 +270747,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 @@ -270768,21 +270768,21 @@ mapheader_get_tagged_pointer: ; 8098F88 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 .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] @@ -270794,7 +270794,7 @@ mapheader_get_tagged_pointer: ; 8098F88 ldrb r1, [r2, 0x3] lsls r1, 24 adds r0, r1 -@08098FC2: +_08098FC2: pop {r1} bx r1 thumb_func_end mapheader_get_tagged_pointer @@ -270806,9 +270806,9 @@ mapheader_run_script_by_tag: ; 8098FC8 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 @@ -270822,18 +270822,18 @@ mapheader_get_first_match_from_tagged_ptr_list: ; 8098FE0 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] @@ -270848,10 +270848,10 @@ mapheader_get_first_match_from_tagged_ptr_list: ; 8098FE0 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 @@ -270862,7 +270862,7 @@ mapheader_get_first_match_from_tagged_ptr_list: ; 8098FE0 ldrb r1, [r6, 0x3] lsls r1, 24 adds r0, r1 -@0809903A: +_0809903A: pop {r4-r6} pop {r1} bx r1 @@ -270920,13 +270920,13 @@ mapheader_run_first_tag2_script_list_match: ; 809907C 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 @@ -270938,9 +270938,9 @@ mapheader_run_first_tag4_script_list_match: ; 8099098 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 @@ -271009,7 +271009,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 @@ -271028,11 +271028,11 @@ sub_80990FC: ; 80990FC adds r1, r2 str r0, [r1] movs r0, 0x1 - b @08099176 + b _08099176 .pool -@08099174: +_08099174: movs r0, 0 -@08099176: +_08099176: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -271059,37 +271059,37 @@ 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 .pool -@080991EC: +_080991EC: bl killram -@080991F0: +_080991F0: adds r0, r4, 0 -@080991F2: +_080991F2: pop {r4-r7} pop {r1} bx r1 @@ -271104,29 +271104,29 @@ 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 .pool -@0809923C: +_0809923C: movs r0, 0 -@0809923E: +_0809923E: pop {r4} pop {r1} bx r1 @@ -271141,35 +271141,35 @@ 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 .pool -@08099294: +_08099294: bl killram -@08099298: +_08099298: movs r0, 0 -@0809929A: +_0809929A: pop {r4-r6} pop {r1} bx r1 @@ -271184,9 +271184,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 @@ -271351,11 +271351,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} @@ -271382,11 +271382,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} @@ -271469,11 +271469,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} @@ -271502,11 +271502,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} @@ -271527,11 +271527,11 @@ s08_jumpstd: ; 8099508 adds r1, r0 ldr r0, =gUnknown_081DC2CC 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 @@ -271551,11 +271551,11 @@ s09_callstd: ; 8099538 adds r1, r0 ldr r0, =gUnknown_081DC2CC 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 @@ -271581,17 +271581,17 @@ s0A_jumpstd_if: ; 8099568 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne @080995A0 + bne _080995A0 lsls r0, r4, 2 ldr r1, =gUnknown_081DC2A0 adds r1, r0, r1 ldr r0, =gUnknown_081DC2CC 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} @@ -271618,17 +271618,17 @@ s0B_callstd_if: ; 80995B4 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne @080995EC + bne _080995EC lsls r0, r4, 2 ldr r1, =gUnknown_081DC2A0 adds r1, r0, r1 ldr r0, =gUnknown_081DC2CC 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} @@ -271880,17 +271880,17 @@ compare_012: ; 809979C 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 @@ -272537,13 +272537,13 @@ sub_8099CA8: ; 8099CA8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @08099CC0 + beq _08099CC0 movs r0, 0 - b @08099CC2 + b _08099CC2 .pool -@08099CC0: +_08099CC0: movs r0, 0x1 -@08099CC2: +_08099CC2: pop {r1} bx r1 thumb_func_end sub_8099CA8 @@ -272604,16 +272604,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 @@ -272621,9 +272621,9 @@ sub_8099D20: ; 8099D20 adds r0, r4, 0 movs r1, 0 bl fade_screen - b @08099D72 + b _08099D72 .pool -@08099D60: +_08099D60: ldr r0, =0x02037fe8 ldr r1, =0x02037714 ldr r2, =0x04000100 @@ -272631,7 +272631,7 @@ sub_8099D20: ; 8099D20 adds r0, r4, 0 movs r1, 0 bl fade_screen -@08099D72: +_08099D72: ldr r1, =sub_8099CA8 adds r0, r5, 0 bl script_setup_asm_script @@ -272651,13 +272651,13 @@ s28_pause_asm: ; 8099D94 strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq @08099DAC + beq _08099DAC movs r0, 0 - b @08099DAE + b _08099DAE .pool -@08099DAC: +_08099DAC: movs r0, 0x1 -@08099DAE: +_08099DAE: pop {r1} bx r1 thumb_func_end s28_pause_asm @@ -273021,9 +273021,9 @@ sub_809A054: ; 809A054 adds r1, r4, 0 bl PlayerGetDestCoords cmp r6, 0xFF - bne @0809A092 + bne _0809A092 cmp r5, 0xFF - bne @0809A092 + bne _0809A092 add r0, sp, 0x4 ldrh r0, [r0] subs r0, 0x7 @@ -273034,8 +273034,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 @@ -273053,7 +273053,7 @@ sub_809A054: ; 809A054 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 @@ -273565,12 +273565,12 @@ s30_music_check_asm: ; 809A4C8 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 @@ -273633,10 +273633,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_battle_music_maybe -@0809A54C: +_0809A54C: adds r0, r5, 0 bl current_map_music_set movs r0, 0 @@ -273687,15 +273687,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 adds r0, r4, 0 bl script_setup_asm_script @@ -273714,15 +273714,15 @@ s38_fadein: ; 809A5C4 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 @@ -273819,10 +273819,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] @@ -273854,10 +273854,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 @@ -274191,14 +274191,14 @@ s5A_face_player: ; 809A9A4 ldrb r0, [r4] lsls r0, 31 cmp r0, 0 - beq @0809A9CC + beq _0809A9CC bl player_get_direction_lower_nybble adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 bl FieldObjectFaceOppositeDirection -@0809A9CC: +_0809A9CC: movs r0, 0 pop {r4} pop {r1} @@ -274331,17 +274331,17 @@ sub_809AAC4: ; 809AAC4 adds r4, r0, 0 bl is_c1_link_related_active cmp r0, 0 - bne @0809AAE4 + bne _0809AAE4 bl sub_80983E8 ldr r1, =sub_80983C4 adds r0, r4, 0 bl script_setup_asm_script movs r0, 0x1 - b @0809AAE6 + b _0809AAE6 .pool -@0809AAE4: +_0809AAE4: movs r0, 0 -@0809AAE6: +_0809AAE6: pop {r4} pop {r1} bx r1 @@ -274353,10 +274353,10 @@ sub_809AAEC: ; 809AAEC 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] @@ -274367,21 +274367,21 @@ sub_809AAEC: ; 809AAEC ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq @0809AB2C + beq _0809AB2C bl sub_80984A0 ldr r1, =sub_809847C adds r0, r4, 0 bl script_setup_asm_script - b @0809AB38 + b _0809AB38 .pool -@0809AB2C: +_0809AB2C: bl sub_80983E8 ldr r1, =sub_80983C4 adds r0, r4, 0 bl script_setup_asm_script -@0809AB38: +_0809AB38: movs r0, 0x1 -@0809AB3A: +_0809AB3A: pop {r4} pop {r1} bx r1 @@ -274427,10 +274427,10 @@ s6C_release_2: ; 809AB7C ldrb r0, [r1] lsls r0, 31 cmp r0, 0 - beq @0809AB9E + beq _0809AB9E adds r0, r1, 0 bl FieldObjectClearAnimIfSpecialAnimFinished -@0809AB9E: +_0809AB9E: movs r0, 0xFF movs r1, 0 movs r2, 0 @@ -274458,9 +274458,9 @@ s67_execute_box: ; 809ABD4 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} @@ -274474,9 +274474,9 @@ sub_809ABF0: ; 809ABF0 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} @@ -274491,9 +274491,9 @@ s9B_unknown: ; 809AC0C 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 @@ -274518,9 +274518,9 @@ sub_809AC3C: ; 809AC3C 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 @@ -274569,17 +274569,17 @@ sub_809AC98: ; 809AC98 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 .pool -@0809ACB8: +_0809ACB8: movs r0, 0x1 -@0809ACBA: +_0809ACBA: pop {r1} bx r1 thumb_func_end sub_809AC98 @@ -274610,13 +274610,13 @@ 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 @@ -274642,13 +274642,13 @@ s6F_multichoice: ; 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 @@ -274683,13 +274683,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 @@ -274733,13 +274733,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 @@ -274797,14 +274797,14 @@ s76_close_picture_box: ; 809AE28 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 @@ -274818,10 +274818,10 @@ sub_809AE48: ; 809AE48 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 @@ -274850,34 +274850,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 @@ -275501,34 +275501,34 @@ sub_809B3DC: ; 809B3DC movs r0, 0x6 strh r0, [r1] movs r6, 0 - b @0809B42A + b _0809B42A .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 .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 @@ -275541,8 +275541,8 @@ sub_809B3DC: ; 809B3DC lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne @0809B3F4 -@0809B44A: + bne _0809B3F4 +_0809B44A: movs r0, 0 pop {r4-r7} pop {r1} @@ -275562,7 +275562,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 @@ -275570,7 +275570,7 @@ s90_add_money: ; 809B458 adds r0, r1 adds r1, r2, 0 bl add_money -@0809B47E: +_0809B47E: movs r0, 0 pop {r4} pop {r1} @@ -275590,7 +275590,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 @@ -275598,7 +275598,7 @@ s91_subtract_money: ; 809B48C adds r0, r1 adds r1, r2, 0 bl subtract_money -@0809B4B2: +_0809B4B2: movs r0, 0 pop {r4} pop {r1} @@ -275618,7 +275618,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] @@ -275630,7 +275630,7 @@ s92_check_money: ; 809B4C0 lsls r0, 24 lsrs r0, 24 strh r0, [r4] -@0809B4EE: +_0809B4EE: movs r0, 0 pop {r4} pop {r1} @@ -275653,7 +275653,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 @@ -275663,7 +275663,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} @@ -275692,7 +275692,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 @@ -275700,7 +275700,7 @@ s95_update_money: ; 809B548 adds r0, r1 bl decrypt_money bl sub_80E52D4 -@0809B56E: +_0809B56E: movs r0, 0 pop {r1} bx r1 @@ -275953,20 +275953,20 @@ berry_script_cmd: ; 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 PlantBerryTree - b @0809B750 -@0809B744: + b _0809B750 +_0809B744: adds r0, r5, 0 adds r1, r3, 0 adds r2, r4, 0 movs r3, 0 bl PlantBerryTree -@0809B750: +_0809B750: movs r0, 0 pop {r4,r5} pop {r1} @@ -276089,13 +276089,13 @@ sub_809B824: ; 809B824 bl FieldEffectActiveListContains lsls r0, 24 cmp r0, 0 - beq @0809B83C + beq _0809B83C movs r0, 0 - b @0809B83E + b _0809B83E .pool -@0809B83C: +_0809B83C: movs r0, 0x1 -@0809B83E: +_0809B83E: pop {r1} bx r1 thumb_func_end sub_809B824 @@ -276222,13 +276222,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 MapGridSetMetatileIdAt - b @0809B966 -@0809B954: + b _0809B966 +_0809B954: movs r1, 0xC0 lsls r1, 4 adds r0, r1, 0 @@ -276237,7 +276237,7 @@ sA2_setmaptile: ; 809B8F0 adds r0, r6, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt -@0809B966: +_0809B966: movs r0, 0 pop {r4-r7} pop {r1} @@ -276323,12 +276323,12 @@ sub_809BA0C: ; 809BA0C 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 @@ -276473,15 +276473,15 @@ 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 .pool -@0809BB48: +_0809BB48: ldr r1, =0x020375f0 movs r0, 0x1 -@0809BB4C: +_0809BB4C: strh r0, [r1] movs r0, 0 pop {r1} @@ -276502,15 +276502,15 @@ 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 .pool -@0809BB80: +_0809BB80: ldr r1, =0x020375f0 movs r0, 0x1 -@0809BB84: +_0809BB84: strh r0, [r1] movs r0, 0 pop {r1} @@ -276587,10 +276587,10 @@ sub_809BBFC: ; 809BBFC 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] @@ -276601,14 +276601,14 @@ sub_809BBFC: ; 809BBFC ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq @0809BC2E + beq _0809BC2E bl sub_8098630 ldr r1, =sub_8098734 adds r0, r4, 0 bl script_setup_asm_script -@0809BC2E: +_0809BC2E: movs r0, 0x1 -@0809BC30: +_0809BC30: pop {r4} pop {r1} bx r1 @@ -276674,14 +276674,14 @@ sCF_execute_RAM_script_DMA: ; 809BCB4 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} @@ -276775,7 +276775,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 @@ -276783,7 +276783,7 @@ sub_809BD70: ; 809BD70 movs r1, 0x23 mov r2, sp bl pokemon_setattr -@0809BDA6: +_0809BDA6: movs r0, 0 add sp, 0x4 pop {r4} @@ -276985,121 +276985,121 @@ 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 .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 @@ -277137,26 +277137,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 @@ -277167,28 +277167,28 @@ sub_809C014: ; 809C014 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 @@ -277196,8 +277196,8 @@ sub_809C014: ; 809C014 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 @@ -277213,7 +277213,7 @@ sub_809C014: ; 809C014 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0809C106 + beq _0809C106 mov r0, sp adds r1, r4, 0 adds r2, r6, 0 @@ -277221,16 +277221,16 @@ sub_809C014: ; 809C014 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 @@ -277238,42 +277238,42 @@ sub_809C014: ; 809C014 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 .pool -@0809C15C: +_0809C15C: movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq @0809C170 + beq _0809C170 bl UseRegisteredKeyItemOnField 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} @@ -277314,9 +277314,9 @@ player_get_next_pos_and_height: ; 809C194 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq @0809C1C6 + beq _0809C1C6 bl PlayerGetZCoord -@0809C1C6: +_0809C1C6: strb r0, [r5, 0x4] add sp, 0x4 pop {r4,r5} @@ -277357,38 +277357,38 @@ sub_809C1FC: ; 809C1FC bl TryGetScriptOnPressingA adds r4, r0, 0 cmp r4, 0 - bne @0809C214 + bne _0809C214 movs r0, 0 - b @0809C24C -@0809C214: + b _0809C24C +_0809C214: ldr r0, =gUnknown_081F860D cmp r4, r0 - beq @0809C244 + beq _0809C244 ldr r0, =gUnknown_081F9553 cmp r4, r0 - beq @0809C244 + beq _0809C244 ldr r0, =gUnknown_0823B4BB cmp r4, r0 - beq @0809C244 + beq _0809C244 ldr r0, =gUnknown_0823B589 cmp r4, r0 - beq @0809C244 + beq _0809C244 ldr r0, =gUnknown_082766A2 cmp r4, r0 - beq @0809C244 + beq _0809C244 ldr r0, =gUnknown_082766A6 cmp r4, r0 - beq @0809C244 + beq _0809C244 ldr r0, =gUnknown_08271D92 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 @@ -277411,27 +277411,27 @@ TryGetScriptOnPressingA: ; 809C270 adds r2, r4, 0 bl TryGetMapObjectScript cmp r0, 0 - bne @0809C2BC + bne _0809C2BC adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl TryGetInvisibleMapObjectScript cmp r0, 0 - bne @0809C2BC + bne _0809C2BC adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 bl TryGetMetatileBehaviorScript cmp r0, 0 - bne @0809C2BC + bne _0809C2BC adds r0, r6, 0 mov r1, r8 adds r2, r7, 0 bl TryGetFieldMoveScript cmp r0, 0 - bne @0809C2BC + bne _0809C2BC movs r0, 0 -@0809C2BC: +_0809C2BC: pop {r3} mov r8, r3 pop {r4-r7} @@ -277455,11 +277455,11 @@ sub_809C2C8: ; 809C2C8 bl MetatileBehavior_IsCounter 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, =gUnknown_08339D64 lsls r2, r6, 3 adds r0, r2, r1 @@ -277475,13 +277475,13 @@ sub_809C2C8: ; 809C2C8 adds r1, r2 lsls r1, 16 lsrs r1, 16 -@0809C30E: +_0809C30E: ldrb r2, [r4, 0x4] bl GetFieldObjectIdByXYZ 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 @@ -277490,26 +277490,26 @@ sub_809C2C8: ; 809C2C8 ldrb r0, [r0, 0x8] adds r5, r1, 0 cmp r0, 0xFF - bne @0809C33C -@0809C32E: + bne _0809C33C +_0809C32E: movs r0, 0 - b @0809C36E + b _0809C36E .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 @@ -277522,7 +277522,7 @@ sub_809C2C8: ; 809C2C8 strh r6, [r0] adds r0, r3, 0 bl GetFieldObjectScriptPointerByFieldObjectId -@0809C36E: +_0809C36E: pop {r4-r6} pop {r1} bx r1 @@ -277544,7 +277544,7 @@ TryGetMapObjectScript: ; 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 @@ -277553,14 +277553,14 @@ TryGetMapObjectScript: ; 809C384 ldrb r0, [r0, 0x8] adds r3, r1, 0 cmp r0, 0xFF - bne @0809C40C -@0809C3B4: + bne _0809C40C +_0809C3B4: adds r0, r6, 0 bl MetatileBehavior_IsCounter lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C400 + bne _0809C400 ldr r1, =gUnknown_08339D64 lsls r2, r7, 3 adds r0, r2, r1 @@ -277581,7 +277581,7 @@ TryGetMapObjectScript: ; 809C384 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 @@ -277590,12 +277590,12 @@ TryGetMapObjectScript: ; 809C384 ldrb r0, [r0, 0x8] adds r3, r1, 0 cmp r0, 0xFF - bne @0809C40C -@0809C400: + bne _0809C40C +_0809C400: movs r0, 0 - b @0809C44E + b _0809C44E .pool -@0809C40C: +_0809C40C: ldr r0, =0x03005df0 strb r4, [r0] ldr r1, =0x020375f2 @@ -277608,20 +277608,20 @@ TryGetMapObjectScript: ; 809C384 strh r7, [r0] bl InTrainerHill cmp r0, 0x1 - bne @0809C43C + bne _0809C43C bl sub_81D62AC - b @0809C442 + b _0809C442 .pool -@0809C43C: +_0809C43C: adds r0, r4, 0 bl GetFieldObjectScriptPointerByFieldObjectId -@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 @@ -277647,53 +277647,53 @@ TryGetInvisibleMapObjectScript: ; 809C458 adds r0, r4, 0 bl FindInvisibleMapObjectByPosition cmp r0, 0 - beq @0809C4CC + beq _0809C4CC ldr r2, [r0, 0x8] cmp r2, 0 - bne @0809C490 + bne _0809C490 ldr r0, =gUnknown_082C8436 - b @0809C532 + b _0809C532 .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 .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 @@ -277707,25 +277707,25 @@ TryGetInvisibleMapObjectScript: ; 809C458 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0809C4CC + beq _0809C4CC ldr r0, =gUnknown_08271CB7 - b @0809C532 + b _0809C532 .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, =gUnknown_082759F1 - b @0809C532 + b _0809C532 .pool -@0809C530: +_0809C530: adds r0, r2, 0 -@0809C532: +_0809C532: pop {r4,r5} pop {r1} bx r1 @@ -277745,202 +277745,202 @@ TryGetMetatileBehaviorScript: ; 809C538 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C55C + bne _0809C55C ldr r0, =gUnknown_0827EE0B - b @0809C7E4 + b _0809C7E4 .pool -@0809C55C: +_0809C55C: adds r0, r5, 0 bl MetatileBehavior_IsPC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C574 + bne _0809C574 ldr r0, =gUnknown_08271D92 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_081E615D - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082393F9 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082A4BAC - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_0826A22A - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_0827208F - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_08292DE5 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082725CE - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082725D7 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082725E0 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082725E9 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082725F2 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_082725FB - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_08272604 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_08277B8A - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_08277365 - b @0809C7E4 + b _0809C7E4 .pool -@0809C6EC: +_0809C6EC: adds r0, r5, 0 bl MetatileBehavior_IsQuestionnaire lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C704 + bne _0809C704 ldr r0, =gUnknown_0827381B - b @0809C7E4 + b _0809C7E4 .pool -@0809C704: +_0809C704: adds r0, r5, 0 bl MetatileBehavior_IsTrainerHillTimer lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C71C + bne _0809C71C ldr r0, =gUnknown_082C8393 - b @0809C7E4 + b _0809C7E4 .pool -@0809C71C: +_0809C71C: movs r4, 0x4 ldrsb r4, [r6, r4] movs r1, 0 @@ -277951,84 +277951,84 @@ TryGetMetatileBehaviorScript: ; 809C538 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, =gUnknown_0823B4BB - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_0823B589 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_0823B684 - b @0809C7E4 + b _0809C7E4 .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, =gUnknown_0823B68C - b @0809C7E4 + b _0809C7E4 .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 @@ -278044,48 +278044,48 @@ TryGetFieldMoveScript: ; 809C7EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C824 + bne _0809C824 bl PartyHasMonWithSurf lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C824 + bne _0809C824 bl IsPlayerFacingSurfableFishableWater lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C824 + bne _0809C824 ldr r0, =gUnknown_08271EA0 - b @0809C862 + b _0809C862 .pool -@0809C824: +_0809C824: adds r0, r4, 0 bl MetatileBehavior_IsWaterfall lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C860 + bne _0809C860 ldr r0, =0x0000086e bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C858 + bne _0809C858 bl IsPlayerSurfingNorth lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809C858 + bne _0809C858 ldr r0, =gUnknown_08290A49 - b @0809C862 + b _0809C862 .pool -@0809C858: +_0809C858: ldr r0, =gUnknown_08290A83 - b @0809C862 + b _0809C862 .pool -@0809C860: +_0809C860: movs r0, 0 -@0809C862: +_0809C862: pop {r4} pop {r1} bx r1 @@ -278098,20 +278098,20 @@ sub_809C868: ; 809C868 bl FlagGet 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, =gUnknown_08290B0F bl script_env_1_execute_new_script movs r0, 0x1 - b @0809C896 + b _0809C896 .pool -@0809C894: +_0809C894: movs r0, 0 -@0809C896: +_0809C896: pop {r1} bx r1 thumb_func_end sub_809C868 @@ -278123,24 +278123,24 @@ sub_809C89C: ; 809C89C bl FlagGet 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, =gUnknown_08290B5A bl script_env_1_execute_new_script movs r0, 0x1 - b @0809C8D6 + b _0809C8D6 .pool -@0809C8D4: +_0809C8D4: movs r0, 0 -@0809C8D6: +_0809C8D6: pop {r1} bx r1 thumb_func_end sub_809C89C @@ -278156,36 +278156,36 @@ 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 @@ -278207,14 +278207,14 @@ 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 .pool -@0809C964: +_0809C964: movs r0, 0 -@0809C966: +_0809C966: pop {r4} pop {r1} bx r1 @@ -278230,38 +278230,38 @@ sub_809C96C: ; 809C96C bl sub_8089918 lsls r0, 24 cmp r0, 0 - beq @0809C988 + beq _0809C988 ldr r0, =gUnknown_082A8337 - b @0809C996 + b _0809C996 .pool -@0809C988: +_0809C988: adds r0, r4, 0 bl sub_8089ABC lsls r0, 24 cmp r0, 0 - beq @0809C9A4 + beq _0809C9A4 ldr r0, =gUnknown_08252BE8 -@0809C996: +_0809C996: bl script_env_1_execute_new_script movs r0, 0x1 - b @0809C9EA + b _0809C9EA .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 @@ -278276,9 +278276,9 @@ sub_809C96C: ; 809C96C lsls r0, 16 asrs r0, 16 bl sub_80FA970 -@0809C9E8: +_0809C9E8: movs r0, 0 -@0809C9EA: +_0809C9EA: add sp, 0x4 pop {r4} pop {r1} @@ -278292,9 +278292,9 @@ per_step_scripts: ; 809C9F4 lsrs r4, r0, 16 bl InUnionRoom cmp r0, 0x1 - bne @0809CA04 - b @0809CB24 -@0809CA04: + bne _0809CA04 + b _0809CB24 +_0809CA04: bl sub_80B215C bl happiness_algorithm_step bl sub_81D4998 @@ -278303,117 +278303,117 @@ per_step_scripts: ; 809C9F4 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, =gUnknown_082736BC bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .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, =gUnknown_08291FC0 bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .pool -@0809CA64: +_0809CA64: bl sub_813B3B0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809CA7C + bne _0809CA7C ldr r0, =gUnknown_08273D1F bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .pool -@0809CA7C: +_0809CA7C: bl sub_8179A04 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809CA94 + bne _0809CA94 ldr r0, =gUnknown_08238EAF bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .pool -@0809CA94: +_0809CA94: bl is_tile_that_overrides_player_control cmp r0, 0x1 - bne @0809CAA8 + bne _0809CAA8 ldr r0, =gUnknown_081DF7BA bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .pool -@0809CAA8: +_0809CAA8: bl sub_8138120 cmp r0, 0x1 - bne @0809CABC + bne _0809CABC ldr r0, =gUnknown_081F49EC bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .pool -@0809CABC: +_0809CABC: bl sub_8138168 cmp r0, 0x1 - bne @0809CAD0 + bne _0809CAD0 ldr r0, =gUnknown_081FA4D6 bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .pool -@0809CAD0: +_0809CAD0: bl sub_81381B0 cmp r0, 0x1 - bne @0809CAE4 + bne _0809CAE4 ldr r0, =gUnknown_0821307B bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .pool -@0809CAE4: +_0809CAE4: bl sub_81381F8 cmp r0, 0x1 - bne @0809CAF8 + bne _0809CAF8 ldr r0, =gUnknown_08224175 bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .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, =gUnknown_0823C050 bl script_env_1_execute_new_script - b @0809CB28 + b _0809CB28 .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 @@ -278443,18 +278443,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 @@ -278478,7 +278478,7 @@ overworld_poison_step: ; 809CB94 ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x9 - beq @0809CBD4 + beq _0809CBD4 ldr r0, =0x0000402b bl GetVarPointer ldrh r1, [r0] @@ -278489,20 +278489,20 @@ 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 .pool -@0809CBD4: +_0809CBD4: movs r0, 0 -@0809CBD6: +_0809CBD6: pop {r1} bx r1 thumb_func_end overworld_poison_step @@ -278525,15 +278525,15 @@ 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 .pool -@0809CC0C: +_0809CC0C: ldr r5, =0x020375d6 ldrh r1, [r5] adds r0, r4, 0 @@ -278541,17 +278541,17 @@ is_it_battle_time_3: ; 809CBE8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0809CC28 + beq _0809CC28 strh r4, [r5] movs r0, 0 - b @0809CC30 + b _0809CC30 .pool -@0809CC28: +_0809CC28: movs r0, 0 strb r0, [r6] strh r7, [r5] movs r0, 0x1 -@0809CC30: +_0809CC30: pop {r4-r7} pop {r1} bx r1 @@ -278581,13 +278581,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 @@ -278595,11 +278595,11 @@ mapheader_run_first_tag2_script_list_match_conditionally: ; 809CC38 bl sub_809CEB0 bl sub_80AF734 movs r0, 0x1 - b @0809CC92 + b _0809CC92 .pool -@0809CC90: +_0809CC90: movs r0, 0 -@0809CC92: +_0809CC92: pop {r3} mov r8, r3 pop {r4-r7} @@ -278622,13 +278622,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 @@ -278641,81 +278641,81 @@ 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 .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 MetatileBehavior_IsAquaHideoutWarp 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, =gUnknown_082A8350 bl script_env_1_execute_new_script movs r0, 0x1 - b @0809CD8C + b _0809CD8C .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 @@ -278731,66 +278731,66 @@ is_warp_tile: ; 809CD94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0809CE2A + beq _0809CE2A adds r0, r4, 0 bl MetatileBehavior_IsLadder lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0809CE2A + beq _0809CE2A adds r0, r4, 0 bl MetatileBehavior_IsEscalator 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 MetatileBehavior_IsAquaHideoutWarp 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 @@ -278805,44 +278805,44 @@ 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 MetatileBehavior_IsNorthArrowWarp - b @0809CE7E -@0809CE62: + b _0809CE7E +_0809CE62: lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsSouthArrowWarp - b @0809CE7E -@0809CE6C: + b _0809CE7E +_0809CE6C: lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsWestArrowWarp - b @0809CE7E -@0809CE76: + b _0809CE7E +_0809CE76: lsls r0, 24 lsrs r0, 24 bl MetatileBehavior_IsEastArrowWarp -@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 @@ -278878,34 +278878,34 @@ 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 .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 @@ -278913,15 +278913,15 @@ sub_809CEB0: ; 809CEB0 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 .pool -@0809CF20: +_0809CF20: movs r0, 0x7 ldrsb r0, [r5, r0] movs r1, 0x6 @@ -278944,7 +278944,7 @@ sub_809CEB0: ; 809CEB0 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 @@ -278957,7 +278957,7 @@ sub_809CEB0: ; 809CEB0 lsls r2, 24 asrs r2, 24 bl saved_warp2_set -@0809CF6E: +_0809CF6E: pop {r4-r7} pop {r0} bx r0 @@ -278974,7 +278974,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 @@ -278982,21 +278982,21 @@ 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 .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 @@ -279006,13 +279006,13 @@ map_warp_consider_2_to_inside: ; 809CF78 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 @@ -279020,11 +279020,11 @@ map_warp_consider_2_to_inside: ; 809CF78 bl sub_809CEB0 bl sub_80AF7D0 movs r0, 0x1 - b @0809CFFE + b _0809CFFE .pool -@0809CFFC: +_0809CFFC: movs r0, 0 -@0809CFFE: +_0809CFFE: pop {r4-r7} pop {r1} bx r1 @@ -279044,32 +279044,32 @@ 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 @@ -279080,32 +279080,32 @@ 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_weather - b @0809D082 -@0809D062: + b _0809D082 +_0809D062: ldrh r0, [r4, 0x6] cmp r0, 0 - beq @0809D07C + beq _0809D07C ldrh r0, [r4, 0x6] bl VarGet 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 @@ -279132,35 +279132,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 @@ -279206,35 +279206,35 @@ FindInvisibleMapObjectByPosition: ; 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 @@ -279249,13 +279249,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 @@ -279265,16 +279265,16 @@ dive_warp: ; 809D16C lsls r1, 16 lsrs r1, 16 bl sub_8085058 - b @0809D1C8 + b _0809D1C8 .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 @@ -279284,19 +279284,19 @@ dive_warp: ; 809D16C 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 @@ -279322,12 +279322,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 @@ -279341,17 +279341,17 @@ sub_809D1E8: ; 809D1E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809D274 + bne _0809D274 movs r0, 0x1 - b @0809D276 + b _0809D276 .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 @@ -279365,12 +279365,12 @@ sub_809D1E8: ; 809D1E8 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} @@ -279563,24 +279563,24 @@ sub_809D42C: ; 809D42C ldr r0, [r0] ldrb r0, [r0, 0x1A] cmp r0, 0xDA - bne @0809D468 + bne _0809D468 ldr r0, =0x00004046 bl VarGet lsls r0, 16 ldr r1, =0x03020000 cmp r0, r1 - bne @0809D468 + bne _0809D468 ldr r0, =0x00000896 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @0809D468 + beq _0809D468 movs r0, 0x1 - b @0809D46A + b _0809D46A .pool -@0809D468: +_0809D468: movs r0, 0 -@0809D46A: +_0809D46A: pop {r1} bx r1 thumb_func_end sub_809D42C @@ -279763,20 +279763,20 @@ sub_809D614: ; 809D614 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @0809D640 + beq _0809D640 ldr r0, =0x0000402c bl VarGet lsls r0, 16 movs r1, 0x92 lsls r1, 20 cmp r0, r1 - bne @0809D640 + bne _0809D640 movs r0, 0x1 - b @0809D642 + b _0809D642 .pool -@0809D640: +_0809D640: movs r0, 0 -@0809D642: +_0809D642: pop {r1} bx r1 thumb_func_end sub_809D614 @@ -279790,30 +279790,30 @@ GetVarPointer: ; 809D648 adds r2, r1, 0 ldr r0, =0x00003fff cmp r1, r0 - bhi @0809D660 + bhi _0809D660 movs r0, 0 - b @0809D688 + b _0809D688 .pool -@0809D660: +_0809D660: lsls r0, r1, 16 cmp r0, 0 - bge @0809D67C + bge _0809D67C ldr r0, =gUnknown_081DBA0C ldr r2, =0xffff8000 adds r1, r2 lsls r1, 2 adds r1, r0 ldr r0, [r1] - b @0809D688 + b _0809D688 .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 .pool @@ -279828,12 +279828,12 @@ VarGet: ; 809D694 adds r0, r4, 0 bl GetVarPointer 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 @@ -279849,13 +279849,13 @@ VarSet: ; 809D6B0 lsrs r4, r1, 16 bl GetVarPointer 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 @@ -279886,33 +279886,33 @@ GetFlagPointer: ; 809D6EC 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 .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 .pool @@ -279928,7 +279928,7 @@ FlagSet: ; 809D740 bl GetFlagPointer adds r2, r0, 0 cmp r2, 0 - beq @0809D760 + beq _0809D760 movs r0, 0x7 ands r0, r4 movs r1, 0x1 @@ -279936,7 +279936,7 @@ FlagSet: ; 809D740 ldrb r0, [r2] orrs r1, r0 strb r1, [r2] -@0809D760: +_0809D760: movs r0, 0 pop {r4} pop {r1} @@ -279953,7 +279953,7 @@ FlagReset: ; 809D768 bl GetFlagPointer adds r2, r0, 0 cmp r2, 0 - beq @0809D788 + beq _0809D788 movs r0, 0x7 ands r0, r4 movs r1, 0x1 @@ -279961,7 +279961,7 @@ FlagReset: ; 809D768 ldrb r0, [r2] bics r0, r1 strb r0, [r2] -@0809D788: +_0809D788: movs r0, 0 pop {r4} pop {r1} @@ -279977,7 +279977,7 @@ FlagGet: ; 809D790 adds r0, r4, 0 bl GetFlagPointer cmp r0, 0 - beq @0809D7B4 + beq _0809D7B4 ldrb r0, [r0] movs r1, 0x7 ands r1, r4 @@ -279985,12 +279985,12 @@ FlagGet: ; 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 @@ -280120,25 +280120,25 @@ trigger_activate_weather: ; 809D858 lsrs r4, r0, 24 movs r2, 0 ldr r3, =gUnknown_085102E0 -@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 .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 @@ -280173,36 +280173,36 @@ sub_809D8B8: ; 809D8B8 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 .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 @@ -280222,13 +280222,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 @@ -280244,7 +280244,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 @@ -280256,27 +280256,27 @@ overworld_ensure_per_step_coros_running: ; 809D93C lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] -@0809D966: +_0809D966: ldr r4, =sub_809E638 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 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 @@ -280293,7 +280293,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 @@ -280302,20 +280302,20 @@ 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 .pool -@0809D9E8: +_0809D9E8: strh r4, [r1] -@0809D9EA: +_0809D9EA: pop {r4} pop {r0} bx r0 @@ -280333,7 +280333,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 @@ -280342,7 +280342,7 @@ wild_encounter_reset_coro_args: ; 809D9F0 movs r1, 0 strh r1, [r0, 0x2] strh r1, [r0, 0x4] -@0809DA1A: +_0809DA1A: pop {r0} bx r0 .pool @@ -280363,39 +280363,39 @@ 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 @@ -280423,7 +280423,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 @@ -280434,7 +280434,7 @@ sub_809DA88: ; 809DA88 bl MapGridSetMetatileIdAt mov r0, r8 cmp r0, 0 - beq @0809DADE + beq _0809DADE movs r0, 0 ldrsb r0, [r4, r0] adds r0, r6, r0 @@ -280442,7 +280442,7 @@ sub_809DA88: ; 809DA88 ldrsb r1, [r4, r1] adds r1, r7, r1 bl CurrentMapDrawMetatileAt -@0809DADE: +_0809DADE: movs r0, 0x4 ldrsb r0, [r5, r0] adds r0, r6, r0 @@ -280453,7 +280453,7 @@ sub_809DA88: ; 809DA88 bl MapGridSetMetatileIdAt mov r0, r8 cmp r0, 0 - beq @0809DB06 + beq _0809DB06 movs r0, 0x4 ldrsb r0, [r5, r0] adds r0, r6, r0 @@ -280461,7 +280461,7 @@ sub_809DA88: ; 809DA88 ldrsb r1, [r5, r1] adds r1, r7, r1 bl CurrentMapDrawMetatileAt -@0809DB06: +_0809DB06: pop {r3} mov r8, r3 pop {r4-r7} @@ -280556,52 +280556,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 @@ -280638,52 +280638,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 @@ -280713,18 +280713,18 @@ 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 .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] @@ -280737,22 +280737,22 @@ sub_809DCB4: ; 809DCB4 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] @@ -280764,7 +280764,7 @@ sub_809DCB4: ; 809DCB4 ldrsh r3, [r4, r5] bl sub_809DB7C cmp r0, 0 - beq @0809DD70 + beq _0809DD70 movs r7, 0x4 ldrsh r0, [r4, r7] movs r2, 0x6 @@ -280785,14 +280785,14 @@ sub_809DCB4: ; 809DCB4 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] @@ -280805,7 +280805,7 @@ sub_809DCB4: ; 809DCB4 ldrsh r3, [r4, r7] bl sub_809DC18 cmp r0, 0 - beq @0809DDAE + beq _0809DDAE mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -280817,7 +280817,7 @@ sub_809DCB4: ; 809DCB4 strh r0, [r4, 0x2] movs r0, 0x8 strh r0, [r4, 0xC] -@0809DDAE: +_0809DDAE: mov r0, sp ldrh r0, [r0] strh r0, [r4, 0x4] @@ -280834,17 +280834,17 @@ sub_809DCB4: ; 809DCB4 bl MetatileBehavior_IsPacifidlogLog 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] @@ -280857,21 +280857,21 @@ sub_809DCB4: ; 809DCB4 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} @@ -280891,7 +280891,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 @@ -280902,25 +280902,25 @@ 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 .pool -@0809DE68: +_0809DE68: ldr r2, =0x0000024f adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt - b @0809DE82 + b _0809DE82 .pool -@0809DE78: +_0809DE78: ldr r2, =0x00000257 adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt -@0809DE82: +_0809DE82: pop {r4,r5} pop {r0} bx r0 @@ -280940,7 +280940,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 @@ -280951,25 +280951,25 @@ 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 .pool -@0809DECC: +_0809DECC: ldr r2, =0x0000024e adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt - b @0809DEE6 + b _0809DEE6 .pool -@0809DEDC: +_0809DEDC: ldr r2, =0x00000256 adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt -@0809DEE6: +_0809DEE6: pop {r4,r5} pop {r0} bx r0 @@ -281000,20 +281000,20 @@ 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 .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] @@ -281031,9 +281031,9 @@ sub_809DEF0: ; 809DEF0 bl MetatileBehavior_IsFortreeBridge 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] @@ -281048,8 +281048,8 @@ sub_809DEF0: ; 809DEF0 movs r3, 0 ldrsh r1, [r2, r3] bl CurrentMapDrawMetatileAt - b @0809E0F2 -@0809DF84: + b _0809E0F2 +_0809DF84: ldrh r0, [r6, 0x6] mov r8, r0 mov r0, sp @@ -281060,7 +281060,7 @@ sub_809DEF0: ; 809DEF0 movs r3, 0x4 ldrsh r7, [r6, r3] cmp r0, r7 - bne @0809DFAC + bne _0809DFAC mov r0, r9 movs r2, 0 ldrsh r1, [r0, r2] @@ -281068,9 +281068,9 @@ sub_809DEF0: ; 809DEF0 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] @@ -281100,22 +281100,22 @@ sub_809DEF0: ; 809DEF0 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 @@ -281140,7 +281140,7 @@ sub_809DEF0: ; 809DEF0 movs r3, 0 ldrsh r1, [r2, r3] bl CurrentMapDrawMetatileAt -@0809E044: +_0809E044: mov r0, r10 strh r0, [r6, 0x8] mov r1, r8 @@ -281152,12 +281152,12 @@ sub_809DEF0: ; 809DEF0 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] @@ -281172,24 +281172,24 @@ sub_809DEF0: ; 809DEF0 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 .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 @@ -281197,8 +281197,8 @@ sub_809DEF0: ; 809DEF0 lsls r1, r3, 16 asrs r1, 16 bl CurrentMapDrawMetatileAt - b @0809E0EA -@0809E0C6: + b _0809E0EA +_0809E0C6: mov r0, r10 lsls r5, r0, 16 asrs r5, 16 @@ -281214,15 +281214,15 @@ sub_809DEF0: ; 809DEF0 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 @@ -281243,26 +281243,26 @@ 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, =gUnknown_085103C8 lsls r1, 1 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq @0809E144 + beq _0809E144 movs r0, 0x1 - b @0809E146 + b _0809E146 .pool -@0809E144: +_0809E144: movs r0, 0 -@0809E146: +_0809E146: pop {r1} bx r1 thumb_func_end sub_809E108 @@ -281278,7 +281278,7 @@ sub_809E14C: ; 809E14C adds r1, r4, 0 bl sub_809E108 cmp r0, 0 - beq @0809E17A + beq _0809E17A ldr r1, =gUnknown_085103C8 lsls r0, r4, 1 adds r0, r1 @@ -281290,7 +281290,7 @@ sub_809E14C: ; 809E14C ldrh r2, [r0] orrs r1, r2 strh r1, [r0] -@0809E17A: +_0809E17A: pop {r4,r5} pop {r0} bx r0 @@ -281308,7 +281308,7 @@ sub_809E184: ; 809E184 adds r1, r4, 0 bl sub_809E108 cmp r0, 0 - beq @0809E1B6 + beq _0809E1B6 ldr r1, =gUnknown_085103C8 lsls r0, r4, 1 adds r0, r1 @@ -281321,14 +281321,14 @@ 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 .pool -@0809E1C0: +_0809E1C0: movs r0, 0x1 -@0809E1C2: +_0809E1C2: pop {r4,r5} pop {r1} bx r1 @@ -281347,34 +281347,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 MapGridSetMetatileIdAt -@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 @@ -281398,22 +281398,22 @@ 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 .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 @@ -281424,8 +281424,8 @@ sub_809E224: ; 809E224 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 @@ -281438,15 +281438,15 @@ sub_809E224: ; 809E224 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] @@ -281469,41 +281469,41 @@ sub_809E224: ; 809E224 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 .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] @@ -281536,19 +281536,19 @@ sub_809E224: ; 809E224 lsls r1, 16 asrs r1, 16 bl sub_809E14C - b @0809E3A2 + b _0809E3A2 .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] @@ -281571,10 +281571,10 @@ sub_809E224: ; 809E224 movs r2, 0 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt -@0809E3A2: +_0809E3A2: movs r0, 0x1 strh r0, [r5, 0x2] -@0809E3A6: +_0809E3A6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -281605,14 +281605,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] @@ -281627,7 +281627,7 @@ sub_809E3B4: ; 809E3B4 bl MetatileBehavior_IsAsh lsls r0, 24 cmp r0, 0 - beq @0809E47A + beq _0809E47A mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -281636,7 +281636,7 @@ sub_809E3B4: ; 809E3B4 bl MapGridGetMetatileIdAt ldr r1, =0x0000020a cmp r0, r1 - bne @0809E444 + bne _0809E444 mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -281645,9 +281645,9 @@ sub_809E3B4: ; 809E3B4 ldr r2, =0x00000212 movs r3, 0x4 bl ash - b @0809E456 + b _0809E456 .pool -@0809E444: +_0809E444: mov r0, sp movs r3, 0 ldrsh r0, [r0, r3] @@ -281656,24 +281656,24 @@ sub_809E3B4: ; 809E3B4 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 GetVarPointer 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} @@ -281694,9 +281694,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 MapGridSetMetatileIdAt @@ -281738,45 +281738,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 VarSet -@0809E556: +_0809E556: mov r0, sp ldrh r2, [r0] movs r3, 0 @@ -281784,14 +281784,14 @@ sub_809E4CC: ; 809E4CC 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] @@ -281800,20 +281800,20 @@ sub_809E4CC: ; 809E4CC 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 VarSet -@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 @@ -281821,13 +281821,13 @@ sub_809E4CC: ; 809E4CC strh r0, [r5, 0xA] ldrh r0, [r4] strh r0, [r5, 0xC] - b @0809E5D2 + b _0809E5D2 .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 @@ -281835,7 +281835,7 @@ sub_809E4CC: ; 809E4CC strh r0, [r5, 0x10] ldrh r0, [r7] strh r0, [r5, 0x12] -@0809E5D2: +_0809E5D2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -281855,22 +281855,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, =gUnknown_085103FC 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 @@ -281924,12 +281924,12 @@ 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 .pool -@0809E688: +_0809E688: strh r7, [r4] mov r0, sp ldrh r0, [r0] @@ -281942,8 +281942,8 @@ sub_809E638: ; 809E638 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 @@ -281952,8 +281952,8 @@ sub_809E638: ; 809E638 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] @@ -281961,14 +281961,14 @@ sub_809E638: ; 809E638 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] @@ -281983,39 +281983,39 @@ sub_809E638: ; 809E638 bl MetatileBehavior_IsMuddySlope 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 .pool -@0809E728: +_0809E728: movs r0, 0 movs r1, 0 -@0809E72C: +_0809E72C: lsls r0, 16 asrs r0, 16 mov r8, r0 @@ -282025,11 +282025,11 @@ sub_809E638: ; 809E638 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 @@ -282043,12 +282043,12 @@ sub_809E638: ; 809E638 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 @@ -282086,18 +282086,18 @@ sub_809E7B0: ; 809E7B0 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @0809E7DA + beq _0809E7DA bl sub_813B9C0 lsls r0, 24 cmp r0, 0 - bne @0809E7DA + bne _0809E7DA bl GameFreakRTC_CalcLocalDateTime 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 @@ -282115,9 +282115,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 @@ -282145,7 +282145,7 @@ sub_809E7E8: ; 809E7E8 bl sub_8177584 ldrh r0, [r5] strh r0, [r6] -@0809E84E: +_0809E84E: pop {r4-r6} pop {r0} bx r0 @@ -282182,9 +282182,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 BerryTreeTimeUpdate ldr r2, [r6] adds r2, 0xA0 @@ -282192,7 +282192,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} @@ -282240,26 +282240,26 @@ 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 .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] @@ -282277,8 +282277,8 @@ sub_809E8E8: ; 809E8E8 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] @@ -282296,8 +282296,8 @@ sub_809E8E8: ; 809E8E8 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] @@ -282315,8 +282315,8 @@ sub_809E8E8: ; 809E8E8 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] @@ -282334,12 +282334,12 @@ sub_809E8E8: ; 809E8E8 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] @@ -282360,11 +282360,11 @@ sub_809E8E8: ; 809E8E8 strh r0, [r3, 0x20] movs r0, 0x50 strh r0, [r3, 0x22] - b @0809E9FE -@0809E9F8: + b _0809E9FE +_0809E9F8: adds r0, r3, 0 bl RemoveObjectAndFreeTiles -@0809E9FE: +_0809E9FE: pop {r0} bx r0 thumb_func_end sub_809E8E8 @@ -282385,26 +282385,26 @@ 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 .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] @@ -282422,8 +282422,8 @@ sub_809EA04: ; 809EA04 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] @@ -282441,8 +282441,8 @@ sub_809EA04: ; 809EA04 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] @@ -282460,8 +282460,8 @@ sub_809EA04: ; 809EA04 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] @@ -282479,23 +282479,23 @@ sub_809EA04: ; 809EA04 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 RemoveObjectAndFreeTiles -@0809EAFE: +_0809EAFE: pop {r0} bx r0 thumb_func_end sub_809EA04 @@ -282766,53 +282766,53 @@ 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 @@ -282882,7 +282882,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 @@ -282891,41 +282891,41 @@ sub_809EDE8: ; 809EDE8 movs r0, 0 strh r0, [r5, 0x2] movs r0, 0x6 - b @0809EE5C + b _0809EE5C .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] @@ -282947,9 +282947,9 @@ sub_809EDE8: ; 809EDE8 strh r4, [r5, 0x2] movs r0, 0x6 strh r0, [r5, 0x4] - b @0809EEF4 + b _0809EEF4 .pool -@0809EEB4: +_0809EEB4: ldrb r0, [r2] lsls r0, 1 adds r0, r5, r0 @@ -282961,7 +282961,7 @@ sub_809EDE8: ; 809EDE8 ands r3, r4 bl sub_809ED38 cmp r0, 0 - beq @0809EEF4 + beq _0809EEF4 movs r0, 0x5 bl audio_play ldrb r0, [r5, 0x10] @@ -282978,7 +282978,7 @@ sub_809EDE8: ; 809EDE8 ldrb r0, [r5, 0x10] movs r1, 0x2 bl CopyWindowToVram -@0809EEF4: +_0809EEF4: add sp, 0xC pop {r3} mov r8, r3 @@ -283082,7 +283082,7 @@ sub_809EF88: ; 809EF88 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@0809EFCA: +_0809EFCA: strh r6, [r4] mov r0, sp str r0, [r1] @@ -283092,7 +283092,7 @@ sub_809EF88: ; 809EF88 adds r2, r5 subs r3, r5 cmp r3, r5 - bhi @0809EFCA + bhi _0809EFCA strh r6, [r4] mov r0, sp str r0, [r1] @@ -283218,12 +283218,12 @@ 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 .pool -@0809F11C: +_0809F11C: movs r2, 0x85 lsls r2, 2 movs r0, 0 @@ -283291,28 +283291,28 @@ sub_809F0F8: ; 809F0F8 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 Reset - b @0809F1F8 + b _0809F1F8 .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} @@ -283333,25 +283333,25 @@ 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 .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 @@ -283362,31 +283362,31 @@ sub_809F200: ; 809F200 bl pal_fade_maybe movs r0, 0x1 strh r0, [r5] - b @0809F404 + b _0809F404 .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, =gUnknown_085ECAA7 bl sub_809F0C0 movs r0, 0x5 strh r0, [r5] - b @0809F404 + b _0809F404 .pool -@0809F29C: +_0809F29C: bl GameFreakRTC_CalcLocalDateTime ldr r0, =sub_809F0F8 movs r1, 0x50 @@ -283394,9 +283394,9 @@ sub_809F200: ; 809F200 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x2] - b @0809F334 + b _0809F334 .pool -@0809F2B4: +_0809F2B4: ldr r2, =0x03005e00 movs r0, 0x2 ldrsh r1, [r5, r0] @@ -283406,9 +283406,9 @@ sub_809F200: ; 809F200 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 @@ -283430,9 +283430,9 @@ sub_809F200: ; 809F200 strh r0, [r5, 0x2] movs r0, 0x3 strh r0, [r5] - b @0809F404 + b _0809F404 .pool -@0809F310: +_0809F310: ldr r2, =0x03005e00 movs r0, 0x2 ldrsh r1, [r5, r0] @@ -283443,19 +283443,19 @@ sub_809F200: ; 809F200 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 .pool -@0809F340: +_0809F340: ldrb r0, [r5, 0x2] bl remove_task bl GameFreakRTC_Reset @@ -283484,36 +283484,36 @@ sub_809F200: ; 809F200 bl sub_809F0C0 movs r0, 0x4 strh r0, [r5] - b @0809F404 + b _0809F404 .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, =gUnknown_085ECA8A bl sub_809F0C0 movs r0, 0x49 bl audio_play - b @0809F3C4 + b _0809F3C4 .pool -@0809F3B8: +_0809F3B8: ldr r0, =gUnknown_085ECA9A 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 @@ -283524,18 +283524,18 @@ sub_809F200: ; 809F200 bl pal_fade_maybe 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 FreeAllWindowBuffers bl Reset -@0809F404: +_0809F404: add sp, 0x4 pop {r4,r5} pop {r0} @@ -283566,46 +283566,46 @@ BuildStartMenuActions: ; 809F440 strb r1, [r0] bl is_c1_link_related_active cmp r0, 0x1 - bne @0809F45C + bne _0809F45C bl BuildStartMenuActions_LinkMode - b @0809F4AC + b _0809F4AC .pool -@0809F45C: +_0809F45C: bl InUnionRoom cmp r0, 0x1 - bne @0809F46A + bne _0809F46A bl BuildStartMenuActions_UnionRoom - b @0809F4AC -@0809F46A: + b _0809F4AC +_0809F46A: bl GetSafariZoneFlag cmp r0, 0x1 - bne @0809F478 + bne _0809F478 bl BuildStartMenuActions_SafariZone - b @0809F4AC -@0809F478: + b _0809F4AC +_0809F478: bl InBattlePike lsls r0, 24 cmp r0, 0 - beq @0809F488 + beq _0809F488 bl BuildStartMenuActions_BattlePike - b @0809F4AC -@0809F488: + b _0809F4AC +_0809F488: bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0809F498 + beq _0809F498 bl BuildStartMenuActions_BattlePyramid - b @0809F4AC -@0809F498: + b _0809F4AC +_0809F498: bl in_multi_battle_room_with_var_condition lsls r0, 24 cmp r0, 0 - beq @0809F4A8 + beq _0809F4A8 bl BuildStartMenuActions_MultiBattleRoom - b @0809F4AC -@0809F4A8: + b _0809F4AC +_0809F4A8: bl BuildStartMenuActions_Normal -@0809F4AC: +_0809F4AC: pop {r0} bx r0 thumb_func_end BuildStartMenuActions @@ -283633,20 +283633,20 @@ BuildStartMenuActions_Normal: ; 809F4CC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809F4E2 + bne _0809F4E2 movs r0, 0 bl AddStartMenuAction -@0809F4E2: +_0809F4E2: movs r0, 0x86 lsls r0, 4 bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809F4F8 + bne _0809F4F8 movs r0, 0x1 bl AddStartMenuAction -@0809F4F8: +_0809F4F8: movs r0, 0x2 bl AddStartMenuAction ldr r0, =0x00000862 @@ -283654,10 +283654,10 @@ BuildStartMenuActions_Normal: ; 809F4CC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809F512 + bne _0809F512 movs r0, 0x3 bl AddStartMenuAction -@0809F512: +_0809F512: movs r0, 0x4 bl AddStartMenuAction movs r0, 0x5 @@ -283704,10 +283704,10 @@ BuildStartMenuActions_LinkMode: ; 809F568 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809F58A + bne _0809F58A movs r0, 0x3 bl AddStartMenuAction -@0809F58A: +_0809F58A: movs r0, 0x9 bl AddStartMenuAction movs r0, 0x6 @@ -283731,10 +283731,10 @@ BuildStartMenuActions_UnionRoom: ; 809F5A4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0809F5C6 + bne _0809F5C6 movs r0, 0x3 bl AddStartMenuAction -@0809F5C6: +_0809F5C6: movs r0, 0x4 bl AddStartMenuAction movs r0, 0x6 @@ -283853,15 +283853,15 @@ sub_809F6C8: ; 809F6C8 adds r0, r1 ldrh r0, [r0] cmp r0, 0x7 - bne @0809F6F0 + bne _0809F6F0 ldr r4, =0x0203760d ldr r0, =gUnknown_08510538 - b @0809F6F4 + b _0809F6F4 .pool -@0809F6F0: +_0809F6F0: ldr r4, =0x0203760d ldr r0, =gUnknown_08510530 -@0809F6F4: +_0809F6F4: bl AddWindow strb r0, [r4] ldr r4, =0x0203760d @@ -283911,7 +283911,7 @@ RemoveExtraStartMenuWindows: ; 809F774 push {r4,lr} bl GetSafariZoneFlag cmp r0, 0 - beq @0809F796 + beq _0809F796 ldr r4, =0x0203760c ldrb r0, [r4] movs r1, 0 @@ -283921,18 +283921,18 @@ RemoveExtraStartMenuWindows: ; 809F774 bl CopyWindowToVram ldrb r0, [r4] bl RemoveWindow -@0809F796: +_0809F796: bl InBattlePyramid 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 RemoveWindow -@0809F7B0: +_0809F7B0: pop {r4} pop {r0} bx r0 @@ -283954,7 +283954,7 @@ PrintStartMenuActions: ; 809F7C0 mov r9, r0 ldr r1, =0x02021fc4 mov r10, r1 -@0809F7DA: +_0809F7DA: ldr r0, =0x02037610 lsls r2, 24 asrs r4, r2, 24 @@ -283968,7 +283968,7 @@ PrintStartMenuActions: ; 809F7C0 ldr r0, =StartMenu_PlayerName adds r7, r2, 0 cmp r1, r0 - bne @0809F828 + bne _0809F828 bl get_start_menu_window_id_maybe lsls r0, 24 lsrs r0, 24 @@ -283982,9 +283982,9 @@ PrintStartMenuActions: ; 809F7C0 lsrs r3, 16 movs r2, 0x8 bl sub_819A024 - b @0809F858 + b _0809F858 .pool -@0809F828: +_0809F828: mov r1, r9 adds r0, r3, r1 ldr r1, [r0] @@ -284006,7 +284006,7 @@ PrintStartMenuActions: ; 809F7C0 mov r2, r10 movs r3, 0x8 bl Print -@0809F858: +_0809F858: movs r0, 0x80 lsls r0, 17 adds r1, r7, r0 @@ -284015,20 +284015,20 @@ PrintStartMenuActions: ; 809F7C0 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 .pool -@0809F87C: +_0809F87C: mov r0, r8 strb r2, [r0] movs r0, 0x1 -@0809F882: +_0809F882: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -284048,32 +284048,32 @@ 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 .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 BuildStartMenuActions ldr r1, =0x02037619 - b @0809F940 + b _0809F940 .pool -@0809F8E4: +_0809F8E4: bl sub_81973A4 ldr r0, =0x0203760f ldrb r0, [r0] @@ -284085,38 +284085,38 @@ sub_809F894: ; 809F894 ldr r1, =0x02037619 movs r0, 0 strb r0, [r1, 0x1] - b @0809F940 + b _0809F940 .pool -@0809F90C: +_0809F90C: bl GetSafariZoneFlag cmp r0, 0 - beq @0809F918 + beq _0809F918 bl sub_809F654 -@0809F918: +_0809F918: bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0809F926 + beq _0809F926 bl sub_809F6C8 -@0809F926: +_0809F926: ldr r1, =0x02037619 - b @0809F940 + b _0809F940 .pool -@0809F930: +_0809F930: ldr r4, =0x0203761a adds r0, r4, 0 movs r1, 0x2 bl PrintStartMenuActions 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 .pool -@0809F94C: +_0809F94C: bl get_start_menu_window_id_maybe lsls r0, 24 lsrs r0, 24 @@ -284139,11 +284139,11 @@ sub_809F894: ; 809F894 movs r1, 0x1 bl CopyWindowToVram movs r0, 0x1 - b @0809F98E + b _0809F98E .pool -@0809F98C: +_0809F98C: movs r0, 0 -@0809F98E: +_0809F98E: add sp, 0xC pop {r4} pop {r1} @@ -284157,10 +284157,10 @@ sub_809F998: ; 809F998 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 .pool @@ -284173,10 +284173,10 @@ task50_startmenu: ; 809F9B4 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 @@ -284210,13 +284210,13 @@ 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 @@ -284247,36 +284247,36 @@ 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 .pool -@0809FA58: +_0809FA58: bl InUnionRoom cmp r0, 0x1 - bne @0809FA64 + bne _0809FA64 bl var_800D_set_xB -@0809FA64: +_0809FA64: ldr r1, =0x03005df4 ldr r0, =HandleStartMenuInput str r0, [r1] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0809FA92 + b _0809FA92 .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 @@ -284288,11 +284288,11 @@ 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 bl sub_809F9D0 bl script_env_2_enable @@ -284309,7 +284309,7 @@ HandleStartMenuInput: ; 809FAC4 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @0809FAE4 + beq _0809FAE4 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -284317,24 +284317,24 @@ HandleStartMenuInput: ; 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, =gUnknown_08510540 @@ -284349,13 +284349,13 @@ HandleStartMenuInput: ; 809FAC4 ldr r1, [r0] ldr r0, =StartMenu_Pokedex 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, =gUnknown_08510540 ldr r2, =0x02037610 @@ -284370,34 +284370,34 @@ HandleStartMenuInput: ; 809FAC4 str r1, [r3] ldr r0, =StartMenu_Save cmp r1, r0 - beq @0809FBA0 + beq _0809FBA0 ldr r0, =StartMenu_Exit cmp r1, r0 - beq @0809FBA0 + beq _0809FBA0 ldr r0, =StartMenu_SafariZoneRetire cmp r1, r0 - beq @0809FBA0 + beq _0809FBA0 ldr r0, =StartMenu_BattlePyramidRetire cmp r1, r0 - beq @0809FBA0 + beq _0809FBA0 movs r0, 0x1 movs r1, 0 bl fade_screen - b @0809FBA0 + b _0809FBA0 .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 RemoveExtraStartMenuWindows bl sub_80A0934 movs r0, 0x1 -@0809FBAE: +_0809FBAE: pop {r4} pop {r1} bx r1 @@ -284411,11 +284411,11 @@ StartMenu_Pokedex: ; 809FBB4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0809FBCC + beq _0809FBCC movs r0, 0 - b @0809FBE6 + b _0809FBE6 .pool -@0809FBCC: +_0809FBCC: movs r0, 0x29 bl sav12_xor_increment bl play_some_sound @@ -284424,7 +284424,7 @@ StartMenu_Pokedex: ; 809FBB4 ldr r0, =sub_80BB534 bl SetMainCallback2 movs r0, 0x1 -@0809FBE6: +_0809FBE6: pop {r1} bx r1 .pool @@ -284438,18 +284438,18 @@ StartMenu_Pokemon: ; 809FBF0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0809FC08 + beq _0809FC08 movs r0, 0 - b @0809FC1C + b _0809FC1C .pool -@0809FC08: +_0809FC08: bl play_some_sound bl RemoveExtraStartMenuWindows bl overworld_free_bg_tilemaps ldr r0, =CB2_PartyMenuFromStartMenu bl SetMainCallback2 movs r0, 0x1 -@0809FC1C: +_0809FC1C: pop {r1} bx r1 .pool @@ -284463,18 +284463,18 @@ StartMenu_Bag: ; 809FC24 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0809FC3C + beq _0809FC3C movs r0, 0 - b @0809FC50 + b _0809FC50 .pool -@0809FC3C: +_0809FC3C: bl play_some_sound bl RemoveExtraStartMenuWindows bl overworld_free_bg_tilemaps ldr r0, =c2_bag bl SetMainCallback2 movs r0, 0x1 -@0809FC50: +_0809FC50: pop {r1} bx r1 .pool @@ -284488,18 +284488,18 @@ StartMenu_PokeNav: ; 809FC58 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0809FC70 + beq _0809FC70 movs r0, 0 - b @0809FC84 + b _0809FC84 .pool -@0809FC70: +_0809FC70: bl play_some_sound bl RemoveExtraStartMenuWindows bl overworld_free_bg_tilemaps ldr r0, =CB2_PokeNav bl SetMainCallback2 movs r0, 0x1 -@0809FC84: +_0809FC84: pop {r1} bx r1 .pool @@ -284513,41 +284513,41 @@ StartMenu_PlayerName: ; 809FC8C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0809FCF4 + bne _0809FCF4 bl play_some_sound bl RemoveExtraStartMenuWindows bl overworld_free_bg_tilemaps bl is_c1_link_related_active cmp r0, 0 - bne @0809FCB6 + bne _0809FCB6 bl InUnionRoom cmp r0, 0 - beq @0809FCC8 -@0809FCB6: + beq _0809FCC8 +_0809FCB6: ldr r0, =sub_8086194 bl sub_80C4DDC - b @0809FCEA + b _0809FCEA .pool -@0809FCC8: +_0809FCC8: ldr r0, =0x000008d2 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @0809FCE4 + beq _0809FCE4 ldr r0, =sub_8086194 bl sub_80C51C4 - b @0809FCEA + b _0809FCEA .pool -@0809FCE4: +_0809FCE4: ldr r0, =sub_8086194 bl sub_80C4DDC -@0809FCEA: +_0809FCEA: movs r0, 0x1 - b @0809FCF6 + b _0809FCF6 .pool -@0809FCF4: +_0809FCF4: movs r0, 0 -@0809FCF6: +_0809FCF6: pop {r1} bx r1 thumb_func_end StartMenu_PlayerName @@ -284558,9 +284558,9 @@ StartMenu_Save: ; 809FCFC bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @0809FD0C + beq _0809FD0C bl RemoveExtraStartMenuWindows -@0809FD0C: +_0809FD0C: ldr r1, =0x03005df4 ldr r0, =sub_809FE28 str r0, [r1] @@ -284578,11 +284578,11 @@ StartMenu_Option: ; 809FD20 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0809FD38 + beq _0809FD38 movs r0, 0 - b @0809FD52 + b _0809FD52 .pool -@0809FD38: +_0809FD38: bl play_some_sound bl RemoveExtraStartMenuWindows bl overworld_free_bg_tilemaps @@ -284592,7 +284592,7 @@ StartMenu_Option: ; 809FD20 ldr r0, =sub_8086194 str r0, [r1, 0x8] movs r0, 0x1 -@0809FD52: +_0809FD52: pop {r1} bx r1 .pool @@ -284627,11 +284627,11 @@ StartMenu_LinkModePlayerName: ; 809FD88 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0809FDA0 + beq _0809FDA0 movs r0, 0 - b @0809FDB4 + b _0809FDB4 .pool -@0809FDA0: +_0809FDA0: bl play_some_sound bl overworld_free_bg_tilemaps ldr r0, =0x03005db4 @@ -284639,7 +284639,7 @@ StartMenu_LinkModePlayerName: ; 809FD88 ldr r1, =sub_8086194 bl sub_80C4E74 movs r0, 0x1 -@0809FDB4: +_0809FDB4: pop {r1} bx r1 .pool @@ -284678,18 +284678,18 @@ StartMenu_BattlePyramidBag: ; 809FDF4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @0809FE0C + beq _0809FE0C movs r0, 0 - b @0809FE20 + b _0809FE20 .pool -@0809FE0C: +_0809FE0C: bl play_some_sound bl RemoveExtraStartMenuWindows bl overworld_free_bg_tilemaps ldr r0, =sub_81C4EFC bl SetMainCallback2 movs r0, 0x1 -@0809FE20: +_0809FE20: pop {r1} bx r1 .pool @@ -284715,15 +284715,15 @@ sub_809FE44: ; 809FE44 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 @@ -284731,9 +284731,9 @@ sub_809FE44: ; 809FE44 ldr r1, =0x03005df4 ldr r0, =HandleStartMenuInput str r0, [r1] - b @0809FE94 + b _0809FE94 .pool -@0809FE7C: +_0809FE7C: movs r0, 0 movs r1, 0x1 bl sub_8197DF8 @@ -284741,10 +284741,10 @@ sub_809FE44: ; 809FE44 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 @@ -284782,20 +284782,20 @@ sub_809FED4: ; 809FED4 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 RemoveExtraStartMenuWindows ldr r1, =0x03005df4 ldr r0, =sub_809FEB8 str r0, [r1] - b @0809FF20 + b _0809FF20 .pool -@0809FF00: +_0809FF00: movs r0, 0 movs r1, 0x1 bl sub_8197DF8 @@ -284804,11 +284804,11 @@ sub_809FED4: ; 809FED4 ldr r0, =gUnknown_08252C88 bl script_env_1_execute_new_script movs r0, 0x1 - b @0809FF22 + b _0809FF22 .pool -@0809FF20: +_0809FF20: movs r0, 0 -@0809FF22: +_0809FF22: pop {r1} bx r1 thumb_func_end sub_809FED4 @@ -284835,7 +284835,7 @@ sub_809FF4C: ; 809FF4C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - beq @0809FF78 + beq _0809FF78 ldr r1, =0x02037621 movs r0, 0 strb r0, [r1] @@ -284844,11 +284844,11 @@ sub_809FF4C: ; 809FF4C bl _call_via_r0 lsls r0, 24 lsrs r0, 24 - b @0809FF7A + b _0809FF7A .pool -@0809FF78: +_0809FF78: movs r0, 0 -@0809FF7A: +_0809FF7A: pop {r1} bx r1 thumb_func_end sub_809FF4C @@ -284898,28 +284898,28 @@ 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 .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 @@ -284965,19 +284965,19 @@ 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 .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 @@ -284988,22 +284988,22 @@ sub_80A0070: ; 80A0070 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 .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 @@ -285021,17 +285021,17 @@ sub_80A00A0: ; 80A00A0 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @080A00D4 + beq _080A00D4 ldr r0, =gUnknown_08252CA7 ldr r1, =sub_80A00EC bl sub_809FF98 - b @080A00DC + b _080A00DC .pool -@080A00D4: +_080A00D4: ldr r0, =gUnknown_082C87B4 ldr r1, =sub_80A00EC bl sub_809FF98 -@080A00DC: +_080A00DC: movs r0, 0 pop {r1} bx r1 @@ -285058,50 +285058,50 @@ sub_80A0108: ; 80A0108 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 str r0, [r1] - b @080A0174 + b _080A0174 .pool -@080A0158: +_080A0158: ldr r1, =0x0203761c ldr r0, =sub_80A0234 str r0, [r1] - b @080A0174 + b _080A0174 .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 @@ -285112,17 +285112,17 @@ sub_80A017C: ; 80A017C ldr r0, =0x020322d4 ldrb r0, [r0] cmp r0, 0x1 - bne @080A019C + bne _080A019C ldr r0, =gUnknown_082C8845 ldr r1, =sub_80A01B4 bl sub_809FF98 - b @080A01A4 + b _080A01A4 .pool -@080A019C: +_080A019C: ldr r0, =gUnknown_082C87D5 ldr r1, =sub_80A01D0 bl sub_809FF98 -@080A01A4: +_080A01A4: movs r0, 0 pop {r1} bx r1 @@ -285163,32 +285163,32 @@ sub_80A01EC: ; 80A01EC 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 str r0, [r1] - b @080A022C + b _080A022C .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 @@ -285214,33 +285214,33 @@ 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 .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, =gUnknown_082C8832 ldr r1, =sub_80A02B0 bl sub_809FF98 - b @080A029C + b _080A029C .pool -@080A0294: +_080A0294: ldr r0, =gUnknown_082C892A ldr r1, =sub_80A02FC bl sub_809FF98 -@080A029C: +_080A029C: bl sub_80A0030 movs r0, 0 pop {r4} @@ -285256,13 +285256,13 @@ sub_80A02B0: ; 80A02B0 bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 - bne @080A02CA + bne _080A02CA movs r0, 0x37 bl audio_play ldr r1, =0x0203761c ldr r0, =sub_80A02D8 str r0, [r1] -@080A02CA: +_080A02CA: movs r0, 0 pop {r1} bx r1 @@ -285275,17 +285275,17 @@ sub_80A02D8: ; 80A02D8 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 @@ -285297,13 +285297,13 @@ sub_80A02FC: ; 80A02FC bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 - bne @080A0316 + bne _080A0316 movs r0, 0x16 bl audio_play ldr r1, =0x0203761c ldr r0, =sub_80A0324 str r0, [r1] -@080A0316: +_080A0316: movs r0, 0 pop {r1} bx r1 @@ -285316,13 +285316,13 @@ sub_80A0324: ; 80A0324 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 @@ -285378,28 +285378,28 @@ sub_80A03A4: ; 80A03A4 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 @@ -285421,23 +285421,23 @@ 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 .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 SetGpuReg @@ -285468,7 +285468,7 @@ sub_80A03E4: ; 80A03E4 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@080A045A: +_080A045A: strh r6, [r4] mov r0, sp str r0, [r1] @@ -285478,7 +285478,7 @@ sub_80A03E4: ; 80A03E4 adds r2, r5 subs r3, r5 cmp r3, r5 - bhi @080A045A + bhi _080A045A strh r6, [r4] mov r0, sp str r0, [r1] @@ -285488,15 +285488,15 @@ sub_80A03E4: ; 80A03E4 orrs r0, r2 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - b @080A04FC + b _080A04FC .pool -@080A0490: +_080A0490: bl ResetAllObjectData bl clear_tasks bl sub_80A1A74 bl dp12_8087EA4 - b @080A04FC -@080A04A2: + b _080A04FC +_080A04A2: movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085105A8 @@ -285511,9 +285511,9 @@ sub_80A03E4: ; 80A03E4 bl box_border_load_tiles_and_pal movs r0, 0xF0 bl sub_81978B0 - b @080A04FC + b _080A04FC .pool -@080A04D4: +_080A04D4: movs r0, 0 bl ShowBg movs r0, 0x1 @@ -285525,18 +285525,18 @@ sub_80A03E4: ; 80A03E4 bl SetVBlankCallback movs r0, 0x1 bl EnableInterrupts - b @080A04FC + b _080A04FC .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 @@ -285551,13 +285551,13 @@ sub_80A0514: ; 80A0514 ldr r0, =0x030026f8 bl sub_80A03E4 cmp r0, 0 - beq @080A052E + beq _080A052E ldr r0, =sub_80A0550 movs r1, 0x50 bl AddTask ldr r0, =sub_80A0540 bl SetMainCallback2 -@080A052E: +_080A052E: pop {r0} bx r0 .pool @@ -285588,31 +285588,31 @@ 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 .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 FillWindowPixelBuffer @@ -285648,45 +285648,45 @@ sub_80A0550: ; 80A0550 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @080A0620 + beq _080A0620 bl InUnionRoom cmp r0, 0 - beq @080A0620 + beq _080A0620 bl sub_800A07C cmp r0, 0 - beq @080A061C + beq _080A061C strh r6, [r5] - b @080A06A8 + b _080A06A8 .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 .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 .pool -@080A065C: +_080A065C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -285695,33 +285695,33 @@ sub_80A0550: ; 80A0550 movs r3, 0x10 bl pal_fade_maybe movs r0, 0x4 - b @080A06A6 -@080A0670: + b _080A06A6 +_080A0670: bl FreeAllWindowBuffers ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 adds r0, r4, 0 bl remove_task - b @080A06A8 + b _080A06A8 .pool -@080A0688: +_080A0688: ldr r0, =sub_8153688 movs r1, 0x5 bl AddTask movs r0, 0x6 - b @080A06A6 + b _080A06A6 .pool -@080A0698: +_080A0698: ldr r0, =sub_8153688 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} @@ -285747,7 +285747,7 @@ sub_80A06B4: ; 80A06B4 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @080A06EC + bne _080A06EC add r0, sp, 0xC ldrb r1, [r0, 0x4] subs r1, 0x2 @@ -285758,7 +285758,7 @@ sub_80A06B4: ; 80A06B4 ands r0, r2 orrs r0, r1 str r0, [sp, 0x10] -@080A06EC: +_080A06EC: ldr r6, =0x02037622 add r0, sp, 0xC bl AddWindow @@ -285772,10 +285772,10 @@ sub_80A06B4: ; 80A06B4 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 @@ -285852,7 +285852,7 @@ sub_80A06B4: ; 80A06B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080A0802 + bne _080A0802 movs r4, 0x31 ldrb r0, [r6] ldr r2, =gUnknown_085EED34 @@ -285882,7 +285882,7 @@ sub_80A06B4: ; 80A06B4 movs r1, 0x1 adds r2, r5, 0 bl Print -@080A0802: +_080A0802: adds r4, 0x10 ldrb r0, [r6] ldr r2, =gUnknown_085EED3C @@ -285952,11 +285952,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 @@ -286141,7 +286141,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 @@ -286157,14 +286157,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 @@ -286178,28 +286178,28 @@ fade_and_return_progress_probably: ; 80A1A1C ldr r0, =0x02037fe4 ldr r0, [r0] cmp r0, 0 - beq @080A1A30 + beq _080A1A30 movs r0, 0xFF - b @080A1A68 + b _080A1A68 .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 .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 @@ -286209,7 +286209,7 @@ fade_and_return_progress_probably: ; 80A1A1C orrs r0, r1 str r0, [r2] adds r0, r3, 0 -@080A1A68: +_080A1A68: pop {r1} bx r1 .pool @@ -286219,14 +286219,14 @@ fade_and_return_progress_probably: ; 80A1A1C 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} @@ -286243,7 +286243,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 @@ -286257,7 +286257,7 @@ sub_80A1A94: ; 80A1A94 lsls r0, 16 lsrs r4, r0, 16 cmp r4, r5 - bls @080A1AA4 + bls _080A1AA4 pop {r4-r7} pop {r0} bx r0 @@ -286286,11 +286286,11 @@ pal_fade_maybe: ; 80A1AD4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @080A1B08 + beq _080A1B08 movs r0, 0 - b @080A1C00 + b _080A1C00 .pool -@080A1B08: +_080A1B08: ldrb r0, [r5, 0xA] movs r3, 0x79 negs r3, r3 @@ -286302,7 +286302,7 @@ pal_fade_maybe: ; 80A1AD4 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 @@ -286314,7 +286314,7 @@ pal_fade_maybe: ; 80A1AD4 orrs r2, r0 strb r2, [r5, 0xA] movs r6, 0 -@080A1B36: +_080A1B36: str r4, [r5] movs r4, 0x3F adds r1, r6, 0 @@ -286364,16 +286364,16 @@ pal_fade_maybe: ; 80A1AD4 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 .pool -@080A1BB0: +_080A1BB0: movs r0, 0x40 orrs r3, r0 -@080A1BB4: +_080A1BB4: strb r3, [r5, 0x8] bl fade_and_return_progress_probably ldr r4, =0x02037fd4 @@ -286394,14 +286394,14 @@ pal_fade_maybe: ; 80A1AD4 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] @@ -286410,7 +286410,7 @@ pal_fade_maybe: ; 80A1AD4 orrs r0, r3 strb r0, [r2, 0x8] movs r0, 0x1 -@080A1C00: +_080A1C00: pop {r3} mov r8, r3 pop {r4-r7} @@ -286464,7 +286464,7 @@ sub_80A1C64: ; 80A1C64 lsls r0, 24 lsrs r7, r0, 24 movs r5, 0 -@080A1C6E: +_080A1C6E: lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -286473,13 +286473,13 @@ sub_80A1C64: ; 80A1C64 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 @@ -286487,35 +286487,35 @@ sub_80A1C64: ; 80A1C64 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 .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 @@ -286542,14 +286542,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 @@ -286592,15 +286592,15 @@ sub_80A1CDC: ; 80A1CDC lsls r0, 25 lsrs r0, 27 cmp r6, r0 - bcc @080A1D10 - b @080A1DC4 + bcc _080A1D10 + b _080A1DC4 .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 @@ -286634,8 +286634,8 @@ sub_80A1CDC: ; 80A1CDC 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 @@ -286666,18 +286666,18 @@ sub_80A1CDC: ; 80A1CDC 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 @@ -286704,7 +286704,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 @@ -286715,19 +286715,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 @@ -286739,18 +286739,18 @@ sub_80A1E40: ; 80A1E40 lsls r3, 17 lsrs r3, 17 bl pal_fade_1 - b @080A1EF4 + b _080A1EF4 .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 @@ -286762,9 +286762,9 @@ sub_80A1E40: ; 80A1E40 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 @@ -286786,8 +286786,8 @@ sub_80A1E40: ; 80A1E40 lsls r0, 25 lsrs r0, 27 cmp r3, r0 - bcc @080A1EC8 -@080A1EF4: + bcc _080A1EC8 +_080A1EF4: pop {r4-r6} pop {r0} bx r0 @@ -286800,12 +286800,12 @@ sub_80A1F00: ; 80A1F00 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 @@ -286823,20 +286823,20 @@ sub_80A1F00: ; 80A1F00 ands r1, r2 orrs r1, r0 str r1, [r3, 0x4] - b @080A1F54 + b _080A1F54 .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 @@ -286850,9 +286850,9 @@ 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 @@ -286963,7 +286963,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 @@ -286973,7 +286973,7 @@ sub_80A2048: ; 80A2048 movs r2, 0x2 orrs r1, r2 strb r1, [r0, 0x4] -@080A206C: +_080A206C: pop {r0} bx r0 .pool @@ -286988,7 +286988,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 @@ -286999,7 +286999,7 @@ sub_80A2074: ; 80A2074 negs r0, r0 ands r0, r2 strb r0, [r1, 0x4] -@080A209A: +_080A209A: pop {r0} bx r0 .pool @@ -287012,7 +287012,7 @@ sub_80A20A4: ; 80A20A4 lsrs r2, r0, 16 movs r1, 0 ldr r3, =0x02037f14 -@080A20AE: +_080A20AE: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -287020,18 +287020,18 @@ sub_80A20A4: ; 80A20A4 ldr r0, [r0] ldrh r0, [r0] cmp r0, r2 - bne @080A20C8 + bne _080A20C8 adds r0, r1, 0 - b @080A20D4 + b _080A20D4 .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 @@ -287044,29 +287044,29 @@ pal_fade__0: ; 80A20D8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @080A20F0 + bne _080A20F0 movs r0, 0 - b @080A220C + b _080A220C .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 @@ -287077,13 +287077,13 @@ pal_fade__0: ; 80A20D8 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] @@ -287091,24 +287091,24 @@ pal_fade__0: ; 80A20D8 ands r0, r1 adds r7, r2, 0 cmp r0, 0 - bne @080A214C + bne _080A214C ldrh r4, [r7] - b @080A2152 + b _080A2152 .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 @@ -287118,15 +287118,15 @@ pal_fade__0: ; 80A20D8 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 @@ -287143,7 +287143,7 @@ pal_fade__0: ; 80A20D8 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] @@ -287151,29 +287151,29 @@ pal_fade__0: ; 80A20D8 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 .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 @@ -287183,9 +287183,9 @@ pal_fade__0: ; 80A20D8 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 @@ -287195,11 +287195,11 @@ pal_fade__0: ; 80A20D8 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 @@ -287212,19 +287212,19 @@ sub_80A2218: ; 80A2218 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 @@ -287235,14 +287235,14 @@ sub_80A2218: ; 80A2218 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 @@ -287269,10 +287269,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 @@ -287281,7 +287281,7 @@ sub_80A2260: ; 80A2260 add r1, r9 mov r10, r1 cmp r0, 0 - beq @080A230E + beq _080A230E movs r4, 0 ldr r2, =0x02037b14 mov r8, r2 @@ -287295,7 +287295,7 @@ sub_80A2260: ; 80A2260 movs r5, 0x1F asrs r7, r0, 24 asrs r6, r1, 24 -@080A22B6: +_080A22B6: mov r0, r9 adds r2, r0, r4 lsls r2, 1 @@ -287339,16 +287339,16 @@ sub_80A2260: ; 80A2260 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 @@ -287368,23 +287368,23 @@ sub_80A2334: ; 80A2334 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 @@ -287395,14 +287395,14 @@ sub_80A2334: ; 80A2334 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} @@ -287464,7 +287464,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] @@ -287472,9 +287472,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 @@ -287483,7 +287483,7 @@ sub_80A23B4: ; 80A23B4 ldr r1, =0x02037b14 ldr r2, =0x01000200 bl CpuSet -@080A241C: +_080A241C: bl fade_and_return_progress_probably add sp, 0x4 pop {r4} @@ -287505,63 +287505,63 @@ pal_fade__1: ; 80A2438 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @080A2458 + bne _080A2458 movs r0, 0 - b @080A2792 + b _080A2792 .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 .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 @@ -287597,25 +287597,25 @@ pal_fade__1: ; 80A2438 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 @@ -287630,15 +287630,15 @@ pal_fade__1: ; 80A2438 lsls r0, 16 lsrs r7, r0, 16 cmp r7, r10 - bcc @080A24B6 - b @080A2694 + bcc _080A24B6 + b _080A2694 .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 @@ -287656,21 +287656,21 @@ pal_fade__1: ; 80A2438 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 @@ -287684,14 +287684,14 @@ pal_fade__1: ; 80A2438 lsls r0, 16 lsrs r7, r0, 16 cmp r7, r10 - bcc @080A254C - b @080A2694 + bcc _080A254C + b _080A2694 .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 @@ -287721,25 +287721,25 @@ pal_fade__1: ; 80A2438 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 @@ -287753,16 +287753,16 @@ pal_fade__1: ; 80A2438 lsls r0, 16 lsrs r7, r0, 16 cmp r7, r10 - bcc @080A25AE - b @080A2694 + bcc _080A25AE + b _080A2694 .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 @@ -287784,19 +287784,19 @@ pal_fade__1: ; 80A2438 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 @@ -287810,8 +287810,8 @@ pal_fade__1: ; 80A2438 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 @@ -287828,11 +287828,11 @@ pal_fade__1: ; 80A2438 movs r0, 0x4 ands r0, r3 cmp r0, 0 - beq @080A26C4 + beq _080A26C4 ldrb r0, [r1, 0x7] - b @080A2790 + b _080A2790 .pool -@080A26C4: +_080A26C4: ldr r2, =0x02037fd4 ldrh r4, [r2, 0x4] lsls r5, r4, 21 @@ -287841,14 +287841,14 @@ pal_fade__1: ; 80A2438 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 .pool -@080A26E8: +_080A26E8: lsrs r1, r5, 27 lsrs r0, r2, 28 subs r1, r0 @@ -287860,40 +287860,40 @@ pal_fade__1: ; 80A2438 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 .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 .pool -@080A2750: +_080A2750: movs r0, 0x1 negs r0, r0 str r0, [sp] @@ -287901,15 +287901,15 @@ pal_fade__1: ; 80A2438 ldr r2, =0x05000100 mov r0, sp bl CpuSet - b @080A2778 + b _080A2778 .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 @@ -287920,12 +287920,12 @@ pal_fade__1: ; 80A2438 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 @@ -288001,16 +288001,16 @@ 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 .pool -@080A2840: +_080A2840: movs r0, 0x40 orrs r6, r0 -@080A2844: +_080A2844: strb r6, [r7, 0x8] pop {r4-r7} pop {r0} @@ -288026,17 +288026,17 @@ 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 .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 @@ -288047,8 +288047,8 @@ pal_fade__2: ; 80A284C 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 @@ -288056,7 +288056,7 @@ pal_fade__2: ; 80A284C movs r0, 0x40 ands r0, r3 cmp r0, 0 - bne @080A28E4 + bne _080A28E4 ldrh r1, [r4, 0x4] lsls r0, r1, 21 lsrs r0, 27 @@ -288074,7 +288074,7 @@ pal_fade__2: ; 80A284C 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 @@ -288092,9 +288092,9 @@ pal_fade__2: ; 80A284C ands r0, r7 lsls r0, 6 ands r3, r6 - b @080A292C + b _080A292C .pool -@080A28E4: +_080A28E4: ldrh r2, [r4, 0x4] lsls r1, r2, 21 lsrs r0, r1, 27 @@ -288112,7 +288112,7 @@ pal_fade__2: ; 80A284C 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 @@ -288131,35 +288131,35 @@ pal_fade__2: ; 80A284C 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 @@ -288182,7 +288182,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 @@ -288200,7 +288200,7 @@ sub_80A2968: ; 80A2968 movs r0, 0x7F ands r0, r1 strb r0, [r4, 0x7] -@080A29AC: +_080A29AC: pop {r4} pop {r0} bx r0 @@ -288215,7 +288215,7 @@ sub_80A29BC: ; 80A29BC movs r0, 0x2 ands r0, r4 cmp r0, 0 - beq @080A2A18 + beq _080A2A18 ldr r2, [r3, 0x8] movs r0, 0xF8 lsls r0, 9 @@ -288223,7 +288223,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 @@ -288236,9 +288236,9 @@ sub_80A29BC: ; 80A29BC ldr r1, =0xfffe0fff ands r0, r1 str r0, [r3, 0x8] - b @080A2A10 + b _080A2A10 .pool -@080A29FC: +_080A29FC: lsls r0, r2, 15 lsrs r0, 27 adds r0, 0x1 @@ -288249,13 +288249,13 @@ sub_80A29BC: ; 80A29BC ands r1, r2 orrs r1, r0 str r1, [r3, 0x8] -@080A2A10: +_080A2A10: movs r0, 0x1 - b @080A2A1A + b _080A2A1A .pool -@080A2A18: +_080A2A18: movs r0, 0 -@080A2A1A: +_080A2A1A: pop {r4} pop {r1} bx r1 @@ -288271,26 +288271,26 @@ 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 @@ -288325,10 +288325,10 @@ TintPalette_GrayScale: ; 80A2A90 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 @@ -288356,8 +288356,8 @@ TintPalette_GrayScale: ; 80A2A90 adds r4, 0x2 subs r5, 0x1 cmp r5, 0 - bne @080A2AA0 -@080A2AD8: + bne _080A2AA0 +_080A2AD8: pop {r4-r6} pop {r0} bx r0 @@ -288370,11 +288370,11 @@ sub_80A2AE0: ; 80A2AE0 lsls r1, 16 lsrs r1, 16 cmp r1, 0 - beq @080A2B34 + beq _080A2B34 movs r6, 0x1F ldr r7, =gUnknown_0852489C adds r5, r1, 0 -@080A2AF2: +_080A2AF2: ldrh r1, [r4] movs r2, 0x1F ands r2, r1 @@ -288395,9 +288395,9 @@ sub_80A2AE0: ; 80A2AE0 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 @@ -288408,8 +288408,8 @@ sub_80A2AE0: ; 80A2AE0 adds r4, 0x2 subs r5, 0x1 cmp r5, 0 - bne @080A2AF2 -@080A2B34: + bne _080A2AF2 +_080A2B34: pop {r4-r7} pop {r0} bx r0 @@ -288423,10 +288423,10 @@ TintPalette_SepiaTone: ; 80A2B40 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 @@ -288457,9 +288457,9 @@ TintPalette_SepiaTone: ; 80A2B40 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 @@ -288468,8 +288468,8 @@ TintPalette_SepiaTone: ; 80A2B40 adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bne @080A2B50 -@080A2BA2: + bne _080A2B50 +_080A2BA2: pop {r4-r7} pop {r0} bx r0 @@ -288496,10 +288496,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 @@ -288532,17 +288532,17 @@ sub_80A2BAC: ; 80A2BAC 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 @@ -288551,8 +288551,8 @@ sub_80A2BAC: ; 80A2BAC adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bne @080A2BD6 -@080A2C38: + bne _080A2BD6 +_080A2C38: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -288601,21 +288601,21 @@ 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 .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 @@ -288624,7 +288624,7 @@ sub_80A2C44: ; 80A2C44 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0xC] -@080A2CC4: +_080A2CC4: adds r0, r5, 0 movs r1, 0x5 mov r2, r10 @@ -288658,27 +288658,27 @@ sub_80A2CF8: ; 80A2CF8 movs r2, 0 ldr r4, =sub_80A2D54 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 .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 @@ -288687,16 +288687,16 @@ sub_80A2CF8: ; 80A2CF8 thumb_func_start sub_80A2D34 sub_80A2D34: ; 80A2D34 push {lr} - b @080A2D3C -@080A2D38: + b _080A2D3C +_080A2D38: bl remove_task -@080A2D3C: +_080A2D3C: ldr r0, =sub_80A2D54 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne @080A2D38 + bne _080A2D38 pop {r0} bx r0 .pool @@ -288724,7 +288724,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] @@ -288738,31 +288738,31 @@ 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 .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 @@ -288787,52 +288787,52 @@ sound_something: ; 80A2DE8 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 .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 .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 .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] @@ -288844,17 +288844,17 @@ sound_something: ; 80A2DE8 strb r0, [r1] ldrh r0, [r2] bl song_play_for_text - b @080A2ECA + b _080A2ECA .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 @@ -288869,7 +288869,7 @@ sound_something: ; 80A2DE8 movs r0, 0x2 strb r0, [r1] strb r2, [r5] -@080A2ECA: +_080A2ECA: pop {r4,r5} pop {r0} bx r0 @@ -288935,10 +288935,10 @@ sub_80A2F50: ; 80A2F50 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] @@ -289038,17 +289038,17 @@ sub_80A303C: ; 80A303C 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 .pool -@080A3058: +_080A3058: movs r0, 0 -@080A305A: +_080A305A: pop {r1} bx r1 thumb_func_end sub_80A303C @@ -289084,25 +289084,25 @@ ducking_tick: ; 80A3094 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 .pool -@080A30B0: +_080A30B0: cmp r1, 0 - bne @080A30C0 + bne _080A30C0 ldr r0, =0x03007420 bl m4aMPlayContinue - b @080A30C6 + b _080A30C6 .pool -@080A30C0: +_080A30C0: movs r0, 0 bl m4aSongNumStart -@080A30C6: +_080A30C6: movs r0, 0x1 -@080A30C8: +_080A30C8: pop {r1} bx r1 thumb_func_end ducking_tick @@ -289129,25 +289129,25 @@ fanfare_play: ; 80A30E4 lsrs r3, r0, 16 movs r1, 0 ldr r2, =gUnknown_085248BC -@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 .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 @@ -289160,13 +289160,13 @@ task_is_not_running_overworld_fanfare: ; 80A3120 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080A3138 + beq _080A3138 movs r0, 0x1 - b @080A313A + b _080A313A .pool -@080A3138: +_080A3138: movs r0, 0 -@080A313A: +_080A313A: pop {r1} bx r1 thumb_func_end task_is_not_running_overworld_fanfare @@ -289179,17 +289179,17 @@ task50_overworld_fanfare: ; 80A3140 ldr r1, =0x03000f4e ldrh r0, [r1] cmp r0, 0 - beq @080A3158 + beq _080A3158 subs r0, 0x1 strh r0, [r1] - b @080A3164 + b _080A3164 .pool -@080A3158: +_080A3158: ldr r0, =0x03007420 bl m4aMPlayContinue adds r0, r4, 0 bl remove_task -@080A3164: +_080A3164: pop {r4} pop {r0} bx r0 @@ -289206,11 +289206,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 @@ -289227,14 +289227,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 @@ -289274,17 +289274,17 @@ sub_80A3200: ; 80A3200 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 .pool -@080A3220: +_080A3220: movs r0, 0x1 -@080A3222: +_080A3222: pop {r1} bx r1 thumb_func_end sub_80A3200 @@ -289322,13 +289322,13 @@ sub_80A3258: ; 80A3258 ldr r0, =0x03007420 ldrh r0, [r0, 0x4] cmp r0, 0 - beq @080A326C + beq _080A326C movs r0, 0 - b @080A326E + b _080A326E .pool -@080A326C: +_080A326C: movs r0, 0x1 -@080A326E: +_080A326E: pop {r1} bx r1 thumb_func_end sub_80A3258 @@ -289399,7 +289399,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] @@ -289407,8 +289407,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 @@ -289424,7 +289424,7 @@ sub_80A32E4: ; 80A32E4 movs r0, 0x2 strb r0, [r1] bl sub_80A3754 -@080A332E: +_080A332E: add sp, 0x4 pop {r4-r6} pop {r0} @@ -289446,26 +289446,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] @@ -289473,7 +289473,7 @@ sub_80A3344: ; 80A3344 movs r2, 0x78 movs r3, 0xA bl sub_80A344C -@080A3394: +_080A3394: add sp, 0x4 pop {r4-r6} pop {r0} @@ -289492,7 +289492,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] @@ -289500,8 +289500,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 @@ -289516,7 +289516,7 @@ play_cry_maybe: ; 80A33A8 ldr r1, =0x020383ec movs r0, 0x2 strb r0, [r1] -@080A33EE: +_080A33EE: add sp, 0x4 pop {r4-r6} pop {r0} @@ -289586,104 +289586,104 @@ 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 .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 .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 .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 .pool -@080A3510: +_080A3510: movs r5, 0xC8 ldr r4, =0x00003868 - b @080A3562 + b _080A3562 .pool -@080A351C: +_080A351C: movs r5, 0xDC ldr r4, =0x00003cc3 movs r3, 0xC0 mov r8, r3 movs r2, 0x46 - b @080A3562 + b _080A3562 .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 .pool -@080A3550: +_080A3550: movs r6, 0x64 movs r5, 0xE1 ldr r4, =0x00003b60 - b @080A3562 + b _080A3562 .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 @@ -289714,91 +289714,91 @@ sub_80A344C: ; 80A344C 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 .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, =gUnknown_0869EF24 - b @080A3654 + b _080A3654 .pool -@080A35E0: +_080A35E0: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =gUnknown_0869DCF4 - b @080A3654 + b _080A3654 .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, =gUnknown_0869F524 - b @080A3654 + b _080A3654 .pool -@080A3604: +_080A3604: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =gUnknown_0869E2F4 - b @080A3654 + b _080A3654 .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, =gUnknown_0869FB24 - b @080A3654 + b _080A3654 .pool -@080A3628: +_080A3628: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =gUnknown_0869E8F4 - b @080A3654 + b _080A3654 .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, =gUnknown_086A0124 - b @080A3654 + b _080A3654 .pool -@080A364C: +_080A364C: lsls r0, r1, 1 adds r0, r1 lsls r0, 2 ldr r1, =gUnknown_0869EEF4 -@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 @@ -289818,14 +289818,14 @@ sub_80A3678: ; 80A3678 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080A3694 + beq _080A3694 bl sub_8000964 movs r0, 0x1 - b @080A3696 + b _080A3696 .pool -@080A3694: +_080A3694: movs r0, 0 -@080A3696: +_080A3696: pop {r1} bx r1 thumb_func_end sub_80A3678 @@ -289860,14 +289860,14 @@ sub_80A36C8: ; 80A36C8 ldr r0, [r0] bl sub_82E17CC cmp r0, 0 - bne @080A36E4 + bne _080A36E4 bl sub_8000964 movs r0, 0 - b @080A36E6 + b _080A36E6 .pool -@080A36E4: +_080A36E4: movs r0, 0x1 -@080A36E6: +_080A36E6: pop {r1} bx r1 thumb_func_end sub_80A36C8 @@ -289879,13 +289879,13 @@ sub_80A36EC: ; 80A36EC ldr r0, [r0] bl sub_82E17CC cmp r0, 0 - bne @080A3704 + bne _080A3704 movs r0, 0 - b @080A3706 + b _080A3706 .pool -@080A3704: +_080A3704: movs r0, 0x1 -@080A3706: +_080A3706: pop {r1} bx r1 thumb_func_end sub_80A36EC @@ -289898,17 +289898,17 @@ sub_80A370C: ; 80A370C ldr r1, =0x020383ec ldrb r0, [r1] cmp r0, 0 - beq @080A3724 + beq _080A3724 subs r0, 0x1 strb r0, [r1] - b @080A3742 + b _080A3742 .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 @@ -289916,7 +289916,7 @@ sub_80A370C: ; 80A370C bl MPlayVolumeControl adds r0, r4, 0 bl remove_task -@080A3742: +_080A3742: pop {r4} pop {r0} bx r0 @@ -289932,11 +289932,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 @@ -289951,14 +289951,14 @@ song_play_for_text: ; 80A3778 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} @@ -290090,29 +290090,29 @@ 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 .pool -@080A38DC: +_080A38DC: movs r0, 0x1 -@080A38DE: +_080A38DE: pop {r1} bx r1 thumb_func_end mplay_has_finished_maybe @@ -290123,17 +290123,17 @@ sub_80A38E4: ; 80A38E4 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 .pool -@080A3904: +_080A3904: movs r0, 0 -@080A3906: +_080A3906: pop {r1} bx r1 thumb_func_end sub_80A38E4 @@ -290144,17 +290144,17 @@ sub_80A390C: ; 80A390C 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 .pool -@080A392C: +_080A392C: movs r0, 0 -@080A392E: +_080A392E: pop {r1} bx r1 thumb_func_end sub_80A390C @@ -290198,23 +290198,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] @@ -290280,7 +290280,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 @@ -290291,23 +290291,23 @@ 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 .pool -@080A3AA8: +_080A3AA8: ldrh r0, [r6] muls r0, r7 ldr r1, =0x020244ec -@080A3AAE: +_080A3AAE: adds r0, r1 movs r1, 0xB bl pokemon_getattr @@ -290316,16 +290316,16 @@ move_something: ; 80A3A48 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 - b @080A3B10 + b _080A3B10 .pool -@080A3AE8: +_080A3AE8: ldr r3, =0x02038434 ldr r5, =0x02038430 mov r0, r8 @@ -290338,7 +290338,7 @@ move_something: ; 80A3A48 ldr r2, =0x02039f34 ldr r1, =0x02038438 movs r4, 0x3 -@080A3B00: +_080A3B00: ldr r0, [r2] ldr r0, [r0, 0x18] ldrh r0, [r0] @@ -290346,27 +290346,27 @@ move_something: ; 80A3A48 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 .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 @@ -290388,36 +290388,36 @@ move_something: ; 80A3A48 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, =gUnknown_082C8D64 - b @080A3BAA + b _080A3BAA .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] @@ -290493,19 +290493,19 @@ sub_80A3C54: ; 80A3C54 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 .pool -@080A3C74: +_080A3C74: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x7 - ble @080A3C60 -@080A3C7C: + ble _080A3C60 +_080A3C7C: pop {r4} pop {r0} bx r0 @@ -290520,20 +290520,20 @@ 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 .pool -@080A3CA8: +_080A3CA8: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x7 - ble @080A3C92 -@080A3CB0: + ble _080A3C92 +_080A3CB0: pop {r4} pop {r0} bx r0 @@ -290547,16 +290547,16 @@ move_anim_waiter: ; 80A3CB8 movs r0, 0 ldrsb r0, [r2, r0] cmp r0, 0 - bgt @080A3CDC + bgt _080A3CDC ldr r0, =0x020383f8 ldr r1, =move_anim_execute str r1, [r0] movs r0, 0 - b @080A3CDE + b _080A3CDE .pool -@080A3CDC: +_080A3CDC: subs r0, r1, 0x1 -@080A3CDE: +_080A3CDE: strb r0, [r2] pop {r0} bx r0 @@ -290566,7 +290566,7 @@ move_anim_waiter: ; 80A3CB8 move_anim_execute: ; 80A3CE4 push {r4,lr} ldr r4, =gUnknown_08525E98 -@080A3CE8: +_080A3CE8: ldr r0, =0x020383f0 ldr r0, [r0] ldrb r0, [r0] @@ -290579,12 +290579,12 @@ move_anim_execute: ; 80A3CE4 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 @@ -290692,11 +290692,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] @@ -290708,41 +290708,41 @@ ma02_instanciate_template: ; 80A3DD8 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 .pool -@080A3E48: +_080A3E48: negs r0, r4 -@080A3E4A: +_080A3E4A: lsls r0, 24 lsrs r4, r0, 24 ldr r0, =0x02038437 - b @080A3E6A + b _080A3E6A .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 @@ -290755,9 +290755,9 @@ ma02_instanciate_template: ; 80A3DD8 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 @@ -290812,11 +290812,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] @@ -290828,8 +290828,8 @@ sub_80A3ECC: ; 80A3ECC 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 @@ -290858,12 +290858,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 @@ -290881,20 +290881,20 @@ sub_80A3F88: ; 80A3F88 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 .pool -@080A3FAC: +_080A3FAC: ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] -@080A3FB2: +_080A3FB2: pop {r0} bx r0 .pool @@ -290920,29 +290920,29 @@ 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 .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 @@ -290950,19 +290950,19 @@ sub_80A3FC4: ; 80A3FC4 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 .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] @@ -290970,10 +290970,10 @@ sub_80A3FC4: ; 80A3FC4 ldr r7, =0x0000ffff ldr r6, =gUnknown_08524B44 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] @@ -290987,14 +290987,14 @@ sub_80A3FC4: ; 80A3FC4 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 @@ -291003,15 +291003,15 @@ sub_80A3FC4: ; 80A3FC4 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} @@ -291073,12 +291073,12 @@ 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 .pool -@080A4148: +_080A4148: ldr r0, =task_pA_ma0A_obj_to_bg_pal movs r1, 0xA bl AddTask @@ -291102,19 +291102,19 @@ sub_80A40F4: ; 80A40F4 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 .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 @@ -291133,7 +291133,7 @@ sub_80A40F4: ; 80A40F4 strb r2, [r0] adds r0, r7, 0 bl move_anim_task_del -@080A41BE: +_080A41BE: pop {r3} mov r8, r3 pop {r4-r7} @@ -291153,19 +291153,19 @@ sub_80A41D8: ; 80A41D8 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @080A41F8 + beq _080A41F8 ldr r0, =0x02038437 - b @080A41FA + b _080A41FA .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 @@ -291174,18 +291174,18 @@ sub_80A41D8: ; 80A41D8 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 .pool -@080A4230: +_080A4230: movs r5, 0x1 -@080A4232: +_080A4232: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0 @@ -291210,14 +291210,14 @@ sub_80A41D8: ; 80A41D8 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 @@ -291226,18 +291226,18 @@ sub_80A41D8: ; 80A41D8 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 .pool -@080A42A4: +_080A42A4: movs r5, 0x1 -@080A42A6: +_080A42A6: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0 @@ -291261,7 +291261,7 @@ sub_80A41D8: ; 80A41D8 movs r1, 0x1 strh r1, [r0, 0xC] strh r1, [r0, 0xE] -@080A42D8: +_080A42D8: ldr r1, =0x020383f0 ldr r0, [r1] adds r0, 0x1 @@ -291287,23 +291287,23 @@ 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 .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] @@ -291313,7 +291313,7 @@ b_side_obj__get_some_boolean: ; 80A4310 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080A4374 + beq _080A4374 ldr r2, =0x02020630 ldr r0, =0x020241e4 adds r0, r5, r0 @@ -291326,14 +291326,14 @@ b_side_obj__get_some_boolean: ; 80A4310 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @080A4384 -@080A4374: + blt _080A4384 +_080A4374: movs r0, 0x1 - b @080A4386 + b _080A4386 .pool -@080A4384: +_080A4384: movs r0, 0 -@080A4386: +_080A4386: pop {r4,r5} pop {r1} bx r1 @@ -291354,14 +291354,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 @@ -291374,9 +291374,9 @@ sub_80A438C: ; 80A438C movs r0, 0xFF movs r3, 0 bl RequestDma3Fill - b @080A43F8 + b _080A43F8 .pool -@080A43DC: +_080A43DC: ldr r1, =0x06004000 movs r2, 0x80 lsls r2, 6 @@ -291389,7 +291389,7 @@ sub_80A438C: ; 80A438C movs r0, 0xFF movs r3, 0 bl RequestDma3Fill -@080A43F8: +_080A43F8: add r0, sp, 0x10 bl sub_80A6B30 add r0, sp, 0x20 @@ -291435,7 +291435,7 @@ sub_80A438C: ; 80A438C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @080A447A + beq _080A447A ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x18] @@ -291443,11 +291443,11 @@ sub_80A438C: ; 80A438C 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 @@ -291462,7 +291462,7 @@ sub_80A438C: ; 80A438C strh r0, [r5] mov r0, r9 cmp r0, 0 - beq @080A44B0 + beq _080A44B0 ldr r0, =0x020241e4 adds r0, r6, r0 ldrb r1, [r0] @@ -291475,7 +291475,7 @@ sub_80A438C: ; 80A438C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080A44B0: +_080A44B0: ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 @@ -291504,16 +291504,16 @@ sub_80A438C: ; 80A438C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @080A4524 + beq _080A4524 movs r3, 0 - b @080A452E + b _080A452E .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] @@ -291531,12 +291531,12 @@ sub_80A438C: ; 80A438C 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 @@ -291606,7 +291606,7 @@ sub_80A438C: ; 80A438C strh r0, [r4] mov r0, r9 cmp r0, 0 - beq @080A460E + beq _080A460E ldrb r1, [r2] lsls r0, r1, 4 adds r0, r1 @@ -291617,7 +291617,7 @@ sub_80A438C: ; 80A438C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080A460E: +_080A460E: ldrh r1, [r5] movs r0, 0x18 bl SetGpuReg @@ -291656,7 +291656,7 @@ sub_80A438C: ; 80A438C movs r1, 0 movs r2, 0 bl sub_8118FBC -@080A4666: +_080A4666: add sp, 0x28 pop {r3,r4} mov r8, r3 @@ -291678,7 +291678,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] @@ -291686,13 +291686,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] @@ -291701,34 +291701,34 @@ sub_80A46A0: ; 80A46A0 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} @@ -291749,23 +291749,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 @@ -291775,11 +291775,11 @@ sub_80A4720: ; 80A4720 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} @@ -291798,13 +291798,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 @@ -291812,16 +291812,16 @@ sub_80A477C: ; 80A477C strh r1, [r0] ldr r0, =0x02022e1a strh r1, [r0] - b @080A47C6 + b _080A47C6 .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} @@ -291867,7 +291867,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 @@ -291891,9 +291891,9 @@ task_pA_ma0A_obj_to_bg_pal: ; 80A47D8 adds r1, r2 ldr r2, =0x04000008 bl CpuSet - b @080A4896 + b _080A4896 .pool -@080A4870: +_080A4870: ldr r1, =0x02022e1c lsls r0, r3, 16 asrs r0, 16 @@ -291912,7 +291912,7 @@ task_pA_ma0A_obj_to_bg_pal: ; 80A47D8 subs r1, 0xE0 ldr r2, =0x04000008 bl CpuSet -@080A4896: +_080A4896: add sp, 0x10 pop {r4-r6} pop {r0} @@ -291929,32 +291929,32 @@ ma0B_0807324C: ; 80A48B0 str r1, [r0] ldrb r4, [r2, 0x1] cmp r4, 0 - bne @080A48C8 + bne _080A48C8 movs r4, 0x2 - b @080A48D2 + b _080A48D2 .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 .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 @@ -291969,12 +291969,12 @@ ma0B_0807324C: ; 80A48B0 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 @@ -291992,11 +291992,11 @@ ma0B_0807324C: ; 80A48B0 negs r1, r1 ands r1, r2 strb r1, [r0] - b @080A494A + b _080A494A .pool -@080A4948: +_080A4948: movs r4, 0 -@080A494A: +_080A494A: ldr r0, =sub_80A4980 movs r1, 0x5 bl AddTask @@ -292035,7 +292035,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 @@ -292044,29 +292044,29 @@ 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 .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 @@ -292075,7 +292075,7 @@ sub_80A4980: ; 80A4980 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x1 - ble @080A4A04 + ble _080A4A04 movs r0, 0x1 eors r4, r0 adds r0, r4, 0 @@ -292084,10 +292084,10 @@ sub_80A4980: ; 80A4980 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 @@ -292103,33 +292103,33 @@ sub_80A4A18: ; 80A4A18 str r1, [r0] ldrb r5, [r2, 0x1] cmp r5, 0 - bne @080A4A30 + bne _080A4A30 movs r5, 0x2 - b @080A4A3A + b _080A4A3A .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 .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 @@ -292138,31 +292138,31 @@ sub_80A4A18: ; 80A4A18 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 .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 @@ -292171,21 +292171,21 @@ sub_80A4A18: ; 80A4A18 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 @@ -292205,33 +292205,33 @@ ma23_8073484: ; 80A4ADC str r1, [r0] ldrb r5, [r2, 0x1] cmp r5, 0 - bne @080A4AF4 + bne _080A4AF4 movs r5, 0x2 - b @080A4AFE + b _080A4AFE .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 .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 @@ -292246,9 +292246,9 @@ ma23_8073484: ; 80A4ADC 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 @@ -292256,7 +292256,7 @@ ma23_8073484: ; 80A4ADC 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 @@ -292271,11 +292271,11 @@ ma23_8073484: ; 80A4ADC negs r1, r1 ands r1, r2 strb r1, [r0] - b @080A4B7A + b _080A4B7A .pool -@080A4B78: +_080A4B78: movs r5, 0 -@080A4B7A: +_080A4B7A: ldr r0, =sub_80A4BB0 movs r1, 0x5 bl AddTask @@ -292314,7 +292314,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 @@ -292324,26 +292324,26 @@ 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 .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 @@ -292352,22 +292352,22 @@ sub_80A4BB0: ; 80A4BB0 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 @@ -292517,10 +292517,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] @@ -292551,7 +292551,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 @@ -292563,12 +292563,12 @@ ma12_cond_if: ; 80A4D88 lsls r0, 24 adds r1, r0 str r1, [r5] - b @080A4DC4 + b _080A4DC4 .pool -@080A4DC0: +_080A4DC0: adds r0, r4, 0x6 str r0, [r5] -@080A4DC4: +_080A4DC4: pop {r4,r5} pop {r0} bx r0 @@ -292605,13 +292605,13 @@ sub_80A4DF0: ; 80A4DF0 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @080A4E10 + beq _080A4E10 movs r0, 0 - b @080A4E12 + b _080A4E12 .pool -@080A4E10: +_080A4E10: movs r0, 0x1 -@080A4E12: +_080A4E12: pop {r1} bx r1 thumb_func_end sub_80A4DF0 @@ -292670,31 +292670,31 @@ 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 .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 .pool -@080A4ECC: +_080A4ECC: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -292702,7 +292702,7 @@ sub_80A4E5C: ; 80A4E5C adds r0, r1 mov r1, r8 strh r1, [r0, 0x8] -@080A4EDA: +_080A4EDA: ldr r1, =0x02038433 movs r0, 0x1 strb r0, [r1] @@ -292730,7 +292730,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 @@ -292740,40 +292740,40 @@ task_p5_load_battle_screen_elements: ; 80A4EF4 ldrh r0, [r4, 0x1C] adds r0, 0x1 strh r0, [r4, 0x1C] - b @080A4FBC + b _080A4FBC .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 .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 @@ -292789,16 +292789,16 @@ task_p5_load_battle_screen_elements: ; 80A4EF4 ldrh r1, [r0, 0x1C] adds r1, 0x1 strh r1, [r0, 0x1C] - b @080A4FBC + b _080A4FBC .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 @@ -292806,12 +292806,12 @@ task_p5_load_battle_screen_elements: ; 80A4EF4 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} @@ -292827,7 +292827,7 @@ sub_80A4FC8: ; 80A4FC8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @080A5050 + beq _080A5050 ldr r6, =gUnknown_08525D54 lsls r4, r7, 1 adds r4, r7 @@ -292868,9 +292868,9 @@ sub_80A4FC8: ; 80A4FC8 adds r0, r4, 0 movs r2, 0x20 bl decompress_palette - b @080A507E + b _080A507E .pool -@080A5050: +_080A5050: ldr r5, =gUnknown_08525D54 lsls r4, r7, 1 adds r4, r7 @@ -292891,7 +292891,7 @@ sub_80A4FC8: ; 80A4FC8 movs r1, 0x20 movs r2, 0x20 bl decompress_palette -@080A507E: +_080A507E: pop {r4-r7} pop {r0} bx r0 @@ -292904,12 +292904,12 @@ dp01t_11_3_message_for_player_only: ; 80A5090 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @080A50A2 + beq _080A50A2 bl sub_80D7724 - b @080A50A6 -@080A50A2: + b _080A50A6 +_080A50A2: bl load_battle_oval_graphics -@080A50A6: +_080A50A6: pop {r0} bx r0 thumb_func_end dp01t_11_3_message_for_player_only @@ -292947,19 +292947,19 @@ ma16_wait_for_battle_screen_elements_s2: ; 80A50F0 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 .pool -@080A5114: +_080A5114: ldr r1, =0x020383fc movs r0, 0x1 -@080A5118: +_080A5118: strb r0, [r1] pop {r0} bx r0 @@ -292972,20 +292972,20 @@ sub_80A5124: ; 80A5124 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 .pool -@080A5148: +_080A5148: ldr r1, =0x020383fc movs r0, 0x1 strb r0, [r1] -@080A514E: +_080A514E: pop {r0} bx r0 .pool @@ -293017,7 +293017,7 @@ sub_80A5178: ; 80A5178 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @080A51C0 + bne _080A51C0 ldr r0, =0x020244d0 ldr r1, [r0] ldr r0, =0x02038436 @@ -293031,99 +293031,99 @@ 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 .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 .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 .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 .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} @@ -293139,7 +293139,7 @@ sub_80A5278: ; 80A5278 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @080A52C0 + bne _080A52C0 ldr r0, =0x020244d0 ldr r1, [r0] ldr r0, =0x02038436 @@ -293153,32 +293153,32 @@ 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 .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} @@ -293194,16 +293194,16 @@ sub_80A52EC: ; 80A52EC 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} @@ -293222,29 +293222,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} @@ -293408,7 +293408,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] @@ -293421,32 +293421,32 @@ 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 .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 @@ -293454,11 +293454,11 @@ c3_08073CEC: ; 80A5478 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 @@ -293701,7 +293701,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] @@ -293715,14 +293715,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 @@ -293796,7 +293796,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] @@ -293807,7 +293807,7 @@ sub_80A57B4: ; 80A57B4 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -@080A57E8: +_080A57E8: pop {r4} pop {r0} bx r0 @@ -293837,11 +293837,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] @@ -293853,8 +293853,8 @@ sub_80A57F8: ; 80A57F8 adds r4, 0x2 subs r3, 0x1 cmp r3, 0 - bne @080A582A -@080A5842: + bne _080A582A +_080A5842: adds r0, r6, 0 movs r1, 0x1 bl AddTask @@ -293877,12 +293877,12 @@ ma20_wait_for_something: ; 80A586C 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 @@ -293890,25 +293890,25 @@ 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 .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 .pool -@080A58CC: +_080A58CC: ldr r0, =0x0203842e movs r2, 0 strh r1, [r0] @@ -293918,7 +293918,7 @@ ma20_wait_for_something: ; 80A586C str r0, [r1] ldr r0, =0x020383fc strb r2, [r0] -@080A58DE: +_080A58DE: pop {r4,r5} pop {r0} bx r0 @@ -293945,7 +293945,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 @@ -293957,13 +293957,13 @@ ma21_08074164: ; 80A58F0 lsls r0, 24 adds r1, r0 str r1, [r5] - b @080A593E + b _080A593E .pool -@080A5938: +_080A5938: adds r0, r4, 0 adds r0, 0x8 str r0, [r5] -@080A593E: +_080A593E: pop {r4-r6} pop {r0} bx r0 @@ -293979,7 +293979,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] @@ -293992,13 +293992,13 @@ sub_80A5944: ; 80A5944 lsls r0, 24 adds r1, r0 str r1, [r4] - b @080A597E + b _080A597E .pool -@080A5978: +_080A5978: ldr r0, [r4] adds r0, 0x4 str r0, [r4] -@080A597E: +_080A597E: pop {r4} pop {r0} bx r0 @@ -294013,13 +294013,13 @@ sub_80A5984: ; 80A5984 adds r1, 0x2 str r1, [r0] cmp r2, 0 - beq @080A59A0 + beq _080A59A0 ldr r0, =0x02038437 - b @080A59A2 + b _080A59A2 .pool -@080A59A0: +_080A59A0: ldr r0, =0x02038436 -@080A59A2: +_080A59A2: ldrb r0, [r0] bl battle_get_per_side_status lsls r0, 24 @@ -294027,12 +294027,12 @@ sub_80A5984: ; 80A5984 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 @@ -294041,7 +294041,7 @@ sub_80A5984: ; 80A5984 movs r1, 0x4 movs r2, 0x2 bl lcd_bg_operations -@080A59D2: +_080A59D2: pop {r4} pop {r0} bx r0 @@ -294058,7 +294058,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 @@ -294067,7 +294067,7 @@ sub_80A59DC: ; 80A59DC movs r1, 0x4 movs r2, 0x2 bl lcd_bg_operations -@080A5A04: +_080A5A04: pop {r0} bx r0 .pool @@ -294091,27 +294091,27 @@ 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 .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 @@ -294120,7 +294120,7 @@ sub_80A5A0C: ; 80A5A0C movs r1, 0x4 movs r2, 0x2 bl lcd_bg_operations -@080A5A78: +_080A5A78: pop {r4-r7} pop {r0} bx r0 @@ -294136,7 +294136,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 @@ -294147,7 +294147,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] @@ -294167,7 +294167,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 @@ -294179,7 +294179,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] @@ -294200,11 +294200,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 @@ -294215,28 +294215,28 @@ 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 .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 @@ -294250,22 +294250,22 @@ sub_80A5AFC: ; 80A5AFC 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 .pool -@080A5BA0: +_080A5BA0: movs r0, 0x1 bl sub_80A477C -@080A5BA6: +_080A5BA6: pop {r4-r7} pop {r0} bx r0 @@ -294282,11 +294282,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 @@ -294297,30 +294297,30 @@ 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 .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 @@ -294333,7 +294333,7 @@ sub_80A5BAC: ; 80A5BAC movs r2, 0x8 orrs r1, r2 strb r1, [r0, 0x5] -@080A5C38: +_080A5C38: pop {r4-r7} pop {r0} bx r0 @@ -294366,29 +294366,29 @@ 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 .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, =gUnknown_08525F58 adds r0, r5, 0 bl battle_get_per_side_status @@ -294402,9 +294402,9 @@ sub_80A5C6C: ; 80A5C6C adds r0, r1 adds r0, r4 ldrb r0, [r0] - b @080A5DB0 + b _080A5DB0 .pool -@080A5CD8: +_080A5CD8: ldr r4, =gUnknown_08525F58 adds r0, r5, 0 bl battle_get_per_side_status @@ -294418,13 +294418,13 @@ sub_80A5C6C: ; 80A5C6C adds r0, r1 adds r0, r4 ldrb r0, [r0, 0x1] - b @080A5DB0 + b _080A5DB0 .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] @@ -294432,19 +294432,19 @@ sub_80A5C6C: ; 80A5C6C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080A5D24 + beq _080A5D24 ldrh r1, [r2, 0x2] - b @080A5D9A + b _080A5D9A .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] @@ -294452,7 +294452,7 @@ sub_80A5C6C: ; 80A5C6C 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 @@ -294460,9 +294460,9 @@ sub_80A5C6C: ; 80A5C6C movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @080A5D7E + b _080A5D7E .pool -@080A5D60: +_080A5D60: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -294470,7 +294470,7 @@ sub_80A5C6C: ; 80A5C6C 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 @@ -294478,30 +294478,30 @@ sub_80A5C6C: ; 80A5C6C 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 .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 @@ -294518,19 +294518,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] @@ -294538,14 +294538,14 @@ sub_80A5DB8: ; 80A5DB8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080A5E00 + beq _080A5E00 ldr r2, [r2, 0x10] - b @080A5E42 + b _080A5E42 .pool -@080A5E00: +_080A5E00: ldr r2, [r2, 0x8] - b @080A5E42 -@080A5E04: + b _080A5E42 +_080A5E04: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -294553,7 +294553,7 @@ sub_80A5DB8: ; 80A5DB8 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 @@ -294565,13 +294565,13 @@ sub_80A5DB8: ; 80A5DB8 movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b @080A5E42 + b _080A5E42 .pool -@080A5E3C: +_080A5E3C: ldr r0, =0x020244bc adds r0, r1, r0 ldr r2, [r0] -@080A5E42: +_080A5E42: movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -294594,48 +294594,48 @@ sub_80A5DB8: ; 80A5DB8 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @080A5E7C + bne _080A5E7C adds r0, r5, 0 - b @080A5E86 + b _080A5E86 .pool -@080A5E7C: +_080A5E7C: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -@080A5E86: +_080A5E86: ldr r1, =gUnknown_083021D8 lsls r0, 2 - b @080A5F90 + b _080A5F90 .pool -@080A5E90: +_080A5E90: ldr r0, =0x00000181 cmp r5, r0 - bne @080A5EB0 + bne _080A5EB0 ldr r0, =gUnknown_08525F8C ldr r1, =0x020244e4 adds r1, r4, r1 ldrb r1, [r1] adds r1, r0 ldrb r0, [r1] - b @080A5F94 + b _080A5F94 .pool -@080A5EB0: +_080A5EB0: movs r0, 0xCE lsls r0, 1 cmp r5, r0 - bls @080A5EC0 + bls _080A5EC0 ldr r0, =gUnknown_083021D8 - b @080A5F92 + b _080A5F92 .pool -@080A5EC0: +_080A5EC0: ldr r1, =gUnknown_083021D8 - b @080A5F8E + b _080A5F8E .pool -@080A5EC8: +_080A5EC8: cmp r5, 0xC9 - bne @080A5F58 + bne _080A5F58 ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -294643,7 +294643,7 @@ sub_80A5DB8: ; 80A5DB8 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 @@ -294655,13 +294655,13 @@ sub_80A5DB8: ; 80A5DB8 movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b @080A5F0A + b _080A5F0A .pool -@080A5F04: +_080A5F04: ldr r0, =0x020244bc adds r0, r1, r0 ldr r2, [r0] -@080A5F0A: +_080A5F0A: movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -294684,25 +294684,25 @@ sub_80A5DB8: ; 80A5DB8 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @080A5F44 + bne _080A5F44 adds r0, r5, 0 - b @080A5F4E + b _080A5F4E .pool -@080A5F44: +_080A5F44: movs r1, 0xCE lsls r1, 1 adds r0, r1 lsls r0, 16 lsrs r0, 16 -@080A5F4E: +_080A5F4E: ldr r1, =gUnknown_08300D38 lsls r0, 2 - b @080A5F90 + b _080A5F90 .pool -@080A5F58: +_080A5F58: ldr r0, =0x00000181 cmp r5, r0 - bne @080A5F7C + bne _080A5F7C ldr r0, =gUnknown_08525F78 ldr r1, =0x020244e4 adds r1, r4, r1 @@ -294710,25 +294710,25 @@ sub_80A5DB8: ; 80A5DB8 lsls r1, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b @080A5F94 + b _080A5F94 .pool -@080A5F7C: +_080A5F7C: movs r0, 0xCE lsls r0, 1 cmp r5, r0 - bls @080A5F8C + bls _080A5F8C ldr r0, =gUnknown_08300D38 - b @080A5F92 + b _080A5F92 .pool -@080A5F8C: +_080A5F8C: ldr r1, =gUnknown_08300D38 -@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 @@ -294749,36 +294749,36 @@ 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, =gUnknown_08525F88 ldr r1, =0x020244e4 adds r1, r6, r1 ldrb r1, [r1] adds r1, r0 ldrb r5, [r1] - b @080A5FFE + b _080A5FFE .pool -@080A5FE8: +_080A5FE8: movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bls @080A5FF8 + bls _080A5FF8 ldr r0, =gUnknown_08305DCC - b @080A5FFC + b _080A5FFC .pool -@080A5FF8: +_080A5FF8: ldr r0, =gUnknown_08305DCC adds r0, r7, r0 -@080A5FFC: +_080A5FFC: ldrb r5, [r0] -@080A5FFE: +_080A5FFE: adds r0, r5, 0 pop {r4-r7} pop {r1} @@ -294799,19 +294799,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 @@ -294825,7 +294825,7 @@ sub_80A600C: ; 80A600C 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, =gUnknown_08525F58 @@ -294843,21 +294843,21 @@ sub_80A600C: ; 80A600C 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} @@ -294877,11 +294877,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] @@ -294889,14 +294889,14 @@ sub_80A60AC: ; 80A60AC movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080A60E4 + beq _080A60E4 ldrh r1, [r2, 0x2] - b @080A610E + b _080A610E .pool -@080A60E4: +_080A60E4: ldrh r1, [r2] - b @080A610E -@080A60E8: + b _080A610E +_080A60E8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -294904,32 +294904,32 @@ sub_80A60AC: ; 80A60AC 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 .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} @@ -294959,7 +294959,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 @@ -294967,8 +294967,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 @@ -294976,7 +294976,7 @@ sub_80A614C: ; 80A614C lsrs r0, 8 movs r1, 0x88 lsls r1, 13 -@080A6180: +_080A6180: adds r0, r1 lsrs r0, 16 lsls r0, 24 @@ -294999,12 +294999,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] @@ -295012,7 +295012,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 @@ -295020,9 +295020,9 @@ sub_80A6190: ; 80A6190 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @080A6202 + b _080A6202 .pool -@080A61E4: +_080A61E4: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -295030,7 +295030,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 @@ -295038,29 +295038,29 @@ sub_80A6190: ; 80A6190 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 .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} @@ -295074,33 +295074,33 @@ obj_id_for_side_relative_to_move: ; 80A6240 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 .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 .pool -@080A6288: +_080A6288: cmp r1, 0x2 - bne @080A62A4 + bne _080A62A4 ldr r5, =0x02038436 ldrb r0, [r5] movs r4, 0x2 @@ -295108,10 +295108,10 @@ obj_id_for_side_relative_to_move: ; 80A6240 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - beq @080A62B6 - b @080A62C0 + beq _080A62B6 + b _080A62C0 .pool -@080A62A4: +_080A62A4: ldr r5, =0x02038437 ldrb r0, [r5] movs r4, 0x2 @@ -295119,19 +295119,19 @@ obj_id_for_side_relative_to_move: ; 80A6240 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 .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 @@ -295164,7 +295164,7 @@ sub_80A62EC: ; 80A62EC movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 - beq @080A6340 + beq _080A6340 movs r2, 0x2E ldrsh r0, [r4, r2] movs r2, 0x30 @@ -295184,27 +295184,27 @@ sub_80A62EC: ; 80A62EC lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble @080A632C + ble _080A632C ldr r2, =0xffffff00 - b @080A6334 + b _080A6334 .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 @@ -295217,7 +295217,7 @@ sub_80A634C: ; 80A634C 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] @@ -295251,27 +295251,27 @@ sub_80A634C: ; 80A634C lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble @080A63A8 + ble _080A63A8 ldr r2, =0xffffff00 - b @080A63B0 + b _080A63B0 .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 @@ -295284,7 +295284,7 @@ sub_80A63C8: ; 80A63C8 movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 - beq @080A6444 + beq _080A6444 movs r2, 0x2E ldrsh r0, [r4, r2] movs r2, 0x30 @@ -295308,44 +295308,44 @@ sub_80A63C8: ; 80A63C8 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble @080A6410 + ble _080A6410 ldr r2, =0xffffff00 - b @080A6418 + b _080A6418 .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 .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 @@ -295358,7 +295358,7 @@ sub_80A6450: ; 80A6450 movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 - beq @080A64A4 + beq _080A64A4 movs r2, 0x2E ldrsh r0, [r4, r2] movs r2, 0x30 @@ -295378,27 +295378,27 @@ sub_80A6450: ; 80A6450 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble @080A6490 + ble _080A6490 ldr r2, =0xffffff00 - b @080A6498 + b _080A6498 .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 @@ -295412,14 +295412,14 @@ sub_80A64B0: ; 80A64B0 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 @@ -295448,11 +295448,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 @@ -295463,9 +295463,9 @@ sub_80A64EC: ; 80A64EC 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] @@ -295490,7 +295490,7 @@ sub_80A653C: ; 80A653C 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] @@ -295501,11 +295501,11 @@ 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 @@ -295518,7 +295518,7 @@ sub_80A656C: ; 80A656C 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] @@ -295535,11 +295535,11 @@ 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 @@ -295552,7 +295552,7 @@ sub_80A65A8: ; 80A65A8 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] @@ -295569,11 +295569,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} @@ -295622,7 +295622,7 @@ sub_80A6630: ; 80A6630 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 @@ -295646,12 +295646,12 @@ sub_80A6630: ; 80A6630 ldrh r2, [r0, 0x26] adds r1, r2 strh r1, [r0, 0x26] - b @080A667A + b _080A667A .pool -@080A6674: +_080A6674: adds r0, r3, 0 bl sub_80A62DC -@080A667A: +_080A667A: pop {r4} pop {r0} bx r0 @@ -295665,7 +295665,7 @@ sub_80A6680: ; 80A6680 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] @@ -295696,12 +295696,12 @@ sub_80A6680: ; 80A6680 lsls r0, 16 asrs r0, 24 strh r0, [r1, 0x26] - b @080A66D6 + b _080A66D6 .pool -@080A66D0: +_080A66D0: adds r0, r4, 0 bl sub_80A62DC -@080A66D6: +_080A66D6: pop {r4} pop {r0} bx r0 @@ -295715,7 +295715,7 @@ sub_80A66DC: ; 80A66DC 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] @@ -295738,11 +295738,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] @@ -295756,11 +295756,11 @@ 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 @@ -295833,10 +295833,10 @@ 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 @@ -295850,10 +295850,10 @@ 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 @@ -295939,34 +295939,34 @@ 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 .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} @@ -296004,7 +296004,7 @@ sub_80A6900: ; 80A6900 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @080A692C + bne _080A692C ldrh r0, [r4, 0x3A] ldrh r1, [r4, 0x3C] adds r0, r1 @@ -296018,10 +296018,10 @@ 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 @@ -296034,7 +296034,7 @@ sub_80A6934: ; 80A6934 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @080A6960 + bne _080A6960 ldrh r0, [r4, 0x3A] ldrh r1, [r4, 0x3C] adds r0, r1 @@ -296048,10 +296048,10 @@ 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 @@ -296079,7 +296079,7 @@ sub_80A6980: ; 80A6980 adds r5, r0, 0 lsls r1, 24 cmp r1, 0 - bne @080A69A8 + bne _080A69A8 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -296093,7 +296093,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] @@ -296115,7 +296115,7 @@ sub_80A69CC: ; 80A69CC adds r5, r0, 0 lsls r1, 24 cmp r1, 0 - bne @080A69F0 + bne _080A69F0 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -296125,9 +296125,9 @@ sub_80A69CC: ; 80A69CC strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - b @080A6A04 + b _080A6A04 .pool -@080A69F0: +_080A69F0: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -296137,7 +296137,7 @@ sub_80A69CC: ; 80A69CC strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 -@080A6A04: +_080A6A04: bl sub_80A60AC lsls r0, 24 lsrs r0, 24 @@ -296190,22 +296190,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} @@ -296222,28 +296222,28 @@ 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 .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 @@ -296251,9 +296251,9 @@ sub_80A6A90: ; 80A6A90 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @080A6AFE + b _080A6AFE .pool -@080A6AF0: +_080A6AF0: ldr r1, =0x0202406e lsls r0, r5, 1 adds r0, r1 @@ -296261,19 +296261,19 @@ sub_80A6A90: ; 80A6A90 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 .pool -@080A6B18: +_080A6B18: movs r0, 0 -@080A6B1A: +_080A6B1A: pop {r4,r5} pop {r1} bx r1 @@ -296297,7 +296297,7 @@ sub_80A6B30: ; 80A6B30 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq @080A6B64 + beq _080A6B64 ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] @@ -296310,9 +296310,9 @@ sub_80A6B30: ; 80A6B30 movs r0, 0x1 strb r0, [r4, 0x9] strh r1, [r4, 0xA] - b @080A6B7E + b _080A6B7E .pool -@080A6B64: +_080A6B64: ldr r0, =0x0202305c ldr r0, [r0] str r0, [r4] @@ -296326,7 +296326,7 @@ sub_80A6B30: ; 80A6B30 movs r0, 0x80 lsls r0, 2 strh r0, [r4, 0xA] -@080A6B7E: +_080A6B7E: strh r1, [r4, 0xC] pop {r4} pop {r0} @@ -296343,7 +296343,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] @@ -296356,15 +296356,15 @@ sub_80A6B90: ; 80A6B90 movs r0, 0x1 strb r0, [r4, 0x9] strh r1, [r4, 0xA] - b @080A6BEA + b _080A6BEA .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] @@ -296378,9 +296378,9 @@ sub_80A6B90: ; 80A6B90 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 @@ -296401,7 +296401,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] @@ -296409,34 +296409,34 @@ sub_80A6BFC: ; 80A6BFC strb r1, [r4, 0x9] strh r0, [r4, 0xA] strh r0, [r4, 0xC] - b @080A6C60 + b _080A6C60 .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 .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 @@ -296577,14 +296577,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 CopyBgTilemapBufferToVram pop {r4,r5} @@ -296598,12 +296598,12 @@ sub_80A6D94: ; 80A6D94 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 @@ -296613,12 +296613,12 @@ 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 @@ -296627,8 +296627,8 @@ sub_80A6DAC: ; 80A6DAC 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 @@ -296637,7 +296637,7 @@ sub_80A6DAC: ; 80A6DAC movs r1, 0x1 movs r2, 0 bl lcd_bg_operations -@080A6DE8: +_080A6DE8: pop {r0} bx r0 thumb_func_end sub_80A6DAC @@ -296717,16 +296717,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 @@ -296743,25 +296743,25 @@ obj_translate_based_on_private_1_2_3_4: ; 80A6E54 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 .pool -@080A6ECC: +_080A6ECC: ldr r0, =0x0000fffe ands r5, r0 -@080A6ED0: +_080A6ED0: movs r0, 0 strh r6, [r7, 0x30] strh r5, [r7, 0x32] @@ -296823,10 +296823,10 @@ sub_80A6F3C: ; 80A6F3C 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] @@ -296840,24 +296840,24 @@ sub_80A6F3C: ; 80A6F3C 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] @@ -296865,7 +296865,7 @@ sub_80A6F3C: ; 80A6F3C subs r0, 0x1 strh r0, [r2, 0x2E] movs r0, 0 -@080A6F90: +_080A6F90: pop {r4-r6} pop {r1} bx r1 @@ -296878,10 +296878,10 @@ sub_80A6F98: ; 80A6F98 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 @@ -296896,10 +296896,10 @@ 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 @@ -296915,9 +296915,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] @@ -296972,16 +296972,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 @@ -296998,25 +296998,25 @@ sub_80A7028: ; 80A7028 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 .pool -@080A70A0: +_080A70A0: ldr r0, =0x0000fffe ands r5, r0 -@080A70A4: +_080A70A4: movs r0, 0 strh r6, [r7, 0x30] strh r5, [r7, 0x32] @@ -297058,10 +297058,10 @@ sub_80A70E8: ; 80A70E8 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] @@ -297075,24 +297075,24 @@ sub_80A70E8: ; 80A70E8 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] @@ -297100,7 +297100,7 @@ sub_80A70E8: ; 80A70E8 subs r0, 0x1 strh r0, [r2, 0x2E] movs r0, 0 -@080A713C: +_080A713C: pop {r4-r6} pop {r1} bx r1 @@ -297113,10 +297113,10 @@ sub_80A7144: ; 80A7144 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 @@ -297132,9 +297132,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] @@ -297188,7 +297188,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 @@ -297198,7 +297198,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 @@ -297237,7 +297237,7 @@ sub_80A7238: ; 80A7238 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 @@ -297250,13 +297250,13 @@ sub_80A7238: ; 80A7238 movs r2, 0x32 ldrsh r0, [r1, r2] cmp r0, 0xC9 - beq @080A7268 + beq _080A7268 movs r0, 0x1 - b @080A726A + b _080A726A .pool -@080A7268: +_080A7268: movs r0, 0 -@080A726A: +_080A726A: pop {r4} pop {r1} bx r1 @@ -297283,13 +297283,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] @@ -297297,7 +297297,7 @@ sub_80A7270: ; 80A7270 negs r0, r0 ands r0, r1 strb r0, [r2] -@080A72B4: +_080A72B4: ldr r1, =0x02020630 lsls r4, r6, 4 adds r0, r4, r6 @@ -297322,11 +297322,11 @@ sub_80A7270: ; 80A7270 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] @@ -297344,7 +297344,7 @@ sub_80A7270: ; 80A7270 ands r0, r2 orrs r0, r1 strb r0, [r5, 0x3] -@080A7312: +_080A7312: ldr r1, =0x02020630 adds r0, r4, r6 lsls r0, 2 @@ -297433,11 +297433,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] @@ -297469,7 +297469,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] @@ -297477,7 +297477,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] @@ -297486,7 +297486,7 @@ sub_80A73E0: ; 80A73E0 lsrs r3, 30 adds r0, r4, 0 bl CalcVecFromObjectCenterToObjectUpperLeft -@080A742E: +_080A742E: ldr r6, =0xffff0000 lsls r0, r7, 16 orrs r5, r0 @@ -297499,7 +297499,7 @@ sub_80A73E0: ; 80A73E0 bl sub_80A7238 lsls r0, 24 cmp r0, 0 - beq @080A745C + beq _080A745C mov r0, sp ldrh r0, [r0] negs r0, r0 @@ -297509,7 +297509,7 @@ sub_80A73E0: ; 80A73E0 ands r1, r6 orrs r1, r0 str r1, [sp] -@080A745C: +_080A745C: ldrb r4, [r4, 0x3] lsls r4, 26 lsrs r4, 27 @@ -297530,7 +297530,7 @@ sub_80A73E0: ; 80A73E0 strh r0, [r4, 0x4] ldrh r0, [r5, 0x6] strh r0, [r4, 0x6] -@080A7486: +_080A7486: add sp, 0x10 pop {r3} mov r8, r3 @@ -297609,14 +297609,14 @@ sub_80A750C: ; 80A750C 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 @@ -297658,10 +297658,10 @@ sub_80A750C: ; 80A750C adds r5, 0x2 subs r6, 0x1 cmp r6, 0 - bge @080A7524 - b @080A7598 + bge _080A7524 + b _080A7598 .pool -@080A7588: +_080A7588: lsls r1, r0, 1 ldr r0, =0x02037714 adds r0, r1, r0 @@ -297669,7 +297669,7 @@ sub_80A750C: ; 80A750C adds r1, r2 ldr r2, =0x04000008 bl CpuSet -@080A7598: +_080A7598: pop {r4-r7} pop {r0} bx r0 @@ -297707,22 +297707,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 @@ -297730,10 +297730,10 @@ sub_80A75AC: ; 80A75AC 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 @@ -297741,10 +297741,10 @@ sub_80A75AC: ; 80A75AC 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 @@ -297752,7 +297752,7 @@ sub_80A75AC: ; 80A75AC 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 @@ -297760,10 +297760,10 @@ sub_80A75AC: ; 80A75AC 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 @@ -297771,7 +297771,7 @@ sub_80A75AC: ; 80A75AC 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 @@ -297779,35 +297779,35 @@ sub_80A75AC: ; 80A75AC 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 .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} @@ -297837,15 +297837,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 @@ -297853,7 +297853,7 @@ sub_80A76C4: ; 80A76C4 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 @@ -297861,9 +297861,9 @@ sub_80A76C4: ; 80A76C4 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 @@ -297871,7 +297871,7 @@ sub_80A76C4: ; 80A76C4 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 @@ -297881,9 +297881,9 @@ sub_80A76C4: ; 80A76C4 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 @@ -297891,7 +297891,7 @@ sub_80A76C4: ; 80A76C4 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 @@ -297901,10 +297901,10 @@ sub_80A76C4: ; 80A76C4 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 @@ -297912,7 +297912,7 @@ sub_80A76C4: ; 80A76C4 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 @@ -297922,7 +297922,7 @@ sub_80A76C4: ; 80A76C4 movs r0, 0x1 lsls r0, r1 orrs r4, r0 -@080A77A0: +_080A77A0: adds r0, r4, 0 pop {r3} mov r8, r3 @@ -297957,42 +297957,42 @@ sub_80A77C8: ; 80A77C8 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 .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 @@ -298010,15 +298010,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 @@ -298026,11 +298026,11 @@ sub_80A7820: ; 80A7820 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 @@ -298072,12 +298072,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] @@ -298117,10 +298117,10 @@ sub_80A791C: ; 80A791C 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 @@ -298134,43 +298134,43 @@ sub_80A7938: ; 80A7938 movs r2, 0xC ldrsh r1, [r0, r2] cmp r1, 0 - bne @080A7950 + bne _080A7950 movs r4, 0x1 movs r7, 0x3 - b @080A7954 + b _080A7954 .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 .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 @@ -298213,13 +298213,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 @@ -298229,7 +298229,7 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: ; 80A79E8 ldrb r0, [r5] lsls r0, 31 cmp r0, 0 - bne @080A7A48 + bne _080A7A48 adds r0, r4, 0 adds r1, r2 movs r2, 0x44 @@ -298249,18 +298249,18 @@ duplicate_obj_of_side_rel2move_in_transparent_mode: ; 80A79E8 strb r0, [r5] lsls r0, r6, 16 asrs r0, 16 - b @080A7A56 + b _080A7A56 .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 @@ -298293,25 +298293,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 @@ -298366,7 +298366,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] @@ -298375,31 +298375,31 @@ 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 .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] @@ -298413,16 +298413,16 @@ sub_80A7AFC: ; 80A7AFC 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 @@ -298439,12 +298439,12 @@ 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 .pool -@080A7BBC: +_080A7BBC: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -298463,7 +298463,7 @@ sub_80A7B98: ; 80A7B98 adds r1, r2 strh r1, [r0, 0x8] bl sub_80A7BF4 -@080A7BE2: +_080A7BE2: pop {r4} pop {r0} bx r0 @@ -298510,13 +298510,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] @@ -298531,12 +298531,12 @@ 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 .pool -@080A7C78: +_080A7C78: ldrh r2, [r4, 0xC] subs r2, 0x1 strh r2, [r4, 0xC] @@ -298549,20 +298549,20 @@ sub_80A7C1C: ; 80A7C1C 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 @@ -298579,12 +298579,12 @@ 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 .pool -@080A7CD8: +_080A7CD8: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -298595,7 +298595,7 @@ sub_80A7CB4: ; 80A7CB4 adds r1, r2 strh r1, [r0, 0x8] bl sub_80A7BF4 -@080A7CEE: +_080A7CEE: pop {r4} pop {r0} bx r0 @@ -298651,15 +298651,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] @@ -298672,7 +298672,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] @@ -298707,42 +298707,42 @@ sub_80A7D34: ; 80A7D34 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 .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] @@ -298752,18 +298752,18 @@ sub_80A7D34: ; 80A7D34 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 .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] @@ -298778,13 +298778,13 @@ sub_80A7D34: ; 80A7D34 lsrs r0, 24 bl sub_80A7344 movs r0, 0 - b @080A7E64 + b _080A7E64 .pool -@080A7E60: +_080A7E60: strh r2, [r4, 0x16] -@080A7E62: +_080A7E62: movs r0, 0x1 -@080A7E64: +_080A7E64: pop {r4-r6} pop {r1} bx r1 @@ -298818,9 +298818,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 @@ -298862,9 +298862,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 @@ -298894,17 +298894,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] @@ -298913,15 +298913,15 @@ sub_80A7F18: ; 80A7F18 lsls r0, r2, 2 adds r0, r1 ldrb r0, [r0, 0x1] - b @080A8042 + b _080A8042 .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] @@ -298929,7 +298929,7 @@ sub_80A7F18: ; 80A7F18 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 @@ -298942,21 +298942,21 @@ sub_80A7F18: ; 80A7F18 bl pokemon_getattr lsls r0, 16 lsrs r2, r0, 16 - b @080A7FC2 + b _080A7FC2 .pool -@080A7FC0: +_080A7FC0: ldrh r2, [r1, 0x2] -@080A7FC2: +_080A7FC2: cmp r2, r7 - bne @080A7FD0 + bne _080A7FD0 ldr r0, =gUnknown_08525F8C - b @080A8018 + b _080A8018 .pool -@080A7FD0: +_080A7FD0: ldr r0, =gUnknown_083021D8 - b @080A8026 + b _080A8026 .pool -@080A7FD8: +_080A7FD8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -298964,7 +298964,7 @@ sub_80A7F18: ; 80A7F18 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 @@ -298977,38 +298977,38 @@ sub_80A7F18: ; 80A7F18 bl pokemon_getattr lsls r0, 16 lsrs r2, r0, 16 - b @080A8012 + b _080A8012 .pool -@080A8010: +_080A8010: ldrh r2, [r1, 0x2] -@080A8012: +_080A8012: cmp r2, r7 - bne @080A8024 + bne _080A8024 ldr r0, =gUnknown_08525F88 -@080A8018: +_080A8018: ldrb r1, [r6] adds r1, r0 ldrb r0, [r1] - b @080A8042 + b _080A8042 .pool -@080A8024: +_080A8024: ldr r0, =gUnknown_08300D38 -@080A8026: +_080A8026: lsls r1, r2, 2 adds r1, r0 ldrb r0, [r1, 0x1] - b @080A8042 + b _080A8042 .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 @@ -299094,15 +299094,15 @@ sub_80A80C8: ; 80A80C8 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 @@ -299110,12 +299110,12 @@ sub_80A80C8: ; 80A80C8 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 @@ -299129,13 +299129,13 @@ sub_80A80C8: ; 80A80C8 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] @@ -299144,9 +299144,9 @@ sub_80A80C8: ; 80A80C8 lsls r0, 2 adds r0, r2 strh r3, [r0, 0x26] -@080A8134: +_080A8134: ldrb r0, [r4, 0x18] -@080A8136: +_080A8136: pop {r4} pop {r1} bx r1 @@ -299162,15 +299162,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 @@ -299193,7 +299193,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] @@ -299213,14 +299213,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 @@ -299241,14 +299241,14 @@ sub_80A8174: ; 80A8174 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] @@ -299269,14 +299269,14 @@ sub_80A8174: ; 80A8174 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 @@ -299297,7 +299297,7 @@ sub_80A8174: ; 80A8174 ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -@080A825C: +_080A825C: pop {r3} mov r8, r3 pop {r4-r7} @@ -299313,16 +299313,16 @@ sub_80A8278: ; 80A8278 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 @@ -299347,13 +299347,13 @@ sub_80A8278: ; 80A8278 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 @@ -299368,32 +299368,32 @@ sub_80A82E4: ; 80A82E4 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 @@ -299410,25 +299410,25 @@ 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 @@ -299442,21 +299442,21 @@ battle_get_per_side_status_permutated: ; 80A8364 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 @@ -299509,13 +299509,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 AllocZeroed @@ -299524,10 +299524,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 @@ -299541,7 +299541,7 @@ sub_80A8394: ; 80A8394 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 @@ -299550,7 +299550,7 @@ sub_80A8394: ; 80A8394 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080A845E + beq _080A845E ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -299559,8 +299559,8 @@ sub_80A8394: ; 80A8394 adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, 0 - beq @080A8488 -@080A845E: + beq _080A8488 +_080A845E: lsls r0, r6, 3 ldr r1, =gMonFrontPicTable adds r0, r1 @@ -299571,9 +299571,9 @@ sub_80A8394: ; 80A8394 adds r1, r3 ldr r1, [r1] movs r2, 0x1 - b @080A850A + b _080A850A .pool -@080A8488: +_080A8488: lsls r0, r6, 3 ldr r1, =gMonFrontPicTable adds r0, r1 @@ -299588,9 +299588,9 @@ sub_80A8394: ; 80A8394 adds r2, r6, 0 mov r3, r8 bl DecompressMonPic_2 - b @080A8540 + b _080A8540 .pool -@080A84B0: +_080A84B0: adds r0, r6, 0 ldr r1, [sp, 0x3C] mov r2, r8 @@ -299604,7 +299604,7 @@ sub_80A8394: ; 80A8394 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 @@ -299613,7 +299613,7 @@ sub_80A8394: ; 80A8394 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080A84F6 + beq _080A84F6 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -299622,8 +299622,8 @@ sub_80A8394: ; 80A8394 adds r0, r1 ldrh r2, [r0, 0x2] cmp r2, 0 - beq @080A8524 -@080A84F6: + beq _080A8524 +_080A84F6: lsls r0, r6, 3 ldr r1, =gMonBackPicTable adds r0, r1 @@ -299634,14 +299634,14 @@ sub_80A8394: ; 80A8394 adds r1, r2 ldr r1, [r1] movs r2, 0 -@080A850A: +_080A850A: str r2, [sp] adds r2, r6, 0 mov r3, r8 bl DecompressMonPicWithoutDuplicatingDeoxysTiles - b @080A8540 + b _080A8540 .pool -@080A8524: +_080A8524: lsls r0, r6, 3 ldr r1, =gMonBackPicTable adds r0, r1 @@ -299655,7 +299655,7 @@ sub_80A8394: ; 80A8394 adds r2, r6, 0 mov r3, r8 bl DecompressMonPic_2 -@080A8540: +_080A8540: ldr r5, =0x020244d4 ldr r0, [r5] movs r4, 0xBE @@ -299680,7 +299680,7 @@ sub_80A8394: ; 80A8394 str r1, [r0] mov r0, r9 cmp r0, 0 - bne @080A85A0 + bne _080A85A0 lsls r0, r7, 1 adds r0, r7 lsls r0, 3 @@ -299690,9 +299690,9 @@ sub_80A8394: ; 80A8394 lsls r1, r2, 16 asrs r1, 16 ldr r3, =gUnknown_08300D38 - b @080A85B2 + b _080A85B2 .pool -@080A85A0: +_080A85A0: lsls r0, r7, 1 adds r0, r7 lsls r0, 3 @@ -299702,7 +299702,7 @@ sub_80A8394: ; 80A8394 lsls r1, r2, 16 asrs r1, 16 ldr r3, =gUnknown_083021D8 -@080A85B2: +_080A85B2: lsls r2, r6, 2 adds r2, r3 ldrb r2, [r2, 0x1] @@ -299717,7 +299717,7 @@ sub_80A8394: ; 80A8394 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @080A85EE + beq _080A85EE ldr r3, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -299730,7 +299730,7 @@ sub_80A8394: ; 80A8394 adds r0, r3 movs r1, 0 bl StartObjectRotScalAnim -@080A85EE: +_080A85EE: adds r0, r4, 0 add sp, 0x10 pop {r3-r5} @@ -299766,7 +299766,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] @@ -299774,17 +299774,17 @@ 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 .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 @@ -299807,40 +299807,40 @@ sub_80A861C: ; 80A861C 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, =gUnknown_083021D8 - b @080A8864 + b _080A8864 .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, =gUnknown_083021D8 - b @080A8864 + b _080A8864 .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] @@ -299849,7 +299849,7 @@ sub_80A861C: ; 80A861C 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 @@ -299869,16 +299869,16 @@ sub_80A861C: ; 80A861C movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b @080A8724 + b _080A8724 .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 @@ -299901,36 +299901,36 @@ sub_80A861C: ; 80A861C lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @080A8760 + bne _080A8760 movs r0, 0xC9 - b @080A876A + b _080A876A .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, =gUnknown_083021D8 - b @080A8864 + b _080A8864 .pool -@080A8774: +_080A8774: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - bls @080A8784 -@080A877C: + bls _080A8784 +_080A877C: ldr r4, =gUnknown_083021D8 - b @080A8866 + b _080A8866 .pool -@080A8784: +_080A8784: lsls r1, r7, 2 ldr r0, =gUnknown_083021D8 - b @080A8864 + b _080A8864 .pool -@080A8790: +_080A8790: ldr r0, =0x020244d0 ldr r0, [r0] ldr r0, [r0] @@ -299939,7 +299939,7 @@ sub_80A861C: ; 80A861C 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 @@ -299959,16 +299959,16 @@ sub_80A861C: ; 80A861C movs r1, 0 bl pokemon_getattr adds r2, r0, 0 - b @080A87E4 + b _080A87E4 .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 @@ -299991,77 +299991,77 @@ sub_80A861C: ; 80A861C lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @080A8820 + bne _080A8820 movs r0, 0xC9 - b @080A882A + b _080A882A .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, =gUnknown_08525F78 adds r4, r0, r1 - b @080A8866 + b _080A8866 .pool -@080A8850: +_080A8850: movs r0, 0xCE lsls r0, 1 cmp r7, r0 - bls @080A8860 + bls _080A8860 ldr r4, =gUnknown_08300D38 - b @080A8866 + b _080A8866 .pool -@080A8860: +_080A8860: lsls r1, r7, 2 -@080A8862: +_080A8862: ldr r0, =gUnknown_08300D38 -@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 .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 @@ -300069,8 +300069,8 @@ sub_80A861C: ; 80A861C lsrs r0, 24 ldrb r1, [r4] lsrs r1, 4 - b @080A88E4 -@080A88C0: + b _080A88E4 +_080A88C0: mov r0, r8 movs r1, 0x2 bl sub_80A5C6C @@ -300078,8 +300078,8 @@ sub_80A861C: ; 80A861C lsrs r0, 24 ldrb r1, [r4] lsrs r1, 4 - b @080A88FC -@080A88D2: + b _080A88FC +_080A88D2: mov r0, r8 movs r1, 0x3 bl sub_80A5C6C @@ -300088,11 +300088,11 @@ sub_80A861C: ; 80A861C 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 @@ -300101,11 +300101,11 @@ sub_80A861C: ; 80A861C 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 @@ -300114,10 +300114,10 @@ sub_80A861C: ; 80A861C 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 @@ -300139,14 +300139,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 @@ -300161,11 +300161,11 @@ sub_80A8924: ; 80A8924 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 @@ -300181,15 +300181,15 @@ sub_80A8924: ; 80A8924 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 @@ -300297,7 +300297,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] @@ -300313,15 +300313,15 @@ sub_80A8A6C: ; 80A8A6C orrs r0, r1 strb r0, [r3] adds r1, r2, 0 - b @080A8AB6 + b _080A8AB6 .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 @@ -300354,7 +300354,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] @@ -300365,15 +300365,15 @@ sub_80A8AEC: ; 80A8AEC negs r0, r0 strh r0, [r2, 0x6] adds r1, r2, 0 - b @080A8B26 + b _080A8B26 .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 @@ -300410,22 +300410,22 @@ 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 .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 @@ -300463,11 +300463,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] @@ -300509,16 +300509,16 @@ sub_80A8BC4: ; 80A8BC4 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 .pool -@080A8C68: +_080A8C68: movs r0, 0x3 -@080A8C6A: +_080A8C6A: strh r0, [r5, 0x14] lsls r0, r4, 1 ldr r1, =0x02037714 @@ -300555,18 +300555,18 @@ 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 .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 @@ -300587,11 +300587,11 @@ sub_80A8CAC: ; 80A8CAC lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne @080A8D6C + bne _080A8D6C strh r1, [r4, 0xE] - b @080A8D4A + b _080A8D4A .pool -@080A8D10: +_080A8D10: adds r0, r4, 0 adds r1, r5, 0 bl sub_80A8D78 @@ -300612,7 +300612,7 @@ sub_80A8CAC: ; 80A8CAC 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 @@ -300620,22 +300620,22 @@ sub_80A8CAC: ; 80A8CAC 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 .pool -@080A8D58: +_080A8D58: movs r2, 0x12 ldrsh r0, [r4, r2] cmp r0, 0 - bne @080A8D6C + bne _080A8D6C ldr r0, =0x00002771 bl FreeObjectPaletteByTag adds r0, r5, 0 bl move_anim_task_del -@080A8D6C: +_080A8D6C: pop {r4,r5} pop {r0} bx r0 @@ -300657,7 +300657,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 @@ -300699,7 +300699,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} @@ -300717,7 +300717,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] @@ -300730,7 +300730,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 .pool @@ -300757,13 +300757,13 @@ 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 .pool -@080A8E68: +_080A8E68: ldr r0, =0x0000fff6 -@080A8E6A: +_080A8E6A: strh r0, [r5, 0x2E] ldr r0, =0x0000ffd8 strh r0, [r5, 0x30] @@ -300802,10 +300802,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 @@ -300814,10 +300814,10 @@ sub_80A8E88: ; 80A8E88 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 @@ -300843,7 +300843,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] @@ -300851,9 +300851,9 @@ sub_80A8EE4: ; 80A8EE4 strh r0, [r4, 0x20] ldrh r0, [r5, 0xA] subs r0, 0x14 - b @080A8F32 + b _080A8F32 .pool -@080A8F24: +_080A8F24: ldrh r0, [r5, 0x8] subs r0, 0x1E ldrh r1, [r4, 0x20] @@ -300861,7 +300861,7 @@ sub_80A8EE4: ; 80A8EE4 strh r0, [r4, 0x20] ldrh r0, [r5, 0xA] subs r0, 0x50 -@080A8F32: +_080A8F32: strh r0, [r4, 0x22] ldr r0, =sub_80A6EEC str r0, [r4, 0x1C] @@ -300918,38 +300918,38 @@ c2_80777E8: ; 80A933C 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 .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 @@ -300986,9 +300986,9 @@ c2_80777E8: ; 80A933C strh r1, [r0] ldr r0, =0x02022e22 strh r1, [r0] - b @080A95D2 + b _080A95D2 .pool -@080A942C: +_080A942C: movs r0, 0 str r0, [sp, 0x4] movs r1, 0xC0 @@ -300996,25 +300996,25 @@ c2_80777E8: ; 80A933C ldr r2, =0x01006000 add r0, sp, 0x4 bl CpuFastSet - b @080A95D2 + b _080A95D2 .pool -@080A9444: +_080A9444: bl sub_8035AA4 - b @080A95D2 -@080A944A: + b _080A95D2 +_080A944A: bl ResetAllObjectData - b @080A95D2 -@080A9450: + b _080A95D2 +_080A9450: bl ResetObjectPaletteAllocator ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - b @080A95D2 + b _080A95D2 .pool -@080A9460: +_080A9460: bl sub_805E350 - b @080A95D2 -@080A9466: + b _080A95D2 +_080A9466: ldr r5, =0x02024474 adds r4, r5, 0 adds r4, 0x22 @@ -301022,76 +301022,76 @@ c2_80777E8: ; 80A933C bl sub_805E08C lsls r0, 24 cmp r0, 0 - beq @080A9484 + beq _080A9484 movs r0, 0 strb r0, [r4] - b @080A95D2 + b _080A95D2 .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 .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 @@ -301116,7 +301116,7 @@ c2_80777E8: ; 80A933C 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 @@ -301134,7 +301134,7 @@ c2_80777E8: ; 80A933C lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -@080A955C: +_080A955C: ldr r1, =0x020244ac ldr r0, =0x020244b8 ldrb r0, [r0] @@ -301145,18 +301145,18 @@ c2_80777E8: ; 80A933C 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 .pool -@080A95A4: +_080A95A4: ldr r0, =vblank_cb_08078BB4 bl SetVBlankCallback bl sub_80A95F4 @@ -301175,7 +301175,7 @@ c2_80777E8: ; 80A933C ldr r0, =sub_8038420 bl SetMainCallback2 bl sub_805EF14 -@080A95D2: +_080A95D2: ldr r1, =0x02024474 adds r1, 0x21 ldrb r0, [r1] @@ -301213,12 +301213,12 @@ sub_80A9614: ; 80A9614 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] @@ -301228,7 +301228,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 @@ -301239,42 +301239,42 @@ sub_80A9614: ; 80A9614 adds r0, r1 adds r1, r4, 0 bl sub_805DC0C - b @080A96F4 + b _080A96F4 .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 .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] @@ -301284,7 +301284,7 @@ sub_80A9614: ; 80A9614 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne @080A96EC + bne _080A96EC ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -301295,18 +301295,18 @@ sub_80A9614: ; 80A9614 adds r0, r1 adds r1, r4, 0 bl sub_805DD7C - b @080A96F4 + b _080A96F4 .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} @@ -301327,9 +301327,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] @@ -301340,15 +301340,15 @@ sub_80A9708: ; 80A9708 ands r0, r1 str r2, [sp] cmp r0, 0 - beq @080A9748 + beq _080A9748 adds r0, r7, 0 bl sub_80A614C - b @080A974E + b _080A974E .pool -@080A9748: +_080A9748: adds r0, r7, 0 bl sub_80A6138 -@080A974E: +_080A974E: lsls r0, 24 lsrs r0, 24 mov r8, r0 @@ -301356,9 +301356,9 @@ sub_80A9708: ; 80A9708 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 @@ -301374,9 +301374,9 @@ sub_80A9708: ; 80A9708 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 @@ -301467,17 +301467,17 @@ sub_80A9708: ; 80A9708 ldr r0, [r0] ldr r2, [sp] adds r0, r2, r0 - b @080A9A50 + b _080A9A50 .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] @@ -301508,17 +301508,17 @@ sub_80A9708: ; 80A9708 lsls r3, 24 lsrs r3, 24 adds r0, r6, 0 - b @080A9914 + b _080A9914 .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 @@ -301542,7 +301542,7 @@ sub_80A9708: ; 80A9708 lsls r3, 24 lsrs r3, 24 adds r0, r5, 0 -@080A9914: +_080A9914: movs r1, 0x50 adds r2, r4, 0 bl AddObjectToFront @@ -301573,9 +301573,9 @@ sub_80A9708: ; 80A9708 lsls r0, 2 adds r0, r4 strh r7, [r0, 0x2E] - b @080A9A70 + b _080A9A70 .pool -@080A9968: +_080A9968: ldr r1, =0x0202406e lsls r0, r7, 1 adds r6, r0, r1 @@ -301591,9 +301591,9 @@ sub_80A9708: ; 80A9708 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 @@ -301684,11 +301684,11 @@ sub_80A9708: ; 80A9708 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 @@ -301701,7 +301701,7 @@ sub_80A9708: ; 80A9708 adds r0, r2 ldr r0, [r0] str r0, [r1] -@080A9A70: +_080A9A70: ldr r1, =0x02020630 ldr r0, =0x020241e4 adds r0, r7, r0 @@ -301726,7 +301726,7 @@ sub_80A9708: ; 80A9708 ands r0, r3 orrs r0, r1 strb r0, [r2] -@080A9AA0: +_080A9AA0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -301746,34 +301746,34 @@ sub_80A9ADC: ; 80A9ADC 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 .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 @@ -301787,7 +301787,7 @@ sub_80A9ADC: ; 80A9ADC 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 @@ -301799,15 +301799,15 @@ sub_80A9ADC: ; 80A9ADC adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe - b @080A9BB8 + b _080A9BB8 .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 @@ -301819,9 +301819,9 @@ sub_80A9ADC: ; 80A9ADC adds r1, r2 movs r2, 0xA bl healthbar_draw_field_maybe - b @080A9BB8 + b _080A9BB8 .pool -@080A9BA0: +_080A9BA0: ldrb r0, [r4] ldr r1, =0x0202406e lsls r4, r5, 1 @@ -301833,39 +301833,39 @@ sub_80A9ADC: ; 80A9ADC 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 .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] @@ -301876,18 +301876,18 @@ sub_80A9ADC: ; 80A9ADC movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne @080A9C5E + bne _080A9C5E adds r0, r6, 0 bl sub_8072984 - b @080A9C5E + b _080A9C5E .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] @@ -301898,10 +301898,10 @@ sub_80A9ADC: ; 80A9ADC 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 @@ -301940,7 +301940,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 @@ -301949,7 +301949,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] @@ -301980,18 +301980,18 @@ sub_80A9C70: ; 80A9C70 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 .pool -@080A9D30: +_080A9D30: movs r0, 0xF8 lsls r0, 7 strh r0, [r1, 0xA] @@ -302001,7 +302001,7 @@ sub_80A9C70: ; 80A9C70 adds r0, r6 lsls r0, 2 adds r6, r0, r7 -@080A9D42: +_080A9D42: movs r2, 0x20 ldrsh r1, [r6, r2] ldrh r2, [r6, 0x22] @@ -302032,16 +302032,16 @@ sub_80A9C70: ; 80A9C70 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 @@ -302072,7 +302072,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 @@ -302090,26 +302090,26 @@ 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 .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 @@ -302120,14 +302120,14 @@ sub_80A9DB4: ; 80A9DB4 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 @@ -302141,7 +302141,7 @@ sub_80A9E44: ; 80A9E44 movs r3, 0x3A ldrsh r0, [r2, r3] cmp r0, 0 - bne @080A9E70 + bne _080A9E70 adds r3, r2, 0 adds r3, 0x3E ldrb r0, [r3] @@ -302153,12 +302153,12 @@ sub_80A9E44: ; 80A9E44 str r1, [r2, 0x1C] adds r0, r2, 0 bl _call_via_r1 - b @080A9E74 + b _080A9E74 .pool -@080A9E70: +_080A9E70: subs r0, r1, 0x1 strh r0, [r2, 0x3A] -@080A9E74: +_080A9E74: pop {r0} bx r0 thumb_func_end sub_80A9E44 @@ -302180,16 +302180,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 @@ -302211,18 +302211,18 @@ sub_80A9E78: ; 80A9E78 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 RemoveObjectAndFreeResources - b @080A9EEC -@080A9EE6: + b _080A9EEC +_080A9EE6: adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@080A9EEC: +_080A9EEC: pop {r4} pop {r0} bx r0 @@ -302253,12 +302253,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 @@ -302281,7 +302281,7 @@ sub_80A9EF4: ; 80A9EF4 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne @080A9F7C + bne _080A9F7C ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -302292,7 +302292,7 @@ sub_80A9EF4: ; 80A9EF4 movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080A9F7C: +_080A9F7C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -302331,14 +302331,14 @@ sub_80A9FD0: ; 80A9FD0 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne @080AA004 + bne _080AA004 ldr r0, =sub_80AA020 str r0, [r1] movs r0, 0 strh r0, [r1, 0xA] - b @080AA01A + b _080AA01A .pool -@080AA004: +_080AA004: lsls r0, r2, 24 lsrs r0, 24 movs r1, 0x10 @@ -302349,7 +302349,7 @@ sub_80A9FD0: ; 80A9FD0 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@080AA01A: +_080AA01A: pop {r0} bx r0 thumb_func_end sub_80A9FD0 @@ -302375,7 +302375,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 @@ -302383,7 +302383,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 @@ -302413,7 +302413,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] @@ -302422,12 +302422,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 str r0, [r5] -@080AA0B0: +_080AA0B0: pop {r4-r6} pop {r0} bx r0 @@ -302453,14 +302453,14 @@ sub_80AA0D0: ; 80AA0D0 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne @080AA108 + bne _080AA108 ldr r0, =sub_80AA124 str r0, [r2] movs r0, 0 strh r0, [r2, 0xA] - b @080AA11E + b _080AA11E .pool -@080AA108: +_080AA108: lsls r0, r3, 24 lsrs r0, 24 movs r1, 0x10 @@ -302471,7 +302471,7 @@ sub_80AA0D0: ; 80AA0D0 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@080AA11E: +_080AA11E: pop {r0} bx r0 thumb_func_end sub_80AA0D0 @@ -302493,7 +302493,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 @@ -302506,11 +302506,11 @@ sub_80AA124: ; 80AA124 bl obj_free_rotscale_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles - b @080AA186 + b _080AA186 .pool -@080AA16C: +_080AA16C: cmp r0, 0x27 - bne @080AA186 + bne _080AA186 movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -302519,7 +302519,7 @@ sub_80AA124: ; 80AA124 bl SetGpuReg adds r0, r4, 0 bl move_anim_task_del -@080AA186: +_080AA186: pop {r4} pop {r0} bx r0 @@ -302537,203 +302537,203 @@ 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 .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] @@ -302750,7 +302750,7 @@ sub_80AA18C: ; 80AA18C str r1, [r0] adds r0, r4, 0 bl _call_via_r1 -@080AA352: +_080AA352: pop {r4,r5} pop {r0} bx r0 @@ -302800,7 +302800,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 @@ -302822,7 +302822,7 @@ task0A_80788BC: ; 80AA3B4 strb r0, [r1] adds r0, r4, 0 bl remove_task -@080AA3F6: +_080AA3F6: pop {r4} pop {r0} bx r0 @@ -302843,7 +302843,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 @@ -302851,25 +302851,25 @@ sub_80AA40C: ; 80AA40C strb r1, [r3, 0x1] movs r0, 0x42 strh r0, [r3, 0x22] - b @080AA46A + b _080AA46A .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, =gUnknown_0853FF70 movs r2, 0x2E ldrsh r1, [r3, r2] @@ -302878,7 +302878,7 @@ sub_80AA40C: ; 80AA40C ldrh r1, [r1] movs r0, 0x52 bl SetGpuReg -@080AA46A: +_080AA46A: pop {r0} bx r0 .pool @@ -302898,25 +302898,25 @@ 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 .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 @@ -302928,29 +302928,29 @@ sub_80AA4B4: ; 80AA4B4 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 @@ -302964,7 +302964,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, =gUnknown_085400D8 @@ -302991,7 +302991,7 @@ sub_80AA4EC: ; 80AA4EC lsls r5, 16 lsrs r0, r5, 16 cmp r6, 0x4 - bls @080AA4FA + bls _080AA4FA pop {r4-r7} pop {r0} bx r0 @@ -303007,7 +303007,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, =gUnknown_085400D8 @@ -303034,7 +303034,7 @@ sub_80AA548: ; 80AA548 lsls r4, 16 lsrs r0, r4, 16 cmp r5, 0x4 - bls @080AA556 + bls _080AA556 pop {r4-r6} pop {r0} bx r0 @@ -303051,43 +303051,43 @@ 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 .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 @@ -303099,34 +303099,34 @@ title_screen_logo_shine_obj_callback_type1: ; 80AA5A4 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 .pool -@080AA62C: +_080AA62C: ldr r0, =0x02037b14 strh r2, [r0] -@080AA630: +_080AA630: adds r0, r4, 0x4 strh r0, [r3, 0x20] - b @080AA648 + b _080AA648 .pool -@080AA63C: +_080AA63C: ldr r1, =0x02037b14 movs r0, 0 strh r0, [r1] adds r0, r3, 0 bl RemoveObjectAndFreeTiles -@080AA648: +_080AA648: pop {r4} pop {r0} bx r0 @@ -303143,16 +303143,16 @@ 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 .pool -@080AA670: +_080AA670: adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@080AA676: +_080AA676: pop {r0} bx r0 thumb_func_end title_screen_logo_shine_obj_callback_type2 @@ -303168,16 +303168,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, =gUnknown_08540124 movs r1, 0 movs r2, 0x44 @@ -303198,9 +303198,9 @@ title_screen_add_logo_shine_obj: ; 80AA67C orrs r1, r2 strb r1, [r0, 0x1] strh r5, [r0, 0x2E] - b @080AA766 + b _080AA766 .pool -@080AA6D0: +_080AA6D0: ldr r0, =gUnknown_08540124 mov r9, r0 movs r1, 0 @@ -303273,7 +303273,7 @@ title_screen_add_logo_shine_obj: ; 80AA67C mov r2, r8 orrs r4, r2 strb r4, [r0, 0x1] -@080AA766: +_080AA766: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -303312,22 +303312,22 @@ 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 .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 @@ -303411,9 +303411,9 @@ c2_title_screen_1: ; 80AA7A4 adds r0, r1 movs r1, 0x1 strb r1, [r0] - b @080AAB1E + b _080AAB1E .pool -@080AA8C4: +_080AA8C4: ldr r0, =gTitleScreenPokemonLogoTiles movs r1, 0xC0 lsls r1, 19 @@ -303464,9 +303464,9 @@ c2_title_screen_1: ; 80AA7A4 adds r0, r2 movs r1, 0x2 strb r1, [r0] - b @080AAB1E + b _080AAB1E .pool -@080AA998: +_080AA998: ldr r0, =task_title_screen_1 movs r1, 0 bl AddTask @@ -303492,9 +303492,9 @@ c2_title_screen_1: ; 80AA7A4 adds r0, r1 movs r1, 0x3 strb r1, [r0] - b @080AAB1E + b _080AAB1E .pool -@080AA9E0: +_080AA9E0: movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -303511,9 +303511,9 @@ c2_title_screen_1: ; 80AA7A4 adds r0, r2 movs r1, 0x4 strb r1, [r0] - b @080AAB1E + b _080AAB1E .pool -@080AAA14: +_080AAA14: movs r2, 0x80 lsls r2, 1 movs r0, 0x78 @@ -303584,14 +303584,14 @@ c2_title_screen_1: ; 80AA7A4 adds r0, r1 movs r1, 0x5 strb r1, [r0] - b @080AAB1E + b _080AAB1E .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] @@ -303606,7 +303606,7 @@ c2_title_screen_1: ; 80AA7A4 bl sub_80BA384 ldr r0, =c2_title_screen_2 bl SetMainCallback2 -@080AAB1E: +_080AAB1E: add sp, 0x14 pop {r4} pop {r0} @@ -303638,7 +303638,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 @@ -303647,8 +303647,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 @@ -303658,27 +303658,27 @@ task_title_screen_1: ; 80AAB44 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 .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 @@ -303686,9 +303686,9 @@ task_title_screen_1: ; 80AAB44 ldrh r0, [r1, 0x8] subs r0, 0x1 strh r0, [r1, 0x8] - b @080AAC32 + b _080AAC32 .pool -@080AABC0: +_080AABC0: ldr r1, =0x00001441 movs r0, 0 bl SetGpuReg @@ -303738,7 +303738,7 @@ task_title_screen_1: ; 80AAB44 strh r0, [r6, 0x8] ldr r0, =task_title_screen_2 str r0, [r6] -@080AAC32: +_080AAC32: pop {r4-r6} pop {r0} bx r0 @@ -303757,7 +303757,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 @@ -303766,8 +303766,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 @@ -303777,7 +303777,7 @@ task_title_screen_2: ; 80AAC50 strh r1, [r0, 0xA] strh r2, [r0, 0x8] adds r6, r3, 0 -@080AAC88: +_080AAC88: ldr r1, =0x03005e00 adds r0, r6, r4 lsls r0, 3 @@ -303786,12 +303786,12 @@ task_title_screen_2: ; 80AAC50 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 .pool -@080AACA8: +_080AACA8: movs r0, 0x1 strh r0, [r5, 0xA] ldr r1, =0x00002142 @@ -303815,7 +303815,7 @@ task_title_screen_2: ; 80AAC50 strh r7, [r5, 0x10] ldr r0, =task_title_screen_3 str r0, [r5] -@080AACE2: +_080AACE2: ldr r2, =0x03005e00 adds r0, r6, r4 lsls r0, 3 @@ -303824,15 +303824,15 @@ task_title_screen_2: ; 80AAC50 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 @@ -303840,15 +303840,15 @@ task_title_screen_2: ; 80AAC50 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 @@ -303885,14 +303885,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 @@ -303905,26 +303905,26 @@ task_title_screen_3: ; 80AAD64 bl pal_fade_maybe ldr r0, =Cb2_GoToMainMenu bl SetMainCallback2 - b @080AAE98 + b _080AAE98 .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 bl SetMainCallback2 - b @080AAE98 + b _080AAE98 .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 @@ -303936,15 +303936,15 @@ task_title_screen_3: ; 80AAD64 bl pal_fade_maybe ldr r0, =c2_reset_rtc_screen_1 bl SetMainCallback2 - b @080AAE98 + b _080AAE98 .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 @@ -303956,9 +303956,9 @@ task_title_screen_3: ; 80AAD64 bl pal_fade_maybe ldr r0, =c2_berry_program_update_screen_1 bl SetMainCallback2 - b @080AAE98 + b _080AAE98 .pool -@080AAE30: +_080AAE30: movs r0, 0x2C movs r1, 0 bl SetGpuReg @@ -303976,7 +303976,7 @@ task_title_screen_3: ; 80AAD64 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @080AAE72 + beq _080AAE72 ldrh r0, [r3, 0x10] adds r0, 0x1 strh r0, [r3, 0x10] @@ -303990,14 +303990,14 @@ task_title_screen_3: ; 80AAD64 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] @@ -304007,7 +304007,7 @@ task_title_screen_3: ; 80AAD64 bl pal_fade_maybe ldr r0, =c2_show_copyright_and_intro_again_1 bl SetMainCallback2 -@080AAE98: +_080AAE98: add sp, 0x4 pop {r4,r5} pop {r0} @@ -304021,10 +304021,10 @@ Cb2_GoToMainMenu: ; 80AAEB8 bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne @080AAECA + bne _080AAECA ldr r0, =CB2_InitMainMenu bl SetMainCallback2 -@080AAECA: +_080AAECA: pop {r0} bx r0 .pool @@ -304036,10 +304036,10 @@ c2_show_copyright_and_intro_again_1: ; 80AAED4 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 bl SetMainCallback2 -@080AAEE6: +_080AAEE6: pop {r0} bx r0 .pool @@ -304051,10 +304051,10 @@ c2_clear_save_data_screen_1: ; 80AAEF0 bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne @080AAF02 + bne _080AAF02 ldr r0, =c2_clear_save_data_screen_2 bl SetMainCallback2 -@080AAF02: +_080AAF02: pop {r0} bx r0 .pool @@ -304066,10 +304066,10 @@ c2_reset_rtc_screen_1: ; 80AAF0C bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne @080AAF1E + bne _080AAF1E ldr r0, =sub_809EF88 bl SetMainCallback2 -@080AAF1E: +_080AAF1E: pop {r0} bx r0 .pool @@ -304081,11 +304081,11 @@ c2_berry_program_update_screen_1: ; 80AAF28 bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne @080AAF3E + bne _080AAF3E bl m4aMPlayAllStop ldr r0, =sub_81BF384 bl SetMainCallback2 -@080AAF3E: +_080AAF3E: pop {r0} bx r0 .pool @@ -304101,7 +304101,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 @@ -304112,18 +304112,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 @@ -304136,7 +304136,7 @@ title_screen_update_rayquaza_ring_palette: ; 80AAF48 movs r1, 0xEF movs r2, 0x2 bl gpu_pal_apply -@080AAF9C: +_080AAF9C: add sp, 0x4 pop {r0} bx r0 @@ -304151,7 +304151,7 @@ sub_80AAFA4: ; 80AAFA4 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne @080AB060 + bne _080AB060 movs r0, 0x90 lsls r0, 5 bl AllocObjectPalette @@ -304232,7 +304232,7 @@ sub_80AAFA4: ; 80AAFA4 ldr r1, =0x000006c9 adds r4, r1 strb r0, [r4] -@080AB060: +_080AB060: pop {r4-r6} pop {r0} bx r0 @@ -304245,31 +304245,31 @@ weather_set: ; 80AB098 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, =gUnknown_0854C150 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 @@ -304345,7 +304345,7 @@ sub_80AB160: ; 80AB160 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0 - beq @080AB198 + beq _080AB198 ldr r1, =gUnknown_0854C150 movs r3, 0xDA lsls r3, 3 @@ -304363,7 +304363,7 @@ sub_80AB160: ; 80AB160 adds r0, r1 ldr r1, =sub_80AB1B0 str r1, [r0] -@080AB198: +_080AB198: pop {r4} pop {r0} bx r0 @@ -304385,7 +304385,7 @@ sub_80AB1B0: ; 80AB1B0 ldrb r0, [r6] ldrb r2, [r7] cmp r0, r2 - beq @080AB22C + beq _080AB22C ldr r0, =gUnknown_0854C150 mov r9, r0 ldrb r0, [r6] @@ -304398,13 +304398,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 @@ -304421,9 +304421,9 @@ sub_80AB1B0: ; 80AB1B0 adds r1, r5, r2 movs r0, 0x1 strb r0, [r1] - b @080AB23C + b _080AB23C .pool -@080AB22C: +_080AB22C: ldr r0, =gUnknown_0854C150 ldrb r1, [r6] lsls r1, 4 @@ -304431,7 +304431,7 @@ sub_80AB1B0: ; 80AB1B0 adds r1, r0 ldr r0, [r1] bl _call_via_r0 -@080AB23C: +_080AB23C: ldr r1, =gUnknown_0854C240 ldr r0, =0x02038454 ldr r2, =0x000006c6 @@ -304489,37 +304489,37 @@ 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 .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 @@ -304532,22 +304532,22 @@ sub_80AB294: ; 80AB294 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 @@ -304555,14 +304555,14 @@ sub_80AB294: ; 80AB294 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 @@ -304571,21 +304571,21 @@ sub_80AB294: ; 80AB294 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 @@ -304595,26 +304595,26 @@ sub_80AB294: ; 80AB294 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 @@ -304633,7 +304633,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 @@ -304646,12 +304646,12 @@ 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 .pool -@080AB3E4: +_080AB3E4: ldr r0, =0x000006c3 adds r2, r3, r0 ldrb r0, [r2] @@ -304663,19 +304663,19 @@ sub_80AB3A8: ; 80AB3A8 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 .pool -@080AB414: +_080AB414: mov r0, r12 subs r0, 0x1 -@080AB418: +_080AB418: strb r0, [r4] movs r1, 0xD8 lsls r1, 3 @@ -304685,7 +304685,7 @@ sub_80AB3A8: ; 80AB3A8 movs r0, 0 movs r1, 0x20 bl pal_fade_2 -@080AB42C: +_080AB42C: pop {r4-r7} pop {r0} bx r0 @@ -304703,43 +304703,43 @@ 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 .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 @@ -304749,13 +304749,13 @@ sub_80AB434: ; 80AB434 ldr r3, =0x000006c6 adds r0, r3 strb r2, [r0] - b @080AB53C + b _080AB53C .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 @@ -304764,14 +304764,14 @@ sub_80AB434: ; 80AB434 strb r0, [r2] ldr r2, =0x000006c6 adds r1, r2 - b @080AB538 + b _080AB538 .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 @@ -304781,15 +304781,15 @@ sub_80AB434: ; 80AB434 adds r0, r1 movs r1, 0x3 strb r1, [r0] - b @080AB53C + b _080AB53C .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] @@ -304798,10 +304798,10 @@ sub_80AB434: ; 80AB434 strb r1, [r0] ldr r0, =0x000006c6 adds r1, r2, r0 -@080AB538: +_080AB538: movs r0, 0x3 strb r0, [r1] -@080AB53C: +_080AB53C: pop {r0} bx r0 .pool @@ -304816,13 +304816,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 @@ -304836,18 +304836,18 @@ sub_80AB54C: ; 80AB54C movs r2, 0x3 bl sub_80AB848 movs r0, 0x1 - b @080AB5A4 + b _080AB5A4 .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} @@ -304862,13 +304862,13 @@ sub_80AB5AC: ; 80AB5AC 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 @@ -304880,9 +304880,9 @@ sub_80AB5AC: ; 80AB5AC ldrh r2, [r2] bl sub_80AB990 movs r0, 0x1 - b @080AB5FE + b _080AB5FE .pool -@080AB5EC: +_080AB5EC: movs r2, 0x6 negs r2, r2 movs r0, 0 @@ -304890,9 +304890,9 @@ sub_80AB5AC: ; 80AB5AC bl pal_fade_2 movs r0, 0x10 strb r0, [r4] -@080AB5FC: +_080AB5FC: movs r0, 0 -@080AB5FE: +_080AB5FE: pop {r4} pop {r1} bx r1 @@ -304906,7 +304906,7 @@ sub_80AB604: ; 80AB604 adds r0, r2, r1 ldrb r1, [r0] cmp r1, 0x10 - beq @080AB638 + beq _080AB638 adds r1, 0x1 strb r1, [r0] movs r0, 0x10 @@ -304918,11 +304918,11 @@ sub_80AB604: ; 80AB604 ldrh r1, [r1] bl sub_80ABAB0 movs r0, 0x1 - b @080AB63A + b _080AB63A .pool -@080AB638: +_080AB638: movs r0, 0 -@080AB63A: +_080AB63A: pop {r1} bx r1 thumb_func_end sub_80AB604 @@ -304949,7 +304949,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 @@ -304960,20 +304960,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 @@ -304990,11 +304990,11 @@ pal_fade_2: ; 80AB644 mov r8, r2 adds r4, 0x1 mov r12, r4 - b @080AB73E + b _080AB73E .pool -@080AB6C0: +_080AB6C0: cmp r0, 0x2 - beq @080AB6D4 + beq _080AB6D4 adds r1, r4, 0 subs r1, 0x10 ldr r2, =0x02038454 @@ -305002,16 +305002,16 @@ pal_fade_2: ; 80AB644 adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bne @080AB6E4 -@080AB6D4: + bne _080AB6E4 +_080AB6D4: ldr r0, =0x020388b4 - b @080AB6EA + b _080AB6EA .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 @@ -305022,7 +305022,7 @@ pal_fade_2: ; 80AB644 mov r12, r4 ldr r3, =0x02037b14 mov r10, r3 -@080AB6FE: +_080AB6FE: adds r2, r6, 0 lsls r0, r2, 1 ldr r1, =0x02037714 @@ -305054,18 +305054,18 @@ pal_fade_2: ; 80AB644 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 .pool -@080AB754: +_080AB754: cmp r0, 0 - bge @080AB81C + bge _080AB81C mvns r0, r0 lsls r0, 24 lsrs r0, 24 @@ -305077,14 +305077,14 @@ pal_fade_2: ; 80AB644 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 @@ -305101,9 +305101,9 @@ pal_fade_2: ; 80AB644 mov r8, r3 adds r4, 0x1 mov r12, r4 - b @080AB804 + b _080AB804 .pool -@080AB7AC: +_080AB7AC: movs r7, 0 mov r0, r9 lsls r0, 16 @@ -305115,7 +305115,7 @@ pal_fade_2: ; 80AB644 ldr r2, [sp] lsls r0, r2, 24 asrs r5, r0, 11 -@080AB7C2: +_080AB7C2: lsls r0, r6, 1 ldr r3, =0x02037b14 adds r4, r0, r3 @@ -305148,16 +305148,16 @@ pal_fade_2: ; 80AB644 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 .pool -@080AB81C: +_080AB81C: lsls r1, r4, 5 ldr r0, =0x02037714 adds r0, r1, r0 @@ -305166,7 +305166,7 @@ pal_fade_2: ; 80AB644 mov r3, r9 lsls r2, r3, 3 bl CpuFastSet -@080AB82E: +_080AB82E: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -305220,17 +305220,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 @@ -305246,28 +305246,28 @@ sub_80AB848: ; 80AB848 mov r9, r3 adds r4, 0x1 mov r12, r4 - b @080AB96A + b _080AB96A .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 .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 @@ -305325,14 +305325,14 @@ sub_80AB848: ; 80AB848 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 @@ -305374,13 +305374,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 @@ -305393,9 +305393,9 @@ sub_80AB990: ; 80AB990 lsrs r5, r0, 16 adds r4, 0x1 mov r8, r4 - b @080ABA8A + b _080ABA8A .pool -@080AB9F4: +_080AB9F4: movs r0, 0 mov r12, r0 ldr r1, [sp, 0x4] @@ -305405,7 +305405,7 @@ sub_80AB990: ; 80AB990 movs r7, 0x1E asrs r0, 11 mov r9, r0 -@080ABA06: +_080ABA06: adds r4, r5, 0 lsls r0, r4, 1 ldr r5, =0x02037714 @@ -305471,13 +305471,13 @@ sub_80AB990: ; 80AB990 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 @@ -305520,13 +305520,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 @@ -305535,10 +305535,10 @@ sub_80ABAB0: ; 80ABAB0 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 @@ -305603,10 +305603,10 @@ sub_80ABAB0: ; 80ABAB0 lsls r0, 16 lsrs r6, r0, 16 cmp r6, r12 - bcc @080ABB10 - b @080ABBB0 + bcc _080ABB10 + b _080ABBB0 .pool -@080ABB9C: +_080ABB9C: lsls r0, r4, 20 lsrs r0, 16 mov r1, sp @@ -305616,12 +305616,12 @@ sub_80ABAB0: ; 80ABAB0 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 @@ -305642,7 +305642,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] @@ -305651,7 +305651,7 @@ sub_80ABBCC: ; 80ABBCC ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@080ABBEE: +_080ABBEE: pop {r4} pop {r0} bx r0 @@ -305669,27 +305669,27 @@ 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 .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 @@ -305705,7 +305705,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 @@ -305715,7 +305715,7 @@ sub_80ABC48: ; 80ABC48 lsls r1, 3 adds r0, r5, r1 strb r4, [r0] -@080ABC6E: +_080ABC6E: pop {r4,r5} pop {r0} bx r0 @@ -305736,7 +305736,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 @@ -305755,7 +305755,7 @@ sub_80ABC7C: ; 80ABC7C lsls r0, r4, 24 asrs r0, 24 bl sub_80ABC48 -@080ABCBC: +_080ABCBC: pop {r4-r6} pop {r0} bx r0 @@ -305772,65 +305772,65 @@ 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 .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 .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 @@ -305844,22 +305844,22 @@ fade_screen: ; 80ABCD0 adds r0, r3 movs r1, 0x2 strb r1, [r0] - b @080ABDE4 + b _080ABDE4 .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 .pool -@080ABDA0: +_080ABDA0: movs r0, 0x1 negs r0, r0 lsls r1, r5, 24 @@ -305868,7 +305868,7 @@ fade_screen: ; 80ABCD0 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@080ABDB2: +_080ABDB2: ldr r4, =0x02038454 ldr r1, =0x000006c6 adds r0, r4, r1 @@ -305893,7 +305893,7 @@ fade_screen: ; 80ABCD0 lsls r3, 3 adds r4, r3 strb r5, [r4] -@080ABDE4: +_080ABDE4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -305932,14 +305932,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 @@ -305948,30 +305948,30 @@ sub_80ABE18: ; 80ABE18 ldrsb r2, [r1, r2] movs r1, 0x1 bl pal_fade_2 - b @080ABEF4 + b _080ABEF4 .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 @@ -305981,10 +305981,10 @@ sub_80ABE18: ; 80ABE18 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls @080ABE88 - b @080ABEF4 + bls _080ABE88 + b _080ABEF4 .pool -@080ABEAC: +_080ABEAC: lsls r0, r4, 20 lsrs r4, r0, 16 lsls r1, r4, 1 @@ -306004,9 +306004,9 @@ sub_80ABE18: ; 80ABE18 adds r0, r4, 0 movs r1, 0x10 bl pal_fade_1 - b @080ABEF4 + b _080ABEF4 .pool -@080ABEE4: +_080ABEE4: lsls r0, r4, 20 lsrs r4, r0, 16 ldr r3, =0x000073fc @@ -306014,7 +306014,7 @@ sub_80ABE18: ; 80ABE18 movs r1, 0x10 movs r2, 0xC bl pal_fade_1 -@080ABEF4: +_080ABEF4: pop {r4-r6} pop {r0} bx r0 @@ -306047,15 +306047,15 @@ sub_80ABF20: ; 80ABF20 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x1 - beq @080ABF3C + beq _080ABF3C movs r0, 0 - b @080ABF42 + b _080ABF42 .pool -@080ABF3C: +_080ABF3C: ldr r2, =0x000006ca adds r0, r1, r2 ldrb r0, [r0] -@080ABF42: +_080ABF42: pop {r1} bx r1 .pool @@ -306114,7 +306114,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 @@ -306122,13 +306122,13 @@ sub_80ABFA4: ; 80ABFA4 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0x1F - bgt @080ABFD8 + bgt _080ABFD8 movs r0, 0x1 - b @080ABFDA + b _080ABFDA .pool -@080ABFD8: +_080ABFD8: movs r0, 0 -@080ABFDA: +_080ABFDA: pop {r4} pop {r1} bx r1 @@ -306175,18 +306175,18 @@ 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 .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 @@ -306196,7 +306196,7 @@ sub_80AC01C: ; 80AC01C lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble @080AC118 + ble _080AC118 strh r1, [r6] ldr r0, =0x0000073c adds r4, r5, r0 @@ -306210,7 +306210,7 @@ sub_80AC01C: ; 80AC01C movs r2, 0 ldrsh r0, [r4, r2] cmp r0, 0x5 - ble @080AC118 + ble _080AC118 ldr r3, =0x0000073e adds r0, r5, r3 strh r1, [r0] @@ -306218,9 +306218,9 @@ sub_80AC01C: ; 80AC01C strh r0, [r7] movs r0, 0x3C strh r0, [r6] - b @080AC118 + b _080AC118 .pool -@080AC090: +_080AC090: movs r0, 0xE8 lsls r0, 3 adds r2, r5, r0 @@ -306248,16 +306248,16 @@ sub_80AC01C: ; 80AC01C 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 .pool -@080AC0E4: +_080AC0E4: movs r0, 0xE8 lsls r0, 3 adds r1, r5, r0 @@ -306268,7 +306268,7 @@ sub_80AC01C: ; 80AC01C lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - ble @080AC118 + ble _080AC118 strh r6, [r1] ldr r1, =0x0000073c adds r4, r5, r1 @@ -306281,9 +306281,9 @@ sub_80AC01C: ; 80AC01C 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 @@ -306365,7 +306365,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] @@ -306377,7 +306377,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 @@ -306389,16 +306389,16 @@ 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 .pool -@080AC210: +_080AC210: ldr r1, =0x00000732 adds r3, r5, r1 ldr r2, =0x00000736 @@ -306407,17 +306407,17 @@ sub_80AC1A8: ; 80AC1A8 adds r2, r1, 0 ldrh r0, [r0] cmp r2, r0 - bcs @080AC230 + bcs _080AC230 adds r0, r1, 0x1 - b @080AC236 + b _080AC236 .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] @@ -306436,13 +306436,13 @@ sub_80AC1A8: ; 80AC1A8 adds r0, r5, r2 ldr r0, [r0] cmp r1, r0 - beq @080AC26C + beq _080AC26C movs r0, 0 - b @080AC26E + b _080AC26E .pool -@080AC26C: +_080AC26C: movs r0, 0x1 -@080AC26E: +_080AC26E: pop {r4-r6} pop {r1} bx r1 @@ -306455,65 +306455,65 @@ sub_80AC274: ; 80AC274 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 .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 @@ -306539,38 +306539,38 @@ 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 .pool -@080AC344: +_080AC344: cmp r2, 0x55 - bne @080AC36E + bne _080AC36E ldr r0, =0x000006dd adds r1, r0 movs r0, 0 - b @080AC366 + b _080AC366 .pool -@080AC354: +_080AC354: ldr r3, =0x000006dd adds r1, r3 movs r0, 0x1 - b @080AC366 + b _080AC366 .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 .pool @@ -306582,29 +306582,29 @@ play_some_sound: ; 80AC378 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 .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 @@ -306695,11 +306695,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 .pool @@ -306715,14 +306715,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 @@ -306738,40 +306738,40 @@ 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 .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 @@ -306787,31 +306787,31 @@ 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 .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 @@ -306861,13 +306861,13 @@ sub_80AC594: ; 80AC594 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - beq @080AC650 + beq _080AC650 ldr r0, =gUnknown_0854FB5C bl LoadObjectPic ldr r0, =gUnknown_0854C290 bl sub_80ABF4C movs r5, 0 -@080AC5B2: +_080AC5B2: ldr r0, =gUnknown_0854FB78 movs r1, 0 movs r2, 0 @@ -306876,7 +306876,7 @@ sub_80AC594: ; 80AC594 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @080AC628 + beq _080AC628 ldr r0, =gUnknown_0854C14C ldr r1, [r0] lsls r2, r5, 2 @@ -306910,9 +306910,9 @@ sub_80AC594: ; 80AC594 movs r1, 0x2 orrs r0, r1 strb r0, [r4] - b @080AC63A + b _080AC63A .pool -@080AC628: +_080AC628: ldr r0, =gUnknown_0854C14C ldr r1, [r0] lsls r0, r5, 2 @@ -306922,19 +306922,19 @@ sub_80AC594: ; 80AC594 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, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x000006de adds r0, r1 movs r1, 0x1 strb r1, [r0] -@080AC650: +_080AC650: pop {r4,r5} pop {r0} bx r0 @@ -306950,24 +306950,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 RemoveObjectAndFreeTiles -@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 FreeObjectTilesByTag @@ -306977,7 +306977,7 @@ sub_80AC660: ; 80AC660 adds r0, r1 movs r1, 0 strb r1, [r0] -@080AC6A4: +_080AC6A4: pop {r4,r5} pop {r0} bx r0 @@ -306994,11 +306994,11 @@ 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 @@ -307035,14 +307035,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 @@ -307059,59 +307059,59 @@ 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 .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 .pool -@080AC78C: +_080AC78C: bl sub_80ABF84 ldr r0, =gUnknown_0854C14C ldr r1, [r0] ldr r2, =0x000006cc adds r1, r2 - b @080AC7F8 + b _080AC7F8 .pool -@080AC7A4: +_080AC7A4: bl sub_80ABFA4 lsls r0, 24 cmp r0, 0 - bne @080AC814 + bne _080AC814 ldr r0, =gUnknown_0854C14C ldr r1, [r0] ldr r0, =0x000006cc adds r1, r0 - b @080AC7F8 + b _080AC7F8 .pool -@080AC7C0: +_080AC7C0: bl sub_80ABFF0 ldr r0, =gUnknown_0854C14C ldr r1, [r0] ldr r2, =0x000006cc adds r1, r2 - b @080AC7F8 + b _080AC7F8 .pool -@080AC7D8: +_080AC7D8: bl sub_80AC01C ldr r0, =gUnknown_0854C14C ldr r2, [r0] @@ -307120,22 +307120,22 @@ sub_80AC734: ; 80AC734 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 .pool -@080AC810: +_080AC810: bl sub_80AC01C -@080AC814: +_080AC814: pop {r0} bx r0 thumb_func_end sub_80AC734 @@ -307170,21 +307170,21 @@ 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 .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] @@ -307203,27 +307203,27 @@ task50_0807B6D4: ; 80AC830 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 SetGpuReg movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xF - ble @080AC922 - b @080AC910 + ble _080AC922 + b _080AC910 .pool -@080AC8C8: +_080AC8C8: ldrh r0, [r4, 0xC] adds r0, 0x1 movs r1, 0 @@ -307231,24 +307231,24 @@ task50_0807B6D4: ; 80AC830 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 SetGpuReg - b @080AC922 -@080AC8F8: + b _080AC922 +_080AC8F8: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -307258,16 +307258,16 @@ task50_0807B6D4: ; 80AC830 ldrh r1, [r4, 0xE] movs r0, 0x48 bl SetGpuReg -@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 @@ -307326,14 +307326,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 @@ -307349,40 +307349,40 @@ 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 .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 @@ -307399,43 +307399,43 @@ 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 .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 .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, =gUnknown_0854C14C ldr r1, [r0] @@ -307445,11 +307445,11 @@ sub_80ACA24: ; 80ACA24 adds r0, 0x1 strh r0, [r1] movs r0, 0 - b @080ACAAA + b _080ACAAA .pool -@080ACAA8: +_080ACAA8: movs r0, 0x1 -@080ACAAA: +_080ACAAA: pop {r4,r5} pop {r1} bx r1 @@ -307464,10 +307464,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 @@ -307555,7 +307555,7 @@ sub_80ACB84: ; 80ACB84 movs r1, 0x36 ldrsh r0, [r5, r1] cmp r0, 0 - bne @080ACC60 + bne _080ACC60 ldr r3, =gUnknown_0854FC44 ldr r4, =gUnknown_0854C14C ldr r2, [r4] @@ -307586,36 +307586,36 @@ 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 .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] @@ -307623,7 +307623,7 @@ sub_80ACB84: ; 80ACB84 strh r0, [r5, 0x2E] lsls r0, 16 cmp r0, 0 - bne @080ACC80 + bne _080ACC80 ldr r0, [r3] ldr r1, =0x000006dc adds r0, r1 @@ -307649,16 +307649,16 @@ sub_80ACB84: ; 80ACB84 movs r1, 0x2 orrs r0, r1 strb r0, [r4] - b @080ACC80 + b _080ACC80 .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] @@ -307667,7 +307667,7 @@ sub_80ACB84: ; 80ACB84 strb r0, [r2] adds r0, r5, 0 bl sub_80ACAB0 -@080ACC80: +_080ACC80: pop {r4,r5} pop {r0} bx r0 @@ -307681,17 +307681,17 @@ sub_80ACC88: ; 80ACC88 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 str r0, [r4, 0x1C] - b @080ACCAC + b _080ACCAC .pool -@080ACCA8: +_080ACCA8: subs r0, r1, 0x1 strh r0, [r4, 0x2E] -@080ACCAC: +_080ACCAC: pop {r4} pop {r0} bx r0 @@ -307734,39 +307734,39 @@ 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 .pool -@080ACD48: +_080ACD48: mov r1, r8 subs r0, r4, r1 strh r0, [r7, 0x2E] @@ -307777,7 +307777,7 @@ sub_80ACCB4: ; 80ACCB4 orrs r0, r1 strb r0, [r2] movs r0, 0x1 -@080ACD5C: +_080ACD5C: strh r0, [r7, 0x3A] pop {r3} mov r8, r3 @@ -307809,9 +307809,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, =gUnknown_0854FC2C ldr r2, =gUnknown_0854FB90 @@ -307826,7 +307826,7 @@ sub_80ACD78: ; 80ACD78 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 @@ -307847,9 +307847,9 @@ sub_80ACD78: ; 80ACD78 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 @@ -307861,8 +307861,8 @@ sub_80ACD78: ; 80ACD78 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 @@ -307883,13 +307883,13 @@ sub_80ACD78: ; 80ACD78 ldr r0, [r0] add r0, r10 str r4, [r0] - b @080ACE46 + b _080ACE46 .pool -@080ACE40: +_080ACE40: adds r1, r4, r6 movs r0, 0 str r0, [r1] -@080ACE46: +_080ACE46: ldr r0, =gUnknown_0854C14C ldr r2, [r0] ldr r6, =0x000006da @@ -307900,38 +307900,38 @@ sub_80ACD78: ; 80ACD78 lsls r0, 24 lsrs r0, 24 cmp r0, 0x18 - bne @080ACE9C + bne _080ACE9C movs r3, 0 adds r1, r2, 0 ldr r5, =sub_80ACB84 ldr r4, =sub_80ACC88 -@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 .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 @@ -307954,11 +307954,11 @@ sub_80ACEAC: ; 80ACEAC ldrb r0, [r4] ldrb r7, [r5] cmp r0, r7 - bne @080ACED0 + bne _080ACED0 movs r0, 0 - b @080ACF32 + b _080ACF32 .pool -@080ACED0: +_080ACED0: ldr r0, =0x000006d6 adds r2, r3, r0 ldrh r0, [r2] @@ -307971,13 +307971,13 @@ sub_80ACEAC: ; 80ACEAC 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 @@ -307985,9 +307985,9 @@ sub_80ACEAC: ; 80ACEAC ldr r1, [r0] movs r0, 0x1 strh r0, [r1, 0x38] - b @080ACF30 + b _080ACF30 .pool -@080ACF10: +_080ACF10: subs r0, 0x1 strb r0, [r4] ldrb r0, [r4] @@ -308004,9 +308004,9 @@ sub_80ACEAC: ; 80ACEAC movs r2, 0x4 orrs r0, r2 strb r0, [r1] -@080ACF30: +_080ACF30: movs r0, 0x1 -@080ACF32: +_080ACF32: pop {r4-r7} pop {r1} bx r1 @@ -308023,24 +308023,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 RemoveObjectAndFreeTiles -@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 @@ -308101,10 +308101,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 @@ -308113,11 +308113,11 @@ sub_80ACFDC: ; 80ACFDC adds r0, r3 ldrb r0, [r0] cmp r4, r0 - bcs @080AD02C + bcs _080AD02C ldr r0, =gUnknown_0854C14C ldr r5, [r0] adds r6, r5, r3 -@080AD012: +_080AD012: lsls r1, r4, 2 adds r0, r5, 0 adds r0, 0x60 @@ -308129,12 +308129,12 @@ sub_80ACFDC: ; 80ACFDC 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} @@ -308152,11 +308152,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 @@ -308164,7 +308164,7 @@ snowflakes_progress2: ; 80AD048 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -@080AD070: +_080AD070: pop {r4,r5} pop {r0} bx r0 @@ -308180,13 +308180,13 @@ 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 .pool -@080AD0A4: +_080AD0A4: ldr r4, =0x000006e5 adds r0, r2, r4 strb r1, [r0] @@ -308196,11 +308196,11 @@ sub_80AD084: ; 80AD084 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, =gUnknown_0854C14C ldr r1, [r0] ldr r0, =0x000006ce @@ -308209,11 +308209,11 @@ sub_80AD084: ; 80AD084 adds r0, 0x1 strh r0, [r1] movs r0, 0 - b @080AD0E2 + b _080AD0E2 .pool -@080AD0E0: +_080AD0E0: movs r0, 0x1 -@080AD0E2: +_080AD0E2: pop {r4} pop {r1} bx r1 @@ -308231,11 +308231,11 @@ snowflakes_progress: ; 80AD0E8 ldrb r0, [r3] ldrb r4, [r2] cmp r0, r4 - bne @080AD110 + bne _080AD110 movs r0, 0 - b @080AD152 + b _080AD152 .pool -@080AD110: +_080AD110: movs r0, 0xDC lsls r0, 3 adds r1, r0 @@ -308245,18 +308245,18 @@ snowflakes_progress: ; 80AD0E8 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, =gUnknown_0854C14C ldr r0, [r0] ldr r2, =0x000006e4 @@ -308269,7 +308269,7 @@ snowflakes_progress: ; 80AD0E8 negs r0, r1 orrs r0, r1 lsrs r0, 31 -@080AD152: +_080AD152: pop {r4} pop {r1} bx r1 @@ -308287,7 +308287,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 @@ -308316,11 +308316,11 @@ snowflake_add: ; 80AD164 adds r5, r0 str r4, [r5] movs r0, 0x1 - b @080AD1CA + b _080AD1CA .pool -@080AD1C8: +_080AD1C8: movs r0, 0 -@080AD1CA: +_080AD1CA: pop {r4-r6} pop {r1} bx r1 @@ -308335,11 +308335,11 @@ snowflake_remove: ; 80AD1D0 adds r2, r1, r0 ldrb r0, [r2] cmp r0, 0 - bne @080AD1EC + bne _080AD1EC movs r0, 0 - b @080AD200 + b _080AD200 .pool -@080AD1EC: +_080AD1EC: subs r0, 0x1 strb r0, [r2] lsls r0, 24 @@ -308349,7 +308349,7 @@ snowflake_remove: ; 80AD1D0 ldr r0, [r1] bl RemoveObjectAndFreeTiles movs r0, 0x1 -@080AD200: +_080AD200: pop {r1} bx r1 thumb_func_end snowflake_remove @@ -308422,9 +308422,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 @@ -308447,7 +308447,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] @@ -308474,7 +308474,7 @@ sub_80AD2B0: ; 80AD2B0 lsls r0, 7 strh r0, [r3, 0x2E] strh r2, [r4] -@080AD2F6: +_080AD2F6: pop {r4} pop {r0} bx r0 @@ -308506,9 +308506,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 @@ -308528,32 +308528,32 @@ sub_80AD30C: ; 80AD30C 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 .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 @@ -308570,7 +308570,7 @@ sub_80AD30C: ; 80AD30C lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bhi @080AD3E0 + bhi _080AD3E0 adds r1, r3 movs r0, 0xFA subs r0, r1 @@ -308583,15 +308583,15 @@ sub_80AD30C: ; 80AD30C strh r1, [r4, 0x38] movs r0, 0xDC strh r0, [r4, 0x3A] - b @080AD40C + b _080AD40C .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] @@ -308608,7 +308608,7 @@ sub_80AD30C: ; 80AD30C strb r0, [r2] ldr r0, =sub_80AD2B0 str r0, [r4, 0x1C] -@080AD40C: +_080AD40C: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] @@ -308617,7 +308617,7 @@ sub_80AD30C: ; 80AD30C movs r3, 0x3A ldrsh r1, [r4, r3] cmp r0, r1 - bne @080AD438 + bne _080AD438 adds r0, r4, 0 bl sub_80AD204 movs r0, 0xFA @@ -308630,7 +308630,7 @@ sub_80AD30C: ; 80AD30C strb r0, [r2] ldr r0, =sub_80AD2B0 str r0, [r4, 0x1C] -@080AD438: +_080AD438: pop {r4,r5} pop {r0} bx r0 @@ -308694,14 +308694,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 @@ -308763,14 +308763,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 @@ -308787,33 +308787,33 @@ 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 .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, =gUnknown_0854C14C ldr r1, [r0] @@ -308821,30 +308821,30 @@ sub_80AD584: ; 80AD584 adds r1, r2 ldrh r0, [r1] adds r0, 0x1 - b @080AD8F8 + b _080AD8F8 .pool -@080AD608: +_080AD608: bl sub_80ACD78 lsls r0, 24 cmp r0, 0 - beq @080AD614 - b @080AD8FA -@080AD614: + beq _080AD614 + b _080AD8FA +_080AD614: ldr r0, =gUnknown_0854C14C ldr r1, [r0] ldr r3, =0x000006cc adds r1, r3 ldrh r0, [r1] adds r0, 0x1 - b @080AD8F8 + b _080AD8F8 .pool -@080AD62C: +_080AD62C: bl sub_80ACEAC lsls r0, 24 cmp r0, 0 - beq @080AD638 - b @080AD8FA -@080AD638: + beq _080AD638 + b _080AD8FA +_080AD638: ldr r0, =gUnknown_0854C14C ldr r1, [r0] ldr r0, =0x000006d2 @@ -308855,24 +308855,24 @@ sub_80AD584: ; 80AD584 adds r1, r2 ldrh r0, [r1] adds r0, 0x1 - b @080AD8F8 + b _080AD8F8 .pool -@080AD65C: +_080AD65C: ldr r0, =gUnknown_0854C14C 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 .pool -@080AD680: +_080AD680: ldr r0, =gUnknown_0854C14C ldr r4, [r0] ldr r2, =0x000006ea @@ -308895,7 +308895,7 @@ sub_80AD584: ; 80AD584 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -@080AD6B0: +_080AD6B0: ldr r0, =gUnknown_0854C14C ldr r2, [r0] ldr r3, =0x000006e6 @@ -308905,16 +308905,16 @@ sub_80AD584: ; 80AD584 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 .pool -@080AD6E0: +_080AD6E0: ldr r0, =gUnknown_0854C14C ldr r4, [r0] ldr r1, =0x000006ea @@ -308928,9 +308928,9 @@ sub_80AD584: ; 80AD584 ldr r2, =0x000006eb adds r1, r4, r2 strb r0, [r1] - b @080AD768 + b _080AD768 .pool -@080AD70C: +_080AD70C: bl GenerateRandomNumber ldr r1, =gUnknown_0854C14C ldr r2, [r1] @@ -308945,7 +308945,7 @@ sub_80AD584: ; 80AD584 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] -@080AD72A: +_080AD72A: movs r0, 0x13 bl sub_80ABC48 ldr r0, =gUnknown_0854C14C @@ -308954,15 +308954,15 @@ sub_80AD584: ; 80AD584 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, =gUnknown_0854C14C ldr r4, [r1] @@ -308974,15 +308974,15 @@ sub_80AD584: ; 80AD584 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 .pool -@080AD788: +_080AD788: ldr r0, =gUnknown_0854C14C ldr r4, [r0] ldr r0, =0x000006e6 @@ -308992,9 +308992,9 @@ sub_80AD584: ; 80AD584 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 @@ -309008,7 +309008,7 @@ sub_80AD584: ; 80AD584 strb r0, [r1] lsls r0, 24 cmp r0, 0 - beq @080AD7E8 + beq _080AD7E8 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -309019,25 +309019,25 @@ sub_80AD584: ; 80AD584 ldr r0, =0x000006cc adds r1, r4, r0 movs r0, 0xA - b @080AD8F8 + b _080AD8F8 .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 .pool -@080AD800: +_080AD800: ldr r3, =0x000006cc adds r1, r4, r3 movs r0, 0xB - b @080AD8F8 + b _080AD8F8 .pool -@080AD80C: +_080AD80C: ldr r0, =gUnknown_0854C14C ldr r2, [r0] ldr r0, =0x000006e6 @@ -309047,13 +309047,13 @@ sub_80AD584: ; 80AD584 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 .pool -@080AD834: +_080AD834: bl GenerateRandomNumber ldr r1, =gUnknown_0854C14C ldr r2, [r1] @@ -309070,9 +309070,9 @@ sub_80AD584: ; 80AD584 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b @080AD8FA + b _080AD8FA .pool -@080AD864: +_080AD864: ldr r0, =gUnknown_0854C14C ldr r5, [r0] ldr r1, =0x000006e6 @@ -309082,7 +309082,7 @@ sub_80AD584: ; 80AD584 strh r0, [r4] lsls r0, 16 cmp r0, 0 - bne @080AD8FA + bne _080AD8FA movs r0, 0x64 bl sub_80AD9BC movs r0, 0x13 @@ -309096,9 +309096,9 @@ sub_80AD584: ; 80AD584 adds r1, r5, r2 ldrh r0, [r1] adds r0, 0x1 - b @080AD8F8 + b _080AD8F8 .pool -@080AD8A8: +_080AD8A8: ldr r0, =gUnknown_0854C14C ldr r4, [r0] ldr r3, =0x000006e6 @@ -309108,7 +309108,7 @@ sub_80AD584: ; 80AD584 strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne @080AD8FA + bne _080AD8FA movs r0, 0x13 movs r1, 0x3 movs r2, 0x5 @@ -309117,27 +309117,27 @@ sub_80AD584: ; 80AD584 adds r1, r4, r0 ldrh r0, [r1] adds r0, 0x1 - b @080AD8F8 + b _080AD8F8 .pool -@080AD8DC: +_080AD8DC: ldr r0, =gUnknown_0854C14C 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 @@ -309153,25 +309153,25 @@ 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 .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, =gUnknown_0854C14C ldr r2, [r0] @@ -309179,16 +309179,16 @@ sub_80AD910: ; 80AD910 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 @@ -309198,14 +309198,14 @@ sub_80AD910: ; 80AD910 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @080AD9B4 + b _080AD9B4 .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 @@ -309213,13 +309213,13 @@ sub_80AD910: ; 80AD910 ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -@080AD9AC: +_080AD9AC: movs r0, 0 - b @080AD9B6 + b _080AD9B6 .pool -@080AD9B4: +_080AD9B4: movs r0, 0x1 -@080AD9B6: +_080AD9B6: pop {r4-r6} pop {r1} bx r1 @@ -309236,7 +309236,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 @@ -309248,7 +309248,7 @@ sub_80AD9BC: ; 80AD9BC strh r0, [r1] movs r0, 0x1 strb r0, [r5] -@080AD9EA: +_080AD9EA: pop {r4-r6} pop {r0} bx r0 @@ -309264,41 +309264,41 @@ 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 .pool -@080ADA38: +_080ADA38: movs r0, 0x58 bl audio_play -@080ADA3E: +_080ADA3E: ldr r0, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x000006ed adds r0, r1 movs r1, 0 strb r1, [r0] - b @080ADA58 + b _080ADA58 .pool -@080ADA54: +_080ADA54: subs r0, 0x1 strh r0, [r1] -@080ADA58: +_080ADA58: pop {r4} pop {r0} bx r0 @@ -309328,7 +309328,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] @@ -309341,7 +309341,7 @@ sub_80ADA60: ; 80ADA60 movs r0, 0 movs r1, 0x10 bl sub_80AC124 -@080ADAA8: +_080ADAA8: pop {r0} bx r0 .pool @@ -309357,14 +309357,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 @@ -309396,41 +309396,41 @@ 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 .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, =gUnknown_0854C14C ldr r1, [r0] ldr r0, =0x000006cc @@ -309438,20 +309438,20 @@ sub_80ADAF0: ; 80ADAF0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @080ADBA6 + b _080ADBA6 .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 @@ -309483,53 +309483,53 @@ 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 .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 @@ -309556,7 +309556,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 @@ -309571,7 +309571,7 @@ sub_80ADC4C: ; 80ADC4C ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -@080ADC90: +_080ADC90: pop {r4} pop {r0} bx r0 @@ -309588,7 +309588,7 @@ sub_80ADCAC: ; 80ADCAC adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080ADD56 + bne _080ADD56 ldr r0, =gUnknown_0854FD30 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -309597,7 +309597,7 @@ sub_80ADCAC: ; 80ADCAC mov r0, sp bl LoadObjectPic movs r5, 0 -@080ADCD0: +_080ADCD0: ldr r0, =gUnknown_0854FD18 movs r1, 0 movs r2, 0 @@ -309606,7 +309606,7 @@ sub_80ADCAC: ; 80ADCAC lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @080ADD34 + beq _080ADD34 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -309633,9 +309633,9 @@ sub_80ADCAC: ; 80ADCAC adds r0, 0xA0 adds r0, r1 str r4, [r0] - b @080ADD42 + b _080ADD42 .pool -@080ADD34: +_080ADD34: ldr r2, =gUnknown_0854C14C ldr r1, [r2] lsls r0, r5, 2 @@ -309643,18 +309643,18 @@ sub_80ADCAC: ; 80ADCAC 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} @@ -309671,23 +309671,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 RemoveObjectAndFreeTiles -@080ADD8C: +_080ADD8C: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls @080ADD7E + bls _080ADD7E ldr r0, =0x00001201 bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C @@ -309696,7 +309696,7 @@ sub_80ADD68: ; 80ADD68 adds r0, r1 movs r1, 0 strb r1, [r0] -@080ADDA8: +_080ADDA8: pop {r4,r5} pop {r0} bx r0 @@ -309731,7 +309731,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 @@ -309739,7 +309739,7 @@ sub_80ADDBC: ; 80ADDBC lsls r1, 6 movs r0, 0x52 bl SetGpuReg -@080ADE04: +_080ADE04: pop {r0} bx r0 .pool @@ -309755,14 +309755,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 @@ -309782,70 +309782,70 @@ 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 .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 .pool -@080ADEE8: +_080ADEE8: bl sub_80AC1A8 -@080ADEEC: +_080ADEEC: pop {r4,r5} pop {r0} bx r0 @@ -309860,47 +309860,47 @@ 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 .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 SetGpuReg 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 @@ -309926,9 +309926,9 @@ sub_80ADF6C: ; 80ADF6C adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080AE008 + bne _080AE008 movs r5, 0 -@080ADF80: +_080ADF80: ldr r0, =gUnknown_0854FD58 movs r1, 0 movs r2, 0 @@ -309937,7 +309937,7 @@ sub_80ADF6C: ; 80ADF6C lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @080ADFE4 + beq _080ADFE4 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -309968,9 +309968,9 @@ sub_80ADF6C: ; 80ADF6C adds r0, 0xF0 adds r0, r1 str r4, [r0] - b @080ADFF2 + b _080ADFF2 .pool -@080ADFE4: +_080ADFE4: ldr r2, =gUnknown_0854C14C ldr r1, [r2] lsls r0, r5, 2 @@ -309978,19 +309978,19 @@ sub_80ADF6C: ; 80ADF6C 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 @@ -310007,23 +310007,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 RemoveObjectAndFreeTiles -@080AE03A: +_080AE03A: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls @080AE02C + bls _080AE02C ldr r0, =0x00001202 bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C @@ -310033,7 +310033,7 @@ sub_80AE014: ; 80AE014 adds r0, r1 movs r1, 0 strb r1, [r0] -@080AE058: +_080AE058: pop {r4,r5} pop {r0} bx r0 @@ -310050,13 +310050,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] @@ -310076,7 +310076,7 @@ sub_80AE068: ; 80AE068 lsls r1, 16 ldr r0, =0x010f0000 cmp r1, r0 - ble @080AE0C8 + ble _080AE0C8 movs r0, 0xF0 lsls r0, 1 adds r1, r0, 0 @@ -310091,7 +310091,7 @@ sub_80AE068: ; 80AE068 ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -@080AE0C8: +_080AE0C8: pop {r4} pop {r0} bx r0 @@ -310130,7 +310130,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] @@ -310152,7 +310152,7 @@ sub_80AE0E4: ; 80AE0E4 movs r0, 0 movs r1, 0x10 bl sub_80AC124 -@080AE14E: +_080AE14E: pop {r4} pop {r0} bx r0 @@ -310169,14 +310169,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 @@ -310193,40 +310193,40 @@ 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 .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 @@ -310243,42 +310243,42 @@ 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 .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 @@ -310300,7 +310300,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 @@ -310308,7 +310308,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] @@ -310316,14 +310316,14 @@ sub_80AE25C: ; 80AE25C 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 @@ -310361,7 +310361,7 @@ sub_80AE2F0: ; 80AE2F0 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080AE396 + bne _080AE396 ldr r0, =gUnknown_0854FD70 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -310370,7 +310370,7 @@ sub_80AE2F0: ; 80AE2F0 mov r0, sp bl LoadObjectPic movs r6, 0 -@080AE314: +_080AE314: adds r0, r6, 0 movs r1, 0x5 bl __udivsi3 @@ -310384,7 +310384,7 @@ sub_80AE2F0: ; 80AE2F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @080AE370 + beq _080AE370 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -310403,9 +310403,9 @@ sub_80AE2F0: ; 80AE2F0 adds r0, r3 adds r0, r1 str r4, [r0] - b @080AE382 + b _080AE382 .pool -@080AE370: +_080AE370: ldr r2, =gUnknown_0854C14C ldr r1, [r2] lsls r0, r6, 2 @@ -310415,18 +310415,18 @@ sub_80AE2F0: ; 80AE2F0 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} @@ -310443,24 +310443,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 RemoveObjectAndFreeTiles -@080AE3CE: +_080AE3CE: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls @080AE3C0 + bls _080AE3C0 ldr r0, =0x00001203 bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C @@ -310469,7 +310469,7 @@ sub_80AE3A8: ; 80AE3A8 adds r0, r1 movs r1, 0 strb r1, [r0] -@080AE3EA: +_080AE3EA: pop {r4,r5} pop {r0} bx r0 @@ -310499,7 +310499,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 @@ -310514,7 +310514,7 @@ sub_80AE3FC: ; 80AE3FC ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -@080AE444: +_080AE444: pop {r4} pop {r0} bx r0 @@ -310545,7 +310545,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 @@ -310561,15 +310561,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 @@ -310586,14 +310586,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 @@ -310611,49 +310611,49 @@ 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 .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 @@ -310671,42 +310671,42 @@ 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 .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 @@ -310725,7 +310725,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] @@ -310733,7 +310733,7 @@ sub_80AE5EC: ; 80AE5EC movs r2, 0 strh r1, [r0] strh r2, [r3] -@080AE612: +_080AE612: pop {r0} bx r0 .pool @@ -310803,24 +310803,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 RemoveObjectAndFreeTiles -@080AE6CA: +_080AE6CA: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls @080AE6BC + bls _080AE6BC ldr r0, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x00000716 @@ -310829,38 +310829,38 @@ sub_80AE6A4: ; 80AE6A4 strb r1, [r0] ldr r0, =0x00001204 bl FreeObjectTilesByTag -@080AE6E6: +_080AE6E6: ldr r0, =gUnknown_0854C14C 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 RemoveObjectAndFreeTiles -@080AE70A: +_080AE70A: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls @080AE6FC + bls _080AE6FC ldr r0, =gUnknown_0854C14C ldr r0, [r0] ldr r1, =0x00000717 adds r0, r1 movs r1, 0 strb r1, [r0] -@080AE720: +_080AE720: pop {r4,r5} pop {r0} bx r0 @@ -310877,13 +310877,13 @@ sub_80AE738: ; 80AE738 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080AE7E6 + bne _080AE7E6 ldr r0, =gUnknown_0854FDDC bl LoadObjectPic ldr r0, =gUnknown_0854C2B0 bl sub_80ABF4C movs r7, 0 -@080AE758: +_080AE758: adds r0, r7, 0 movs r1, 0x5 bl __udivsi3 @@ -310897,7 +310897,7 @@ sub_80AE738: ; 80AE738 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @080AE7C0 + beq _080AE7C0 ldr r2, =gUnknown_0854C14C ldr r5, [r2] lsls r0, r7, 2 @@ -310919,9 +310919,9 @@ sub_80AE738: ; 80AE738 ldr r0, [r5] strh r6, [r0, 0x30] ldr r2, [sp] - b @080AE7D2 + b _080AE7D2 .pool -@080AE7C0: +_080AE7C0: ldr r2, =gUnknown_0854C14C ldr r1, [r2] lsls r0, r7, 2 @@ -310931,18 +310931,18 @@ sub_80AE738: ; 80AE738 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} @@ -310963,12 +310963,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 @@ -310984,7 +310984,7 @@ sub_80AE7F8: ; 80AE7F8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @080AE8BC + beq _080AE8BC mov r2, r9 ldr r4, [r2] lsls r0, r7, 2 @@ -311032,9 +311032,9 @@ sub_80AE7F8: ; 80AE7F8 ldr r1, [r4] ldr r0, =sub_80AE958 str r0, [r1, 0x1C] - b @080AE8CE + b _080AE8CE .pool -@080AE8BC: +_080AE8BC: mov r2, r9 ldr r0, [r2] lsls r1, r7, 2 @@ -311044,7 +311044,7 @@ sub_80AE7F8: ; 80AE7F8 adds r0, r1 mov r1, r10 str r1, [r0] -@080AE8CE: +_080AE8CE: mov r2, r9 ldr r0, [r2] ldr r1, =0x00000717 @@ -311055,8 +311055,8 @@ sub_80AE7F8: ; 80AE7F8 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 @@ -311090,7 +311090,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 @@ -311105,7 +311105,7 @@ sub_80AE8F8: ; 80AE8F8 ldr r0, =0x000001ff ands r1, r0 strh r1, [r3, 0x20] -@080AE940: +_080AE940: pop {r4} pop {r0} bx r0 @@ -311124,10 +311124,10 @@ sub_80AE958: ; 80AE958 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne @080AE972 + bne _080AE972 ldr r0, =sub_80AE97C str r0, [r2, 0x1C] -@080AE972: +_080AE972: pop {r0} bx r0 .pool @@ -311145,12 +311145,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, =gUnknown_08329F40 @@ -311183,13 +311183,13 @@ sub_80AE97C: ; 80AE97C 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 @@ -311245,7 +311245,7 @@ sub_80AEA34: ; 80AEA34 adds r0, r4, r1 ldrb r5, [r0] cmp r5, 0 - bne @080AEA6C + bne _080AEA6C ldr r0, =gUnknown_0854FDF8 bl LoadObjectPic movs r2, 0xE5 @@ -311263,7 +311263,7 @@ sub_80AEA34: ; 80AEA34 adds r2, 0x6 adds r0, r4, r2 strh r5, [r0] -@080AEA6C: +_080AEA6C: pop {r4,r5} pop {r0} bx r0 @@ -311280,14 +311280,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 @@ -311318,16 +311318,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] @@ -311337,9 +311337,9 @@ sub_80AEAB8: ; 80AEAB8 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 @@ -311352,13 +311352,13 @@ sub_80AEB2C: ; 80AEB2C 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 @@ -311386,7 +311386,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 @@ -311416,7 +311416,7 @@ sub_80AEB48: ; 80AEB48 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@080AEBB0: +_080AEBB0: pop {r4} pop {r0} bx r0 @@ -311432,10 +311432,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 @@ -311445,15 +311445,15 @@ sub_80AEBD0: ; 80AEBD0 ldr r1, [r0] ldr r0, =gUnknown_0854FE44 cmp r1, r0 - bne @080AEBFE + bne _080AEBFE adds r0, r2, r5 bl RemoveObjectAndFreeTiles -@080AEBFE: +_080AEBFE: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3F - bls @080AEBE4 + bls _080AEBE4 ldr r0, =0x00001205 bl FreeObjectTilesByTag ldr r0, =gUnknown_0854C14C @@ -311462,7 +311462,7 @@ sub_80AEBD0: ; 80AEBD0 adds r0, r1 movs r1, 0 strh r1, [r0] -@080AEC1A: +_080AEC1A: pop {r4,r5} pop {r0} bx r0 @@ -311480,31 +311480,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] @@ -311514,10 +311514,10 @@ unc_0807DAB4: ; 80AEC34 lsls r0, 16 asrs r0, 16 cmp r0, 0x77 - ble @080AEC8E + ble _080AEC8E adds r0, r1, 0 bl RemoveObjectAndFreeTiles -@080AEC8E: +_080AEC8E: pop {r0} bx r0 thumb_func_end unc_0807DAB4 @@ -311545,18 +311545,18 @@ 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 .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 @@ -311568,15 +311568,15 @@ sub_80AECA8: ; 80AECA8 strh r0, [r4, 0x1E] ldrh r0, [r4] adds r0, 0x1 - b @080AED1A + b _080AED1A .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 @@ -311587,9 +311587,9 @@ sub_80AECA8: ; 80AECA8 adds r0, r1, 0 strh r0, [r4, 0x1E] movs r0, 0 -@080AED1A: +_080AED1A: strh r0, [r4] -@080AED1C: +_080AED1C: pop {r4} pop {r0} bx r0 @@ -311616,26 +311616,26 @@ 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 .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 @@ -311729,35 +311729,35 @@ sub_80AEE20: ; 80AEE20 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bne @080AEE4C + bne _080AEE4C ldr r0, =sub_80AECA8 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 .pool -@080AEE4C: +_080AEE4C: ldr r5, =sub_80AECA8 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} @@ -311773,35 +311773,35 @@ sub_80AEE84: ; 80AEE84 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bne @080AEEB0 + bne _080AEEB0 ldr r0, =sub_80AECA8 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 .pool -@080AEEB0: +_080AEEB0: ldr r5, =sub_80AECA8 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} @@ -311816,100 +311816,100 @@ sub_80AEEE8: ; 80AEEE8 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 .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, =gUnknown_0854FE5C - b @080AEF9E + b _080AEF9E .pool -@080AEF9C: +_080AEF9C: ldr r1, =gUnknown_0854FE60 -@080AEF9E: +_080AEF9E: ldr r0, =0x03005d8c ldr r0, [r0] adds r0, 0x2F ldrb r0, [r0] adds r0, r1 ldrb r0, [r0] - b @080AEFB6 + b _080AEFB6 .pool -@080AEFB4: +_080AEFB4: movs r0, 0 -@080AEFB6: +_080AEFB6: pop {r1} bx r1 thumb_func_end sub_80AEEE8 @@ -311940,15 +311940,15 @@ sub_80AEFDC: ; 80AEFDC 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 @@ -312001,22 +312001,22 @@ 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 @@ -312058,20 +312058,20 @@ 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 @@ -312083,9 +312083,9 @@ sub_80AF0F4: ; 80AF0F4 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} @@ -312099,10 +312099,10 @@ task0A_nop_for_a_while: ; 80AF10C 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 @@ -312129,11 +312129,11 @@ task0A_asap_script_env_2_enable_and_set_ctx_running: ; 80AF148 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 @@ -312179,24 +312179,24 @@ 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 .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 @@ -312205,21 +312205,21 @@ task_mpl_807DD60: ; 80AF1A4 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 @@ -312252,25 +312252,25 @@ 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 .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] @@ -312278,27 +312278,27 @@ sub_80AF234: ; 80AF234 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 @@ -312317,37 +312317,37 @@ 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 .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 @@ -312389,20 +312389,20 @@ sub_80AF334: ; 80AF334 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080AF36C + bne _080AF36C ldr r1, =sub_80AF438 - b @080AF37E + b _080AF37E .pool -@080AF36C: +_080AF36C: adds r0, r4, 0 bl sub_8088F58 lsls r0, 24 lsrs r0, 24 ldr r1, =task_map_chg_seq_0807E2CC cmp r0, 0x1 - bne @080AF37E + bne _080AF37E ldr r1, =task_map_chg_seq_0807E20C -@080AF37E: +_080AF37E: adds r0, r1, 0 movs r1, 0xA bl AddTask @@ -312440,9 +312440,9 @@ 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 @@ -312502,21 +312502,21 @@ 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 .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 @@ -312530,11 +312530,11 @@ sub_80AF438: ; 80AF438 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 @@ -312553,13 +312553,13 @@ sub_80AF438: ; 80AF438 bl FieldObjectSetSpecialAnim movs r0, 0x2 strh r0, [r5, 0x8] - b @080AF54A + b _080AF54A .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 @@ -312583,30 +312583,30 @@ sub_80AF438: ; 80AF438 bl FieldObjectClearAnimIfSpecialAnimFinished movs r0, 0x3 strh r0, [r5, 0x8] - b @080AF54A + b _080AF54A .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 @@ -312629,20 +312629,20 @@ 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 .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 @@ -312651,11 +312651,11 @@ task_map_chg_seq_0807E20C: ; 80AF550 bl PlayerGetDestCoords 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 @@ -312680,22 +312680,22 @@ task_map_chg_seq_0807E20C: ; 80AF550 bl FieldObjectSetSpecialAnim movs r0, 0x2 strh r0, [r5, 0x8] - b @080AF60A + b _080AF60A .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 @@ -312714,27 +312714,27 @@ 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 .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 @@ -312747,13 +312747,13 @@ sub_80AF660: ; 80AF660 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 movs r1, 0x50 bl AddTask -@080AF67C: +_080AF67C: pop {r4} pop {r0} bx r0 @@ -312789,12 +312789,12 @@ task_mpl_807E3C8: ; 80AF6B0 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 @@ -312843,12 +312843,12 @@ sub_80AF71C: ; 80AF71C 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 @@ -313043,40 +313043,40 @@ 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 .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 bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@080AF93E: +_080AF93E: pop {r4,r5} pop {r0} bx r0 @@ -313112,18 +313112,18 @@ 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 .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 @@ -313131,32 +313131,32 @@ sub_80AF96C: ; 80AF96C 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 bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@080AF9E8: +_080AF9E8: pop {r4,r5} pop {r0} bx r0 @@ -313187,48 +313187,48 @@ 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 .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 bl SetMainCallback2 adds r0, r6, 0 bl remove_task -@080AFA7C: +_080AFA7C: pop {r4-r6} pop {r0} bx r0 @@ -313253,23 +313253,23 @@ 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 .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 @@ -313294,20 +313294,20 @@ sub_80AFA88: ; 80AFA88 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 @@ -313336,13 +313336,13 @@ sub_80AFA88: ; 80AFA88 bl FieldObjectSetSpecialAnim movs r0, 0x2 strh r0, [r5, 0x8] - b @080AFBE8 + b _080AFBE8 .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 @@ -313369,25 +313369,25 @@ sub_80AFA88: ; 80AFA88 bl sub_80AF0F4 movs r0, 0x3 strh r0, [r5, 0x8] - b @080AFBE8 + b _080AFBE8 .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 @@ -313395,7 +313395,7 @@ sub_80AFA88: ; 80AFA88 strh r0, [r5, 0x8] ldr r0, =sub_80AFA0C str r0, [r5] -@080AFBE8: +_080AFBE8: pop {r4-r6} pop {r0} bx r0 @@ -313415,41 +313415,41 @@ 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 .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 bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@080AFC56: +_080AFC56: pop {r4,r5} pop {r0} bx r0 @@ -313480,29 +313480,29 @@ sub_80AFC60: ; 80AFC60 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 @@ -313522,8 +313522,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 @@ -313561,15 +313561,15 @@ sub_80AFCC4: ; 80AFCC4 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 @@ -313584,29 +313584,29 @@ sub_80AFCC4: ; 80AFCC4 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 @@ -313626,8 +313626,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 @@ -313665,15 +313665,15 @@ sub_80AFD7C: ; 80AFD7C 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 @@ -313697,18 +313697,18 @@ 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 .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 @@ -313725,9 +313725,9 @@ sub_80AFE08: ; 80AFE08 bl sub_80AFCC4 movs r0, 0x1 strh r0, [r4] - b @080AFEC6 + b _080AFEC6 .pool -@080AFE64: +_080AFE64: ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 @@ -313753,25 +313753,25 @@ sub_80AFE08: ; 80AFE08 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 .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 @@ -313790,18 +313790,18 @@ 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 .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 @@ -313818,9 +313818,9 @@ sub_80AFECC: ; 80AFECC bl sub_80AFD7C movs r0, 0x1 strh r0, [r4] - b @080AFF8A + b _080AFF8A .pool -@080AFF28: +_080AFF28: ldr r0, =0x02039b28 ldrb r1, [r0, 0x14] lsls r0, r1, 4 @@ -313846,25 +313846,25 @@ sub_80AFECC: ; 80AFECC 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 .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 @@ -313879,11 +313879,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 @@ -313898,11 +313898,11 @@ sub_80AFFB8: ; 80AFFB8 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 @@ -313941,14 +313941,14 @@ 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 .pool -@080B0028: +_080B0028: negs r0, r7 strh r0, [r1, 0xA] -@080B002C: +_080B002C: adds r0, r2, 0 pop {r3,r4} mov r8, r3 @@ -313990,14 +313990,14 @@ 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 .pool -@080B0088: +_080B0088: negs r0, r7 strh r0, [r1, 0xA] -@080B008C: +_080B008C: adds r0, r2, 0 pop {r3,r4} mov r8, r3 @@ -314019,9 +314019,9 @@ sub_80B009C: ; 80B009C lsrs r0, 24 movs r5, 0 cmp r4, 0 - bne @080B00B6 + bne _080B00B6 movs r5, 0x1 -@080B00B6: +_080B00B6: ldr r1, =gUnknown_0854FE64 lsls r0, 1 adds r0, r1 @@ -314050,7 +314050,7 @@ sub_80B00E8: ; 80B00E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq @080B0116 + beq _080B0116 ldr r4, =0x02038c28 ldr r1, =gUnknown_0854FE64 lsls r0, 1 @@ -314067,7 +314067,7 @@ sub_80B00E8: ; 80B00E8 lsls r2, 1 adds r0, r4, 0 bl CpuFastSet -@080B0116: +_080B0116: pop {r4} pop {r0} bx r0 @@ -314113,31 +314113,31 @@ 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 .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 @@ -314156,52 +314156,52 @@ 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 .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 bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@080B023A: +_080B023A: pop {r4,r5} pop {r0} bx r0 @@ -314244,20 +314244,20 @@ sub_80B028C: ; 80B028C 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 @@ -314267,7 +314267,7 @@ sub_80B028C: ; 80B028C adds r4, r0 adds r5, 0x1 cmp r5, 0xF - ble @080B02AA + ble _080B02AA add sp, 0x4 pop {r4,r5} pop {r0} @@ -314285,21 +314285,21 @@ 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 .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 @@ -314307,14 +314307,14 @@ sub_80B02C8: ; 80B02C8 movs r0, 0x52 bl SetGpuReg 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 @@ -314334,26 +314334,26 @@ 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 .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] @@ -314420,9 +314420,9 @@ sub_80B0318: ; 80B0318 bl sub_80BA038 movs r0, 0x1 strh r0, [r5] - b @080B052C + b _080B052C .pool -@080B0424: +_080B0424: movs r0, 0 movs r1, 0x11 movs r2, 0 @@ -314441,19 +314441,19 @@ sub_80B0318: ; 80B0318 movs r3, 0xA0 bl sub_80B003C strh r4, [r5] - b @080B052C -@080B0450: + b _080B052C +_080B0450: ldr r0, =sub_80AFECC 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 .pool -@080B046C: +_080B046C: bl InstallCameraPanAheadCallback movs r0, 0 bl SetCameraPanningCallback @@ -314462,14 +314462,14 @@ sub_80B0318: ; 80B0318 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] @@ -314479,26 +314479,26 @@ sub_80B0318: ; 80B0318 movs r1, 0x4 negs r1, r1 cmp r0, 0 - beq @080B04A4 + beq _080B04A4 movs r1, 0x4 -@080B04A4: +_080B04A4: movs r0, 0 bl SetCameraPanning - b @080B052C -@080B04AC: + b _080B052C +_080B04AC: bl InstallCameraPanAheadCallback 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] @@ -314510,7 +314510,7 @@ sub_80B0318: ; 80B0318 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B052C + bne _080B052C movs r0, 0x5 strh r0, [r5] movs r0, 0 @@ -314518,8 +314518,8 @@ sub_80B0318: ; 80B0318 movs r2, 0 movs r3, 0x1 bl sub_8199DF0 - b @080B052C -@080B04F2: + b _080B052C +_080B04F2: movs r0, 0x40 movs r1, 0xFF bl SetGpuReg @@ -314541,7 +314541,7 @@ sub_80B0318: ; 80B0318 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} @@ -314564,28 +314564,28 @@ 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 .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] @@ -314633,11 +314633,11 @@ 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 @@ -314656,28 +314656,28 @@ 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 .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 bl SetMainCallback2 @@ -314685,7 +314685,7 @@ task01_battle_start: ; 80B05F0 bl overworld_poison_timer_set adds r0, r5, 0 bl remove_task -@080B0652: +_080B0652: pop {r4,r5} pop {r0} bx r0 @@ -314725,12 +314725,12 @@ sub_80B0698: ; 80B0698 push {lr} bl GetSafariZoneFlag 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 @@ -314758,7 +314758,7 @@ sub_80B06BC: ; 80B06BC bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @080B06F2 + beq _080B06F2 ldr r0, =0x0000400e movs r1, 0 bl VarSet @@ -314767,7 +314767,7 @@ sub_80B06BC: ; 80B06BC lsls r1, 14 orrs r0, r1 str r0, [r4] -@080B06F2: +_080B06F2: bl sub_80B0EC8 lsls r0, 24 lsrs r0, 24 @@ -314888,22 +314888,22 @@ sub_80B0828: ; 80B0828 bl InBattlePyramid 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 @@ -315009,31 +315009,31 @@ 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 .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 @@ -315044,9 +315044,9 @@ sub_80B0934: ; 80B0934 lsls r1, 1 movs r0, 0x17 bl task_add_01_battle_start - b @080B09FE + b _080B09FE .pool -@080B09B8: +_080B09B8: ldr r0, [r4] movs r1, 0x80 lsls r1, 22 @@ -315056,8 +315056,8 @@ sub_80B0934: ; 80B0934 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 @@ -315067,20 +315067,20 @@ sub_80B0934: ; 80B0934 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 .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 @@ -315106,19 +315106,19 @@ 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 .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 @@ -315149,32 +315149,32 @@ 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 .pool -@080B0ABC: +_080B0ABC: ldr r0, =0x00000193 cmp r2, r0 - beq @080B0AD0 - b @080B0AD4 + beq _080B0AD0 + b _080B0AD4 .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 @@ -315207,26 +315207,26 @@ sub_80B0AF8: ; 80B0AF8 ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 - bne @080B0B4C + bne _080B0B4C bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080B0B4C + bne _080B0B4C bl InBattlePike lsls r0, 24 cmp r0, 0 - bne @080B0B4C + bne _080B0B4C ldr r0, =c2_whiteout bl SetMainCallback2 - b @080B0B58 + b _080B0B58 .pool -@080B0B4C: +_080B0B4C: ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 ldr r1, =0x03005dac ldr r0, =sub_80AF6F0 str r0, [r1] -@080B0B58: +_080B0B58: add sp, 0x4 pop {r0} bx r0 @@ -315252,24 +315252,24 @@ sub_80B0B6C: ; 80B0B6C ldrb r0, [r0] bl battle_exit_is_player_defeat cmp r0, 0x1 - bne @080B0BC0 + bne _080B0BC0 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @080B0BB4 + beq _080B0BB4 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 - b @080B0BC6 + b _080B0BC6 .pool -@080B0BB4: +_080B0BB4: ldr r0, =c2_whiteout bl SetMainCallback2 - b @080B0BC6 + b _080B0BC6 .pool -@080B0BC0: +_080B0BC0: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 -@080B0BC6: +_080B0BC6: add sp, 0x4 pop {r0} bx r0 @@ -315299,139 +315299,139 @@ sub_80B0BD0: ; 80B0BD0 bl MetatileBehavior_IsTallGrass lsls r0, 24 cmp r0, 0 - beq @080B0C06 + beq _080B0C06 movs r0, 0 - b @080B0D1A -@080B0C06: + b _080B0D1A +_080B0C06: adds r0, r4, 0 bl MetatileBehavior_IsLongGrass lsls r0, 24 cmp r0, 0 - beq @080B0C16 + beq _080B0C16 movs r0, 0x1 - b @080B0D1A -@080B0C16: + b _080B0D1A +_080B0C16: adds r0, r4, 0 bl MetatileBehavior_IsSandOrDeepSand 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 .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 MetatileBehavior_IsSurfableWaterOrUnderwater 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 MetatileBehavior_IsSurfableWaterOrUnderwater 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 MetatileBehavior_IsSurfableWaterOrUnderwater 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 TestPlayerAvatarFlags 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 .pool -@080B0D18: +_080B0D18: movs r0, 0x2 -@080B0D1A: +_080B0D1A: add sp, 0x4 pop {r4,r5} pop {r1} @@ -315458,31 +315458,31 @@ 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 MetatileBehavior_IsSurfableWaterOrUnderwater 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 .pool -@080B0D78: +_080B0D78: movs r0, 0x1 - b @080B0D7E -@080B0D7C: + b _080B0D7E +_080B0D7C: movs r0, 0x3 -@080B0D7E: +_080B0D7E: add sp, 0x4 pop {r4} pop {r1} @@ -315496,7 +315496,7 @@ sub_80B0D88: ; 80B0D88 lsrs r5, r0, 24 movs r7, 0 movs r6, 0 -@080B0D92: +_080B0D92: movs r0, 0x64 adds r1, r6, 0 muls r1, r0 @@ -315509,14 +315509,14 @@ sub_80B0D88: ; 80B0D88 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 @@ -315527,12 +315527,12 @@ sub_80B0D88: ; 80B0D88 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} @@ -315556,34 +315556,34 @@ reads_trainer_data_byte0: ; 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 .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] @@ -315594,17 +315594,17 @@ reads_trainer_data_byte0: ; 80B0DE8 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] @@ -315615,17 +315615,17 @@ reads_trainer_data_byte0: ; 80B0DE8 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] @@ -315636,17 +315636,17 @@ reads_trainer_data_byte0: ; 80B0DE8 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] @@ -315657,8 +315657,8 @@ reads_trainer_data_byte0: ; 80B0DE8 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} @@ -315683,35 +315683,35 @@ sub_80B0EC8: ; 80B0EC8 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcs @080B0F10 + bcs _080B0F10 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @080B0F04 + beq _080B0F04 movs r0, 0 - b @080B0F2E + b _080B0F2E .pool -@080B0F04: +_080B0F04: ldr r0, =gUnknown_0854FE88 lsls r1, r5, 1 - b @080B0F20 + b _080B0F20 .pool -@080B0F10: +_080B0F10: bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080B0F2C + bne _080B0F2C ldr r0, =gUnknown_0854FE88 lsls r1, r6, 1 adds r0, 0x1 -@080B0F20: +_080B0F20: adds r1, r0 ldrb r0, [r1] - b @080B0F2E + b _080B0F2E .pool -@080B0F2C: +_080B0F2C: movs r0, 0xA -@080B0F2E: +_080B0F2E: pop {r4-r6} pop {r1} bx r1 @@ -315725,7 +315725,7 @@ reads_trainer_data_byte1_byte0x18: ; 80B0F34 movs r0, 0x80 lsls r0, 3 cmp r1, r0 - beq @080B0F98 + beq _080B0F98 ldr r1, =gTrainers ldrh r2, [r4] lsls r0, r2, 2 @@ -315734,68 +315734,68 @@ reads_trainer_data_byte1_byte0x18: ; 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 .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 .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 @@ -315810,19 +315810,19 @@ reads_trainer_data_byte1_byte0x18: ; 80B0F34 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc @080B0FF8 + bcc _080B0FF8 ldr r0, =gUnknown_0854FE90 lsls r1, r6, 1 adds r0, 0x1 - b @080B0FFC + b _080B0FFC .pool -@080B0FF8: +_080B0FF8: ldr r0, =gUnknown_0854FE90 lsls r1, r6, 1 -@080B0FFC: +_080B0FFC: adds r1, r0 ldrb r0, [r1] -@080B1000: +_080B1000: pop {r4-r6} pop {r1} bx r1 @@ -315844,90 +315844,90 @@ 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 .pool -@080B1040: +_080B1040: cmp r5, 0xD - bgt @080B106C + bgt _080B106C movs r0, 0x4 - b @080B1120 -@080B1048: + b _080B1120 +_080B1048: ldr r4, =gUnknown_0854FEA4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - b @080B1114 + b _080B1114 .pool -@080B105C: +_080B105C: ldr r4, =gUnknown_0854FEA7 bl GenerateRandomNumber ands r5, r0 lsls r0, r5, 16 - b @080B111A + b _080B111A .pool -@080B106C: +_080B106C: ldr r0, =0x000040ce bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - beq @080B10EC + beq _080B10EC ldr r4, =gUnknown_0854FE98 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - b @080B1112 + b _080B1112 .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, =gUnknown_0854FEA4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 movs r1, 0x3 - b @080B1114 + b _080B1114 .pool -@080B10B8: +_080B10B8: ldr r4, =gUnknown_0854FEA7 bl GenerateRandomNumber ands r5, r0 lsls r0, r5, 16 - b @080B111A + b _080B111A .pool -@080B10C8: +_080B10C8: ldr r0, =0x000040ce bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - beq @080B10EC + beq _080B10EC ldr r4, =gUnknown_0854FE98 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 - b @080B1112 + b _080B1112 .pool -@080B10EC: +_080B10EC: ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, =0x00000cb2 @@ -315947,16 +315947,16 @@ sub_80B100C: ; 80B100C lsls r0, 16 lsrs r0, 16 ldr r4, =gUnknown_0854FE98 -@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 @@ -316017,7 +316017,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] @@ -316035,7 +316035,7 @@ sub_80B11A8: ; 80B11A8 bl sav12_xor_increment bl sub_80EECC8 bl sub_80B1218 -@080B11F0: +_080B11F0: pop {r0} bx r0 .pool @@ -316060,9 +316060,9 @@ sub_80B1218: ; 80B1218 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 @@ -316075,9 +316075,9 @@ sub_80B1234: ; 80B1234 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 @@ -316150,28 +316150,28 @@ 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 .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 @@ -316197,22 +316197,22 @@ InitTrainerBattleVariables: ; 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 .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 @@ -316235,64 +316235,64 @@ TrainerBattleLoadArgs: ; 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 .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 TrainerBattleLoadArg8 ldr r1, [r4] strb r0, [r1] adds r5, 0x1 - b @080B13E8 -@080B13B6: + b _080B13E8 +_080B13B6: adds r0, r5, 0 bl TrainerBattleLoadArg16 ldr r1, [r4] strh r0, [r1] adds r5, 0x2 - b @080B13E8 -@080B13C4: + b _080B13E8 +_080B13C4: adds r0, r5, 0 bl TrainerBattleLoadArg32 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} @@ -316306,7 +316306,7 @@ battle_80801F0: ; 80B13F8 ldr r0, =0x02038bd0 ldrh r1, [r0] cmp r1, 0 - beq @080B141A + beq _080B141A ldr r0, =0x020375f2 strh r1, [r0] lsls r0, r1, 24 @@ -316318,7 +316318,7 @@ battle_80801F0: ; 80B13F8 bl GetFieldObjectIdByLocalIdAndMap ldr r1, =0x03005df0 strb r0, [r1] -@080B141A: +_080B141A: pop {r0} bx r0 .pool @@ -316339,66 +316339,66 @@ TrainerBattleConfigure: ; 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 .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, =gUnknown_0854FF84 adds r1, r5, 0 bl TrainerBattleLoadArgs ldr r0, =gUnknown_082713C2 - b @080B161E + b _080B161E .pool -@080B14A8: +_080B14A8: ldr r0, =gUnknown_0854FF3C - b @080B14D6 + b _080B14D6 .pool -@080B14B0: +_080B14B0: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne @080B14C4 + bne _080B14C4 ldr r0, =gUnknown_0854FEF4 - b @080B15FE + b _080B15FE .pool -@080B14C4: +_080B14C4: ldr r0, =gUnknown_0855005C - b @080B1616 + b _080B1616 .pool -@080B14CC: +_080B14CC: ldr r0, =gUnknown_0854FEF4 - b @080B15FE + b _080B15FE .pool -@080B14D4: +_080B14D4: ldr r0, =gUnknown_0854FFCC -@080B14D6: +_080B14D6: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 ldr r0, =gUnknown_0827138A - b @080B161E + b _080B161E .pool -@080B14EC: +_080B14EC: ldr r0, =gUnknown_0854FF3C adds r1, r5, 0 bl TrainerBattleLoadArgs @@ -316408,9 +316408,9 @@ TrainerBattleConfigure: ; 80B1430 bl sub_80B2234 strh r0, [r4] ldr r0, =gUnknown_082713F8 - b @080B161E + b _080B161E .pool -@080B1514: +_080B1514: ldr r0, =gUnknown_0854FEAC adds r1, r5, 0 bl TrainerBattleLoadArgs @@ -316420,13 +316420,13 @@ TrainerBattleConfigure: ; 80B1430 bl sub_80B2234 strh r0, [r4] ldr r0, =gUnknown_082713D1 - b @080B161E + b _080B161E .pool -@080B153C: +_080B153C: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne @080B156C + bne _080B156C ldr r0, =gUnknown_0854FEAC adds r1, r5, 0 bl TrainerBattleLoadArgs @@ -316435,38 +316435,38 @@ TrainerBattleConfigure: ; 80B1430 ldrb r0, [r0] bl sub_81A9AA8 ldr r1, =0x02038bca - b @080B157E + b _080B157E .pool -@080B156C: +_080B156C: ldr r0, =gUnknown_08550014 adds r1, r5, 0 bl TrainerBattleLoadArgs ldr r0, =0x020375f2 ldrb r0, [r0] bl sub_81A9AA8 -@080B157C: +_080B157C: ldr r1, =0x02038bcc -@080B157E: +_080B157E: strh r0, [r1] - b @080B161C + b _080B161C .pool -@080B1590: +_080B1590: ldr r0, =gUnknown_0854FEAC - b @080B159A + b _080B159A .pool -@080B1598: +_080B1598: ldr r0, =gUnknown_08550014 -@080B159A: +_080B159A: adds r1, r5, 0 bl TrainerBattleLoadArgs movs r0, 0 - b @080B161E + b _080B161E .pool -@080B15A8: +_080B15A8: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne @080B15D8 + bne _080B15D8 ldr r0, =gUnknown_0854FEAC adds r1, r5, 0 bl TrainerBattleLoadArgs @@ -316475,37 +316475,37 @@ TrainerBattleConfigure: ; 80B1430 ldrb r0, [r0] bl battle_init ldr r1, =0x02038bca - b @080B157E + b _080B157E .pool -@080B15D8: +_080B15D8: ldr r0, =gUnknown_08550014 adds r1, r5, 0 bl TrainerBattleLoadArgs ldr r0, =0x020375f2 ldrb r0, [r0] bl battle_init - b @080B157C + b _080B157C .pool -@080B15F4: +_080B15F4: ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne @080B1614 + bne _080B1614 ldr r0, =gUnknown_0854FEAC -@080B15FE: +_080B15FE: adds r1, r5, 0 bl TrainerBattleLoadArgs bl battle_80801F0 - b @080B161C + b _080B161C .pool -@080B1614: +_080B1614: ldr r0, =gUnknown_08550014 -@080B1616: +_080B1616: adds r1, r5, 0 bl TrainerBattleLoadArgs -@080B161C: +_080B161C: ldr r0, =gUnknown_08271362 -@080B161E: +_080B161E: pop {r4,r5} pop {r1} bx r1 @@ -316635,26 +316635,26 @@ check_trainer_flag: ; 80B1718 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @080B1734 + beq _080B1734 ldr r0, =0x03005df0 ldrb r0, [r0] bl GetBattlePyramidTrainerFlag - b @080B1752 + b _080B1752 .pool -@080B1734: +_080B1734: bl InTrainerHill cmp r0, 0 - bne @080B174A + bne _080B174A bl trainerflag_opponent lsls r0, 16 lsrs r0, 16 bl FlagGet - b @080B1752 -@080B174A: + b _080B1752 +_080B174A: ldr r0, =0x03005df0 ldrb r0, [r0] bl GetTrainerHillTrainerFlag -@080B1752: +_080B1752: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -316668,12 +316668,12 @@ rom_npc_set_flag_for_script_id: ; 80B1760 ldr r0, =0x02038bcc ldrh r0, [r0] cmp r0, 0 - beq @080B1776 + beq _080B1776 bl sub_80B1290 lsls r0, 16 lsrs r0, 16 bl FlagSet -@080B1776: +_080B1776: bl trainerflag_opponent lsls r0, 16 lsrs r0, 16 @@ -316741,20 +316741,20 @@ sub_80B17E0: ; 80B17E0 ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 - bne @080B17FC + bne _080B17FC ldr r1, =0x02022fec ldr r0, =0x00008009 - b @080B1800 + b _080B1800 .pool -@080B17FC: +_080B17FC: ldr r1, =0x02022fec movs r0, 0x8 -@080B1800: +_080B1800: str r0, [r1] bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @080B1884 + beq _080B1884 ldr r0, =0x0000400e movs r1, 0 bl VarSet @@ -316767,7 +316767,7 @@ sub_80B17E0: ; 80B17E0 ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 - bne @080B1864 + bne _080B1864 movs r0, 0x1 bl sub_816306C ldr r4, =0x020247a8 @@ -316784,9 +316784,9 @@ sub_80B17E0: ; 80B17E0 lsls r1, 1 adds r0, r4, r1 bl zero_pokemon_struct - b @080B187A + b _080B187A .pool -@080B1864: +_080B1864: movs r0, 0x1 bl sub_8163048 ldr r4, =0x020247a8 @@ -316795,15 +316795,15 @@ sub_80B17E0: ; 80B17E0 adds r4, 0x64 adds r0, r4, 0 bl zero_pokemon_struct -@080B187A: +_080B187A: bl sub_81A9B04 - b @080B18B8 + b _080B18B8 .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 @@ -316813,15 +316813,15 @@ sub_80B17E0: ; 80B17E0 ldr r0, =0x030060a8 ldrb r0, [r0] cmp r0, 0x2 - bne @080B18B0 + bne _080B18B0 bl sub_81D639C - b @080B18B4 + b _080B18B4 .pool -@080B18B0: +_080B18B0: bl sub_81D6384 -@080B18B4: +_080B18B4: bl sub_81D61E8 -@080B18B8: +_080B18B8: ldr r1, =0x02038bf9 ldr r2, =0x030060a8 ldrb r0, [r2] @@ -316839,18 +316839,18 @@ sub_80B17E0: ; 80B17E0 bl InBattlePyramid 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 .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} @@ -316865,44 +316865,44 @@ sub_80B1918: ; 80B1918 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 InBattlePyramid 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 bl SetMainCallback2 - b @080B198A + b _080B198A .pool -@080B195C: +_080B195C: ldr r0, =c2_whiteout bl SetMainCallback2 - b @080B198A + b _080B198A .pool -@080B1968: +_080B1968: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 bl InBattlePyramid 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 .pool @@ -316916,28 +316916,28 @@ sub_80B1994: ; 80B1994 movs r0, 0x80 lsls r0, 3 cmp r1, r0 - bne @080B19B4 + bne _080B19B4 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 - b @080B19E2 + b _080B19E2 .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 bl SetMainCallback2 - b @080B19E2 + b _080B19E2 .pool -@080B19D0: +_080B19D0: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 bl sub_80B20BC bl rom_npc_set_flag_for_script_id bl sub_80B22BC -@080B19E2: +_080B19E2: pop {r0} bx r0 .pool @@ -316965,20 +316965,20 @@ sub_80B1A14: ; 80B1A14 bl InBattlePyramid 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 .pool -@080B1A44: +_080B1A44: ldr r3, =0x02037350 ldr r2, =0x03006090 ldr r0, =0x02038bfc @@ -316997,17 +316997,17 @@ sub_80B1A14: ; 80B1A14 lsls r0, 16 lsrs r0, 16 bl sub_81A9EDC - b @080B1AD8 + b _080B1AD8 .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 @@ -317016,9 +317016,9 @@ sub_80B1A14: ; 80B1A14 lsrs r1, 16 movs r0, 0x2 bl sub_81D572C - b @080B1AD8 + b _080B1AD8 .pool -@080B1AAC: +_080B1AAC: ldr r3, =0x02037350 ldr r2, =0x03006090 ldr r0, =0x02038bfc @@ -317039,14 +317039,14 @@ sub_80B1A14: ; 80B1A14 lsrs r1, 16 movs r0, 0x2 bl sub_81D572C -@080B1AD8: +_080B1AD8: bl sub_80982B8 - b @080B1AF4 + b _080B1AF4 .pool -@080B1AEC: +_080B1AEC: bl sub_80B1C7C bl box_related_two__2 -@080B1AF4: +_080B1AF4: pop {r0} bx r0 thumb_func_end sub_80B1A14 @@ -317057,9 +317057,9 @@ sub_80B1AF8: ; 80B1AF8 ldr r0, =0x02038bec ldr r0, [r0] cmp r0, 0 - bne @080B1B04 + bne _080B1B04 ldr r0, =gUnknown_082C8436 -@080B1B04: +_080B1B04: pop {r1} bx r1 .pool @@ -317071,32 +317071,32 @@ sub_80B1B10: ; 80B1B10 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 .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 .pool -@080B1B54: +_080B1B54: ldr r0, =gUnknown_082742E6 -@080B1B56: +_080B1B56: pop {r1} bx r1 .pool @@ -317118,105 +317118,105 @@ SetUpTrainerEncounterMusic: ; 80B1B70 ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne @080B1B88 + bne _080B1B88 ldr r0, =0x02038bca - b @080B1B8A + b _080B1B8A .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 GetTrainerEncounterMusicId 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 .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 .pool -@080B1C04: +_080B1C04: ldr r0, =0x0000017b - b @080B1C5E + b _080B1C5E .pool -@080B1C0C: +_080B1C0C: movs r0, 0xD0 lsls r0, 1 - b @080B1C5E -@080B1C12: + b _080B1C5E +_080B1C12: ldr r0, =0x000001a1 - b @080B1C5E + b _080B1C5E .pool -@080B1C1C: +_080B1C1C: ldr r0, =0x000001a3 - b @080B1C5E + b _080B1C5E .pool -@080B1C24: +_080B1C24: ldr r0, =0x000001b9 - b @080B1C5E + b _080B1C5E .pool -@080B1C2C: +_080B1C2C: ldr r0, =0x00000181 - b @080B1C5E + b _080B1C5E .pool -@080B1C34: +_080B1C34: ldr r0, =0x000001c1 - b @080B1C5E + b _080B1C5E .pool -@080B1C3C: +_080B1C3C: movs r0, 0xE1 lsls r0, 1 - b @080B1C5E -@080B1C42: + b _080B1C5E +_080B1C42: ldr r0, =0x000001c3 - b @080B1C5E + b _080B1C5E .pool -@080B1C4C: +_080B1C4C: ldr r0, =0x000001c5 - b @080B1C5E + b _080B1C5E .pool -@080B1C54: +_080B1C54: ldr r0, =0x0000018d - b @080B1C5E + b _080B1C5E .pool -@080B1C5C: +_080B1C5C: ldr r0, =0x000001a7 -@080B1C5E: +_080B1C5E: bl current_map_music_set -@080B1C62: +_080B1C62: pop {r0} bx r0 .pool @@ -317227,9 +317227,9 @@ SetUpTrainerEncounterMusic: ; 80B1B70 ReturnEmptyStringIfNull: ; 80B1C6C push {lr} cmp r0, 0 - bne @080B1C74 + bne _080B1C74 ldr r0, =gUnknown_085E8D03 -@080B1C74: +_080B1C74: pop {r1} bx r1 .pool @@ -317241,13 +317241,13 @@ sub_80B1C7C: ; 80B1C7C ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - beq @080B1C94 + beq _080B1C94 ldr r0, =0x02038bd8 - b @080B1C96 + b _080B1C96 .pool -@080B1C94: +_080B1C94: ldr r0, =0x02038bd4 -@080B1C96: +_080B1C96: ldr r0, [r0] bl ReturnEmptyStringIfNull pop {r1} @@ -317263,14 +317263,14 @@ sub_80B1CA4: ; 80B1CA4 movs r0, 0x80 lsls r0, 3 cmp r1, r0 - bne @080B1CBC + bne _080B1CBC bl sub_80EA250 - b @080B1CC0 + b _080B1CC0 .pool -@080B1CBC: +_080B1CBC: ldr r0, =0x02038bdc ldr r0, [r0] -@080B1CC0: +_080B1CC0: ldr r4, =0x02021fc4 bl ReturnEmptyStringIfNull adds r1, r0, 0 @@ -317329,20 +317329,20 @@ sub_80B1D2C: ; 80B1D2C 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 @@ -317354,36 +317354,36 @@ sub_80B1D50: ; 80B1D50 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 @@ -317393,25 +317393,25 @@ sub_80B1D50: ; 80B1D50 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 FlagGet 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 @@ -317424,21 +317424,21 @@ sub_80B1DBC: ; 80B1DBC 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 @@ -317468,17 +317468,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 @@ -317486,7 +317486,7 @@ sub_80B1DFC: ; 80B1DFC adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne @080B1E72 + bne _080B1E72 movs r1, 0xAE lsls r1, 1 adds r0, r5, r1 @@ -317495,7 +317495,7 @@ sub_80B1DFC: ; 80B1DFC bl FlagGet lsls r0, 24 cmp r0, 0 - beq @080B1E74 + beq _080B1E74 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -317504,17 +317504,17 @@ sub_80B1DFC: ; 80B1DFC 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 @@ -317537,11 +317537,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 @@ -317559,30 +317559,30 @@ 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 .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 @@ -317598,22 +317598,22 @@ 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 @@ -317629,9 +317629,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 @@ -317639,13 +317639,13 @@ sub_80B1F38: ; 80B1F38 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @080B1F6C + beq _080B1F6C movs r0, 0x1 - b @080B1F6E + b _080B1F6E .pool -@080B1F6C: +_080B1F6C: movs r0, 0 -@080B1F6E: +_080B1F6E: pop {r1} bx r1 thumb_func_end sub_80B1F38 @@ -317660,9 +317660,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 @@ -317670,13 +317670,13 @@ sub_80B1F74: ; 80B1F74 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @080B1FA8 + beq _080B1FA8 movs r0, 0x1 - b @080B1FAA + b _080B1FAA .pool -@080B1FA8: +_080B1FA8: movs r0, 0 -@080B1FAA: +_080B1FAA: pop {r1} bx r1 thumb_func_end sub_80B1F74 @@ -317692,39 +317692,39 @@ 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 @@ -317741,40 +317741,40 @@ 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 @@ -317790,7 +317790,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 @@ -317798,7 +317798,7 @@ sub_80B205C: ; 80B205C adds r0, r1 movs r1, 0 strb r1, [r0] -@080B207E: +_080B207E: pop {r0} bx r0 .pool @@ -317812,20 +317812,20 @@ sub_80B208C: ; 80B208C movs r4, 0xAE lsls r4, 1 ldr r2, =gUnknown_085500A4 -@080B2098: +_080B2098: ldrh r0, [r2] cmp r0, r3 - bne @080B20A8 + bne _080B20A8 adds r0, r1, r4 - b @080B20B2 + b _080B20B2 .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 @@ -317839,18 +317839,18 @@ sub_80B20BC: ; 80B20BC bl FlagGet 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 FlagSet -@080B20E2: +_080B20E2: pop {r0} bx r0 .pool @@ -317867,19 +317867,19 @@ 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 @@ -317891,26 +317891,26 @@ sub_80B2128: ; 80B2128 movs r6, 0 movs r5, 0 ldr r4, =gUnknown_08550584 -@080B2130: +_080B2130: ldrh r0, [r4] bl FlagGet 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 .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 @@ -317921,22 +317921,22 @@ 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 .pool -@080B2180: +_080B2180: adds r0, 0x1 -@080B2182: +_080B2182: strh r0, [r1] -@080B2184: +_080B2184: pop {r0} bx r0 thumb_func_end sub_80B215C @@ -317946,20 +317946,20 @@ 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 .pool -@080B21AC: +_080B21AC: movs r0, 0 -@080B21AE: +_080B21AE: pop {r1} bx r1 thumb_func_end sub_80B2188 @@ -317973,20 +317973,20 @@ sub_80B21B4: ; 80B21B4 lsrs r4, r1, 16 bl sub_80B2188 cmp r0, 0 - beq @080B21E0 + beq _080B21E0 ldr r0, =gUnknown_085500A4 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 @@ -318067,17 +318067,17 @@ 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 .pool -@080B2298: +_080B2298: movs r0, 0x1 -@080B229A: +_080B229A: pop {r4,r5} pop {r1} bx r1 @@ -318116,7 +318116,7 @@ CheckIfMultipleTrainersWantBattle: ; 80B22D8 ldr r1, =0x02038bf9 ldrb r0, [r1] cmp r0, 0x1 - bls @080B2300 + bls _080B2300 movs r0, 0 strb r0, [r1] ldr r1, =0x02038bf8 @@ -318124,15 +318124,15 @@ CheckIfMultipleTrainersWantBattle: ; 80B22D8 strb r0, [r1] ldr r1, =0x020375f0 movs r0, 0x1 - b @080B230A + b _080B230A .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 @@ -318151,35 +318151,35 @@ sub_80B2318: ; 80B2318 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080B2338 + beq _080B2338 movs r0, 0 - b @080B2364 + b _080B2364 .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 @@ -318198,7 +318198,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 @@ -318211,7 +318211,7 @@ sub_80B236C: ; 80B236C adds r1, r2 strh r6, [r1, 0xA] strh r5, [r1, 0xC] -@080B23A0: +_080B23A0: pop {r4-r6} pop {r0} bx r0 @@ -318297,20 +318297,20 @@ 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 .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 @@ -318328,35 +318328,35 @@ 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 .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 @@ -318367,14 +318367,14 @@ sub_80B2478: ; 80B2478 movs r3, 0x1 bl ConvertIntToDecimalString movs r0, 0x4 - b @080B24F2 + b _080B24F2 .pool -@080B24EC: +_080B24EC: movs r0, 0xA - b @080B24F2 -@080B24F0: + b _080B24F2 +_080B24F0: movs r0, 0 -@080B24F2: +_080B24F2: pop {r4} pop {r1} bx r1 @@ -318389,10 +318389,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 @@ -318401,7 +318401,7 @@ sub_80B24F8: ; 80B24F8 ldr r0, =sub_80B2D2C str r0, [r1] movs r0, 0x1 -@080B251E: +_080B251E: pop {r4} pop {r1} bx r1 @@ -318418,12 +318418,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 @@ -318434,11 +318434,11 @@ sub_80B252C: ; 80B252C ldr r1, =sub_80B2CEC str r1, [r0] movs r0, 0x1 - b @080B2572 + b _080B2572 .pool -@080B2570: +_080B2570: movs r0, 0 -@080B2572: +_080B2572: pop {r4} pop {r1} bx r1 @@ -318452,20 +318452,20 @@ sub_80B2578: ; 80B2578 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 .pool -@080B25A4: +_080B25A4: ldr r1, =0x020229c6 movs r0, 0 strh r0, [r1] @@ -318477,7 +318477,7 @@ sub_80B2578: ; 80B2578 ldr r1, =sub_80B2CEC str r1, [r0] movs r0, 0x1 -@080B25BA: +_080B25BA: pop {r4} pop {r1} bx r1 @@ -318493,10 +318493,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 @@ -318505,7 +318505,7 @@ sub_80B25CC: ; 80B25CC ldr r0, =sub_80B2D2C str r0, [r1] movs r0, 0x1 -@080B25F2: +_080B25F2: pop {r4} pop {r1} bx r1 @@ -318528,12 +318528,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 @@ -318553,23 +318553,23 @@ 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, =gUnknown_08550594 bl AddWindow strh r0, [r4, 0xA] - b @080B2678 + b _080B2678 .pool -@080B266C: +_080B266C: cmp r2, 0x9 - ble @080B2678 + ble _080B2678 subs r0, 0x8 adds r0, r1, r0 ldr r1, =sub_80B2688 str r1, [r0] -@080B2678: +_080B2678: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -318590,13 +318590,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 @@ -318610,23 +318610,23 @@ sub_80B2688: ; 80B2688 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B26EC + bne _080B26EC movs r0, 0x15 bl audio_play ldr r0, =gUnknown_082780B3 bl box_related_two__3 ldr r0, =sub_80B270C - b @080B26FA + b _080B26FA .pool -@080B26EC: +_080B26EC: movs r0, 0x16 bl audio_play ldr r0, =gUnknown_08278131 bl box_related_two__3 ldr r0, =sub_80B2918 -@080B26FA: +_080B26FA: str r0, [r4] -@080B26FC: +_080B26FC: pop {r4,r5} pop {r0} bx r0 @@ -318641,20 +318641,20 @@ sub_80B270C: ; 80B270C 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 @@ -318663,7 +318663,7 @@ sub_80B270C: ; 80B270C strh r2, [r1, 0xE] ldr r0, =sub_80B275C str r0, [r1] -@080B274C: +_080B274C: pop {r4} pop {r0} bx r0 @@ -318692,15 +318692,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 @@ -318710,11 +318710,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] @@ -318731,7 +318731,7 @@ sub_80B275C: ; 80B275C add r0, r8 ldr r1, =sub_80B2804 str r1, [r0] -@080B27E4: +_080B27E4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -318750,33 +318750,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, =gUnknown_082780B3 bl box_related_two__3 ldr r1, =0x03005e00 @@ -318786,13 +318786,13 @@ sub_80B2804: ; 80B2804 adds r0, r1 ldr r1, =sub_80B270C str r1, [r0] - b @080B2898 + b _080B2898 .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 @@ -318803,7 +318803,7 @@ sub_80B2804: ; 80B2804 adds r1, r0 ldr r0, =sub_80B28A8 str r0, [r1] -@080B2898: +_080B2898: pop {r4-r6} pop {r0} bx r0 @@ -318825,24 +318825,24 @@ 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 - b @080B2908 + b _080B2908 .pool -@080B28F4: +_080B28F4: ldr r4, =0x020375f0 adds r0, r7, 0 adds r1, r6, 0 @@ -318850,11 +318850,11 @@ sub_80B28A8: ; 80B28A8 strh r0, [r4] lsls r0, 16 cmp r0, 0 - beq @080B290A + beq _080B290A ldr r0, =sub_80B2A08 -@080B2908: +_080B2908: str r0, [r5] -@080B290A: +_080B290A: pop {r4-r7} pop {r0} bx r0 @@ -318878,11 +318878,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 @@ -318892,29 +318892,29 @@ 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 - b @080B29E4 + b _080B29E4 .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 - b @080B29E4 + b _080B29E4 .pool -@080B2994: +_080B2994: bl sub_800ABAC ldr r4, =0x03005db8 strb r0, [r4] @@ -318949,9 +318949,9 @@ sub_80B2918: ; 80B2918 adds r4, 0x56 strh r0, [r4] ldr r0, =sub_80B2C30 -@080B29E4: +_080B29E4: str r0, [r7] -@080B29E6: +_080B29E6: pop {r3} mov r8, r3 pop {r4-r7} @@ -318970,30 +318970,30 @@ 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 .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 @@ -319002,9 +319002,9 @@ sub_80B2A08: ; 80B2A08 adds r1, r0 ldr r0, =sub_80B2CB0 str r0, [r1] - b @080B2ACE + b _080B2ACE .pool -@080B2A6C: +_080B2A6C: bl sub_800ABAC ldr r4, =0x03005db8 strb r0, [r4] @@ -319047,7 +319047,7 @@ sub_80B2A08: ; 80B2A08 str r1, [r0] movs r0, 0x2 bl sub_800A4D8 -@080B2ACE: +_080B2ACE: pop {r3} mov r8, r3 pop {r4-r7} @@ -319080,7 +319080,7 @@ sub_80B2AF4: ; 80B2AF4 mov r10, r0 ldr r0, =gSpeciesNames mov r9, r0 -@080B2B20: +_080B2B20: lsls r0, r1, 1 adds r1, 0x1 mov r8, r1 @@ -319088,22 +319088,22 @@ sub_80B2AF4: ; 80B2AF4 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 CopyString movs r2, 0x1 -@080B2B48: +_080B2B48: cmp r7, 0x1 - bne @080B2B5C + bne _080B2B5C ldrh r0, [r4] mov r1, r10 muls r1, r0 @@ -319111,16 +319111,16 @@ sub_80B2AF4: ; 80B2AF4 ldr r0, =0x02021dc4 bl CopyString 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 @@ -319143,22 +319143,22 @@ task_map_chg_seq_0807EC34: ; 80B2B94 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 @@ -319169,9 +319169,9 @@ task_map_chg_seq_0807EC34: ; 80B2B94 adds r0, r1 ldr r1, =sub_80B2CB0 str r1, [r0] - b @080B2C22 + b _080B2C22 .pool -@080B2BEC: +_080B2BEC: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -319183,9 +319183,9 @@ task_map_chg_seq_0807EC34: ; 80B2B94 lsls r0, r4, 24 lsrs r0, 24 bl remove_task - b @080B2C22 + b _080B2C22 .pool -@080B2C10: +_080B2C10: bl sub_800AC34 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -319194,7 +319194,7 @@ task_map_chg_seq_0807EC34: ; 80B2B94 adds r1, r0 ldr r0, =sub_80B2CB0 str r0, [r1] -@080B2C22: +_080B2C22: pop {r4,r5} pop {r0} bx r0 @@ -319209,19 +319209,19 @@ sub_80B2C30: ; 80B2C30 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 .pool -@080B2C5C: +_080B2C5C: movs r0, 0x64 muls r0, r4 ldr r1, =0x02039b58 @@ -319238,19 +319238,19 @@ sub_80B2C30: ; 80B2C30 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 @@ -319265,7 +319265,7 @@ sub_80B2CB0: ; 80B2CB0 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @080B2CDE + bne _080B2CDE ldr r0, =0x03005e00 lsls r4, r5, 2 adds r4, r5 @@ -319278,7 +319278,7 @@ sub_80B2CB0: ; 80B2CB0 bl RemoveWindow adds r0, r5, 0 bl remove_task -@080B2CDE: +_080B2CDE: pop {r4,r5} pop {r0} bx r0 @@ -319358,15 +319358,15 @@ sub_80B2D6C: ; 80B2D6C movs r1, 0x96 lsls r1, 18 cmp r0, r1 - bgt @080B2D94 + bgt _080B2D94 movs r0, 0 - b @080B2D9A + b _080B2D9A .pool -@080B2D94: +_080B2D94: ldr r0, =sub_80B2D2C str r0, [r2] movs r0, 0x1 -@080B2D9A: +_080B2D9A: pop {r1} bx r1 .pool @@ -319380,39 +319380,39 @@ sub_80B2DA4: ; 80B2DA4 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 .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 .pool -@080B2DDC: +_080B2DDC: movs r3, 0x2 ldr r1, =0x020229c6 ldr r4, =0x00002244 - b @080B2E30 + b _080B2E30 .pool -@080B2DEC: +_080B2DEC: movs r3, 0x4 movs r2, 0x4 ldr r1, =0x020229c6 ldr r4, =0x00002255 - b @080B2E30 + b _080B2E30 .pool -@080B2E00: +_080B2E00: movs r3, 0x2 ldr r0, =0x03005d90 ldr r0, [r0] @@ -319422,18 +319422,18 @@ sub_80B2DA4: ; 80B2DA4 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne @080B2E2C + bne _080B2E2C ldr r1, =0x020229c6 ldr r4, =0x00002266 - b @080B2E30 + b _080B2E30 .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 @@ -319491,7 +319491,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 @@ -319504,7 +319504,7 @@ sub_80B2EA8: ; 80B2EA8 adds r0, r1 movs r1, 0 strh r1, [r0, 0x8] -@080B2ED4: +_080B2ED4: pop {r4} pop {r0} bx r0 @@ -319527,16 +319527,16 @@ 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 .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 @@ -319546,31 +319546,31 @@ sub_80B2EE4: ; 80B2EE4 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 .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 @@ -319579,22 +319579,22 @@ sub_80B2EE4: ; 80B2EE4 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] @@ -319606,22 +319606,22 @@ sub_80B2EE4: ; 80B2EE4 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - b @080B2FC6 + b _080B2FC6 .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 @@ -319692,49 +319692,49 @@ sub_80B3050: ; 80B3050 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq @080B3068 + beq _080B3068 movs r0, 0xFF - b @080B3134 + b _080B3134 .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 .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 .pool -@080B30B8: +_080B30B8: ldr r1, =0x020229c6 ldr r2, =0x00002244 - b @080B3124 + b _080B3124 .pool -@080B30C8: +_080B30C8: ldr r1, =0x020229c6 ldr r2, =0x00002255 - b @080B3124 + b _080B3124 .pool -@080B30D8: +_080B30D8: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000ca9 @@ -319743,34 +319743,34 @@ sub_80B3050: ; 80B3050 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne @080B3100 + bne _080B3100 ldr r1, =0x020229c6 ldr r2, =0x00002266 - b @080B3124 + b _080B3124 .pool -@080B3100: +_080B3100: ldr r1, =0x020229c6 ldr r2, =0x00002277 - b @080B3124 + b _080B3124 .pool -@080B3110: +_080B3110: ldr r1, =0x020229c6 ldr r2, =0x00001111 - b @080B3124 + b _080B3124 .pool -@080B3120: +_080B3120: ldr r1, =0x020229c6 ldr r2, =0x00003322 -@080B3124: +_080B3124: adds r0, r2, 0 strh r0, [r1] -@080B3128: +_080B3128: ldr r0, =sub_80B3144 movs r1, 0x50 bl AddTask lsls r0, 24 lsrs r0, 24 -@080B3134: +_080B3134: pop {r1} bx r1 .pool @@ -319789,22 +319789,22 @@ 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 movs r1, 0x50 bl AddTask - b @080B3184 + b _080B3184 .pool -@080B3178: +_080B3178: cmp r2, 0x9 - ble @080B3184 + ble _080B3184 subs r0, 0x8 adds r0, r1, r0 ldr r1, =sub_80B3194 str r1, [r0] -@080B3184: +_080B3184: ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -319824,30 +319824,30 @@ 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 - b @080B31D8 + b _080B31D8 .pool -@080B31CC: +_080B31CC: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_80B3220 -@080B31D8: +_080B31D8: str r0, [r1] -@080B31DA: +_080B31DA: pop {r4,r5} pop {r0} bx r0 @@ -319865,7 +319865,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 @@ -319874,7 +319874,7 @@ sub_80B31E8: ; 80B31E8 adds r1, r0 ldr r0, =sub_80B3220 str r0, [r1] -@080B3212: +_080B3212: pop {r4,r5} pop {r0} bx r0 @@ -319889,17 +319889,17 @@ sub_80B3220: ; 80B3220 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 @@ -319918,40 +319918,40 @@ sub_80B3254: ; 80B3254 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 .pool -@080B3284: +_080B3284: ldr r1, =0x02022fec movs r0, 0xB - b @080B32A4 + b _080B32A4 .pool -@080B3290: +_080B3290: bl sub_80F94E8 ldr r1, =0x02022fec movs r0, 0x4B - b @080B32A4 + b _080B32A4 .pool -@080B32A0: +_080B32A0: ldr r1, =0x02022fec ldr r0, =0x0000014b -@080B32A4: +_080B32A4: str r0, [r1] -@080B32A6: +_080B32A6: pop {r0} bx r0 .pool @@ -319970,22 +319970,22 @@ 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 .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 @@ -319994,55 +319994,55 @@ sub_80B32B4: ; 80B32B4 adds r0, r2, 0 strh r0, [r1] bl sub_8009FAC - b @080B3346 + b _080B3346 .pool -@080B3318: +_080B3318: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 - b @080B3342 + b _080B3342 .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 .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 .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 @@ -320059,7 +320059,7 @@ sub_80B32B4: ; 80B32B4 str r0, [r1, 0x8] adds r0, r5, 0 bl remove_task -@080B33A0: +_080B33A0: pop {r4,r5} pop {r0} bx r0 @@ -320079,26 +320079,26 @@ 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 .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 @@ -320109,43 +320109,43 @@ sub_80B33BC: ; 80B33BC bl sub_8009FAC movs r0, 0x1 strh r0, [r6] - b @080B3532 + b _080B3532 .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 .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 .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 .pool -@080B3474: +_080B3474: lsls r1, r4, 8 ldr r2, =0x020223c4 adds r0, r5, 0 @@ -320163,56 +320163,56 @@ sub_80B33BC: ; 80B33BC 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 .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 .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] @@ -320232,7 +320232,7 @@ sub_80B33BC: ; 80B33BC str r0, [r1, 0x8] adds r0, r4, 0 bl remove_task -@080B3532: +_080B3532: pop {r4-r7} pop {r0} bx r0 @@ -320248,34 +320248,34 @@ 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 .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 @@ -320283,21 +320283,21 @@ sub_80B3554: ; 80B3554 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 .pool -@080B35C8: +_080B35C8: bl sub_800AC34 ldr r0, =0x030022c0 movs r1, 0x87 @@ -320305,21 +320305,21 @@ sub_80B3554: ; 80B3554 adds r0, r1 movs r1, 0x1 strb r1, [r0] - b @080B35FE + b _080B35FE .pool -@080B35E0: +_080B35E0: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @080B35FE + bne _080B35FE ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 - b @080B35FE + b _080B35FE .pool -@080B35F8: +_080B35F8: ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 -@080B35FE: +_080B35FE: bl run_active_tasks pop {r4} pop {r0} @@ -320346,7 +320346,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 @@ -320355,16 +320355,16 @@ 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 .pool -@080B3670: +_080B3670: ldr r4, =0x020229e8 bl link_get_multiplayer_id eors r0, r5 @@ -320378,9 +320378,9 @@ sub_80B360C: ; 80B360C ldr r1, [r1] movs r0, 0 bl sub_801B990 - b @080B36B2 + b _080B36B2 .pool -@080B3694: +_080B3694: ldr r4, =0x020229e8 bl link_get_multiplayer_id eors r0, r5 @@ -320394,18 +320394,18 @@ sub_80B360C: ; 80B360C ldr r1, [r1] movs r0, 0x1 bl sub_801B990 -@080B36B2: +_080B36B2: bl InUnionRoom cmp r0, 0x1 - bne @080B36CC + bne _080B36CC ldr r1, =0x030022c0 ldr r0, =sub_80B3554 - b @080B36D0 + b _080B36D0 .pool -@080B36CC: +_080B36CC: ldr r1, =0x030022c0 ldr r0, =c2_8056854 -@080B36D0: +_080B36D0: str r0, [r1, 0x8] ldr r0, =sub_80A0514 bl SetMainCallback2 @@ -320424,16 +320424,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 copy_bags_and_unk_data_to_save_blocks -@080B370E: +_080B370E: movs r0, 0x7F bl copy_saved_warp2_bank_and_enter_x_to_warp1 pop {r0} @@ -320462,68 +320462,68 @@ 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 .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, =gUnknown_08278091 bl box_related_two__2 movs r0, 0x1 strh r0, [r5, 0x8] - b @080B37CC + b _080B37CC .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 .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 @@ -320562,58 +320562,58 @@ 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 .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 .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 .pool -@080B3870: +_080B3870: ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @080B3884 + bne _080B3884 ldr r0, =sub_80773AC bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@080B3884: +_080B3884: pop {r4,r5} pop {r0} bx r0 @@ -320633,57 +320633,57 @@ 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 .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 .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 .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 @@ -320695,15 +320695,15 @@ sub_80B3924: ; 80B3924 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @080B3940 + beq _080B3940 ldr r0, =sub_80B3894 bl sub_80B37D4 - b @080B3946 + b _080B3946 .pool -@080B3940: +_080B3940: ldr r0, =sub_80B37FC bl sub_80B37D4 -@080B3946: +_080B3946: pop {r0} bx r0 .pool @@ -320735,15 +320735,15 @@ sub_80B3968: ; 80B3968 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @080B3994 + beq _080B3994 ldr r0, =sub_80B33BC bl sub_80B37D4 - b @080B399A + b _080B399A .pool -@080B3994: +_080B3994: ldr r0, =sub_80B32B4 bl sub_80B37D4 -@080B399A: +_080B399A: pop {r0} bx r0 .pool @@ -320793,7 +320793,7 @@ sub_80B39D4: ; 80B39D4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq @080B3A28 + beq _080B3A28 ldr r0, =0x02021dc4 ldr r2, =gUnknown_0855059C subs r1, 0x1 @@ -320802,11 +320802,11 @@ sub_80B39D4: ; 80B39D4 ldr r1, [r1] bl CopyString movs r0, 0x1 - b @080B3A2A + b _080B3A2A .pool -@080B3A28: +_080B3A28: movs r0, 0 -@080B3A2A: +_080B3A2A: pop {r4} pop {r1} bx r1 @@ -320830,37 +320830,37 @@ task00_08081A90: ; 80B3A30 movs r0, 0x96 lsls r0, 17 cmp r1, r0 - ble @080B3A62 + ble _080B3A62 bl sub_80097E8 ldr r0, =c2_800ACD4 bl SetMainCallback2 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 bl SetMainCallback2 -@080B3A86: +_080B3A86: adds r0, r4, 0 bl remove_task - b @080B3AA6 + b _080B3AA6 .pool -@080B3AA0: +_080B3AA0: adds r0, r5, 0 bl remove_task -@080B3AA6: +_080B3AA6: pop {r4,r5} pop {r0} bx r0 @@ -320874,11 +320874,11 @@ sub_80B3AAC: ; 80B3AAC 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 @@ -320918,84 +320918,84 @@ 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 .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 .pool -@080B3B40: +_080B3B40: bl sub_8009734 ldr r0, =task00_08081A90 movs r1, 0x1 bl AddTask - b @080B3B96 + b _080B3B96 .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 @@ -321008,12 +321008,12 @@ sub_80B3BC4: ; 80B3BC4 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 .pool @@ -321030,7 +321030,7 @@ CheckForTrainersWantingBattle: ; 80B3BE8 strb r1, [r0] movs r4, 0 ldr r6, =0x02037350 -@080B3BF8: +_080B3BF8: lsls r0, r4, 3 adds r0, r4 lsls r0, 2 @@ -321038,42 +321038,42 @@ CheckForTrainersWantingBattle: ; 80B3BE8 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 CheckIfTrainerWantsBattle 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 CheckPlayerPartySize 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 ResetTrainerOpponentIds ldr r2, =0x03006090 ldrb r0, [r5] @@ -321090,21 +321090,21 @@ CheckForTrainersWantingBattle: ; 80B3BE8 ldr r0, =0x030060ac strb r4, [r0] movs r0, 0x1 - b @080B3CF4 + b _080B3CF4 .pool -@080B3C88: +_080B3C88: ldrb r0, [r5] cmp r0, 0x2 - bne @080B3CEC + bne _080B3CEC bl ResetTrainerOpponentIds 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 @@ -321122,8 +321122,8 @@ CheckForTrainersWantingBattle: ; 80B3BE8 ldr r0, =0x030060a8 ldrb r0, [r0] cmp r4, r0 - bcc @080B3CA0 -@080B3CC6: + bcc _080B3CA0 +_080B3CC6: bl TwoTrainersWantBattleExecuteScript ldr r1, =0x02038bfc movs r0, 0 @@ -321132,14 +321132,14 @@ CheckForTrainersWantingBattle: ; 80B3BE8 movs r0, 0x1 strb r0, [r1] movs r0, 0x1 - b @080B3CF4 + b _080B3CF4 .pool -@080B3CEC: +_080B3CEC: ldr r1, =0x030060ac movs r0, 0 strb r0, [r1] movs r0, 0 -@080B3CF4: +_080B3CF4: pop {r4-r7} pop {r1} bx r1 @@ -321159,38 +321159,38 @@ CheckIfTrainerWantsBattle: ; 80B3D00 mov r9, r0 bl InTrainerHill cmp r0, 0x1 - bne @080B3D1E + bne _080B3D1E bl sub_81D62AC - b @080B3D24 -@080B3D1E: + b _080B3D24 +_080B3D1E: adds r0, r5, 0 bl GetFieldObjectScriptPointerByFieldObjectId -@080B3D24: +_080B3D24: adds r7, r0, 0 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @080B3D3E + beq _080B3D3E adds r0, r5, 0 bl GetBattlePyramidTrainerFlag -@080B3D36: +_080B3D36: lsls r0, 24 -@080B3D38: +_080B3D38: cmp r0, 0 - beq @080B3D56 - b @080B3DE0 -@080B3D3E: + beq _080B3D56 + b _080B3DE0 +_080B3D3E: bl InTrainerHill cmp r0, 0x1 - bne @080B3D4E + bne _080B3D4E adds r0, r5, 0 bl GetTrainerHillTrainerFlag - b @080B3D36 -@080B3D4E: + b _080B3D36 +_080B3D4E: adds r0, r7, 0 bl GetTrainerFlagFromScriptPointer - b @080B3D38 -@080B3D56: + b _080B3D38 +_080B3D56: lsls r4, r5, 3 adds r0, r4, r5 lsls r0, 2 @@ -321201,22 +321201,22 @@ CheckIfTrainerWantsBattle: ; 80B3D00 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 CheckPlayerPartySize 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] @@ -321251,11 +321251,11 @@ CheckIfTrainerWantsBattle: ; 80B3D00 adds r0, 0x1 strb r0, [r4] mov r0, r9 - b @080B3DE2 + b _080B3DE2 .pool -@080B3DE0: +_080B3DE0: movs r0, 0 -@080B3DE2: +_080B3DE2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -321280,7 +321280,7 @@ CheckIfTrainerCanApproachPlayer: ; 80B3DF0 ldrb r0, [r7, 0x7] mov r8, r4 cmp r0, 0x1 - bne @080B3E50 + bne _080B3E50 ldr r1, =gUnknown_0855072C ldrb r0, [r7, 0x18] lsls r0, 28 @@ -321306,14 +321306,14 @@ CheckIfTrainerCanApproachPlayer: ; 80B3DF0 bl CheckPathBetweenTrainerAndPlayer lsls r0, 24 lsrs r0, 24 - b @080B3E90 + b _080B3E90 .pool -@080B3E4C: +_080B3E4C: adds r0, r6, 0 - b @080B3E90 -@080B3E50: + b _080B3E90 +_080B3E50: movs r5, 0 -@080B3E52: +_080B3E52: ldr r0, =gUnknown_0855072C lsls r4, r5, 2 adds r4, r0 @@ -321338,12 +321338,12 @@ CheckIfTrainerCanApproachPlayer: ; 80B3DF0 bl CheckPathBetweenTrainerAndPlayer 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 @@ -321367,27 +321367,27 @@ IsTrainerInRangeSouth: ; 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 @@ -321407,27 +321407,27 @@ IsTrainerInRangeNorth: ; 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 @@ -321447,27 +321447,27 @@ IsTrainerInRangeWest: ; 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 @@ -321487,27 +321487,27 @@ IsTrainerInRangeEast: ; 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 @@ -321528,7 +321528,7 @@ CheckPathBetweenTrainerAndPlayer: ; 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] @@ -321545,8 +321545,8 @@ CheckPathBetweenTrainerAndPlayer: ; 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] @@ -321559,13 +321559,13 @@ CheckPathBetweenTrainerAndPlayer: ; 80B3FB0 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 @@ -321574,8 +321574,8 @@ CheckPathBetweenTrainerAndPlayer: ; 80B3FB0 mov r2, r8 bl MoveCoords cmp r5, r4 - blt @080B3FEE -@080B4028: + blt _080B3FEE +_080B4028: ldrb r4, [r6, 0x19] lsls r5, r4, 28 lsrs r5, 28 @@ -321597,13 +321597,13 @@ CheckPathBetweenTrainerAndPlayer: ; 80B3FB0 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 @@ -321662,15 +321662,15 @@ sub_80B40C8: ; 80B40C8 ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - bne @080B40E4 + bne _080B40E4 ldr r0, =0x03006090 ldrb r5, [r0, 0x8] - b @080B40E8 + b _080B40E8 .pool -@080B40E4: +_080B40E4: ldr r0, =0x03006090 ldrb r5, [r0, 0x14] -@080B40E8: +_080B40E8: ldr r4, =c3_8081EDC adds r0, r5, 0 adds r1, r4, 0 @@ -321710,14 +321710,14 @@ 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 .pool -@080B4150: +_080B4150: ldr r7, =gUnknown_0855073C -@080B4152: +_080B4152: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -321729,8 +321729,8 @@ c3_8081EDC: ; 80B4118 bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne @080B4152 -@080B416C: + bne _080B4152 +_080B416C: pop {r4-r7} pop {r0} bx r0 @@ -321784,10 +321784,10 @@ sub_80B41C0: ; 80B41C0 bl FieldEffectActiveListContains 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] @@ -321796,18 +321796,18 @@ sub_80B41C0: ; 80B41C0 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 @@ -321822,17 +321822,17 @@ sub_80B4200: ; 80B4200 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B421E + beq _080B421E adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished 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 @@ -321845,15 +321845,15 @@ sub_80B4200: ; 80B4200 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 FieldObjectSetSpecialAnim ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -@080B4252: +_080B4252: movs r0, 0 pop {r4,r5} pop {r1} @@ -321869,13 +321869,13 @@ sub_80B425C: ; 80B425C bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B427A + beq _080B427A adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B4308 -@080B427A: + beq _080B4308 +_080B427A: ldrb r0, [r5, 0x18] lsls r0, 28 lsrs r0, 28 @@ -321907,13 +321907,13 @@ sub_80B425C: ; 80B425C bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B42D2 + beq _080B42D2 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B4308 -@080B42D2: + beq _080B4308 +_080B42D2: bl sub_808BCE8 ldr r0, =0x02037590 ldrb r0, [r0, 0x5] @@ -321937,7 +321937,7 @@ sub_80B425C: ; 80B425C ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -@080B4308: +_080B4308: movs r0, 0 pop {r4-r6} pop {r1} @@ -321961,16 +321961,16 @@ sub_80B4318: ; 80B4318 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B4344 + beq _080B4344 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished 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} @@ -321987,20 +321987,20 @@ sub_80B435C: ; 80B435C bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B437A + beq _080B437A adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B4388 -@080B437A: + beq _080B4388 +_080B437A: adds r0, r4, 0 movs r1, 0x59 bl FieldObjectSetSpecialAnim ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -@080B4388: +_080B4388: movs r0, 0 pop {r4,r5} pop {r1} @@ -322015,10 +322015,10 @@ sub_80B4390: ; 80B4390 bl FieldObjectClearAnimIfSpecialAnimFinished 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} @@ -322034,20 +322034,20 @@ sub_80B43AC: ; 80B43AC bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B43CA + beq _080B43CA adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B43D8 -@080B43CA: + beq _080B43D8 +_080B43CA: adds r0, r4, 0 movs r1, 0x3E bl FieldObjectSetSpecialAnim ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -@080B43D8: +_080B43D8: movs r0, 0 pop {r4,r5} pop {r1} @@ -322063,7 +322063,7 @@ sub_80B43E0: ; 80B43E0 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 - beq @080B4426 + beq _080B4426 ldr r2, =0x02038c08 movs r1, 0x10 ldrsh r0, [r4, r1] @@ -322089,7 +322089,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} @@ -322112,7 +322112,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 @@ -322148,7 +322148,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} @@ -322164,10 +322164,10 @@ sub_80B44AC: ; 80B44AC bl FieldEffectActiveListContains 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} @@ -322193,13 +322193,13 @@ sub_80B44C8: ; 80B44C8 movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0 - bne @080B44FA + bne _080B44FA ldr r0, [sp] bl FieldObjectClearAnim ldrh r0, [r4, 0x16] adds r0, 0x1 strh r0, [r4, 0x16] -@080B44FA: +_080B44FA: ldr r1, =gUnknown_0855076C movs r2, 0x8 ldrsh r0, [r4, r2] @@ -322213,12 +322213,12 @@ sub_80B44C8: ; 80B44C8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x3 - bne @080B4564 + bne _080B4564 movs r0, 0x31 bl FieldEffectActiveListContains lsls r0, 24 cmp r0, 0 - bne @080B4564 + bne _080B4564 ldr r4, [sp] ldrb r0, [r4, 0x18] lsls r0, 28 @@ -322241,15 +322241,15 @@ sub_80B44C8: ; 80B44C8 bl sub_808F23C adds r0, r5, 0 bl remove_task - b @080B456E + b _080B456E .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} @@ -322307,11 +322307,11 @@ sub_80B45D0: ; 80B45D0 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 @@ -322321,16 +322321,16 @@ sub_80B45D0: ; 80B45D0 ldr r0, =0x03006090 ldrb r0, [r0, 0xC] bl sub_80974D0 - b @080B4616 + b _080B4616 .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 .pool @@ -322347,7 +322347,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 @@ -322356,7 +322356,7 @@ oei_exclamation_mark: ; 80B4620 movs r1, 0 movs r2, 0 bl sub_80B46D8 -@080B4648: +_080B4648: movs r0, 0 pop {r1} bx r1 @@ -322374,7 +322374,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 @@ -322383,7 +322383,7 @@ sub_80B4658: ; 80B4658 movs r1, 0x21 movs r2, 0x1 bl sub_80B46D8 -@080B4680: +_080B4680: movs r0, 0 pop {r1} bx r1 @@ -322401,7 +322401,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 @@ -322417,7 +322417,7 @@ sub_80B4690: ; 80B4690 movs r1, 0x20 orrs r0, r1 strb r0, [r4, 0x5] -@080B46C6: +_080B46C6: movs r0, 0 pop {r4} pop {r1} @@ -322482,22 +322482,22 @@ objc_exclamation_mark_probably: ; 80B4724 bl TryGetFieldObjectIdByLocalIdAndMap 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 FieldEffectStop - b @080B47B2 -@080B4764: + b _080B47B2 +_080B4764: ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -322528,14 +322528,14 @@ objc_exclamation_mark_probably: ; 80B4724 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 .pool -@080B47B0: +_080B47B0: strh r2, [r4, 0x34] -@080B47B2: +_080B47B2: add sp, 0x4 pop {r4} pop {r0} @@ -322548,15 +322548,15 @@ sub_80B47BC: ; 80B47BC ldr r0, =0x02038bfc ldrb r0, [r0] cmp r0, 0 - beq @080B47D4 + beq _080B47D4 ldr r0, =0x03006090 ldrb r0, [r0, 0xC] - b @080B47D8 + b _080B47D8 .pool -@080B47D4: +_080B47D4: ldr r0, =0x03006090 ldrb r0, [r0] -@080B47D8: +_080B47D8: pop {r1} bx r1 .pool @@ -322568,20 +322568,20 @@ sub_80B47E0: ; 80B47E0 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 .pool -@080B47FC: +_080B47FC: ldr r0, =0x03006090 ldrb r0, [r0] -@080B4800: +_080B4800: pop {r1} bx r1 .pool @@ -322593,7 +322593,7 @@ sub_80B4808: ; 80B4808 ldr r0, =0x030060ac ldrb r0, [r0] cmp r0, 0x1 - bne @080B4870 + bne _080B4870 ldr r2, =0x03006090 ldr r0, =0x03006080 ldrh r1, [r0] @@ -322624,9 +322624,9 @@ sub_80B4808: ; 80B4808 ldrb r2, [r0, 0x4] movs r0, 0xFF bl exec_movement - b @080B489E + b _080B489E .pool -@080B4870: +_080B4870: ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -322648,7 +322648,7 @@ sub_80B4808: ; 80B4808 ldrb r2, [r0, 0x4] movs r0, 0xFF bl exec_movement -@080B489E: +_080B489E: movs r0, 0xFF bl sub_809BE48 pop {r0} @@ -322696,16 +322696,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 @@ -322713,7 +322713,7 @@ sub_80B48C4: ; 80B48C4 ldr r1, [sp, 0x4] lsls r0, r1, 16 asrs r7, r0, 16 -@080B4920: +_080B4920: adds r0, r4, 0x7 adds r1, r5, 0x7 bl MapGridGetMetatileBehaviorAt @@ -322723,18 +322723,18 @@ sub_80B48C4: ; 80B48C4 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 .pool -@080B4954: +_080B4954: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -322742,18 +322742,18 @@ sub_80B48C4: ; 80B48C4 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 @@ -322778,7 +322778,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 @@ -322798,23 +322798,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 @@ -322823,13 +322823,13 @@ sub_80B4984: ; 80B4984 lsls r0, 16 lsrs r0, 16 cmp r0, 0x31 - bls @080B4A08 - b @080B4A7A + bls _080B4A08 + b _080B4A7A .pool -@080B4A04: +_080B4A04: movs r0, 0x1 - b @080B4A7C -@080B4A08: + b _080B4A7C +_080B4A08: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00002e6a @@ -322838,7 +322838,7 @@ sub_80B4984: ; 80B4984 bl sub_80B4AB8 movs r5, 0 ldr r6, =0x000001bf -@080B4A1A: +_080B4A1A: bl sub_80B4A98 lsls r1, r5, 1 mov r2, sp @@ -322850,21 +322850,21 @@ sub_80B4984: ; 80B4984 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] @@ -322876,20 +322876,20 @@ sub_80B4984: ; 80B4984 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 @@ -322935,98 +322935,98 @@ 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 @@ -323043,39 +323043,39 @@ 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 @@ -323095,76 +323095,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} @@ -323178,14 +323178,14 @@ sub_80B4C74: ; 80B4C74 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 @@ -323202,39 +323202,39 @@ sub_80B4C74: ; 80B4C74 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne @080B4CEA + bne _080B4CEA adds r0, r5, 0 bl GetMonAbility 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 .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 @@ -323248,9 +323248,9 @@ get_wild_data_index_for_map: ; 80B4CF8 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 @@ -323261,31 +323261,31 @@ get_wild_data_index_for_map: ; 80B4CF8 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 VarGet 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 .pool -@080B4D58: +_080B4D58: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -323295,10 +323295,10 @@ get_wild_data_index_for_map: ; 80B4CF8 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 @@ -323311,7 +323311,7 @@ sub_80B4D78: ; 80B4D78 sub sp, 0x1C bl GetSafariZoneFlag cmp r0, 0x1 - bne @080B4E0E + bne _080B4E0E bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -323320,13 +323320,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] @@ -323334,41 +323334,41 @@ sub_80B4D78: ; 80B4D78 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] @@ -323376,50 +323376,50 @@ sub_80B4D78: ; 80B4D78 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 GetMonAbility 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 .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} @@ -323443,30 +323443,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 GetMonAbility lsls r0, 24 lsrs r0, 24 cmp r0, 0x38 - bne @080B4F28 + bne _080B4F28 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -323474,7 +323474,7 @@ sub_80B4E68: ; 80B4E68 bl __umodsi3 lsls r0, 16 cmp r0, 0 - beq @080B4F28 + beq _080B4F28 adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -323490,13 +323490,13 @@ sub_80B4E68: ; 80B4E68 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFE - bne @080B4F00 + bne _080B4F00 movs r4, 0 - b @080B4F02 + b _080B4F02 .pool -@080B4F00: +_080B4F00: movs r4, 0xFE -@080B4F02: +_080B4F02: bl sub_80B4D78 lsls r0, 24 lsrs r0, 24 @@ -323510,9 +323510,9 @@ sub_80B4E68: ; 80B4E68 adds r2, r7, 0 movs r3, 0x20 bl sub_8067EF8 - b @080B4F40 + b _080B4F40 .pool -@080B4F28: +_080B4F28: bl sub_80B4D78 lsls r0, 24 lsrs r0, 24 @@ -323523,7 +323523,7 @@ sub_80B4E68: ; 80B4E68 adds r2, r7, 0 movs r3, 0x20 bl pokemon_make_with_nature -@080B4F40: +_080B4F40: add sp, 0xC pop {r4-r7} pop {r0} @@ -323545,17 +323545,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 @@ -323563,7 +323563,7 @@ sub_80B4F4C: ; 80B4F4C bl TryGetAbilityInfluencedWildMonIndex lsls r0, 24 cmp r0, 0 - bne @080B4FBA + bne _080B4FBA ldr r0, [r5, 0x4] movs r1, 0xD movs r2, 0x9 @@ -323571,10 +323571,10 @@ sub_80B4F4C: ; 80B4F4C bl TryGetAbilityInfluencedWildMonIndex 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 @@ -323582,13 +323582,13 @@ sub_80B4F4C: ; 80B4F4C bl TryGetAbilityInfluencedWildMonIndex 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 @@ -323600,33 +323600,33 @@ sub_80B4F4C: ; 80B4F4C 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 DoKeenEyeIntimidateWildEncounterTest lsls r0, 24 cmp r0, 0 - bne @080B5008 -@080B5000: + bne _080B5008 +_080B5000: movs r0, 0 - b @080B501C + b _080B501C .pool -@080B5008: +_080B5008: mov r0, sp ldrb r0, [r0] ldr r1, [r5, 0x4] @@ -323636,7 +323636,7 @@ sub_80B4F4C: ; 80B4F4C adds r1, r4, 0 bl sub_80B4E68 movs r0, 0x1 -@080B501C: +_080B501C: add sp, 0x4 pop {r4-r6} pop {r1} @@ -323679,7 +323679,7 @@ sub_80B505C: ; 80B505C movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @080B508C + beq _080B508C ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002b94 @@ -323688,11 +323688,11 @@ sub_80B505C: ; 80B505C bl sub_80B58CC lsls r0, 24 cmp r0, 0 - bne @080B508C + bne _080B508C movs r0, 0 - b @080B50C6 + b _080B50C6 .pool -@080B508C: +_080B508C: ldr r0, =0x03005d8c ldr r1, [r0] ldr r2, =0x00002b90 @@ -323703,7 +323703,7 @@ sub_80B505C: ; 80B505C ldrb r1, [r1] bl sub_80B4E68 movs r4, 0 -@080B50A2: +_080B50A2: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 1 @@ -323719,9 +323719,9 @@ sub_80B505C: ; 80B505C 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 @@ -323737,21 +323737,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 @@ -323764,13 +323764,13 @@ sub_80B50DC: ; 80B50DC lsrs r0, 16 ldrb r1, [r1] cmp r0, r1 - bcs @080B513C + bcs _080B513C movs r0, 0x1 - b @080B513E + b _080B513E .pool -@080B513C: +_080B513C: movs r0, 0 -@080B513E: +_080B513E: pop {r4} pop {r1} bx r1 @@ -323791,12 +323791,12 @@ DoWildEncounterRateDiceRoll: ; 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 @@ -323815,7 +323815,7 @@ DoWildEncounterRateTest: ; 80B5170 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @080B519A + beq _080B519A ldr r1, [sp] lsls r0, r1, 2 adds r0, r1 @@ -323823,72 +323823,72 @@ DoWildEncounterRateTest: ; 80B5170 movs r1, 0x64 bl __udivsi3 str r0, [sp] -@080B519A: +_080B519A: mov r0, sp bl affects_encounter_rate_based_on_flags mov r0, sp bl ApplyCleanseTagWildEncounterRateReduction 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 GetMonAbility 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 .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 @@ -323913,12 +323913,12 @@ DoGlobalWildEncounterDiceRoll: ; 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 DoGlobalWildEncounterDiceRoll @@ -323932,16 +323932,16 @@ sub_80B5260: ; 80B5260 movs r0, 0xE0 lsls r0, 3 cmp r1, r0 - bne @080B5280 + bne _080B5280 movs r0, 0x53 bl FlagGet lsls r0, 24 lsrs r0, 24 - b @080B5282 + b _080B5282 .pool -@080B5280: +_080B5280: movs r0, 0 -@080B5282: +_080B5282: pop {r1} bx r1 thumb_func_end sub_80B5260 @@ -323961,32 +323961,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 DoGlobalWildEncounterDiceRoll lsls r0, 24 cmp r0, 0 - bne @080B52D8 - b @080B54FE -@080B52D8: + bne _080B52D8 + b _080B54FE +_080B52D8: ldr r1, =gUnknown_08553A14 lsls r0, r5, 2 adds r0, r5 @@ -324000,9 +324000,9 @@ is_it_battle_time_2: ; 80B5288 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 @@ -324010,38 +324010,38 @@ is_it_battle_time_2: ; 80B5288 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 .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 DoGlobalWildEncounterDiceRoll lsls r0, 24 cmp r0, 0 - bne @080B5352 - b @080B54FE -@080B5352: + bne _080B5352 + b _080B54FE +_080B5352: ldr r1, =gUnknown_08553894 lsls r0, r5, 2 adds r0, r5 @@ -324055,9 +324055,9 @@ is_it_battle_time_2: ; 80B5288 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 @@ -324065,13 +324065,13 @@ is_it_battle_time_2: ; 80B5288 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 .pool -@080B539C: +_080B539C: lsls r0, r6, 24 lsrs r4, r0, 24 adds r0, r4, 0 @@ -324079,7 +324079,7 @@ is_it_battle_time_2: ; 80B5288 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B543C + bne _080B543C ldr r1, =gWildMonHeaders lsls r2, r5, 2 adds r0, r2, r5 @@ -324089,17 +324089,17 @@ is_it_battle_time_2: ; 80B5288 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 DoGlobalWildEncounterDiceRoll lsls r0, 24 cmp r0, 0 - bne @080B53D4 - b @080B54FE -@080B53D4: + bne _080B53D4 + b _080B54FE +_080B53D4: ldr r1, =gWildMonHeaders adds r0, r4, r5 lsls r0, 2 @@ -324112,26 +324112,26 @@ is_it_battle_time_2: ; 80B5288 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, =gWildMonHeaders adds r0, r4, r5 lsls r0, 2 @@ -324144,33 +324144,33 @@ is_it_battle_time_2: ; 80B5288 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080B54F6 - b @080B54FE + beq _080B54F6 + b _080B54FE .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 TestPlayerAvatarFlags 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, =gWildMonHeaders lsls r2, r5, 2 adds r0, r2, r5 @@ -324180,14 +324180,14 @@ is_it_battle_time_2: ; 80B5288 ldr r0, [r0] adds r4, r2, 0 cmp r0, 0 - beq @080B54FE + beq _080B54FE cmp r8, r9 - beq @080B5492 + beq _080B5492 bl DoGlobalWildEncounterDiceRoll lsls r0, 24 cmp r0, 0 - beq @080B54FE -@080B5492: + beq _080B54FE +_080B5492: ldr r1, =gWildMonHeaders adds r0, r4, r5 lsls r0, 2 @@ -324200,13 +324200,13 @@ is_it_battle_time_2: ; 80B5288 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 @@ -324215,12 +324215,12 @@ is_it_battle_time_2: ; 80B5288 bl sub_80B58CC lsls r0, 24 cmp r0, 0 - beq @080B54FE + beq _080B54FE bl sub_80B072C movs r0, 0x1 - b @080B5500 + b _080B5500 .pool -@080B54E4: +_080B54E4: ldr r0, [r4] movs r1, 0x1 movs r2, 0x3 @@ -324228,14 +324228,14 @@ is_it_battle_time_2: ; 80B5288 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 @@ -324252,7 +324252,7 @@ rock_smash_wild_pokemon_encounter: ; 80B550C lsrs r2, r0, 16 ldr r0, =0x0000ffff cmp r2, r0 - beq @080B5568 + beq _080B5568 ldr r1, =gWildMonHeaders lsls r0, r2, 2 adds r0, r2 @@ -324261,14 +324261,14 @@ rock_smash_wild_pokemon_encounter: ; 80B550C adds r0, r1 ldr r4, [r0] cmp r4, 0 - beq @080B5554 + beq _080B5554 ldrb r0, [r4] movs r1, 0x1 bl DoWildEncounterRateTest lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B5568 + bne _080B5568 adds r0, r4, 0 movs r1, 0x2 movs r2, 0x3 @@ -324276,18 +324276,18 @@ rock_smash_wild_pokemon_encounter: ; 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 .pool -@080B5568: +_080B5568: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -@080B556E: +_080B556E: pop {r4} pop {r0} bx r0 @@ -324308,13 +324308,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 @@ -324331,21 +324331,21 @@ 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 .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 @@ -324364,11 +324364,11 @@ sub_80B5578: ; 80B5578 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B56F2 + bne _080B56F2 bl sub_81A9C04 - b @080B56EA + b _080B56EA .pool -@080B562C: +_080B562C: mov r0, sp movs r2, 0 ldrsh r0, [r0, r2] @@ -324381,7 +324381,7 @@ sub_80B5578: ; 80B5578 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B568C + bne _080B568C ldr r1, =gWildMonHeaders lsls r0, r4, 2 adds r0, r4 @@ -324390,28 +324390,28 @@ sub_80B5578: ; 80B5578 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 .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] @@ -324424,12 +324424,12 @@ sub_80B5578: ; 80B5578 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, =gWildMonHeaders lsls r0, r4, 2 adds r0, r4 @@ -324438,29 +324438,29 @@ sub_80B5578: ; 80B5578 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 .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} @@ -324475,7 +324475,7 @@ GetFishingWildMonListHeader: ; 80B56FC lsrs r2, r0, 16 ldr r0, =0x0000ffff cmp r2, r0 - beq @080B572C + beq _080B572C ldr r0, =gWildMonHeaders lsls r1, r2, 2 adds r1, r2 @@ -324484,13 +324484,13 @@ GetFishingWildMonListHeader: ; 80B56FC adds r1, r0 ldr r0, [r1] cmp r0, 0 - beq @080B572C + beq _080B572C movs r0, 0x1 - b @080B572E + b _080B572E .pool -@080B572C: +_080B572C: movs r0, 0 -@080B572E: +_080B572E: pop {r1} bx r1 thumb_func_end GetFishingWildMonListHeader @@ -324504,7 +324504,7 @@ sub_80B5734: ; 80B5734 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B5764 + bne _080B5764 ldr r4, =gUnknown_08553A78 adds r0, r4, 0 bl sub_80B4C74 @@ -324514,9 +324514,9 @@ sub_80B5734: ; 80B5734 ldrh r4, [r4, 0x2] adds r0, r4, 0 bl sub_80B4E68 - b @080B5784 + b _080B5784 .pool -@080B5764: +_080B5764: ldr r4, =gWildMonHeaders bl get_wild_data_index_for_map lsls r0, 16 @@ -324531,7 +324531,7 @@ sub_80B5734: ; 80B5734 bl sub_80B5024 lsls r0, 16 lsrs r4, r0, 16 -@080B5784: +_080B5784: movs r0, 0xC bl sav12_xor_increment adds r0, r4, 0 @@ -324554,7 +324554,7 @@ wild_pokemon_rand_for_map: ; 80B57A0 lsrs r3, r0, 16 ldr r0, =0x0000ffff cmp r3, r0 - beq @080B57D2 + beq _080B57D2 ldr r2, =gWildMonHeaders lsls r1, r3, 2 adds r1, r3 @@ -324566,25 +324566,25 @@ 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 .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 @@ -324593,22 +324593,22 @@ wild_pokemon_rand_for_map: ; 80B57A0 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 @@ -324622,7 +324622,7 @@ sub_80B582C: ; 80B582C lsrs r2, r0, 16 ldr r0, =0x0000ffff cmp r2, r0 - beq @080B5868 + beq _080B5868 ldr r1, =gWildMonHeaders lsls r0, r2, 2 adds r0, r2 @@ -324631,18 +324631,18 @@ 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 .pool -@080B5868: +_080B5868: movs r0, 0 -@080B586A: +_080B586A: pop {r4} pop {r1} bx r1 @@ -324654,21 +324654,21 @@ sub_80B5870: ; 80B5870 bl InBattlePike lsls r0, 24 cmp r0, 0 - bne @080B58C4 + bne _080B58C4 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080B58C4 + bne _080B58C4 bl InUnionRoom cmp r0, 0x1 - beq @080B58C4 + beq _080B58C4 ldr r5, =0x00004021 adds r0, r5, 0 bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0 - beq @080B58C4 + beq _080B58C4 subs r4, r0, 0x1 lsls r4, 16 lsrs r4, 16 @@ -324676,15 +324676,15 @@ sub_80B5870: ; 80B5870 adds r1, r4, 0 bl VarSet cmp r4, 0 - bne @080B58C4 + bne _080B58C4 ldr r0, =gUnknown_082A4B2A bl script_env_1_execute_new_script movs r0, 0x1 - b @080B58C6 + b _080B58C6 .pool -@080B58C4: +_080B58C4: movs r0, 0 -@080B58C6: +_080B58C6: pop {r4,r5} pop {r1} bx r1 @@ -324699,9 +324699,9 @@ sub_80B58CC: ; 80B58CC bl VarGet 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 @@ -324711,32 +324711,32 @@ sub_80B58CC: ; 80B58CC 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 .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 @@ -324753,39 +324753,39 @@ DoKeenEyeIntimidateWildEncounterTest: ; 80B5934 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne @080B5988 + bne _080B5988 adds r0, r4, 0 bl GetMonAbility 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 .pool -@080B5988: +_080B5988: movs r0, 0x1 -@080B598A: +_080B598A: pop {r4,r5} pop {r1} bx r1 @@ -324818,24 +324818,24 @@ TryGetRandomWildMonIndexByType: ; 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, =gBaseStats mov r10, r6 -@080B59DE: +_080B59DE: lsls r0, r3, 2 add r0, r12 ldrh r1, [r0, 0x2] @@ -324847,33 +324847,33 @@ TryGetRandomWildMonIndexByType: ; 80B5990 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 .pool -@080B5A24: +_080B5A24: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -324884,7 +324884,7 @@ TryGetRandomWildMonIndexByType: ; 80B5990 mov r1, r8 strb r0, [r1] movs r0, 0x1 -@080B5A3C: +_080B5A3C: mov sp, r9 add sp, 0x4 pop {r3-r5} @@ -324913,20 +324913,20 @@ TryGetAbilityInfluencedWildMonIndex: ; 80B5A50 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne @080B5AA4 + bne _080B5AA4 adds r0, r4, 0 bl GetMonAbility 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 @@ -324934,11 +324934,11 @@ TryGetAbilityInfluencedWildMonIndex: ; 80B5A50 bl TryGetRandomWildMonIndexByType lsls r0, 24 lsrs r0, 24 - b @080B5AA6 + b _080B5AA6 .pool -@080B5AA4: +_080B5AA4: movs r0, 0 -@080B5AA6: +_080B5AA6: pop {r3} mov r8, r3 pop {r4-r7} @@ -324956,24 +324956,24 @@ affects_encounter_rate_based_on_flags: ; 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 .pool -@080B5AD0: +_080B5AD0: ldr r0, =0x000008ae bl FlagGet 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 @@ -324988,13 +324988,13 @@ ApplyCleanseTagWildEncounterRateReduction: ; 80B5AF0 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 @@ -325018,7 +325018,7 @@ FieldEffectStart: ; 80B5B18 str r0, [sp] add r4, sp, 0x4 ldr r5, =gUnknown_0855C1F0 -@080B5B36: +_080B5B36: ldr r0, [sp] ldrb r0, [r0] lsls r0, 2 @@ -325029,7 +325029,7 @@ FieldEffectStart: ; 80B5B18 bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne @080B5B36 + bne _080B5B36 ldr r0, [sp, 0x4] add sp, 0x8 pop {r4,r5} @@ -325188,10 +325188,10 @@ FieldEffectScript_LoadTiles: ; 80B5C3C lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne @080B5C5A + bne _080B5C5A adds r0, r5, 0 bl LoadObjectPic -@080B5C5A: +_080B5C5A: ldr r0, [r4] adds r0, 0x4 str r0, [r4] @@ -325299,10 +325299,10 @@ FieldEffectFreeTilesIfUnused: ; 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 @@ -325312,27 +325312,27 @@ FieldEffectFreeTilesIfUnused: ; 80B5D04 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 FreeObjectTilesByTag -@080B5D58: +_080B5D58: pop {r4,r5} pop {r0} bx r0 @@ -325351,11 +325351,11 @@ FieldEffectFreePaletteIfUnused: ; 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 @@ -325365,20 +325365,20 @@ FieldEffectFreePaletteIfUnused: ; 80B5D68 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 FreeObjectPaletteByTag -@080B5DB0: +_080B5DB0: pop {r4-r6} pop {r0} bx r0 @@ -325392,7 +325392,7 @@ FieldEffectActiveListClear: ; 80B5DC0 movs r2, 0 ldr r4, =0x03000f58 movs r3, 0xFF -@080B5DC8: +_080B5DC8: adds r0, r2, r4 ldrb r1, [r0] orrs r1, r3 @@ -325401,7 +325401,7 @@ FieldEffectActiveListClear: ; 80B5DC0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1F - bls @080B5DC8 + bls _080B5DC8 pop {r4} pop {r0} bx r0 @@ -325416,21 +325416,21 @@ FieldEffectActiveListAdd: ; 80B5DE4 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 .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 @@ -325445,22 +325445,22 @@ FieldEffectActiveListRemove: ; 80B5E10 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 .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 @@ -325474,22 +325474,22 @@ FieldEffectActiveListContains: ; 80B5E40 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 .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 FieldEffectActiveListContains @@ -325656,14 +325656,14 @@ 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 .pool -@080B5FDC: +_080B5FDC: movs r0, 0x40 -@080B5FDE: +_080B5FDE: add sp, 0x10 pop {r4,r5} pop {r1} @@ -325719,14 +325719,14 @@ 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 .pool -@080B605C: +_080B605C: movs r0, 0x40 -@080B605E: +_080B605E: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -325747,12 +325747,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} @@ -325991,7 +325991,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 @@ -326004,7 +326004,7 @@ sub_80B6250: ; 80B6250 ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -@080B6282: +_080B6282: pop {r4} pop {r0} bx r0 @@ -326025,11 +326025,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 .pool @@ -326048,7 +326048,7 @@ sub_80B62B4: ; 80B62B4 movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0x6 - ble @080B62E6 + ble _080B62E6 adds r0, r1, 0 bl RemoveObjectAndFreeTiles movs r0, 0x19 @@ -326058,7 +326058,7 @@ sub_80B62B4: ; 80B62B4 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B62E6: +_080B62E6: pop {r0} bx r0 .pool @@ -326184,14 +326184,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 .pool @@ -326211,11 +326211,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 .pool @@ -326234,7 +326234,7 @@ sub_80B642C: ; 80B642C movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0x6 - ble @080B645E + ble _080B645E adds r0, r1, 0 bl RemoveObjectAndFreeTiles movs r0, 0x3E @@ -326244,7 +326244,7 @@ sub_80B642C: ; 80B642C lsls r0, 24 lsrs r0, 24 bl remove_task -@080B645E: +_080B645E: pop {r0} bx r0 .pool @@ -326314,13 +326314,13 @@ sub_80B64DC: ; 80B64DC 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, =gUnknown_0855C304 @@ -326365,17 +326365,17 @@ sub_80B64DC: ; 80B64DC 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 @@ -326392,7 +326392,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] @@ -326403,11 +326403,11 @@ 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 @@ -326425,7 +326425,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] @@ -326434,11 +326434,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 @@ -326538,7 +326538,7 @@ sub_80B65A8: ; 80B65A8 movs r3, 0x34 ldrsh r0, [r7, r3] cmp r0, 0x2 - ble @080B66C2 + ble _080B66C2 ldrh r0, [r7, 0x2E] adds r0, 0x1 movs r1, 0 @@ -326546,7 +326546,7 @@ sub_80B65A8: ; 80B65A8 movs r0, 0x8 strh r0, [r7, 0x30] strh r1, [r7, 0x32] -@080B66C2: +_080B66C2: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -326568,7 +326568,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] @@ -326577,13 +326577,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 @@ -326672,11 +326672,11 @@ 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 @@ -326696,16 +326696,16 @@ sub_80B6800: ; 80B6800 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 @@ -326730,10 +326730,10 @@ sub_80B6828: ; 80B6828 movs r1, 0x2E ldrsh r0, [r0, r1] cmp r0, 0x4 - ble @080B6848 + ble _080B6848 adds r0, r3, 0 bl FieldEffectFreeGraphicsResources -@080B6848: +_080B6848: pop {r0} bx r0 .pool @@ -326789,7 +326789,7 @@ sub_80B68AC: ; 80B68AC 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 @@ -326801,17 +326801,17 @@ sub_80B68AC: ; 80B68AC adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim -@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 FieldEffectFreeGraphicsResources -@080B68E4: +_080B68E4: pop {r4} pop {r0} bx r0 @@ -326828,7 +326828,7 @@ sub_80B68EC: ; 80B68EC lsrs r2, 16 lsls r3, 24 cmp r3, 0 - bne @080B6934 + bne _080B6934 ldr r0, =gUnknown_0855C334 lsls r1, 16 asrs r1, 16 @@ -326845,9 +326845,9 @@ sub_80B68EC: ; 80B68EC adds r0, r1 ldr r1, =gUnknown_0855C2C4 bl SetSpriteOamTables_NoPriorityFromTable - b @080B6948 + b _080B6948 .pool -@080B6934: +_080B6934: ldr r0, =gUnknown_0855C34C lsls r1, 16 asrs r1, 16 @@ -326857,7 +326857,7 @@ sub_80B68EC: ; 80B68EC bl AddObjectToBack lsls r0, 24 lsrs r4, r0, 24 -@080B6948: +_080B6948: ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -326890,18 +326890,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 @@ -326919,18 +326919,18 @@ sub_80B6970: ; 80B6970 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 FieldEffectFreeGraphicsResources -@080B69D4: +_080B69D4: pop {r0} bx r0 .pool @@ -326979,31 +326979,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 FieldEffectStart ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@080B6A64: +_080B6A64: movs r0, 0x1F bl FieldEffectActiveListContains 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 @@ -327013,7 +327013,7 @@ task00_8084310: ; 80B6A24 str r0, [r1] adds r0, r5, 0 bl remove_task -@080B6A8A: +_080B6A8A: pop {r4-r6} pop {r0} bx r0 @@ -327043,7 +327043,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 @@ -327051,7 +327051,7 @@ mapldr_08084390: ; 80B6AA4 adds r0, r4 movs r1, 0x3 bl FieldObjectTurn -@080B6AE6: +_080B6AE6: bl script_env_2_enable bl player_bitmagic ldr r1, =0x03005dac @@ -327077,29 +327077,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 FieldEffectStart ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@080B6B3E: +_080B6B3E: movs r0, 0x20 bl FieldEffectActiveListContains 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 @@ -327135,7 +327135,7 @@ sub_80B6B94: ; 80B6B94 ldr r0, =0x03005e00 adds r4, r1, r0 ldr r5, =gUnknown_0855C3C8 -@080B6BA6: +_080B6BA6: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -327145,7 +327145,7 @@ sub_80B6B94: ; 80B6B94 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @080B6BA6 + bne _080B6BA6 pop {r4,r5} pop {r0} bx r0 @@ -327237,11 +327237,11 @@ sub_80B6C74: ; 80B6C74 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} @@ -327326,28 +327326,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] @@ -327368,11 +327368,11 @@ sub_80B6D04: ; 80B6D04 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] @@ -327386,7 +327386,7 @@ sub_80B6D04: ; 80B6D04 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@080B6DA8: +_080B6DA8: movs r0, 0 pop {r4-r6} pop {r1} @@ -327428,19 +327428,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} @@ -327488,10 +327488,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 @@ -327509,7 +327509,7 @@ sub_80B6E88: ; 80B6E88 ldr r0, =0x03005e00 adds r4, r1, r0 ldr r5, =gUnknown_0855C3E4 -@080B6E9A: +_080B6E9A: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -327519,7 +327519,7 @@ sub_80B6E88: ; 80B6E88 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @080B6E9A + bne _080B6E9A pop {r4,r5} pop {r0} bx r0 @@ -327558,13 +327558,13 @@ sub_80B6EE0: ; 80B6EE0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B6F0A + beq _080B6F0A adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B6F3E -@080B6F0A: + beq _080B6F3E +_080B6F0A: bl player_get_direction_lower_nybble lsls r0, 24 lsrs r0, 24 @@ -327582,13 +327582,13 @@ sub_80B6EE0: ; 80B6EE0 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} @@ -327604,12 +327604,12 @@ sub_80B6F50: ; 80B6F50 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} @@ -327634,12 +327634,12 @@ sub_80B6F84: ; 80B6F84 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} @@ -327683,11 +327683,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 @@ -327721,11 +327721,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 @@ -327749,12 +327749,12 @@ sub_80B7060: ; 80B7060 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 @@ -327767,7 +327767,7 @@ sub_80B7060: ; 80B7060 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B709C: +_080B709C: pop {r0} bx r0 .pool @@ -327801,7 +327801,7 @@ sub_80B70DC: ; 80B70DC ldr r0, =0x03005e00 adds r4, r1, r0 ldr r5, =gUnknown_0855C3FC -@080B70EE: +_080B70EE: movs r1, 0x8 ldrsh r0, [r4, r1] lsls r0, 2 @@ -327811,7 +327811,7 @@ sub_80B70DC: ; 80B70DC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @080B70EE + bne _080B70EE pop {r4,r5} pop {r0} bx r0 @@ -327857,15 +327857,15 @@ 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 .pool -@080B717C: +_080B717C: movs r1, 0 -@080B717E: +_080B717E: adds r0, r1, 0 bl sub_80E1558 movs r0, 0x1 @@ -327933,20 +327933,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} @@ -328012,21 +328012,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} @@ -328041,16 +328041,16 @@ sub_80B72D0: ; 80B72D0 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 @@ -328070,7 +328070,7 @@ sub_80B72F4: ; 80B72F4 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B7338 + beq _080B7338 bl CameraObjectReset1 bl script_env_2_disable movs r0, 0x4 @@ -328085,7 +328085,7 @@ sub_80B72F4: ; 80B72F4 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B7338: +_080B7338: movs r0, 0 pop {r4} pop {r1} @@ -328129,7 +328129,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 @@ -328146,7 +328146,7 @@ sub_80B7384: ; 80B7384 bl _call_via_r2 lsls r0, 24 cmp r0, 0 - bne @080B7396 + bne _080B7396 pop {r4,r5} pop {r0} bx r0 @@ -328181,7 +328181,7 @@ waterfall_1_do_anim_probably: ; 80B73F0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - bne @080B7420 + bne _080B7420 adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished ldr r1, =0x02038c08 @@ -328193,7 +328193,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} @@ -328209,15 +328209,15 @@ waterfall_2_wait_anim_finish_probably: ; 80B742C bl FieldEffectActiveListContains 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 @@ -328253,16 +328253,16 @@ sub_80B7478: ; 80B7478 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - bne @080B748E + bne _080B748E movs r0, 0 - b @080B74CA -@080B748E: + b _080B74CA +_080B748E: ldrb r0, [r4, 0x1E] bl MetatileBehavior_IsWaterfall 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] @@ -328274,13 +328274,13 @@ sub_80B7478: ; 80B7478 movs r0, 0x2B bl FieldEffectActiveListRemove movs r0, 0 - b @080B74CA + b _080B74CA .pool -@080B74C4: +_080B74C4: movs r0, 0x3 strh r0, [r5, 0x8] movs r0, 0x1 -@080B74CA: +_080B74CA: pop {r4,r5} pop {r1} bx r1 @@ -328324,7 +328324,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 @@ -328334,7 +328334,7 @@ sub_80B750C: ; 80B750C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @080B751E + bne _080B751E pop {r4,r5} pop {r0} bx r0 @@ -328387,7 +328387,7 @@ dive_3_unknown: ; 80B7580 bl FieldEffectActiveListContains lsls r0, 24 cmp r0, 0 - bne @080B75C4 + bne _080B75C4 ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -328405,7 +328405,7 @@ dive_3_unknown: ; 80B7580 bl remove_task movs r0, 0x2C bl FieldEffectActiveListRemove -@080B75C4: +_080B75C4: movs r0, 0 add sp, 0x8 pop {r1} @@ -328438,7 +328438,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 @@ -328460,7 +328460,7 @@ sub_80B75F0: ; 80B75F0 bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne @080B7604 + bne _080B7604 pop {r4-r6} pop {r0} bx r0 @@ -328511,13 +328511,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} @@ -328581,33 +328581,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 @@ -328626,7 +328626,7 @@ sub_80B7704: ; 80B7704 asrs r2, 16 adds r0, r2 cmn r3, r0 - ble @080B7798 + ble _080B7798 ldrh r0, [r5, 0x26] ldrh r1, [r4, 0xE] subs r0, r1 @@ -328634,26 +328634,26 @@ sub_80B7704: ; 80B7704 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 .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] @@ -328674,19 +328674,19 @@ sub_80B7704: ; 80B7704 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} @@ -328716,12 +328716,12 @@ sub_80B7814: ; 80B7814 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 @@ -328733,7 +328733,7 @@ sub_80B7814: ; 80B7814 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B784C: +_080B784C: movs r0, 0 pop {r1} bx r1 @@ -328768,7 +328768,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 @@ -328790,7 +328790,7 @@ sub_80B7890: ; 80B7890 bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne @080B78A4 + bne _080B78A4 pop {r4-r6} pop {r0} bx r0 @@ -328830,7 +328830,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] @@ -328853,7 +328853,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} @@ -328876,7 +328876,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] @@ -328895,7 +328895,7 @@ sub_80B7968: ; 80B7968 lsrs r1, 24 adds r0, r4, 0 bl FieldObjectSetSpecialAnim -@080B79B0: +_080B79B0: movs r0, 0 pop {r4} pop {r1} @@ -328910,7 +328910,7 @@ sub_80B79BC: ; 80B79BC bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B79E6 + beq _080B79E6 ldr r1, =0x02037590 movs r0, 0 strb r0, [r1, 0x6] @@ -328921,7 +328921,7 @@ sub_80B79BC: ; 80B79BC lsls r0, 24 lsrs r0, 24 bl remove_task -@080B79E6: +_080B79E6: movs r0, 0 pop {r1} bx r1 @@ -328983,11 +328983,11 @@ sub_80B7A58: ; 80B7A58 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @080B7A70 + beq _080B7A70 adds r0, r2, 0 movs r1, 0x32 bl FieldEffectStop -@080B7A70: +_080B7A70: pop {r0} bx r0 thumb_func_end sub_80B7A58 @@ -329017,7 +329017,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 @@ -329039,7 +329039,7 @@ sub_80B7A8C: ; 80B7A8C bl _call_via_r3 lsls r0, 24 cmp r0, 0 - bne @080B7AA0 + bne _080B7AA0 pop {r4-r6} pop {r0} bx r0 @@ -329080,12 +329080,12 @@ sub_80B7B18: ; 80B7B18 bl FieldObjectClearAnimIfSpecialAnimFinished 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] @@ -329108,9 +329108,9 @@ sub_80B7B18: ; 80B7B18 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b @080B7B8C + b _080B7B8C .pool -@080B7B6C: +_080B7B6C: adds r0, r1, 0x1 strh r0, [r5, 0xA] ldrb r0, [r4, 0x18] @@ -329124,7 +329124,7 @@ sub_80B7B18: ; 80B7B18 bl FieldObjectSetSpecialAnim movs r0, 0x27 bl audio_play -@080B7B8C: +_080B7B8C: movs r0, 0 pop {r4-r6} pop {r1} @@ -329146,7 +329146,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 @@ -329154,7 +329154,7 @@ sub_80B7B94: ; 80B7B94 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -@080B7BBE: +_080B7BBE: movs r0, 0 pop {r4} pop {r1} @@ -329170,13 +329170,13 @@ sub_80B7BCC: ; 80B7BCC bl FieldEffectActiveListContains 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} @@ -329191,12 +329191,12 @@ sub_80B7BF4: ; 80B7BF4 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 @@ -329208,7 +329208,7 @@ sub_80B7BF4: ; 80B7BF4 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B7C2C: +_080B7C2C: movs r0, 0 pop {r1} bx r1 @@ -329270,11 +329270,11 @@ sub_80B7CAC: ; 80B7CAC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @080B7CC4 + beq _080B7CC4 adds r0, r2, 0 movs r1, 0x31 bl FieldEffectStop -@080B7CC4: +_080B7CC4: pop {r0} bx r0 thumb_func_end sub_80B7CAC @@ -329346,15 +329346,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 @@ -329366,28 +329366,28 @@ sub_80B7D34: ; 80B7D34 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B7D86 + beq _080B7D86 adds r0, r5, 0 bl FieldObjectClearAnimIfSpecialAnimFinished 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 @@ -329405,20 +329405,20 @@ sub_80B7D34: ; 80B7D34 lsls r0, 24 lsrs r0, 24 bl remove_task - b @080B7E40 + b _080B7E40 .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 @@ -329434,17 +329434,17 @@ sub_80B7D34: ; 80B7D34 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} @@ -329510,7 +329510,7 @@ sub_80B7EC4: ; 80B7EC4 bl sub_80ABDFC lsls r0, 24 cmp r0, 0 - beq @080B7EE2 + beq _080B7EE2 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -329518,7 +329518,7 @@ sub_80B7EC4: ; 80B7EC4 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] -@080B7EE2: +_080B7EE2: pop {r4} pop {r0} bx r0 @@ -329544,35 +329544,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 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B7F32 + beq _080B7F32 adds r0, r6, 0 bl FieldObjectClearAnimIfSpecialAnimFinished 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_lower_nybble lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bne @080B7F7C + bne _080B7F7C ldrb r1, [r6, 0x1] movs r0, 0x21 negs r0, r0 @@ -329585,9 +329585,9 @@ sub_80B7EE8: ; 80B7EE8 lsls r0, 24 lsrs r0, 24 bl remove_task - b @080B7FC0 + b _080B7FC0 .pool -@080B7F7C: +_080B7F7C: ldrb r0, [r6, 0x18] lsls r0, 28 lsrs r0, 28 @@ -329603,15 +329603,15 @@ sub_80B7EE8: ; 80B7EE8 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 @@ -329622,7 +329622,7 @@ sub_80B7EE8: ; 80B7EE8 ands r0, r2 orrs r0, r1 strb r0, [r6, 0x1] -@080B7FC0: +_080B7FC0: add sp, 0x8 pop {r4-r6} pop {r0} @@ -329702,13 +329702,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 @@ -329721,18 +329721,18 @@ sub_80B8034: ; 80B8034 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] @@ -329744,7 +329744,7 @@ sub_80B8034: ; 80B8034 strh r0, [r4, 0xE] movs r0, 0x2D bl audio_play -@080B80AE: +_080B80AE: add sp, 0x8 pop {r4,r5} pop {r0} @@ -329779,7 +329779,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] @@ -329789,7 +329789,7 @@ sub_80B80C4: ; 80B80C4 ldrb r1, [r0] adds r0, r3, 0 bl FieldObjectTurn -@080B810E: +_080B810E: ldrh r0, [r5, 0x22] ldrh r1, [r4, 0xE] subs r0, r1 @@ -329803,20 +329803,20 @@ sub_80B80C4: ; 80B80C4 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 @@ -329830,23 +329830,23 @@ sub_80B80C4: ; 80B80C4 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} @@ -329863,20 +329863,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 @@ -329889,7 +329889,7 @@ sub_80B8198: ; 80B8198 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B81E6: +_080B81E6: pop {r4} pop {r0} bx r0 @@ -329956,7 +329956,7 @@ sub_80B8280: ; 80B8280 bl sub_80ABDFC lsls r0, 24 cmp r0, 0 - beq @080B82F6 + beq _080B82F6 ldr r5, =0x02037590 ldrb r0, [r5, 0x4] lsls r2, r0, 4 @@ -330007,7 +330007,7 @@ sub_80B8280: ; 80B8280 strh r0, [r6, 0x26] movs r0, 0x2D bl audio_play -@080B82F6: +_080B82F6: pop {r4-r6} pop {r0} bx r0 @@ -330045,12 +330045,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] @@ -330066,9 +330066,9 @@ sub_80B830C: ; 80B830C ands r0, r2 orrs r0, r1 strb r0, [r3] - b @080B83AA + b _080B83AA .pool -@080B8384: +_080B8384: ldrb r1, [r5, 0x5] movs r0, 0xD negs r0, r0 @@ -330082,39 +330082,39 @@ sub_80B830C: ; 80B830C 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] @@ -330124,11 +330124,11 @@ sub_80B830C: ; 80B830C ldrb r1, [r0] adds r0, r6, 0 bl FieldObjectTurn -@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 @@ -330136,7 +330136,7 @@ sub_80B830C: ; 80B830C movs r0, 0x1 strh r0, [r4, 0xA] strh r7, [r4, 0xC] -@080B8406: +_080B8406: add sp, 0x8 pop {r4-r7} pop {r0} @@ -330164,7 +330164,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 @@ -330180,14 +330180,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 CameraObjectReset1 bl sub_809757C @@ -330196,7 +330196,7 @@ sub_80B8410: ; 80B8410 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B8484: +_080B8484: add sp, 0x8 pop {r4,r5} pop {r0} @@ -330214,13 +330214,13 @@ sub_80B849C: ; 80B849C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080B84BC + bne _080B84BC ldr r0, =sub_80B8554 - b @080B84BE + b _080B84BE .pool -@080B84BC: +_080B84BC: ldr r0, =sub_80B88B4 -@080B84BE: +_080B84BE: movs r1, 0xFF bl AddTask lsls r0, 24 @@ -330420,19 +330420,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 @@ -330447,11 +330447,11 @@ sub_80B8660: ; 80B8660 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] @@ -330465,7 +330465,7 @@ sub_80B8660: ; 80B8660 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] -@080B86DC: +_080B86DC: pop {r4-r7} pop {r0} bx r0 @@ -330489,11 +330489,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 .pool @@ -330519,15 +330519,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 @@ -330536,13 +330536,13 @@ sub_80B871C: ; 80B871C 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 @@ -330677,7 +330677,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] @@ -330688,7 +330688,7 @@ sub_80B8874: ; 80B8874 lsrs r1, r0, 16 adds r2, 0x2 cmp r1, r3 - bls @080B888A + bls _080B888A pop {r4,r5} pop {r0} bx r0 @@ -330799,7 +330799,7 @@ sub_80B898C: ; 80B898C bl sub_80B8B38 lsls r0, 24 cmp r0, 0 - beq @080B89C4 + beq _080B89C4 movs r0, 0x42 movs r1, 0xF0 bl SetGpuReg @@ -330819,7 +330819,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} @@ -330843,11 +330843,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 @@ -330890,11 +330890,11 @@ 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 @@ -331006,10 +331006,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 @@ -331018,7 +331018,7 @@ sub_80B8B38: ; 80B8B38 movs r4, 0x10 ldrsh r0, [r5, r4] cmp r3, r0 - blt @080B8BD6 + blt _080B8BD6 movs r0, 0x20 subs r3, r0, r3 ands r3, r1 @@ -331044,7 +331044,7 @@ sub_80B8B38: ; 80B8B38 mov r6, r12 adds r6, 0x1 ands r6, r0 -@080B8B98: +_080B8B98: lsls r1, r4, 5 adds r2, r1, r3 lsls r2, 1 @@ -331072,13 +331072,13 @@ sub_80B8B38: ; 80B8B38 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 @@ -331097,10 +331097,10 @@ sub_80B8BF0: ; 80B8BF0 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 @@ -331109,7 +331109,7 @@ sub_80B8BF0: ; 80B8BF0 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 @@ -331125,7 +331125,7 @@ sub_80B8BF0: ; 80B8BF0 adds r4, r2, 0x1 movs r0, 0x1F ands r4, r0 -@080B8C30: +_080B8C30: lsls r0, r3, 5 adds r1, r0, r2 lsls r1, 1 @@ -331139,13 +331139,13 @@ sub_80B8BF0: ; 80B8BF0 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 @@ -331207,7 +331207,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 @@ -331217,19 +331217,19 @@ 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 .pool -@080B8CF8: +_080B8CF8: ldrh r0, [r1, 0x2E] movs r1, 0 bl cry_related -@080B8D00: +_080B8D00: pop {r0} bx r0 thumb_func_end sub_80B8CC0 @@ -331243,10 +331243,10 @@ sub_80B8D04: ; 80B8D04 strh r0, [r1, 0x30] lsls r0, 16 cmp r0, 0 - bne @080B8D18 + bne _080B8D18 ldr r0, =sub_80B8D20 str r0, [r1, 0x1C] -@080B8D18: +_080B8D18: pop {r0} bx r0 .pool @@ -331262,15 +331262,15 @@ 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 @@ -331381,13 +331381,13 @@ sub_80B8E14: ; 80B8E14 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B8E3E + beq _080B8E3E adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B8E50 -@080B8E3E: + beq _080B8E50 +_080B8E3E: bl sub_808C114 adds r0, r4, 0 movs r1, 0x39 @@ -331395,7 +331395,7 @@ sub_80B8E14: ; 80B8E14 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -@080B8E50: +_080B8E50: pop {r4,r5} pop {r0} bx r0 @@ -331416,7 +331416,7 @@ sub_80B8E60: ; 80B8E60 bl FieldObjectCheckIfSpecialAnimFinishedOrInactive lsls r0, 24 cmp r0, 0 - beq @080B8E96 + beq _080B8E96 ldr r2, =0x02038c08 movs r1, 0x26 ldrsh r0, [r4, r1] @@ -331429,7 +331429,7 @@ sub_80B8E60: ; 80B8E60 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@080B8E96: +_080B8E96: pop {r4} pop {r0} bx r0 @@ -331444,7 +331444,7 @@ sub_80B8EA8: ; 80B8EA8 bl FieldEffectActiveListContains lsls r0, 24 cmp r0, 0 - bne @080B8F12 + bne _080B8F12 ldr r5, =0x02037590 ldrb r0, [r5, 0x5] lsls r4, r0, 3 @@ -331484,7 +331484,7 @@ sub_80B8EA8: ; 80B8EA8 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -@080B8F12: +_080B8F12: pop {r4-r6} pop {r0} bx r0 @@ -331505,7 +331505,7 @@ sub_80B8F24: ; 80B8F24 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B8F84 + beq _080B8F84 movs r0, 0 strb r0, [r5, 0x6] ldrb r1, [r5] @@ -331532,7 +331532,7 @@ sub_80B8F24: ; 80B8F24 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B8F84: +_080B8F84: pop {r4,r5} pop {r0} bx r0 @@ -331600,13 +331600,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 @@ -331618,19 +331618,19 @@ sub_80B8F98: ; 80B8F98 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, =gUnknown_0855B630 -@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 @@ -331658,11 +331658,11 @@ sub_80B8F98: ; 80B8F98 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 @@ -331735,7 +331735,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 @@ -331761,15 +331761,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 FieldEffectStop -@080B919A: +_080B919A: pop {r4,r5} pop {r0} bx r0 @@ -331836,13 +331836,13 @@ sub_80B9204: ; 80B9204 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B922E + beq _080B922E adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B924C -@080B922E: + beq _080B924C +_080B922E: ldrb r0, [r6] strh r0, [r5, 0x26] movs r0, 0x1 @@ -331855,7 +331855,7 @@ sub_80B9204: ; 80B9204 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -@080B924C: +_080B924C: pop {r4-r6} pop {r0} bx r0 @@ -331876,7 +331876,7 @@ sub_80B925C: ; 80B925C bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B928C + beq _080B928C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -331886,7 +331886,7 @@ sub_80B925C: ; 80B925C str r0, [r1] movs r0, 0x3B bl FieldEffectStart -@080B928C: +_080B928C: pop {r4} pop {r0} bx r0 @@ -331901,7 +331901,7 @@ sub_80B92A0: ; 80B92A0 bl FieldEffectActiveListContains lsls r0, 24 cmp r0, 0 - bne @080B92E8 + bne _080B92E8 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] lsls r0, r1, 3 @@ -331913,14 +331913,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 @@ -331928,7 +331928,7 @@ sub_80B92A0: ; 80B92A0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@080B92E8: +_080B92E8: pop {r4,r5} pop {r0} bx r0 @@ -331943,7 +331943,7 @@ sub_80B92F8: ; 80B92F8 bl sub_80B9508 lsls r0, 24 cmp r0, 0 - beq @080B932C + beq _080B932C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -331960,7 +331960,7 @@ sub_80B92F8: ; 80B92F8 adds r0, r1 movs r1, 0x2 bl FieldObjectSetSpecialAnim -@080B932C: +_080B932C: pop {r4} pop {r0} bx r0 @@ -331982,18 +331982,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 FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B9380 + beq _080B9380 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -332001,7 +332001,7 @@ sub_80B933C: ; 80B933C bl audio_play ldrb r0, [r4, 0xA] bl sub_80B9524 -@080B9380: +_080B9380: pop {r4} pop {r0} bx r0 @@ -332018,7 +332018,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 @@ -332052,20 +332052,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 RemoveObjectAndFreeTiles -@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 @@ -332082,7 +332082,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 @@ -332109,7 +332109,7 @@ sub_80B9418: ; 80B9418 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -@080B9464: +_080B9464: pop {r4,r5} pop {r0} bx r0 @@ -332124,12 +332124,12 @@ sub_80B9474: ; 80B9474 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 @@ -332143,7 +332143,7 @@ sub_80B9494: ; 80B9494 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @080B94B6 + bne _080B94B6 movs r0, 0x1F bl FieldEffectActiveListRemove ldr r0, =sub_80B91D4 @@ -332151,7 +332151,7 @@ sub_80B9494: ; 80B9494 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B94B6: +_080B94B6: pop {r0} bx r0 .pool @@ -332258,11 +332258,11 @@ sub_80B957C: ; 80B957C 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 @@ -332285,7 +332285,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 @@ -332307,15 +332307,15 @@ sub_80B957C: ; 80B957C 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] @@ -332335,7 +332335,7 @@ sub_80B957C: ; 80B957C adds r0, r4, 0 movs r3, 0 bl CalcVecFromObjectCenterToObjectUpperLeft -@080B9628: +_080B9628: pop {r4} pop {r0} bx r0 @@ -332365,7 +332365,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 @@ -332389,14 +332389,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 @@ -332410,11 +332410,11 @@ sub_80B96B0: ; 80B96B0 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 @@ -332440,7 +332440,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 @@ -332468,30 +332468,30 @@ sub_80B96B0: ; 80B96B0 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] @@ -332510,7 +332510,7 @@ sub_80B96B0: ; 80B96B0 movs r1, 0x4 orrs r0, r1 strb r0, [r2] -@080B9784: +_080B9784: pop {r4} pop {r0} bx r0 @@ -332589,13 +332589,13 @@ sub_80B9804: ; 80B9804 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080B982E + beq _080B982E adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080B98A6 -@080B982E: + beq _080B98A6 +_080B982E: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] @@ -332610,11 +332610,11 @@ sub_80B9804: ; 80B9804 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 GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 @@ -332647,7 +332647,7 @@ sub_80B9804: ; 80B9804 ldrb r0, [r5, 0xA] ldrb r1, [r4, 0x4] bl sub_80B9560 -@080B98A6: +_080B98A6: pop {r4-r6} pop {r0} bx r0 @@ -332662,13 +332662,13 @@ sub_80B98B8: ; 80B98B8 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 @@ -332700,7 +332700,7 @@ sub_80B98B8: ; 80B98B8 adds r0, 0x1 strh r0, [r5, 0x8] strh r1, [r5, 0xC] -@080B9910: +_080B9910: pop {r4,r5} pop {r0} bx r0 @@ -332735,11 +332735,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} @@ -332755,7 +332755,7 @@ sub_80B9978: ; 80B9978 bl sub_80B9508 lsls r0, 24 cmp r0, 0 - beq @080B99DC + beq _080B99DC ldr r0, =0x02037590 ldrb r0, [r0, 0x5] lsls r5, r0, 3 @@ -332795,7 +332795,7 @@ sub_80B9978: ; 80B9978 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] -@080B99DC: +_080B99DC: pop {r4-r6} pop {r0} bx r0 @@ -332816,13 +332816,13 @@ sub_80B99F0: ; 80B99F0 bl FieldObjectClearAnimIfSpecialAnimFinished 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 @@ -332837,7 +332837,7 @@ sub_80B9A28: ; 80B9A28 bl sub_80B9508 lsls r0, 24 cmp r0, 0 - beq @080B9A54 + beq _080B9A54 movs r0, 0xA ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -332851,7 +332851,7 @@ sub_80B9A28: ; 80B9A28 strh r0, [r4, 0x8] movs r0, 0x10 strh r0, [r4, 0xA] -@080B9A54: +_080B9A54: pop {r4} pop {r0} bx r0 @@ -332867,7 +332867,7 @@ sub_80B9A60: ; 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 @@ -332880,12 +332880,12 @@ sub_80B9A60: ; 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 GetPlayerAvatarGraphicsIdByStateId adds r1, r0, 0 @@ -332907,7 +332907,7 @@ sub_80B9A60: ; 80B9A60 lsls r0, 24 lsrs r0, 24 bl remove_task -@080B9ACA: +_080B9ACA: pop {r4-r7} pop {r0} bx r0 @@ -332926,7 +332926,7 @@ sub_80B9ADC: ; 80B9ADC bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @080B9B2C + bne _080B9B2C ldr r0, =sub_80B9BE8 movs r1, 0x50 bl AddTask @@ -332946,12 +332946,12 @@ sub_80B9ADC: ; 80B9ADC strh r0, [r1, 0x16] ldr r0, [r4, 0x8] strh r0, [r1, 0x18] - b @080B9B32 + b _080B9B32 .pool -@080B9B2C: +_080B9B2C: movs r0, 0x41 bl FieldEffectActiveListRemove -@080B9B32: +_080B9B32: movs r0, 0 add sp, 0x4 pop {r4} @@ -332972,36 +332972,36 @@ 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 .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] @@ -333010,28 +333010,28 @@ sub_80B9B3C: ; 80B9B3C 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 SetCameraPanning - b @080B9BB6 -@080B9BAC: + b _080B9BB6 +_080B9BAC: movs r0, 0xA ldrsh r1, [r4, r0] movs r0, 0 bl SetCameraPanning -@080B9BB6: +_080B9BB6: bl UpdateCameraPanning 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 @@ -333114,7 +333114,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] @@ -333155,7 +333155,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} @@ -333174,12 +333174,12 @@ sub_80B9CDC: ; 80B9CDC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @080B9D16 + bne _080B9D16 ldr r0, =sub_80B9B3C bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne @080B9D16 + bne _080B9D16 bl InstallCameraPanAheadCallback ldrb r0, [r4, 0xC] ldrb r1, [r4, 0xE] @@ -333189,7 +333189,7 @@ sub_80B9CDC: ; 80B9CDC bl FieldEffectActiveListRemove adds r0, r5, 0 bl remove_task -@080B9D16: +_080B9D16: pop {r4,r5} pop {r0} bx r0 @@ -333225,7 +333225,7 @@ sub_80B9D24: ; 80B9D24 lsls r2, 16 mov r8, r2 lsls r7, r0, 16 -@080B9D5A: +_080B9D5A: ldr r0, =gUnknown_0855C5EC mov r2, r8 asrs r1, r2, 16 @@ -333235,7 +333235,7 @@ sub_80B9D24: ; 80B9D24 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @080B9D96 + beq _080B9D96 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -333254,10 +333254,10 @@ sub_80B9D24: ; 80B9D24 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} @@ -333273,64 +333273,64 @@ sub_80B9DB8: ; 80B9DB8 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 RemoveObjectAndFreeTiles -@080B9E24: +_080B9E24: pop {r0} bx r0 thumb_func_end sub_80B9DB8 @@ -333347,7 +333347,7 @@ sub_80B9E28: ; 80B9E28 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @080B9EBE + bne _080B9EBE mov r0, sp ldrb r0, [r0] lsls r4, r0, 3 @@ -333409,7 +333409,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} @@ -333438,12 +333438,12 @@ 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 .pool -@080B9F10: +_080B9F10: ldrh r0, [r6, 0x20] lsls r0, 4 strh r0, [r5, 0x8] @@ -333473,12 +333473,12 @@ sub_80B9EDC: ; 80B9EDC 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] @@ -333496,8 +333496,8 @@ sub_80B9EDC: ; 80B9EDC 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 @@ -333519,7 +333519,7 @@ sub_80B9EDC: ; 80B9EDC bl FieldEffectActiveListRemove adds r0, r7, 0 bl remove_task -@080B9FAC: +_080B9FAC: pop {r4-r7} pop {r0} bx r0 @@ -333544,11 +333544,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 @@ -333593,7 +333593,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] @@ -333602,9 +333602,9 @@ sub_80BA038: ; 80BA038 adds r1, r2 str r1, [r0, 0x4] ldr r1, =sub_80BA134 - b @080BA07C + b _080BA07C .pool -@080BA06C: +_080BA06C: ldr r0, =0x02039b28 ldr r1, =0x02038c2c str r1, [r0] @@ -333613,7 +333613,7 @@ sub_80BA038: ; 80BA038 adds r1, r2 str r1, [r0, 0x4] ldr r1, =sub_80BA154 -@080BA07C: +_080BA07C: str r1, [r0, 0x10] adds r1, r0, 0 ldr r0, [sp, 0x4] @@ -333639,9 +333639,9 @@ sub_80BA0A8: ; 80BA0A8 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 @@ -333657,9 +333657,9 @@ sub_80BA0A8: ; 80BA0A8 ldr r1, =0x02039b44 movs r0, 0x1 strb r0, [r1] - b @080BA122 + b _080BA122 .pool -@080BA0EC: +_080BA0EC: ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -333686,7 +333686,7 @@ sub_80BA0A8: ; 80BA0A8 movs r1, 0x1 eors r0, r1 strb r0, [r4, 0x14] -@080BA122: +_080BA122: pop {r4} pop {r0} bx r0 @@ -333739,15 +333739,15 @@ 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 .pool -@080BA1A4: +_080BA1A4: ldr r1, =0x03005e00 mov r0, r12 lsls r2, r0, 2 @@ -333759,67 +333759,67 @@ task00_for_dp12: ; 80BA174 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 .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 .pool -@080BA21C: +_080BA21C: ldr r0, =0x02022e16 - b @080BA24E + b _080BA24E .pool -@080BA224: +_080BA224: ldr r0, =0x02022e18 - b @080BA24E + b _080BA24E .pool -@080BA22C: +_080BA22C: ldr r0, =0x02022e1a - b @080BA24E + b _080BA24E .pool -@080BA234: +_080BA234: ldr r0, =0x02022e1c - b @080BA24E + b _080BA24E .pool -@080BA23C: +_080BA23C: ldr r0, =0x02022e1e - b @080BA24E + b _080BA24E .pool -@080BA244: +_080BA244: ldr r0, =0x02022e20 - b @080BA24E + b _080BA24E .pool -@080BA24C: +_080BA24C: ldr r0, =0x02022e22 -@080BA24E: +_080BA24E: ldrh r6, [r0] -@080BA250: +_080BA250: mov r0, r9 add r0, r12 lsls r0, 3 @@ -333829,7 +333829,7 @@ task00_for_dp12: ; 80BA174 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 @@ -333842,14 +333842,14 @@ task00_for_dp12: ; 80BA174 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] @@ -333866,10 +333866,10 @@ task00_for_dp12: ; 80BA174 movs r1, 0xA ldrsh r0, [r7, r1] cmp r3, r0 - blt @080BA28A - b @080BA324 + blt _080BA28A + b _080BA324 .pool -@080BA2BC: +_080BA2BC: ldrh r0, [r1, 0x12] strh r0, [r1, 0x10] movs r2, 0xE @@ -333882,14 +333882,14 @@ task00_for_dp12: ; 80BA174 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] @@ -333906,8 +333906,8 @@ task00_for_dp12: ; 80BA174 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 @@ -333921,10 +333921,10 @@ task00_for_dp12: ; 80BA174 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 @@ -333947,7 +333947,7 @@ sub_80BA33C: ; 80BA33C movs r2, 0 ldr r0, =gUnknown_08329F40 mov r12, r0 -@080BA350: +_080BA350: lsls r0, r1, 1 adds r3, r0, r6 lsls r0, r2, 1 @@ -333956,9 +333956,9 @@ sub_80BA33C: ; 80BA33C 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 @@ -333968,7 +333968,7 @@ sub_80BA33C: ; 80BA33C lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xFF - bls @080BA350 + bls _080BA350 pop {r4-r7} pop {r0} bx r0 @@ -334076,7 +334076,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 @@ -334087,7 +334087,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] @@ -334097,8 +334097,8 @@ sub_80BA384: ; 80BA384 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} @@ -334145,37 +334145,37 @@ CB2_OptionsMenu: ; 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 .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 .pool -@080BA54C: +_080BA54C: movs r3, 0xC0 lsls r3, 19 movs r4, 0xC0 @@ -334191,7 +334191,7 @@ CB2_OptionsMenu: ; 80BA4DC movs r0, 0x81 lsls r0, 24 mov r12, r0 -@080BA56A: +_080BA56A: strh r6, [r2] add r0, sp, 0x4 str r0, [r1] @@ -334201,7 +334201,7 @@ CB2_OptionsMenu: ; 80BA4DC adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @080BA56A + bhi _080BA56A strh r6, [r2] add r2, sp, 0x4 str r2, [r1] @@ -334312,9 +334312,9 @@ CB2_OptionsMenu: ; 80BA4DC bl ShowBg movs r0, 0x1 bl ShowBg - b @080BA7EC + b _080BA7EC .pool -@080BA69C: +_080BA69C: bl sub_80A1A74 bl remove_some_task bl clear_tasks @@ -334323,9 +334323,9 @@ CB2_OptionsMenu: ; 80BA4DC movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @080BA7F4 + b _080BA7F4 .pool -@080BA6BC: +_080BA6BC: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x14] @@ -334338,9 +334338,9 @@ CB2_OptionsMenu: ; 80BA4DC lsls r3, 1 movs r0, 0x1 bl LoadBgTiles - b @080BA7EC + b _080BA7EC .pool -@080BA6E0: +_080BA6E0: ldr r0, =gUnknown_0855C6A0 movs r1, 0 movs r2, 0x2 @@ -334358,16 +334358,16 @@ CB2_OptionsMenu: ; 80BA4DC movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @080BA7F4 + b _080BA7F4 .pool -@080BA718: +_080BA718: ldr r0, =gUnknown_0855C604 movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply - b @080BA7EC + b _080BA7EC .pool -@080BA728: +_080BA728: movs r0, 0 bl PutWindowTilemap bl sub_80BB0D0 @@ -334375,14 +334375,14 @@ CB2_OptionsMenu: ; 80BA4DC movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @080BA7F4 + b _080BA7F4 .pool -@080BA740: +_080BA740: movs r0, 0x87 lsls r0, 3 adds r1, r2, r0 - b @080BA7F4 -@080BA748: + b _080BA7F4 +_080BA748: movs r0, 0x1 bl PutWindowTilemap bl sub_80BB104 @@ -334393,15 +334393,15 @@ CB2_OptionsMenu: ; 80BA4DC 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 .pool -@080BA774: +_080BA774: ldr r0, =sub_80BA83C movs r1, 0 bl AddTask @@ -334453,18 +334453,18 @@ CB2_OptionsMenu: ; 80BA4DC movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram -@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 .pool -@080BA80C: +_080BA80C: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -334476,7 +334476,7 @@ CB2_OptionsMenu: ; 80BA4DC bl SetVBlankCallback ldr r0, =sub_80BA4B0 bl SetMainCallback2 -@080BA828: +_080BA828: add sp, 0xC pop {r3} mov r8, r3 @@ -334496,7 +334496,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 @@ -334504,7 +334504,7 @@ sub_80BA83C: ; 80BA83C adds r1, r0 ldr r0, =sub_80BA86C str r0, [r1] -@080BA85C: +_080BA85C: pop {r0} bx r0 .pool @@ -334520,7 +334520,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 @@ -334529,33 +334529,33 @@ 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 .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 str r0, [r1] - b @080BAA5A + b _080BAA5A .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 @@ -334566,18 +334566,18 @@ sub_80BA86C: ; 80BA86C ldrsh r0, [r3, r6] adds r7, r1, 0 cmp r0, 0 - ble @080BA8E8 + ble _080BA8E8 subs r0, r5, 0x1 - b @080BA90C + b _080BA90C .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 @@ -334588,22 +334588,22 @@ sub_80BA86C: ; 80BA86C 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 .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 @@ -334613,24 +334613,24 @@ sub_80BA86C: ; 80BA86C 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 .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 @@ -334644,11 +334644,11 @@ sub_80BA86C: ; 80BA86C 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 @@ -334662,11 +334662,11 @@ sub_80BA86C: ; 80BA86C 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 @@ -334680,11 +334680,11 @@ sub_80BA86C: ; 80BA86C 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 @@ -334698,11 +334698,11 @@ sub_80BA86C: ; 80BA86C 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 @@ -334716,11 +334716,11 @@ sub_80BA86C: ; 80BA86C 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 @@ -334734,20 +334734,20 @@ sub_80BA86C: ; 80BA86C 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 CopyWindowToVram -@080BAA5A: +_080BAA5A: pop {r4-r7} pop {r0} bx r0 @@ -334844,14 +334844,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 FreeAllWindowBuffers ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 -@080BAB2C: +_080BAB2C: pop {r0} bx r0 .pool @@ -334897,8 +334897,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 @@ -334910,18 +334910,18 @@ sub_80BAB68: ; 80BAB68 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 @@ -334956,40 +334956,40 @@ 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 .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 .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 @@ -335081,12 +335081,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 @@ -335142,12 +335142,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 @@ -335203,14 +335203,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} @@ -335267,17 +335267,17 @@ 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 .pool -@080BAE80: +_080BAE80: movs r4, 0 -@080BAE82: +_080BAE82: adds r0, r4, 0 bl sub_8098758 ldr r1, [r0] @@ -335296,23 +335296,23 @@ sub_80BAE5C: ; 80BAE5C 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 .pool -@080BAED0: +_080BAED0: movs r4, 0x13 -@080BAED2: +_080BAED2: adds r0, r4, 0 bl sub_8098758 ldr r1, [r0] @@ -335331,7 +335331,7 @@ sub_80BAE5C: ; 80BAE5C ldr r1, =0x02039b48 movs r0, 0x1 strb r0, [r1] -@080BAEFE: +_080BAEFE: adds r0, r4, 0 pop {r4} pop {r1} @@ -335353,9 +335353,9 @@ sub_80BAF0C: ; 80BAF0C ldrb r0, [r1] ldr r7, =gUnknown_085EE635 cmp r0, 0xFF - beq @080BAF44 + beq _080BAF44 adds r2, r1, 0 -@080BAF28: +_080BAF28: mov r0, sp adds r1, r0, r5 adds r0, r5, r2 @@ -335367,17 +335367,17 @@ sub_80BAF0C: ; 80BAF0C 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 @@ -335393,9 +335393,9 @@ sub_80BAF0C: ; 80BAF0C bl __umodsi3 adds r0, 0xA1 strb r0, [r4] - b @080BAF9E + b _080BAF9E .pool -@080BAF80: +_080BAF80: mov r0, sp adds r4, r0, r5 adds r0, r6, 0 @@ -335410,7 +335410,7 @@ sub_80BAF0C: ; 80BAF0C adds r1, r0, r5 movs r0, 0x77 strb r0, [r1] -@080BAF9E: +_080BAF9E: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -335444,40 +335444,40 @@ 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 .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 .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 @@ -335595,7 +335595,7 @@ sub_80BB104: ; 80BB104 bl FillWindowPixelBuffer movs r4, 0 ldr r5, =gUnknown_0855C664 -@080BB114: +_080BB114: lsls r0, r4, 2 adds r0, r5 ldr r2, [r0] @@ -335616,7 +335616,7 @@ sub_80BB104: ; 80BB104 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @080BB114 + bls _080BB114 movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -335828,7 +335828,7 @@ sub_80BB2D0: ; 80BB2D0 ldr r3, =0x03005d8c ldr r6, =0x00000988 ldr r5, =0x00003b24 -@080BB30C: +_080BB30C: ldr r0, [r4] adds r0, 0x28 adds r0, r1 @@ -335849,7 +335849,7 @@ sub_80BB2D0: ; 80BB2D0 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x33 - bls @080BB30C + bls _080BB30C pop {r4-r6} pop {r0} bx r0 @@ -335891,7 +335891,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] @@ -335906,7 +335906,7 @@ sub_80BB384: ; 80BB384 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r5 - bls @080BB39A + bls _080BB39A movs r2, 0xC1 lsls r2, 3 adds r0, r4, r2 @@ -335954,7 +335954,7 @@ sub_80BB384: ; 80BB384 adds r2, r4, r0 ldr r1, =0x0000ffff adds r5, r1, 0 -@080BB416: +_080BB416: lsls r0, r3, 1 adds r0, r2, r0 ldrh r1, [r0] @@ -335964,7 +335964,7 @@ sub_80BB384: ; 80BB384 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls @080BB416 + bls _080BB416 movs r2, 0xC5 lsls r2, 3 adds r0, r4, r2 @@ -336006,7 +336006,7 @@ sub_80BB384: ; 80BB384 ldr r0, =0x0000063a adds r1, r4, r0 movs r2, 0 -@080BB47C: +_080BB47C: lsls r0, r3, 1 adds r0, r1, r0 strh r2, [r0] @@ -336014,7 +336014,7 @@ sub_80BB384: ; 80BB384 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls @080BB47C + bls _080BB47C ldr r1, =0x0000064a adds r0, r4, r1 movs r1, 0 @@ -336048,26 +336048,26 @@ sub_80BB384: ; 80BB384 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 @@ -336086,15 +336086,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 @@ -336114,7 +336114,7 @@ sub_80BB534: ; 80BB534 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@080BB582: +_080BB582: strh r6, [r2] mov r0, sp str r0, [r1] @@ -336124,7 +336124,7 @@ sub_80BB534: ; 80BB534 adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @080BB582 + bhi _080BB582 strh r6, [r2] mov r2, sp str r2, [r1] @@ -336168,9 +336168,9 @@ sub_80BB534: ; 80BB534 adds r0, r2 movs r1, 0x1 strb r1, [r0] - b @080BB74C + b _080BB74C .pool -@080BB5FC: +_080BB5FC: bl remove_some_task bl clear_tasks bl ResetAllObjectData @@ -336183,9 +336183,9 @@ sub_80BB534: ; 80BB534 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] - b @080BB74C + b _080BB74C .pool -@080BB628: +_080BB628: ldr r4, =0x02039b4c ldr r0, =0x00000664 bl AllocZeroed @@ -336204,12 +336204,12 @@ sub_80BB534: ; 80BB534 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] @@ -336233,7 +336233,7 @@ sub_80BB534: ; 80BB534 strb r1, [r0] bl sub_809D42C cmp r0, 0 - bne @080BB6D0 + bne _080BB6D0 movs r0, 0 bl sub_80C0844 ldr r1, [r4] @@ -336242,9 +336242,9 @@ sub_80BB534: ; 80BB534 strh r0, [r1] movs r0, 0x1 bl sub_80C0844 - b @080BB6E4 + b _080BB6E4 .pool -@080BB6D0: +_080BB6D0: movs r0, 0 bl pokedex_count ldr r1, [r4] @@ -336253,7 +336253,7 @@ sub_80BB534: ; 80BB534 strh r0, [r1] movs r0, 0x1 bl pokedex_count -@080BB6E4: +_080BB6E4: ldr r1, [r4] ldr r3, =0x0000061c adds r1, r3 @@ -336271,9 +336271,9 @@ sub_80BB534: ; 80BB534 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @080BB74C + b _080BB74C .pool -@080BB71C: +_080BB71C: movs r0, 0x1 bl EnableInterrupts ldr r0, =sub_80BB370 @@ -336293,7 +336293,7 @@ sub_80BB534: ; 80BB534 ldr r1, =0x0000ffff movs r2, 0x80 bl MPlayVolumeControl -@080BB74C: +_080BB74C: add sp, 0x8 pop {r3} mov r8, r3 @@ -336332,7 +336332,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 @@ -336340,7 +336340,7 @@ sub_80BB78C: ; 80BB78C adds r1, r0 ldr r0, =sub_80BB7D4 str r0, [r1] -@080BB7BE: +_080BB7BE: pop {r4} pop {r0} bx r0 @@ -336370,19 +336370,19 @@ 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 .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] @@ -336391,7 +336391,7 @@ sub_80BB7D4: ; 80BB7D4 ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq @080BB8A4 + beq _080BB8A4 bl sub_80BD8D0 ldr r4, =0x02020630 ldr r0, [r7] @@ -336432,16 +336432,16 @@ sub_80BB7D4: ; 80BB7D4 ldr r1, =sub_80BBBF4 str r1, [r0] movs r0, 0x15 - b @080BB976 + b _080BB976 .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 @@ -336466,15 +336466,15 @@ sub_80BB7D4: ; 80BB7D4 str r1, [r0] movs r0, 0x5 bl audio_play - b @080BBA06 + b _080BBA06 .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 @@ -336527,16 +336527,16 @@ sub_80BB7D4: ; 80BB7D4 ldr r0, =sub_80BBD1C str r0, [r3] movs r0, 0x2 -@080BB976: +_080BB976: bl audio_play bl sub_80BC890 - b @080BBA06 + b _080BBA06 .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] @@ -336553,9 +336553,9 @@ sub_80BB7D4: ; 80BB7D4 str r1, [r0] movs r0, 0x3 bl audio_play - b @080BBA06 + b _080BBA06 .pool -@080BB9D8: +_080BB9D8: ldr r5, =0x02039b4c ldr r0, [r5] ldr r4, =0x0000060e @@ -336570,7 +336570,7 @@ sub_80BB7D4: ; 80BB7D4 adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq @080BBA06 + beq _080BBA06 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -336578,7 +336578,7 @@ sub_80BB7D4: ; 80BB7D4 adds r1, r0 ldr r0, =sub_80BBA28 str r0, [r1] -@080BBA06: +_080BBA06: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -336608,7 +336608,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 @@ -336616,7 +336616,7 @@ sub_80BBA28: ; 80BBA28 adds r1, r0 ldr r0, =sub_80BB7D4 str r0, [r1] -@080BBA5C: +_080BBA5C: pop {r4} pop {r0} bx r0 @@ -336642,34 +336642,34 @@ 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 .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 .pool -@080BBADC: +_080BBADC: ldr r4, =0x0000060e adds r1, r3, r4 movs r0, 0 @@ -336677,9 +336677,9 @@ sub_80BBA78: ; 80BBA78 ldr r0, =0x0000062c adds r1, r3, r0 movs r0, 0x40 - b @080BBB0C + b _080BBB0C .pool -@080BBAF4: +_080BBAF4: ldr r1, =0x0000060c adds r2, r3, r1 ldrh r0, [r2] @@ -336692,7 +336692,7 @@ sub_80BBA78: ; 80BBA78 adds r0, 0x30 ldr r2, =0x0000062c adds r1, r3, r2 -@080BBB0C: +_080BBB0C: strb r0, [r1] bl sub_80BDA40 ldr r0, [r6] @@ -336701,13 +336701,13 @@ sub_80BBA78: ; 80BBA78 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 .pool -@080BBB34: +_080BBB34: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -336724,13 +336724,13 @@ sub_80BBA78: ; 80BBA78 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 @@ -336744,14 +336744,14 @@ sub_80BBA78: ; 80BBA78 adds r0, r1 ldr r1, =sub_80BB7D4 str r1, [r0] - b @080BBBB6 + b _080BBBB6 .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 @@ -336759,20 +336759,20 @@ sub_80BBA78: ; 80BBA78 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 .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 @@ -336780,12 +336780,12 @@ sub_80BBA78: ; 80BBA78 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} @@ -336811,11 +336811,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] @@ -336841,7 +336841,7 @@ sub_80BBBF4: ; 80BBBF4 strh r0, [r1, 0x8] ldr r0, =sub_80BBC74 str r0, [r1] -@080BBC52: +_080BBC52: pop {r4-r6} pop {r0} bx r0 @@ -336866,23 +336866,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 @@ -336891,9 +336891,9 @@ sub_80BBC74: ; 80BBC74 adds r0, r1 ldrb r1, [r4, 0x8] bl sub_80BE9F8 - b @080BBCFC + b _080BBCFC .pool -@080BBCE0: +_080BBCE0: ldr r2, =0x02039b50 ldr r0, =0x02039b4c ldr r1, [r0] @@ -336908,7 +336908,7 @@ sub_80BBC74: ; 80BBC74 strb r0, [r2] ldr r0, =sub_80BB78C str r0, [r4] -@080BBCFC: +_080BBCFC: pop {r4,r5} pop {r0} bx r0 @@ -336933,7 +336933,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] @@ -336941,7 +336941,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] @@ -336950,9 +336950,9 @@ sub_80BBD1C: ; 80BBD1C movs r0, 0x40 strb r0, [r1] ldr r0, =sub_80BBE70 - b @080BBDC8 + b _080BBDC8 .pool -@080BBD7C: +_080BBD7C: ldr r1, =0x0000062a adds r0, r2, r1 ldrh r1, [r0] @@ -336976,12 +336976,12 @@ sub_80BBD1C: ; 80BBD1C 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 @@ -336991,9 +336991,9 @@ sub_80BBD1C: ; 80BBD1C adds r0, r2 strh r1, [r0] ldr r0, =sub_80BB78C -@080BBDC8: +_080BBDC8: str r0, [r6] -@080BBDCA: +_080BBDCA: pop {r4-r6} pop {r0} bx r0 @@ -337010,7 +337010,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 @@ -337022,10 +337022,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 @@ -337045,7 +337045,7 @@ sub_80BBDE8: ; 80BBDE8 bl MPlayVolumeControl ldr r0, [r5] bl Free -@080BBE4A: +_080BBE4A: pop {r4-r6} pop {r0} bx r0 @@ -337069,7 +337069,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 @@ -337077,7 +337077,7 @@ sub_80BBE70: ; 80BBE70 adds r1, r0 ldr r0, =sub_80BBEB8 str r0, [r1] -@080BBEA0: +_080BBEA0: pop {r4} pop {r0} bx r0 @@ -337103,19 +337103,19 @@ 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 .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] @@ -337124,7 +337124,7 @@ sub_80BBEB8: ; 80BBEB8 ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq @080BBF70 + beq _080BBF70 bl sub_80BD8D0 ldr r3, =0x02020630 ldr r0, [r5] @@ -337158,16 +337158,16 @@ sub_80BBEB8: ; 80BBEB8 ldr r1, =sub_80BC2D4 str r1, [r0] movs r0, 0x15 - b @080BC00A + b _080BC00A .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 @@ -337192,15 +337192,15 @@ sub_80BBEB8: ; 80BBEB8 str r1, [r0] movs r0, 0x5 bl audio_play - b @080BC08A + b _080BC08A .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] @@ -337226,16 +337226,16 @@ sub_80BBEB8: ; 80BBEB8 ldr r0, =sub_80BBD1C str r0, [r1] movs r0, 0x2 -@080BC00A: +_080BC00A: bl audio_play bl sub_80BC890 - b @080BC08A + b _080BC08A .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] @@ -337252,9 +337252,9 @@ sub_80BBEB8: ; 80BBEB8 str r1, [r0] movs r0, 0x3 bl audio_play - b @080BC08A + b _080BC08A .pool -@080BC05C: +_080BC05C: ldr r5, =0x02039b4c ldr r0, [r5] ldr r4, =0x0000060e @@ -337269,7 +337269,7 @@ sub_80BBEB8: ; 80BBEB8 adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq @080BC08A + beq _080BC08A ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -337277,7 +337277,7 @@ sub_80BBEB8: ; 80BBEB8 adds r1, r0 ldr r0, =sub_80BC0A8 str r0, [r1] -@080BC08A: +_080BC08A: add sp, 0x4 pop {r4-r7} pop {r0} @@ -337304,7 +337304,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 @@ -337312,7 +337312,7 @@ sub_80BC0A8: ; 80BC0A8 adds r1, r0 ldr r0, =sub_80BBEB8 str r0, [r1] -@080BC0DC: +_080BC0DC: pop {r4} pop {r0} bx r0 @@ -337338,41 +337338,41 @@ 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 .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 .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 @@ -337383,9 +337383,9 @@ sub_80BC0F8: ; 80BC0F8 adds r1, r2 movs r0, 0x40 strb r0, [r1] - b @080BC1B2 + b _080BC1B2 .pool -@080BC194: +_080BC194: ldr r5, =0x02039b4c ldr r2, [r5] ldr r0, =0x0000060c @@ -337401,22 +337401,22 @@ sub_80BC0F8: ; 80BC0F8 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 .pool -@080BC1E4: +_080BC1E4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -337433,9 +337433,9 @@ sub_80BC0F8: ; 80BC0F8 str r1, [r0] movs r0, 0x34 bl audio_play - b @080BC238 + b _080BC238 .pool -@080BC214: +_080BC214: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -337452,13 +337452,13 @@ sub_80BC0F8: ; 80BC0F8 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 @@ -337472,14 +337472,14 @@ sub_80BC0F8: ; 80BC0F8 adds r0, r1 ldr r1, =sub_80BBEB8 str r1, [r0] - b @080BC296 + b _080BC296 .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 @@ -337487,20 +337487,20 @@ sub_80BC0F8: ; 80BC0F8 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 .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 @@ -337508,12 +337508,12 @@ sub_80BC0F8: ; 80BC0F8 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} @@ -337539,11 +337539,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] @@ -337573,7 +337573,7 @@ sub_80BC2D4: ; 80BC2D4 strh r2, [r0] ldr r0, =sub_80BC360 str r0, [r1] -@080BC33A: +_080BC33A: pop {r4-r6} pop {r0} bx r0 @@ -337598,23 +337598,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 @@ -337623,12 +337623,12 @@ sub_80BC360: ; 80BC360 adds r0, r1 ldrb r1, [r4, 0x8] bl sub_80BE9F8 - b @080BC3D0 + b _080BC3D0 .pool -@080BC3CC: +_080BC3CC: ldr r0, =sub_80BBE70 str r0, [r4] -@080BC3D0: +_080BC3D0: pop {r4,r5} pop {r0} bx r0 @@ -337645,7 +337645,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 @@ -337670,12 +337670,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 @@ -337693,7 +337693,7 @@ sub_80BC3DC: ; 80BC3DC str r1, [r0] bl sub_80BDA40 bl sub_80BC890 -@080BC450: +_080BC450: pop {r4,r5} pop {r0} bx r0 @@ -337710,7 +337710,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 @@ -337735,12 +337735,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 @@ -337756,7 +337756,7 @@ sub_80BC47C: ; 80BC47C adds r0, r1 ldr r1, =sub_80BBDE8 str r1, [r0] -@080BC4E8: +_080BC4E8: pop {r4,r5} pop {r0} bx r0 @@ -337776,23 +337776,23 @@ 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 .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 @@ -337800,9 +337800,9 @@ sub_80BC514: ; 80BC514 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 @@ -337864,26 +337864,26 @@ sub_80BC514: ; 80BC514 movs r3, 0 bl CopyToBgTilemapBuffer cmp r5, 0 - bne @080BC640 + bne _080BC640 ldr r1, =gUnknown_08DC2A08 movs r3, 0xA0 lsls r3, 2 movs r0, 0 movs r2, 0 bl CopyToBgTilemapBuffer - b @080BC64E + b _080BC64E .pool -@080BC640: +_080BC640: ldr r1, =gUnknown_08DC2B1C movs r3, 0xA0 lsls r3, 2 movs r0, 0 movs r2, 0 bl CopyToBgTilemapBuffer -@080BC64E: +_080BC64E: bl sub_80A1A74 cmp r5, 0 - bne @080BC674 + bne _080BC674 ldr r3, =0x02039b4c ldr r1, [r3] ldr r0, =0x0000064c @@ -337892,9 +337892,9 @@ sub_80BC514: ; 80BC514 movs r0, 0x2 negs r0, r0 ands r0, r2 - b @080BC682 + b _080BC682 .pool -@080BC674: +_080BC674: ldr r3, =0x02039b4c ldr r1, [r3] ldr r2, =0x0000064c @@ -337902,7 +337902,7 @@ sub_80BC514: ; 80BC514 ldrb r0, [r1] movs r2, 0x1 orrs r0, r2 -@080BC682: +_080BC682: strb r0, [r1] ldr r0, [r3] ldr r1, =0x0000064c @@ -337925,9 +337925,9 @@ sub_80BC514: ; 80BC514 adds r0, r2 movs r1, 0x1 strb r1, [r0] - b @080BC838 + b _080BC838 .pool -@080BC6CC: +_080BC6CC: bl ResetAllObjectData bl ResetObjectPaletteAllocator ldr r1, =0x0300301c @@ -337939,16 +337939,16 @@ sub_80BC514: ; 80BC514 bl LoadTaggedObjectPalettes adds r0, r5, 0 bl sub_80BDB7C - b @080BC7F8 + b _080BC7F8 .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 @@ -337958,7 +337958,7 @@ sub_80BC514: ; 80BC514 adds r1, r2 ldrb r1, [r1] bl sub_80BC8D4 -@080BC71C: +_080BC71C: ldr r4, =0x02039b4c ldr r0, [r4] ldr r1, =0x0000060e @@ -337983,9 +337983,9 @@ sub_80BC514: ; 80BC514 bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080BC7F8 + b _080BC7F8 .pool -@080BC768: +_080BC768: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -337999,9 +337999,9 @@ sub_80BC514: ; 80BC514 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @080BC800 + b _080BC800 .pool -@080BC790: +_080BC790: ldr r1, =0x00003f3f movs r0, 0x48 bl SetGpuReg @@ -338040,18 +338040,18 @@ sub_80BC514: ; 80BC514 bl ShowBg movs r0, 0x3 bl ShowBg -@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 .pool -@080BC818: +_080BC818: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -338059,17 +338059,17 @@ sub_80BC514: ; 80BC514 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 .pool -@080BC838: +_080BC838: movs r0, 0 -@080BC83A: +_080BC83A: add sp, 0x4 pop {r4-r6} pop {r1} @@ -338082,27 +338082,27 @@ sub_80BC844: ; 80BC844 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080BC858 + bne _080BC858 ldr r0, =gUnknown_08DC17B6 - b @080BC862 + b _080BC862 .pool -@080BC858: +_080BC858: bl sub_809D42C cmp r0, 0 - bne @080BC870 + bne _080BC870 ldr r0, =gUnknown_08DC16F6 -@080BC862: +_080BC862: movs r1, 0x1 movs r2, 0xBE bl gpu_pal_apply - b @080BC87A + b _080BC87A .pool -@080BC870: +_080BC870: ldr r0, =gUnknown_08DC1876 movs r1, 0x1 movs r2, 0xBE bl gpu_pal_apply -@080BC87A: +_080BC87A: bl sub_8098C64 movs r1, 0xF0 movs r2, 0x20 @@ -338119,27 +338119,27 @@ sub_80BC890: ; 80BC890 movs r0, 0 bl GetBgTilemap cmp r0, 0 - beq @080BC8A4 + beq _080BC8A4 bl Free -@080BC8A4: +_080BC8A4: movs r0, 0x1 bl GetBgTilemap cmp r0, 0 - beq @080BC8B2 + beq _080BC8B2 bl Free -@080BC8B2: +_080BC8B2: movs r0, 0x2 bl GetBgTilemap cmp r0, 0 - beq @080BC8C0 + beq _080BC8C0 bl Free -@080BC8C0: +_080BC8C0: movs r0, 0x3 bl GetBgTilemap cmp r0, 0 - beq @080BC8CE + beq _080BC8CE bl Free -@080BC8CE: +_080BC8CE: pop {r0} bx r0 thumb_func_end sub_80BC890 @@ -338163,69 +338163,69 @@ 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 .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 .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 @@ -338276,36 +338276,36 @@ sub_80BC8D4: ; 80BC8D4 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 .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 @@ -338316,13 +338316,13 @@ sub_80BC8D4: ; 80BC8D4 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 @@ -338372,16 +338372,16 @@ sub_80BC8D4: ; 80BC8D4 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 @@ -338389,10 +338389,10 @@ sub_80BC8D4: ; 80BC8D4 asrs r0, 16 ldrh r2, [r6] cmp r0, r2 - blt @080BCA1A - b @080BCDB4 + blt _080BCA1A + b _080BCDB4 .pool -@080BCACC: +_080BCACC: movs r4, 0 mov r5, sp ldr r3, =0x02039b4c @@ -338400,7 +338400,7 @@ sub_80BC8D4: ; 80BC8D4 ldr r6, =0x0000060c movs r7, 0x1 mov r9, r7 -@080BCADA: +_080BCADA: ldr r1, =gUnknown_0855C6A4 lsls r4, 16 asrs r0, r4, 15 @@ -338414,13 +338414,13 @@ sub_80BC8D4: ; 80BC8D4 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 @@ -338461,7 +338461,7 @@ sub_80BC8D4: ; 80BC8D4 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@080BCB58: +_080BCB58: movs r2, 0x80 lsls r2, 9 adds r1, r7, r2 @@ -338469,16 +338469,16 @@ sub_80BC8D4: ; 80BC8D4 movs r0, 0xCD lsls r0, 17 cmp r1, r0 - ble @080BCADA - b @080BCDB4 + ble _080BCADA + b _080BCDB4 .pool -@080BCB78: +_080BCB78: ldr r4, =0x00000181 lsls r0, r4, 16 mov r5, sp ldr r7, =0x02039b4c ldr r6, =0x0000060c -@080BCB82: +_080BCB82: ldr r1, =gUnknown_0855C9DA asrs r0, 15 adds r0, r1 @@ -338490,13 +338490,13 @@ sub_80BC8D4: ; 80BC8D4 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] @@ -338525,17 +338525,17 @@ sub_80BC8D4: ; 80BC8D4 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 .pool -@080BCC08: +_080BCC08: movs r4, 0 mov r5, sp ldr r7, =0x02039b4c @@ -338543,7 +338543,7 @@ sub_80BC8D4: ; 80BC8D4 ldr r6, =0x0000060c ldr r0, =0x00000181 mov r9, r0 -@080BCC16: +_080BCC16: ldr r1, =gUnknown_0855C9DA lsls r4, 16 asrs r0, r4, 15 @@ -338557,13 +338557,13 @@ sub_80BC8D4: ; 80BC8D4 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 @@ -338594,23 +338594,23 @@ sub_80BC8D4: ; 80BC8D4 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 .pool -@080BCCA0: +_080BCCA0: ldr r4, =0x00000181 lsls r0, r4, 16 mov r5, sp ldr r7, =0x02039b4c ldr r6, =0x0000060c -@080BCCAA: +_080BCCAA: ldr r1, =gUnknown_0855CCDE asrs r0, 15 adds r0, r1 @@ -338622,13 +338622,13 @@ sub_80BC8D4: ; 80BC8D4 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] @@ -338657,17 +338657,17 @@ sub_80BC8D4: ; 80BC8D4 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 .pool -@080BCD30: +_080BCD30: movs r4, 0 mov r5, sp ldr r7, =0x02039b4c @@ -338675,7 +338675,7 @@ sub_80BC8D4: ; 80BC8D4 ldr r6, =0x0000060c ldr r0, =0x00000181 mov r9, r0 -@080BCD3E: +_080BCD3E: ldr r1, =gUnknown_0855CCDE lsls r4, 16 asrs r0, r4, 15 @@ -338689,13 +338689,13 @@ sub_80BC8D4: ; 80BC8D4 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 @@ -338726,15 +338726,15 @@ sub_80BC8D4: ; 80BC8D4 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 @@ -338744,7 +338744,7 @@ sub_80BC8D4: ; 80BC8D4 asrs r0, r3, 16 ldr r2, =0x00000181 cmp r0, r2 - bgt @080BCE08 + bgt _080BCE08 adds r5, r1, 0 movs r4, 0x2 negs r4, r4 @@ -338755,7 +338755,7 @@ sub_80BC8D4: ; 80BC8D4 adds r7, r2, 0 ldr r0, =0x0000ffff adds r6, r0, 0 -@080BCDDC: +_080BCDDC: ldr r1, [r5] asrs r3, 16 lsls r4, r3, 2 @@ -338777,8 +338777,8 @@ sub_80BC8D4: ; 80BC8D4 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 @@ -338850,25 +338850,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] @@ -338878,17 +338878,17 @@ sub_80BCE84: ; 80BCE84 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 .pool -@080BCEF0: +_080BCEF0: mov r3, r9 lsls r0, r3, 25 lsrs r4, r0, 24 @@ -338902,7 +338902,7 @@ sub_80BCE84: ; 80BCE84 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 @@ -338925,8 +338925,8 @@ sub_80BCE84: ; 80BCE84 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 @@ -338941,7 +338941,7 @@ sub_80BCE84: ; 80BCE84 movs r1, 0x16 adds r2, r4, 0 bl sub_80BD23C -@080BCF64: +_080BCF64: movs r0, 0x80 lsls r0, 9 add r0, r10 @@ -338952,16 +338952,16 @@ sub_80BCE84: ; 80BCE84 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 @@ -338969,8 +338969,8 @@ sub_80BCE84: ; 80BCE84 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - bne @080BCFB8 -@080BCF9A: + bne _080BCFB8 +_080BCF9A: ldr r0, [r2] movs r1, 0xC6 lsls r1, 3 @@ -338978,9 +338978,9 @@ sub_80BCE84: ; 80BCE84 movs r2, 0 ldrsh r1, [r0, r2] lsls r1, 25 - b @080BD0B2 + b _080BD0B2 .pool -@080BCFB8: +_080BCFB8: movs r1, 0xC6 lsls r1, 3 adds r0, r3, r1 @@ -338996,7 +338996,7 @@ sub_80BCE84: ; 80BCE84 ldrb r0, [r0, 0x2] lsls r0, 31 cmp r0, 0 - beq @080BD028 + beq _080BD028 movs r3, 0xC6 lsls r3, 3 adds r0, r1, r3 @@ -339033,8 +339033,8 @@ sub_80BCE84: ; 80BCE84 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 @@ -339067,11 +339067,11 @@ sub_80BCE84: ; 80BCE84 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 @@ -339086,33 +339086,33 @@ sub_80BCE84: ; 80BCE84 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 .pool -@080BD0CC: +_080BD0CC: lsls r0, r2, 25 lsrs r4, r0, 24 movs r0, 0x11 @@ -339125,7 +339125,7 @@ sub_80BCE84: ; 80BCE84 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 @@ -339148,8 +339148,8 @@ sub_80BCE84: ; 80BCE84 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 @@ -339164,7 +339164,7 @@ sub_80BCE84: ; 80BCE84 movs r1, 0x16 adds r2, r4, 0 bl sub_80BD23C -@080BD13E: +_080BD13E: movs r0, 0 movs r1, 0x2 bl CopyWindowToVram @@ -339204,12 +339204,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 @@ -339259,7 +339259,7 @@ sub_80BD1F4: ; 80BD1F4 lsls r2, 24 lsrs r4, r2, 24 cmp r0, 0 - beq @080BD220 + beq _080BD220 ldr r1, =gUnknown_0855D2BE lsls r2, r3, 3 lsls r3, r4, 3 @@ -339269,9 +339269,9 @@ sub_80BD1F4: ; 80BD1F4 str r0, [sp, 0x4] movs r0, 0 bl BlitBitmapToWindow - b @080BD234 + b _080BD234 .pool -@080BD220: +_080BD220: lsls r2, r3, 3 lsls r3, r4, 3 movs r0, 0x8 @@ -339281,7 +339281,7 @@ sub_80BD1F4: ; 80BD1F4 movs r0, 0 movs r1, 0 bl FillWindowPixelRect -@080BD234: +_080BD234: add sp, 0x8 pop {r4} pop {r0} @@ -339301,16 +339301,16 @@ sub_80BD23C: ; 80BD23C bl NationalPokedexNumToSpecies adds r1, r0, 0 cmp r1, 0 - beq @080BD264 + beq _080BD264 movs r0, 0xB muls r1, r0 ldr r0, =gSpeciesNames adds r4, r1, r0 - b @080BD266 + b _080BD266 .pool -@080BD264: +_080BD264: ldr r4, =gUnknown_0855D2FE -@080BD266: +_080BD266: str r5, [sp] movs r0, 0 movs r1, 0x7 @@ -339371,7 +339371,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 @@ -339383,7 +339383,7 @@ sub_80BD2B4: ; 80BD2B4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls @080BD2DA + bls _080BD2DA ldr r0, [r7] ldr r1, =0x00000626 adds r0, r1 @@ -339397,7 +339397,7 @@ sub_80BD2B4: ; 80BD2B4 lsrs r0, 16 ldr r4, =0x0000ffff cmp r0, r4 - beq @080BD334 + beq _080BD334 movs r1, 0x60 movs r2, 0x50 bl sub_80BDACC @@ -339415,13 +339415,13 @@ sub_80BD2B4: ; 80BD2B4 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 @@ -339439,7 +339439,7 @@ sub_80BD2B4: ; 80BD2B4 adds r0, r3 movs r1, 0 strh r1, [r0, 0x38] -@080BD366: +_080BD366: adds r0, r6, 0x1 lsls r0, 16 lsrs r0, 16 @@ -339447,7 +339447,7 @@ sub_80BD2B4: ; 80BD2B4 lsls r0, 16 lsrs r0, 16 cmp r0, r4 - beq @080BD39C + beq _080BD39C movs r1, 0x60 movs r2, 0x50 bl sub_80BDACC @@ -339465,7 +339465,7 @@ sub_80BD2B4: ; 80BD2B4 adds r0, r3 movs r1, 0x20 strh r1, [r0, 0x38] -@080BD39C: +_080BD39C: movs r0, 0 adds r1, r6, 0 mov r2, r8 @@ -339516,25 +339516,25 @@ 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 .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 @@ -339542,7 +339542,7 @@ sub_80BD404: ; 80BD404 adds r1, r0, r1 ldrh r0, [r1] cmp r0, r12 - beq @080BD46A + beq _080BD46A lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -339550,12 +339550,12 @@ sub_80BD404: ; 80BD404 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 @@ -339590,16 +339590,16 @@ sub_80BD404: ; 80BD404 ldrb r0, [r2] subs r0, r1 strb r0, [r2] - b @080BD558 + b _080BD558 .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 @@ -339607,7 +339607,7 @@ sub_80BD404: ; 80BD404 adds r1, r0, r1 ldrh r0, [r1] cmp r0, r12 - beq @080BD506 + beq _080BD506 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -339615,12 +339615,12 @@ sub_80BD404: ; 80BD404 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 @@ -339655,11 +339655,11 @@ sub_80BD404: ; 80BD404 ldrb r3, [r1] adds r0, r3 strb r0, [r1] -@080BD558: +_080BD558: movs r0, 0 - b @080BD598 + b _080BD598 .pool -@080BD578: +_080BD578: ldr r4, =0x0000062d adds r2, r1, r4 movs r3, 0xC6 @@ -339675,7 +339675,7 @@ sub_80BD404: ; 80BD404 movs r0, 0x1A bl SetGpuReg movs r0, 0x1 -@080BD598: +_080BD598: pop {r3} mov r8, r3 pop {r4-r7} @@ -339701,12 +339701,12 @@ 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 .pool -@080BD5D8: +_080BD5D8: subs r0, r3, 0x1 lsls r0, 16 lsrs r0, 16 @@ -339715,7 +339715,7 @@ sub_80BD5A8: ; 80BD5A8 lsrs r1, r0, 16 ldr r0, =0x0000ffff cmp r1, r0 - beq @080BD612 + beq _080BD612 adds r0, r1, 0 movs r1, 0x60 movs r2, 0x50 @@ -339734,21 +339734,21 @@ sub_80BD5A8: ; 80BD5A8 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 .pool -@080BD634: +_080BD634: movs r0, 0xF - b @080BD692 -@080BD638: + b _080BD692 +_080BD638: adds r0, r3, 0x1 lsls r0, 16 lsrs r0, 16 @@ -339757,7 +339757,7 @@ sub_80BD5A8: ; 80BD5A8 lsrs r1, r0, 16 ldr r0, =0x0000ffff cmp r1, r0 - beq @080BD672 + beq _080BD672 adds r0, r1, 0 movs r1, 0x60 movs r2, 0x50 @@ -339776,22 +339776,22 @@ sub_80BD5A8: ; 80BD5A8 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 .pool -@080BD690: +_080BD690: movs r0, 0 -@080BD692: +_080BD692: strh r0, [r1] -@080BD694: +_080BD694: pop {r4-r6} pop {r0} bx r0 @@ -339815,9 +339815,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 @@ -339837,14 +339837,14 @@ sub_80BD69C: ; 80BD69C adds r1, r7, 0 bl sub_80BD5A8 movs r0, 0x1 - b @080BD734 + b _080BD734 .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 @@ -339852,7 +339852,7 @@ sub_80BD69C: ; 80BD69C ldrh r0, [r0] subs r0, 0x1 cmp r7, r0 - bge @080BD74C + bge _080BD74C movs r1, 0x2 mov r10, r1 lsls r3, r0, 16 @@ -339866,25 +339866,25 @@ sub_80BD69C: ; 80BD69C 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 .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 @@ -339902,7 +339902,7 @@ sub_80BD69C: ; 80BD69C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @080BD75E + bls _080BD75E ldr r1, [r5] ldr r3, =0x0000062c adds r1, r3 @@ -339917,14 +339917,14 @@ sub_80BD69C: ; 80BD69C bl sub_80BD2B4 movs r0, 0x6D bl audio_play - b @080BD81A + b _080BD81A .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 @@ -339932,10 +339932,10 @@ sub_80BD69C: ; 80BD69C 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 @@ -339953,7 +339953,7 @@ sub_80BD69C: ; 80BD69C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @080BD7D2 + bls _080BD7D2 ldr r1, [r5] ldr r2, =0x0000062c adds r1, r2 @@ -339968,10 +339968,10 @@ sub_80BD69C: ; 80BD69C 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 @@ -339979,9 +339979,9 @@ sub_80BD69C: ; 80BD69C adds r0, r1 mov r2, r10 strh r2, [r0] - b @080BD8A2 + b _080BD8A2 .pool -@080BD83C: +_080BD83C: ldr r1, =gUnknown_0855D28C ldr r6, =0x02039b4c ldr r2, [r6] @@ -340029,10 +340029,10 @@ sub_80BD69C: ; 80BD69C 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 @@ -340052,7 +340052,7 @@ sub_80BD8D0: ; 80BD8D0 mov r12, r0 ldr r6, =0x02020630 ldr r5, =0x0000ffff -@080BD8DC: +_080BD8DC: mov r1, r12 ldr r3, [r1] lsls r1, r4, 1 @@ -340067,22 +340067,22 @@ sub_80BD8D0: ; 80BD8D0 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 @@ -340102,12 +340102,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 @@ -340127,50 +340127,50 @@ sub_80BD930: ; 80BD930 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 .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 .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] @@ -340189,33 +340189,33 @@ sub_80BD930: ; 80BD930 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 .pool -@080BDA38: +_080BDA38: movs r0, 0 -@080BDA3A: +_080BDA3A: pop {r4-r6} pop {r1} bx r1 @@ -340227,7 +340227,7 @@ sub_80BDA40: ; 80BDA40 movs r5, 0 ldr r6, =0x02039b4c ldr r7, =0x0000ffff -@080BDA48: +_080BDA48: ldr r0, [r6] lsls r4, r5, 1 ldr r1, =0x0000061e @@ -340235,7 +340235,7 @@ sub_80BDA40: ; 80BDA40 adds r1, r0, r4 ldrh r0, [r1] cmp r0, r7 - beq @080BDA6C + beq _080BDA6C bl sub_818D820 ldr r1, [r6] ldr r0, =0x0000061e @@ -340245,12 +340245,12 @@ sub_80BDA40: ; 80BDA40 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} @@ -340265,7 +340265,7 @@ sub_80BDA8C: ; 80BDA8C lsrs r2, r0, 16 ldr r0, =0x00000181 cmp r2, r0 - bhi @080BDAA8 + bhi _080BDAA8 ldr r0, =0x02039b4c ldr r1, [r0] lsls r0, r2, 2 @@ -340273,21 +340273,21 @@ 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 .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 @@ -340308,7 +340308,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 @@ -340317,7 +340317,7 @@ sub_80BDACC: ; 80BDACC adds r0, r7 ldrh r0, [r0] cmp r0, r3 - bne @080BDB60 + bne _080BDB60 lsls r2, 16 mov r0, r8 asrs r1, 16 @@ -340357,16 +340357,16 @@ sub_80BDACC: ; 80BDACC adds r0, r7 strh r5, [r0] adds r0, r5, 0 - b @080BDB6C + b _080BDB6C .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 @@ -340532,14 +340532,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, =gUnknown_0855D1F4 adds r0, r4, 0 movs r1, 0x20 @@ -340587,19 +340587,19 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4, 0 bl StartObjectImageAnim cmp r5, 0 - beq @080BDD6C + beq _080BDD6C movs r0, 0x1 mov r8, r0 - b @080BDD78 + b _080BDD78 .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, =gUnknown_0855D224 movs r1, 0x20 movs r2, 0x30 @@ -340621,11 +340621,11 @@ sub_80BDB7C: ; 80BDB7C 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 @@ -340634,9 +340634,9 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 bl StartObjectImageAnim - b @080BDDE8 + b _080BDDE8 .pool -@080BDDD4: +_080BDDD4: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -340647,7 +340647,7 @@ sub_80BDB7C: ; 80BDB7C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080BDDE8: +_080BDDE8: ldr r6, =gUnknown_0855D224 adds r0, r6, 0 movs r1, 0x28 @@ -340702,19 +340702,19 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4, 0 bl StartObjectImageAnim cmp r5, 0 - beq @080BDE80 + beq _080BDE80 movs r0, 0x1 mov r8, r0 - b @080BDE8C + b _080BDE8C .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, =gUnknown_0855D224 movs r1, 0x20 movs r2, 0x50 @@ -340736,11 +340736,11 @@ sub_80BDB7C: ; 80BDB7C 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 @@ -340749,9 +340749,9 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 bl StartObjectImageAnim - b @080BDEFC + b _080BDEFC .pool -@080BDEE8: +_080BDEE8: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -340762,7 +340762,7 @@ sub_80BDB7C: ; 80BDB7C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080BDEFC: +_080BDEFC: ldr r0, =gUnknown_0855D224 movs r1, 0x28 movs r2, 0x50 @@ -340790,9 +340790,9 @@ sub_80BDB7C: ; 80BDB7C lsls r1, 24 lsrs r1, 24 bl StartObjectImageAnim - b @080BE3E2 + b _080BE3E2 .pool -@080BDF4C: +_080BDF4C: ldr r4, =gUnknown_0855D1F4 adds r0, r4, 0 movs r1, 0x20 @@ -340877,19 +340877,19 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4, 0 bl StartObjectImageAnim cmp r5, 0 - beq @080BE024 + beq _080BE024 movs r0, 0x1 mov r8, r0 - b @080BE030 + b _080BE030 .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, =gUnknown_0855D23C movs r1, 0x30 movs r2, 0x2D @@ -340907,11 +340907,11 @@ sub_80BDB7C: ; 80BDB7C 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 @@ -340920,9 +340920,9 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 bl StartObjectImageAnim - b @080BE090 + b _080BE090 .pool -@080BE07C: +_080BE07C: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -340933,7 +340933,7 @@ sub_80BDB7C: ; 80BDB7C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080BE090: +_080BE090: ldr r5, =gUnknown_0855D23C adds r0, r5, 0 movs r1, 0x38 @@ -340985,19 +340985,19 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4, 0 bl StartObjectImageAnim cmp r5, 0 - beq @080BE11C + beq _080BE11C movs r0, 0x1 mov r8, r0 - b @080BE128 + b _080BE128 .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, =gUnknown_0855D23C movs r1, 0x30 movs r2, 0x37 @@ -341019,11 +341019,11 @@ sub_80BDB7C: ; 80BDB7C 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 @@ -341032,9 +341032,9 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 bl StartObjectImageAnim - b @080BE198 + b _080BE198 .pool -@080BE184: +_080BE184: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -341045,7 +341045,7 @@ sub_80BDB7C: ; 80BDB7C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080BE198: +_080BE198: ldr r5, =gUnknown_0855D23C adds r0, r5, 0 movs r1, 0x38 @@ -341101,19 +341101,19 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4, 0 bl StartObjectImageAnim cmp r5, 0 - beq @080BE230 + beq _080BE230 movs r1, 0x1 mov r8, r1 - b @080BE23C + b _080BE23C .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, =gUnknown_0855D23C movs r1, 0x30 movs r2, 0x51 @@ -341131,11 +341131,11 @@ sub_80BDB7C: ; 80BDB7C 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 @@ -341144,9 +341144,9 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 bl StartObjectImageAnim - b @080BE29C + b _080BE29C .pool -@080BE288: +_080BE288: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -341157,7 +341157,7 @@ sub_80BDB7C: ; 80BDB7C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080BE29C: +_080BE29C: ldr r5, =gUnknown_0855D23C adds r0, r5, 0 movs r1, 0x38 @@ -341209,19 +341209,19 @@ sub_80BDB7C: ; 80BDB7C adds r0, r4, 0 bl StartObjectImageAnim cmp r5, 0 - beq @080BE328 + beq _080BE328 movs r0, 0x1 mov r8, r0 - b @080BE334 + b _080BE334 .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, =gUnknown_0855D23C movs r1, 0x30 movs r2, 0x5B @@ -341243,11 +341243,11 @@ sub_80BDB7C: ; 80BDB7C 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 @@ -341256,9 +341256,9 @@ sub_80BDB7C: ; 80BDB7C lsls r1, r5, 24 lsrs r1, 24 bl StartObjectImageAnim - b @080BE3A4 + b _080BE3A4 .pool -@080BE390: +_080BE390: ldr r1, =0x02020630 lsls r0, r7, 4 adds r0, r7 @@ -341269,7 +341269,7 @@ sub_80BDB7C: ; 80BDB7C movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@080BE3A4: +_080BE3A4: ldr r0, =gUnknown_0855D23C movs r1, 0x38 movs r2, 0x5B @@ -341297,7 +341297,7 @@ sub_80BDB7C: ; 80BDB7C lsls r1, 24 lsrs r1, 24 bl StartObjectImageAnim -@080BE3E2: +_080BE3E2: ldr r0, =gUnknown_0855D254 movs r1, 0x88 movs r2, 0x60 @@ -341310,9 +341310,9 @@ sub_80BDB7C: ; 80BDB7C adds r0, r7 lsls r0, 2 adds r0, r1 - b @080BE42C + b _080BE42C .pool -@080BE414: +_080BE414: ldr r0, =gUnknown_0855D254 movs r1, 0x88 movs r2, 0x50 @@ -341324,7 +341324,7 @@ sub_80BDB7C: ; 80BDB7C adds r0, r7 lsls r0, 2 add r0, r10 -@080BE42C: +_080BE42C: adds r0, 0x3E ldrb r1, [r0] movs r2, 0x4 @@ -341355,10 +341355,10 @@ sub_80BE44C: ; 80BE44C adds r0, r2 ldrb r0, [r0] cmp r0, 0 - beq @080BE464 + beq _080BE464 adds r0, r1, 0 bl RemoveObjectAndFreeTiles -@080BE464: +_080BE464: pop {r0} bx r0 .pool @@ -341384,44 +341384,44 @@ 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 .pool -@080BE4D4: +_080BE4D4: ldr r0, =nullsub_38 str r0, [r2, 0x1C] -@080BE4D8: +_080BE4D8: pop {r0} bx r0 .pool @@ -341441,9 +341441,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 @@ -341453,9 +341453,9 @@ sub_80BE4E0: ; 80BE4E0 ldr r0, [r7] adds r0, r4 adds r0, r5 - b @080BE5EC + b _080BE5EC .pool -@080BE520: +_080BE520: ldr r2, =gUnknown_08329F40 ldrh r0, [r4, 0x38] lsls r0, 24 @@ -341466,9 +341466,9 @@ sub_80BE4E0: ; 80BE4E0 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 @@ -341484,9 +341484,9 @@ sub_80BE4E0: ; 80BE4E0 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 @@ -341514,7 +341514,7 @@ sub_80BE4E0: ; 80BE4E0 lsls r0, 16 lsrs r0, 16 cmp r0, 0x7E - bhi @080BE5B4 + bhi _080BE5B4 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -341524,26 +341524,26 @@ sub_80BE4E0: ; 80BE4E0 strb r1, [r2] movs r0, 0x1 strh r0, [r4, 0x2E] - b @080BE5C0 + b _080BE5C0 .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 @@ -341555,10 +341555,10 @@ sub_80BE4E0: ; 80BE4E0 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} @@ -341576,14 +341576,14 @@ 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 RemoveObjectAndFreeTiles - b @080BE648 + b _080BE648 .pool -@080BE62C: +_080BE62C: ldr r2, [r1] ldr r1, =0x0000060e adds r0, r2, r1 @@ -341597,7 +341597,7 @@ sub_80BE604: ; 80BE604 subs r1, 0x1 bl __divsi3 strh r0, [r4, 0x26] -@080BE648: +_080BE648: pop {r4} pop {r0} bx r0 @@ -341615,18 +341615,18 @@ 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 RemoveObjectAndFreeTiles - b @080BE750 + b _080BE750 .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 @@ -341636,56 +341636,56 @@ sub_80BE658: ; 80BE658 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 .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 .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, =gUnknown_08329F40 @@ -341694,9 +341694,9 @@ sub_80BE658: ; 80BE658 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 @@ -341707,30 +341707,30 @@ sub_80BE658: ; 80BE658 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 .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 @@ -341746,12 +341746,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 RemoveObjectAndFreeTiles -@080BE774: +_080BE774: pop {r0} bx r0 .pool @@ -341769,14 +341769,14 @@ 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 RemoveObjectAndFreeTiles - b @080BE824 + b _080BE824 .pool -@080BE7AC: +_080BE7AC: ldr r0, [r7] ldr r5, =0x0000062c adds r0, r5 @@ -341822,9 +341822,9 @@ sub_80BE780: ; 80BE780 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 @@ -341833,12 +341833,12 @@ sub_80BE780: ; 80BE780 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} @@ -341856,34 +341856,34 @@ 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 RemoveObjectAndFreeTiles - b @080BE8D4 + b _080BE8D4 .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] @@ -341905,24 +341905,24 @@ sub_80BE834: ; 80BE834 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 .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 @@ -342040,17 +342040,17 @@ sub_80BE9C4: ; 80BE9C4 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne @080BE9F0 + bne _080BE9F0 ldr r1, [r1] ldr r0, =sub_80BEDF4 cmp r1, r0 - bne @080BE9F0 + bne _080BE9F0 movs r0, 0 - b @080BE9F2 + b _080BE9F2 .pool -@080BE9F0: +_080BE9F0: movs r0, 0x1 -@080BE9F2: +_080BE9F2: pop {r1} bx r1 thumb_func_end sub_80BE9C4 @@ -342090,35 +342090,35 @@ 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 .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 @@ -342139,28 +342139,28 @@ sub_80BEA24: ; 80BEA24 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 .pool -@080BEAF0: +_080BEAF0: ldr r1, =gUnknown_08DC1934 movs r2, 0x80 lsls r2, 6 @@ -342193,9 +342193,9 @@ sub_80BEA24: ; 80BEA24 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @080BED70 + b _080BED70 .pool -@080BEB50: +_080BEB50: movs r0, 0xD bl sub_80BFCDC ldr r4, =0x02039b4c @@ -342216,14 +342216,14 @@ sub_80BEA24: ; 80BEA24 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @080BED70 + b _080BED70 .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] @@ -342245,12 +342245,12 @@ sub_80BEA24: ; 80BEA24 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 CopyWindowToVram @@ -342264,9 +342264,9 @@ sub_80BEA24: ; 80BEA24 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @080BED70 + b _080BED70 .pool -@080BEC08: +_080BEC08: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -342275,7 +342275,7 @@ sub_80BEA24: ; 80BEA24 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne @080BEC44 + bne _080BEC44 ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] @@ -342296,14 +342296,14 @@ sub_80BEA24: ; 80BEA24 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 .pool -@080BEC60: +_080BEC60: movs r3, 0 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -342313,13 +342313,13 @@ sub_80BEA24: ; 80BEA24 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] @@ -342333,7 +342333,7 @@ sub_80BEA24: ; 80BEA24 movs r0, 0x1 lsls r0, r1 orrs r3, r0 -@080BEC98: +_080BEC98: mvns r0, r3 movs r1, 0 str r1, [sp] @@ -342343,9 +342343,9 @@ sub_80BEA24: ; 80BEA24 ldr r0, =0x030060b4 ldr r0, [r0] bl SetVBlankCallback - b @080BED68 + b _080BED68 .pool -@080BECBC: +_080BECBC: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -342371,15 +342371,15 @@ sub_80BEA24: ; 80BEA24 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @080BED70 + b _080BED70 .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 @@ -342394,7 +342394,7 @@ sub_80BEA24: ; 80BEA24 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne @080BED58 + bne _080BED58 bl sub_80A369C ldr r0, =0x02039b54 ldr r0, [r0] @@ -342406,29 +342406,29 @@ sub_80BEA24: ; 80BEA24 movs r2, 0x7D movs r3, 0xA bl sub_80A32C0 - b @080BEDA0 + b _080BEDA0 .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 .pool -@080BED7C: +_080BED7C: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -342447,7 +342447,7 @@ sub_80BEA24: ; 80BEA24 lsls r3, 3 adds r0, r5, r3 strb r2, [r0] -@080BEDA0: +_080BEDA0: add sp, 0x4 pop {r4-r6} pop {r0} @@ -342462,27 +342462,27 @@ sub_80BEDB0: ; 80BEDB0 movs r0, 0 bl GetBgTilemap cmp r0, 0 - beq @080BEDC4 + beq _080BEDC4 bl Free -@080BEDC4: +_080BEDC4: movs r0, 0x1 bl GetBgTilemap cmp r0, 0 - beq @080BEDD2 + beq _080BEDD2 bl Free -@080BEDD2: +_080BEDD2: movs r0, 0x2 bl GetBgTilemap cmp r0, 0 - beq @080BEDE0 + beq _080BEDE0 bl Free -@080BEDE0: +_080BEDE0: movs r0, 0x3 bl GetBgTilemap cmp r0, 0 - beq @080BEDEE + beq _080BEDEE bl Free -@080BEDEE: +_080BEDEE: pop {r0} bx r0 thumb_func_end sub_80BEDB0 @@ -342501,7 +342501,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 @@ -342513,9 +342513,9 @@ sub_80BEDF4: ; 80BEDF4 str r0, [r4] movs r0, 0x6C bl audio_play - b @080BEFBA + b _080BEFBA .pool -@080BEE34: +_080BEE34: ldr r1, =0x030022c0 ldrh r2, [r1, 0x2E] movs r0, 0x2 @@ -342523,37 +342523,37 @@ sub_80BEDF4: ; 80BEDF4 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 .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 .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] @@ -342565,9 +342565,9 @@ sub_80BEDF4: ; 80BEDF4 ldr r3, =0x0000064e adds r0, r3 movs r1, 0x1 - b @080BEEF0 + b _080BEEF0 .pool -@080BEEA0: +_080BEEA0: movs r0, 0x15 negs r0, r0 str r3, [sp] @@ -342579,20 +342579,20 @@ sub_80BEDF4: ; 80BEDF4 ldr r1, =0x0000064e adds r0, r1 movs r1, 0x2 - b @080BEEF0 + b _080BEEF0 .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 .pool -@080BEED8: +_080BEED8: movs r0, 0x15 negs r0, r0 str r3, [sp] @@ -342604,19 +342604,19 @@ sub_80BEDF4: ; 80BEDF4 ldr r3, =0x0000064e adds r0, r3 movs r1, 0x3 -@080BEEF0: +_080BEEF0: strb r1, [r0] ldr r0, =sub_80BEFD0 str r0, [r4] movs r0, 0x15 bl audio_play - b @080BEFBA + b _080BEFBA .pool -@080BEF08: +_080BEF08: movs r0, 0x1 negs r0, r0 str r3, [sp] -@080BEF0E: +_080BEF0E: movs r1, 0 movs r2, 0 movs r3, 0x10 @@ -342625,31 +342625,31 @@ sub_80BEDF4: ; 80BEDF4 str r0, [r4] movs r0, 0x3 bl audio_play - b @080BEFBA + b _080BEFBA .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] @@ -342659,32 +342659,32 @@ sub_80BEDF4: ; 80BEDF4 bl sub_80BFD0C movs r0, 0x6D bl audio_play - b @080BEFBA + b _080BEFBA .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] @@ -342694,7 +342694,7 @@ sub_80BEDF4: ; 80BEDF4 bl sub_80BFD0C movs r0, 0x6D bl audio_play -@080BEFBA: +_080BEFBA: add sp, 0x4 pop {r4,r5} pop {r0} @@ -342712,7 +342712,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 @@ -342726,24 +342726,24 @@ 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 - b @080BF02A + b _080BF02A .pool -@080BF020: +_080BF020: ldr r0, =sub_80BF250 - b @080BF02A + b _080BF02A .pool -@080BF028: +_080BF028: ldr r0, =sub_80BF82C -@080BF02A: +_080BF02A: str r0, [r4] -@080BF02C: +_080BF02C: pop {r4} pop {r0} bx r0 @@ -342760,7 +342760,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 @@ -342770,7 +342770,7 @@ sub_80BF038: ; 80BF038 bl sub_818D820 ldr r0, =sub_80BEA24 str r0, [r4] -@080BF05E: +_080BF05E: pop {r4} pop {r0} bx r0 @@ -342787,7 +342787,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 @@ -342798,7 +342798,7 @@ sub_80BF070: ; 80BF070 bl sub_80BEDB0 adds r0, r4, 0 bl remove_task -@080BF09C: +_080BF09C: pop {r4} pop {r0} bx r0 @@ -342816,12 +342816,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 @@ -342829,7 +342829,7 @@ sub_80BF0AC: ; 80BF0AC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @080BF196 + bne _080BF196 ldr r4, =0x02039b4c ldr r0, [r4] ldr r1, =0x0000064a @@ -342850,9 +342850,9 @@ sub_80BF0AC: ; 80BF0AC strb r5, [r0] movs r0, 0x1 strb r0, [r7] - b @080BF196 + b _080BF196 .pool -@080BF120: +_080BF120: movs r0, 0xD bl sub_80BFCF4 movs r0, 0 @@ -342873,9 +342873,9 @@ sub_80BF0AC: ; 80BF0AC ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] - b @080BF196 + b _080BF196 .pool -@080BF15C: +_080BF15C: ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] @@ -342902,7 +342902,7 @@ sub_80BF0AC: ; 80BF0AC adds r0, r1 ldr r1, =sub_80BF1B4 str r1, [r0] -@080BF196: +_080BF196: pop {r4-r7} pop {r0} bx r0 @@ -342920,7 +342920,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 @@ -342928,7 +342928,7 @@ sub_80BF1B4: ; 80BF1B4 adds r1, r0 ldr r0, =sub_80BF1EC str r0, [r1] -@080BF1D6: +_080BF1D6: pop {r0} bx r0 .pool @@ -342944,35 +342944,35 @@ 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 - b @080BF240 + b _080BF240 .pool -@080BF234: +_080BF234: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 lsls r1, 3 adds r1, r0 ldr r0, =sub_80BF250 -@080BF240: +_080BF240: str r0, [r1] -@080BF242: +_080BF242: pop {r0} bx r0 .pool @@ -342991,35 +342991,35 @@ 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 .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 @@ -343046,9 +343046,9 @@ sub_80BF250: ; 80BF250 lsls r2, 3 adds r4, r2 strb r1, [r4] - b @080BF5B2 + b _080BF5B2 .pool -@080BF310: +_080BF310: ldr r1, =gUnknown_08DC1934 movs r2, 0x80 lsls r2, 6 @@ -343075,9 +343075,9 @@ sub_80BF250: ; 80BF250 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @080BF582 + b _080BF582 .pool -@080BF360: +_080BF360: movs r0, 0xD bl sub_80BFCF4 movs r0, 0x1 @@ -343091,17 +343091,17 @@ sub_80BF250: ; 80BF250 lsls r0, 31 lsrs r0, 31 bl sub_80BC844 - b @080BF57A + b _080BF57A .pool -@080BF38C: +_080BF38C: bl sub_80A1A74 ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @080BF582 + b _080BF582 .pool -@080BF3A0: +_080BF3A0: ldr r0, =gUnknown_085E871B movs r1, 0x52 movs r2, 0x21 @@ -343117,9 +343117,9 @@ sub_80BF250: ; 80BF250 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @080BF582 + b _080BF582 .pool -@080BF3D0: +_080BF3D0: ldr r0, =0x02039b54 ldr r0, [r0] ldrh r0, [r0] @@ -343148,9 +343148,9 @@ sub_80BF250: ; 80BF250 strb r0, [r1, 0x5] ldr r0, =0x030061ec strb r3, [r0] - b @080BF57A + b _080BF57A .pool -@080BF41C: +_080BF41C: ldr r1, =0xffff0000 ldr r0, [sp, 0x4] ands r0, r1 @@ -343183,9 +343183,9 @@ sub_80BF250: ; 80BF250 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 @@ -343196,9 +343196,9 @@ sub_80BF250: ; 80BF250 strb r0, [r1] ldr r0, =0x030061ec strb r2, [r0] - b @080BF5B2 + b _080BF5B2 .pool -@080BF498: +_080BF498: ldr r1, =0x00ffffff ldr r0, [sp, 0xC] ands r0, r1 @@ -343222,7 +343222,7 @@ sub_80BF250: ; 80BF250 bl sub_8145850 lsls r0, 24 cmp r0, 0 - beq @080BF4D8 + beq _080BF4D8 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 @@ -343230,7 +343230,7 @@ sub_80BF250: ; 80BF250 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@080BF4D8: +_080BF4D8: movs r0, 0x3 movs r1, 0x2 bl CopyWindowToVram @@ -343245,9 +343245,9 @@ sub_80BF250: ; 80BF250 bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080BF5B2 + b _080BF5B2 .pool -@080BF514: +_080BF514: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -343262,9 +343262,9 @@ sub_80BF250: ; 80BF250 movs r4, 0x87 lsls r4, 3 adds r1, r4 - b @080BF582 + b _080BF582 .pool -@080BF540: +_080BF540: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -343286,18 +343286,18 @@ sub_80BF250: ; 80BF250 bl ShowBg movs r0, 0x3 bl ShowBg -@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 .pool -@080BF590: +_080BF590: ldr r0, =0x02039b4c ldr r0, [r0] ldr r1, =0x0000064e @@ -343315,7 +343315,7 @@ sub_80BF250: ; 80BF250 adds r0, r1 ldr r1, =sub_80BF5CC str r1, [r0] -@080BF5B2: +_080BF5B2: add sp, 0x14 pop {r4,r5} pop {r0} @@ -343334,21 +343334,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 @@ -343358,9 +343358,9 @@ sub_80BF5CC: ; 80BF5CC lsls r0, 16 lsrs r0, 16 bl sub_8145534 - b @080BF772 + b _080BF772 .pool -@080BF624: +_080BF624: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -343368,15 +343368,15 @@ sub_80BF5CC: ; 80BF5CC 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] @@ -343401,24 +343401,24 @@ sub_80BF5CC: ; 80BF5CC str r1, [r0] movs r0, 0x3 bl audio_play - b @080BF772 + b _080BF772 .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] @@ -343443,37 +343443,37 @@ sub_80BF5CC: ; 80BF5CC str r1, [r0] movs r0, 0x6D bl audio_play - b @080BF772 + b _080BF772 .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 .pool -@080BF73C: +_080BF73C: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -343498,7 +343498,7 @@ sub_80BF5CC: ; 80BF5CC str r1, [r0] movs r0, 0x6D bl audio_play -@080BF772: +_080BF772: add sp, 0x4 pop {r4,r5} pop {r0} @@ -343516,7 +343516,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 @@ -343531,24 +343531,24 @@ 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 - b @080BF7EE + b _080BF7EE .pool -@080BF7E4: +_080BF7E4: ldr r0, =sub_80BF0AC - b @080BF7EE + b _080BF7EE .pool -@080BF7EC: +_080BF7EC: ldr r0, =sub_80BF82C -@080BF7EE: +_080BF7EE: str r0, [r4] -@080BF7F0: +_080BF7F0: pop {r4} pop {r0} bx r0 @@ -343561,13 +343561,13 @@ sub_80BF7FC: ; 80BF7FC sub sp, 0x4 lsls r0, 24 cmp r0, 0 - beq @080BF810 + beq _080BF810 ldr r1, =0x00000392 - b @080BF812 + b _080BF812 .pool -@080BF810: +_080BF810: ldr r1, =0x000002af -@080BF812: +_080BF812: mov r0, sp strh r1, [r0] mov r0, sp @@ -343593,34 +343593,34 @@ 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 .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 @@ -343645,9 +343645,9 @@ sub_80BF82C: ; 80BF82C adds r1, r5, r0 movs r0, 0x1 strb r0, [r1] - b @080BFB94 + b _080BFB94 .pool -@080BF8D8: +_080BF8D8: ldr r1, =gUnknown_08DC1934 movs r2, 0x80 lsls r2, 6 @@ -343666,9 +343666,9 @@ sub_80BF82C: ; 80BF82C bl FillWindowPixelBuffer movs r0, 0 bl PutWindowTilemap - b @080BFB4E + b _080BFB4E .pool -@080BF910: +_080BF910: movs r0, 0xD bl sub_80BFCF4 movs r0, 0x2 @@ -343682,9 +343682,9 @@ sub_80BF82C: ; 80BF82C lsls r0, 31 lsrs r0, 31 bl sub_80BC844 - b @080BFB4E + b _080BFB4E .pool -@080BF93C: +_080BF93C: ldr r1, =gUnknown_085E8723 add r0, sp, 0x4 bl CopyString @@ -343706,12 +343706,12 @@ sub_80BF82C: ; 80BF82C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @080BFB56 + b _080BFB56 .pool -@080BF97C: +_080BF97C: bl sub_80A1A74 - b @080BFB4E -@080BF982: + b _080BFB4E +_080BF982: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] @@ -343782,9 +343782,9 @@ sub_80BF82C: ; 80BF82C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @080BFB56 + b _080BFB56 .pool -@080BFA34: +_080BFA34: ldr r5, =0x02039b54 ldr r0, [r5] ldrh r0, [r0] @@ -343856,9 +343856,9 @@ sub_80BF82C: ; 80BF82C bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080BFB4E + b _080BFB4E .pool -@080BFAE8: +_080BFAE8: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -343873,9 +343873,9 @@ sub_80BF82C: ; 80BF82C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @080BFB56 + b _080BFB56 .pool -@080BFB14: +_080BFB14: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -343897,18 +343897,18 @@ sub_80BF82C: ; 80BF82C bl ShowBg movs r0, 0x3 bl ShowBg -@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 .pool -@080BFB64: +_080BFB64: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -343916,7 +343916,7 @@ sub_80BF82C: ; 80BF82C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne @080BFB94 + bne _080BFB94 ldr r0, =0x02039b4c ldr r0, [r0] ldr r1, =0x0000064e @@ -343933,7 +343933,7 @@ sub_80BF82C: ; 80BF82C adds r0, r1 ldr r1, =sub_80BFBB0 str r1, [r0] -@080BFB94: +_080BFB94: add sp, 0x44 pop {r4-r7} pop {r0} @@ -343955,7 +343955,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 @@ -343978,24 +343978,24 @@ sub_80BFBB0: ; 80BFBB0 str r1, [r0] movs r0, 0x3 bl audio_play - b @080BFC5C + b _080BFC5C .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] @@ -344018,7 +344018,7 @@ sub_80BFBB0: ; 80BFBB0 str r1, [r0] movs r0, 0x6D bl audio_play -@080BFC5C: +_080BFC5C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -344036,7 +344036,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 @@ -344052,18 +344052,18 @@ 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 - b @080BFCCE + b _080BFCCE .pool -@080BFCCC: +_080BFCCC: ldr r0, =sub_80BF250 -@080BFCCE: +_080BFCCE: str r0, [r4] -@080BFCD0: +_080BFCD0: pop {r4} pop {r0} bx r0 @@ -344108,7 +344108,7 @@ sub_80BFD0C: ; 80BFD0C bl GetBgTilemap adds r7, r0, 0 movs r1, 0 -@080BFD22: +_080BFD22: lsls r0, r1, 3 subs r0, r1 adds r0, 0x1 @@ -344117,14 +344117,14 @@ sub_80BFD0C: ; 80BFD0C 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 @@ -344141,11 +344141,11 @@ sub_80BFD0C: ; 80BFD0C 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 CopyBgTilemapBufferToVram pop {r3} @@ -344168,28 +344168,28 @@ sub_80BFD7C: ; 80BFD7C bl GetBgTilemap 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 @@ -344206,11 +344206,11 @@ sub_80BFD7C: ; 80BFD7C 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 CopyBgTilemapBufferToVram pop {r3} @@ -344270,31 +344270,31 @@ 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 .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] @@ -344332,9 +344332,9 @@ sub_80BFE38: ; 80BFE38 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - b @080C0074 + b _080C0074 .pool -@080BFF0C: +_080BFF0C: ldr r1, =gUnknown_08DC1934 movs r2, 0x80 lsls r2, 6 @@ -344372,15 +344372,15 @@ sub_80BFE38: ; 80BFE38 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @080C0074 + b _080C0074 .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 @@ -344394,8 +344394,8 @@ sub_80BFE38: ; 80BFE38 bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080C002E -@080BFFA8: + b _080C002E +_080BFFA8: adds r0, r4, 0 movs r1, 0x30 movs r2, 0x38 @@ -344430,9 +344430,9 @@ sub_80BFE38: ; 80BFE38 lsls r0, 3 adds r0, r1 strh r4, [r0, 0xE] - b @080C0038 + b _080C0038 .pool -@080C0000: +_080C0000: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -344450,19 +344450,19 @@ sub_80BFE38: ; 80BFE38 bl ShowBg movs r0, 0x3 bl ShowBg -@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 .pool -@080C0044: +_080C0044: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -344470,7 +344470,7 @@ sub_80BFE38: ; 80BFE38 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne @080C0074 + bne _080C0074 adds r0, r4, 0 bl NationalPokedexNumToSpecies lsls r0, 16 @@ -344485,7 +344485,7 @@ sub_80BFE38: ; 80BFE38 strh r6, [r0, 0xC] ldr r1, =sub_80C0088 str r1, [r0] -@080C0074: +_080C0074: add sp, 0x4 pop {r4-r6} pop {r0} @@ -344504,7 +344504,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] @@ -344528,9 +344528,9 @@ sub_80C0088: ; 80C0088 str r2, [r0] ldr r0, =blockset_load_palette_to_gpu str r0, [r1] - b @080C011E + b _080C011E .pool -@080C00E8: +_080C00E8: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -344542,19 +344542,19 @@ sub_80C0088: ; 80C0088 movs r0, 0x10 ands r1, r0 cmp r1, 0 - beq @080C0114 + beq _080C0114 ldr r0, =gUnknown_08DC16F6 movs r1, 0x31 movs r2, 0xE bl gpu_pal_apply - b @080C011E + b _080C011E .pool -@080C0114: +_080C0114: ldr r0, =gUnknown_08DC1756 movs r1, 0x31 movs r2, 0xE bl gpu_pal_apply -@080C011E: +_080C011E: add sp, 0x4 pop {r4} pop {r0} @@ -344572,7 +344572,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 @@ -344581,15 +344581,15 @@ blockset_load_palette_to_gpu: ; 80C012C movs r0, 0x2 bl GetBgTilemap cmp r0, 0 - beq @080C015A + beq _080C015A bl Free -@080C015A: +_080C015A: movs r0, 0x3 bl GetBgTilemap cmp r0, 0 - beq @080C0168 + beq _080C0168 bl Free -@080C0168: +_080C0168: ldr r0, =0x03005e00 lsls r4, r6, 2 adds r4, r6 @@ -344627,7 +344627,7 @@ blockset_load_palette_to_gpu: ; 80C012C bl decompress_palette adds r0, r6, 0 bl remove_task -@080C01BA: +_080C01BA: pop {r4-r6} pop {r0} bx r0 @@ -344642,34 +344642,34 @@ sub_80C01CC: ; 80C01CC 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 @@ -344682,7 +344682,7 @@ sub_80C020C: ; 80C020C adds r5, r1, 0 adds r7, r2, 0 cmp r3, 0 - beq @080C0234 + beq _080C0234 ldr r4, =gUnknown_085E8735 movs r0, 0x1 adds r1, r4, 0 @@ -344694,20 +344694,20 @@ 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 .pool -@080C024C: +_080C024C: adds r5, r6, 0 lsls r4, r6, 16 -@080C0250: +_080C0250: ldr r1, =gUnknown_085E8D4F mov r0, sp bl CopyString @@ -344724,31 +344724,31 @@ sub_80C020C: ; 80C020C lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0 - beq @080C028C + beq _080C028C movs r0, 0xB muls r1, r0 ldr r0, =gSpeciesNames adds r0, r1, r0 - b @080C028E + b _080C028E .pool -@080C028C: +_080C028C: ldr r0, =gUnknown_0856E688 -@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 .pool -@080C02AC: +_080C02AC: ldr r0, =gUnknown_085E86B8 -@080C02AE: +_080C02AE: movs r1, 0x64 movs r2, 0x29 bl sub_80BE8DC @@ -344761,7 +344761,7 @@ sub_80C020C: ; 80C020C movs r2, 0x49 bl sub_80BE8DC cmp r7, 0 - beq @080C02FC + beq _080C02FC ldr r0, =gPokedexEntries lsls r4, r6, 5 adds r4, r0 @@ -344773,9 +344773,9 @@ sub_80C020C: ; 80C020C movs r1, 0x81 movs r2, 0x49 bl sub_80C0460 - b @080C0310 + b _080C0310 .pool -@080C02FC: +_080C02FC: ldr r0, =gUnknown_085E86C6 movs r1, 0x81 movs r2, 0x39 @@ -344784,19 +344784,19 @@ sub_80C020C: ; 80C020C movs r1, 0x81 movs r2, 0x49 bl sub_80BE8DC -@080C0310: +_080C0310: cmp r7, 0 - beq @080C032C + beq _080C032C ldr r0, =gPokedexEntries lsls r1, r6, 5 adds r0, 0x10 adds r1, r0 ldr r4, [r1] - b @080C032E + b _080C032E .pool -@080C032C: +_080C032C: ldr r4, =gUnknown_0855D30C -@080C032E: +_080C032E: movs r0, 0x1 adds r1, r4, 0 movs r2, 0xF0 @@ -344837,9 +344837,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 @@ -344862,7 +344862,7 @@ sub_80C0354: ; 80C0354 bl __udivsi3 adds r2, r0, 0 cmp r2, 0 - bne @080C03D4 + bne _080C03D4 mov r1, sp adds r1, 0x2 movs r0, 0x12 @@ -344872,9 +344872,9 @@ sub_80C0354: ; 80C0354 adds r0, r6, 0 adds r0, 0xA1 strb r0, [r1] - b @080C03F4 + b _080C03F4 .pool -@080C03D4: +_080C03D4: mov r1, sp adds r1, 0x2 movs r0, 0xC @@ -344890,7 +344890,7 @@ sub_80C0354: ; 80C0354 bl __umodsi3 adds r0, 0xA1 strb r0, [r4] -@080C03F4: +_080C03F4: adds r1, r5, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -344968,9 +344968,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 @@ -344982,18 +344982,18 @@ sub_80C0460: ; 80C0460 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 .pool -@080C04C0: +_080C04C0: movs r1, 0x1 mov r8, r1 movs r6, 0x1 -@080C04C6: +_080C04C6: ldr r1, =0x000186a0 adds r0, r7, 0 bl __umodsi3 @@ -345007,10 +345007,10 @@ sub_80C0460: ; 80C0460 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 @@ -345018,15 +345018,15 @@ sub_80C0460: ; 80C0460 add r1, sp movs r0, 0x77 strb r0, [r1] - b @080C050E + b _080C050E .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 @@ -345042,10 +345042,10 @@ sub_80C0460: ; 80C0460 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 @@ -345053,13 +345053,13 @@ sub_80C0460: ; 80C0460 add r1, sp movs r0, 0x77 strb r0, [r1] - b @080C0552 + b _080C0552 .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 @@ -345177,24 +345177,24 @@ sub_80C0630: ; 80C0630 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, =gPokedexEntries lsls r1, r2, 5 adds r1, r0 ldrh r0, [r1, 0xC] - b @080C065C + b _080C065C .pool -@080C0654: +_080C0654: ldr r0, =gPokedexEntries lsls r1, r2, 5 adds r1, r0 ldrh r0, [r1, 0xE] -@080C065C: +_080C065C: pop {r1} bx r1 .pool @@ -345222,24 +345222,24 @@ 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 .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 @@ -345248,9 +345248,9 @@ pokedex_flag_operation: ; 80C0664 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 @@ -345260,22 +345260,22 @@ pokedex_flag_operation: ; 80C0664 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 .pool -@080C06FC: +_080C06FC: ldr r1, =0x03005d90 ldr r3, [r1] adds r0, r3, 0 @@ -345285,7 +345285,7 @@ pokedex_flag_operation: ; 80C0664 ands r2, r5 adds r7, r1, 0 cmp r2, 0 - beq @080C07E8 + beq _080C07E8 adds r0, r3, 0 adds r0, 0x5C adds r0, r4 @@ -345293,7 +345293,7 @@ pokedex_flag_operation: ; 80C0664 ands r0, r5 ldr r6, =0x03005d8c cmp r2, r0 - bne @080C0754 + bne _080C0754 ldr r1, [r6] ldr r3, =0x00000988 adds r0, r1, r3 @@ -345301,19 +345301,19 @@ pokedex_flag_operation: ; 80C0664 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 .pool -@080C0754: +_080C0754: ldr r1, [r7] adds r1, 0x28 adds r1, r4 @@ -345325,7 +345325,7 @@ pokedex_flag_operation: ; 80C0664 ldr r1, [r7] adds r1, 0x5C adds r1, r4 -@080C076A: +_080C076A: ldrb r2, [r1] adds r0, r3, 0 ands r0, r2 @@ -345346,9 +345346,9 @@ pokedex_flag_operation: ; 80C0664 ands r3, r1 strb r3, [r0] movs r6, 0 - b @080C07E8 + b _080C07E8 .pool -@080C079C: +_080C079C: ldr r0, =0x03005d90 ldr r1, [r0] adds r1, 0x5C @@ -345369,19 +345369,19 @@ pokedex_flag_operation: ; 80C0664 ldr r1, [r3] ldr r3, =0x00003b24 adds r1, r3 - b @080C07DE + b _080C07DE .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} @@ -345397,38 +345397,38 @@ pokedex_count: ; 80C07F4 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 .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} @@ -345442,14 +345442,14 @@ sub_80C0844: ; 80C0844 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 @@ -345457,8 +345457,8 @@ sub_80C0844: ; 80C0844 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 @@ -345466,19 +345466,19 @@ sub_80C0844: ; 80C0844 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} @@ -345492,37 +345492,37 @@ sub_80C089C: ; 80C089C 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} @@ -345533,7 +345533,7 @@ sub_80C089C: ; 80C089C sub_80C08E4: ; 80C08E4 push {r4,lr} movs r0, 0 -@080C08E8: +_080C08E8: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -345545,15 +345545,15 @@ sub_80C08E4: ; 80C08E4 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 @@ -345563,7 +345563,7 @@ sub_80C08E4: ; 80C08E4 sub_80C0918: ; 80C0918 push {r4,lr} movs r0, 0 -@080C091C: +_080C091C: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -345572,15 +345572,15 @@ sub_80C0918: ; 80C0918 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 @@ -345590,7 +345590,7 @@ sub_80C0918: ; 80C0918 sub_80C0944: ; 80C0944 push {r4,r5,lr} movs r0, 0 -@080C0948: +_080C0948: adds r0, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -345599,12 +345599,12 @@ sub_80C0944: ; 80C0944 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 @@ -345613,13 +345613,13 @@ sub_80C0944: ; 80C0944 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 @@ -345628,17 +345628,17 @@ sub_80C0944: ; 80C0944 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne @080C09A0 -@080C0996: + bne _080C09A0 +_080C0996: movs r0, 0 - b @080C09A8 + b _080C09A8 .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 @@ -345655,7 +345655,7 @@ sub_80C09B0: ; 80C09B0 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne @080C09E2 + bne _080C09E2 movs r0, 0 bl ResetGpuRegBits movs r0, 0x8 @@ -345667,13 +345667,13 @@ sub_80C09B0: ; 80C09B0 movs r0, 0x12 movs r1, 0 bl SetGpuReg -@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 ResetGpuRegBits movs r0, 0xA @@ -345685,13 +345685,13 @@ sub_80C09B0: ; 80C09B0 movs r0, 0x16 movs r1, 0 bl SetGpuReg -@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 ResetGpuRegBits movs r0, 0xC @@ -345703,13 +345703,13 @@ sub_80C09B0: ; 80C09B0 movs r0, 0x1A movs r1, 0 bl SetGpuReg -@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 ResetGpuRegBits movs r0, 0xE @@ -345721,12 +345721,12 @@ sub_80C09B0: ; 80C09B0 movs r0, 0x1E movs r1, 0 bl SetGpuReg -@080C0A60: +_080C0A60: movs r1, 0x80 lsls r1, 5 ands r5, r1 cmp r5, 0 - bne @080C0A7E + bne _080C0A7E movs r0, 0 bl ResetGpuRegBits bl ResetAllObjectData @@ -345734,7 +345734,7 @@ sub_80C09B0: ; 80C09B0 ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] -@080C0A7E: +_080C0A7E: pop {r4,r5} pop {r0} bx r0 @@ -345853,7 +345853,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] @@ -345863,12 +345863,12 @@ sub_80C0B44: ; 80C0B44 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, =gSpeciesNames movs r0, 0xB @@ -345877,10 +345877,10 @@ sub_80C0B44: ; 80C0B44 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 @@ -345894,15 +345894,15 @@ sub_80C0B44: ; 80C0B44 adds r0, r3 ldrb r0, [r0] cmp r0, 0xFF - beq @080C0BD4 + beq _080C0BD4 cmp r4, 0x9 - bls @080C0B98 - b @080C0BD4 + bls _080C0B98 + b _080C0BD4 .pool -@080C0BC0: +_080C0BC0: movs r4, 0 movs r1, 0xAE -@080C0BC4: +_080C0BC4: mov r2, sp adds r0, r2, r4 strb r1, [r0] @@ -345910,8 +345910,8 @@ sub_80C0B44: ; 80C0B44 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 @@ -345940,7 +345940,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] @@ -345948,26 +345948,26 @@ sub_80C0BF0: ; 80C0BF0 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 @@ -345980,8 +345980,8 @@ sub_80C0BF0: ; 80C0BF0 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] @@ -346018,17 +346018,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 @@ -346040,16 +346040,16 @@ sub_80C0C6C: ; 80C0C6C 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 @@ -346114,13 +346114,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 @@ -346134,10 +346134,10 @@ sub_80C0D30: ; 80C0D30 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] @@ -346148,11 +346148,11 @@ sub_80C0D30: ; 80C0D30 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 @@ -346214,47 +346214,47 @@ 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 @@ -346266,25 +346266,25 @@ sub_80C0E68: ; 80C0E68 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 .pool -@080C0E88: +_080C0E88: ldr r0, =0x03005d90 ldr r0, [r0] ldr r0, [r0, 0x1C] - b @080C0E96 + b _080C0E96 .pool -@080C0E94: +_080C0E94: movs r0, 0 -@080C0E96: +_080C0E96: pop {r1} bx r1 thumb_func_end sub_80C0E68 @@ -346395,14 +346395,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] @@ -346410,12 +346410,12 @@ sub_80C0F30: ; 80C0F30 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 @@ -346423,12 +346423,12 @@ sub_80C0F30: ; 80C0F30 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, =gUnknown_0856ED08 adds r0, 0x3 @@ -346437,7 +346437,7 @@ sub_80C0F30: ; 80C0F30 ldr r0, =gUnknown_0856ED08 adds r0, r7 mov r9, r0 -@080C0FBA: +_080C0FBA: ldr r1, =0x02039b4c ldr r0, [r1] lsls r4, r5, 2 @@ -346455,7 +346455,7 @@ sub_80C0F30: ; 80C0F30 mov r0, r9 ldrb r0, [r0] cmp r2, r0 - bcc @080C0FF2 + bcc _080C0FF2 mov r1, r9 ldrb r0, [r1] ldr r1, =gUnknown_0856ED08 @@ -346464,21 +346464,21 @@ sub_80C0F30: ; 80C0F30 ldrb r1, [r1] adds r0, r1 cmp r2, r0 - blt @080C100A -@080C0FF2: + blt _080C100A +_080C0FF2: ldr r0, =gUnknown_0856ED08 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 @@ -346489,7 +346489,7 @@ sub_80C0F30: ; 80C0F30 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -@080C101E: +_080C101E: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -346499,17 +346499,17 @@ sub_80C0F30: ; 80C0F30 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 @@ -346518,11 +346518,11 @@ sub_80C0F30: ; 80C0F30 adds r0, r2 ldrh r0, [r0] cmp r6, r0 - bcs @080C10A2 + bcs _080C10A2 adds r7, r1, 0 ldr r0, =gBaseStats mov r8, r0 -@080C105A: +_080C105A: ldr r0, [r7] lsls r4, r5, 2 adds r0, r4 @@ -346539,7 +346539,7 @@ sub_80C0F30: ; 80C0F30 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 @@ -346549,7 +346549,7 @@ sub_80C0F30: ; 80C0F30 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -@080C1090: +_080C1090: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -346558,30 +346558,30 @@ sub_80C0F30: ; 80C0F30 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 @@ -346590,18 +346590,18 @@ sub_80C0F30: ; 80C0F30 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 @@ -346619,10 +346619,10 @@ sub_80C0F30: ; 80C0F30 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 @@ -346632,7 +346632,7 @@ sub_80C0F30: ; 80C0F30 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -@080C112A: +_080C112A: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -346642,10 +346642,10 @@ sub_80C0F30: ; 80C0F30 adds r0, r2 ldrh r0, [r0] cmp r5, r0 - bcc @080C10E0 - b @080C11D4 + bcc _080C10E0 + b _080C11D4 .pool -@080C1158: +_080C1158: movs r5, 0 movs r6, 0 ldr r1, =0x02039b4c @@ -346654,9 +346654,9 @@ sub_80C0F30: ; 80C0F30 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 @@ -346664,7 +346664,7 @@ sub_80C0F30: ; 80C0F30 lsls r0, 30 adds r4, r1, 0 cmp r0, 0 - bge @080C11C0 + bge _080C11C0 ldrh r0, [r2] bl NationalPokedexNumToSpecies lsls r0, 16 @@ -346680,16 +346680,16 @@ sub_80C0F30: ; 80C0F30 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 @@ -346700,7 +346700,7 @@ sub_80C0F30: ; 80C0F30 adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 -@080C11C0: +_080C11C0: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -346710,25 +346710,25 @@ sub_80C0F30: ; 80C0F30 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 @@ -346739,7 +346739,7 @@ sub_80C0F30: ; 80C0F30 mov r8, r0 ldr r0, =0x0000ffff adds r7, r0, 0 -@080C1208: +_080C1208: ldr r1, [r4] lsls r3, r5, 2 adds r1, r3 @@ -346760,8 +346760,8 @@ sub_80C0F30: ; 80C0F30 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} @@ -346861,21 +346861,21 @@ 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 .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 @@ -346883,9 +346883,9 @@ sub_80C12E0: ; 80C12E0 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 @@ -346936,21 +346936,21 @@ sub_80C12E0: ; 80C12E0 bl copy_decompressed_tile_data_to_vram_autofree bl sub_809D42C cmp r0, 0 - bne @080C13E4 + bne _080C13E4 ldr r1, =gUnknown_08DC3A0C movs r0, 0x3 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer - b @080C13F0 + b _080C13F0 .pool -@080C13E4: +_080C13E4: ldr r1, =gUnknown_08DC3870 movs r0, 0x3 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer -@080C13F0: +_080C13F0: ldr r0, =gUnknown_08DC3286 movs r1, 0x1 movs r2, 0x7E @@ -346961,9 +346961,9 @@ sub_80C12E0: ; 80C12E0 adds r0, r2 movs r1, 0x1 strb r1, [r0] - b @080C1516 + b _080C1516 .pool -@080C1414: +_080C1414: ldr r0, =gUnknown_0855D26C bl LoadCompressedObjectPic ldr r0, =gUnknown_0855D27C @@ -346976,7 +346976,7 @@ sub_80C12E0: ; 80C12E0 lsls r2, r0, 3 ldr r5, =0x03005e08 movs r3, 0 -@080C1432: +_080C1432: lsls r0, r1, 1 adds r0, r2 adds r0, r5 @@ -346985,7 +346985,7 @@ sub_80C12E0: ; 80C12E0 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls @080C1432 + bls _080C1432 adds r0, r4, 0 bl sub_80C23B8 movs r0, 0 @@ -347001,9 +347001,9 @@ sub_80C12E0: ; 80C12E0 bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080C14DA + b _080C14DA .pool -@080C1480: +_080C1480: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -347015,9 +347015,9 @@ sub_80C12E0: ; 80C12E0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @080C14E2 + b _080C14E2 .pool -@080C14A0: +_080C14A0: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -347039,18 +347039,18 @@ sub_80C12E0: ; 80C12E0 bl ShowBg movs r0, 0x3 bl ShowBg -@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 .pool -@080C14F0: +_080C14F0: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -347058,7 +347058,7 @@ sub_80C12E0: ; 80C12E0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne @080C1516 + bne _080C1516 ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -347070,7 +347070,7 @@ sub_80C12E0: ; 80C12E0 lsls r1, 3 adds r0, r3, r1 strb r2, [r0] -@080C1516: +_080C1516: add sp, 0x4 pop {r4,r5} pop {r0} @@ -347085,27 +347085,27 @@ sub_80C152C: ; 80C152C movs r0, 0 bl GetBgTilemap cmp r0, 0 - beq @080C1540 + beq _080C1540 bl Free -@080C1540: +_080C1540: movs r0, 0x1 bl GetBgTilemap cmp r0, 0 - beq @080C154E + beq _080C154E bl Free -@080C154E: +_080C154E: movs r0, 0x2 bl GetBgTilemap cmp r0, 0 - beq @080C155C + beq _080C155C bl Free -@080C155C: +_080C155C: movs r0, 0x3 bl GetBgTilemap cmp r0, 0 - beq @080C156A + beq _080C156A bl Free -@080C156A: +_080C156A: pop {r0} bx r0 thumb_func_end sub_80C152C @@ -347148,7 +347148,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 @@ -347158,13 +347158,13 @@ sub_80C15B0: ; 80C15B0 adds r1, r0 ldr r0, =sub_80C1D38 str r0, [r1] - b @080C16BC + b _080C16BC .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 @@ -347173,44 +347173,44 @@ sub_80C15B0: ; 80C15B0 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 .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 str r0, [r5] - b @080C16BC + b _080C16BC .pool -@080C1630: +_080C1630: movs r0, 0x3 bl audio_play ldr r0, =sub_80C1D38 str r0, [r5] - b @080C16BC + b _080C16BC .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 @@ -347219,7 +347219,7 @@ sub_80C15B0: ; 80C15B0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - ble @080C167C + ble _080C167C movs r0, 0x6D bl audio_play ldrh r0, [r4, 0x8] @@ -347233,13 +347233,13 @@ sub_80C15B0: ; 80C15B0 bl CopyWindowToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram -@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 @@ -347248,7 +347248,7 @@ sub_80C15B0: ; 80C15B0 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0x1 - bgt @080C16BC + bgt _080C16BC movs r0, 0x6D bl audio_play ldrh r0, [r4, 0x8] @@ -347262,7 +347262,7 @@ sub_80C15B0: ; 80C15B0 bl CopyWindowToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram -@080C16BC: +_080C16BC: pop {r4,r5} pop {r0} bx r0 @@ -347311,21 +347311,21 @@ sub_80C170C: ; 80C170C movs r1, 0x8 ldrsh r0, [r0, r1] cmp r0, 0 - beq @080C1740 + beq _080C1740 bl sub_809D42C ldr r6, =gUnknown_0856EDB8 cmp r0, 0 - bne @080C174C + bne _080C174C ldr r6, =gUnknown_0856EDF0 - b @080C174C + b _080C174C .pool -@080C1740: +_080C1740: bl sub_809D42C ldr r6, =gUnknown_0856ED9C cmp r0, 0 - bne @080C174C + bne _080C174C ldr r6, =gUnknown_0856EDD4 -@080C174C: +_080C174C: ldr r0, =0x030022c0 ldrh r1, [r0, 0x2E] movs r0, 0x2 @@ -347333,7 +347333,7 @@ sub_80C170C: ; 80C170C lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - beq @080C178C + beq _080C178C movs r0, 0x17 bl audio_play adds r0, r5, 0 @@ -347345,13 +347345,13 @@ sub_80C170C: ; 80C170C adds r1, r0 ldr r0, =sub_80C1570 str r0, [r1] - b @080C1994 + b _080C1994 .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 @@ -347360,11 +347360,11 @@ sub_80C170C: ; 80C170C 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] @@ -347388,11 +347388,11 @@ sub_80C170C: ; 80C170C 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] @@ -347415,9 +347415,9 @@ sub_80C170C: ; 80C170C bl audio_play ldr r0, =sub_80C1D38 str r0, [r6] - b @080C1994 + b _080C1994 .pool -@080C183C: +_080C183C: ldr r0, =gUnknown_085E875B bl sub_80C2618 ldr r0, =sub_80C19A4 @@ -347427,20 +347427,20 @@ sub_80C170C: ; 80C170C movs r0, 0 movs r1, 0x2 bl CopyWindowToVram - b @080C1994 + b _080C1994 .pool -@080C1860: +_080C1860: movs r0, 0x15 bl audio_play ldr r0, =sub_80C1B64 str r0, [r6] - b @080C1994 + b _080C1994 .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 @@ -347452,7 +347452,7 @@ sub_80C170C: ; 80C170C adds r0, r6 ldrb r0, [r0] cmp r0, 0xFF - beq @080C18B6 + beq _080C18B6 movs r0, 0x5 bl audio_play movs r2, 0xA @@ -347468,13 +347468,13 @@ sub_80C170C: ; 80C170C bl CopyWindowToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram -@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 @@ -347486,7 +347486,7 @@ sub_80C170C: ; 80C170C adds r0, r6 ldrb r0, [r0, 0x1] cmp r0, 0xFF - beq @080C1900 + beq _080C1900 movs r0, 0x5 bl audio_play movs r2, 0xA @@ -347502,13 +347502,13 @@ sub_80C170C: ; 80C170C bl CopyWindowToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram -@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 @@ -347520,7 +347520,7 @@ sub_80C170C: ; 80C170C adds r0, r6 ldrb r0, [r0, 0x2] cmp r0, 0xFF - beq @080C194A + beq _080C194A movs r0, 0x5 bl audio_play movs r2, 0xA @@ -347536,13 +347536,13 @@ sub_80C170C: ; 80C170C bl CopyWindowToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram -@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 @@ -347554,7 +347554,7 @@ sub_80C170C: ; 80C170C adds r0, r6 ldrb r0, [r0, 0x3] cmp r0, 0xFF - beq @080C1994 + beq _080C1994 movs r0, 0x5 bl audio_play movs r2, 0xA @@ -347570,7 +347570,7 @@ sub_80C170C: ; 80C170C bl CopyWindowToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram -@080C1994: +_080C1994: pop {r4-r7} pop {r0} bx r0 @@ -347662,26 +347662,26 @@ sub_80C1A4C: ; 80C1A4C 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, =gUnknown_085E8773 bl sub_80C2618 - b @080C1A90 + b _080C1A90 .pool -@080C1A84: +_080C1A84: movs r0, 0x20 bl audio_play ldr r0, =gUnknown_085E8785 bl sub_80C2618 -@080C1A90: +_080C1A90: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -347692,7 +347692,7 @@ sub_80C1A4C: ; 80C1A4C movs r0, 0 movs r1, 0x2 bl CopyWindowToVram -@080C1AA6: +_080C1AA6: pop {r4} pop {r0} bx r0 @@ -347710,14 +347710,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 @@ -347749,9 +347749,9 @@ sub_80C1AB8: ; 80C1AB8 str r1, [r0] movs r0, 0x3 bl audio_play - b @080C1B54 + b _080C1B54 .pool -@080C1B40: +_080C1B40: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -347761,7 +347761,7 @@ sub_80C1AB8: ; 80C1AB8 str r0, [r1] movs r0, 0x17 bl audio_play -@080C1B54: +_080C1B54: pop {r4,r5} pop {r0} bx r0 @@ -347850,19 +347850,19 @@ 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 .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 @@ -347872,7 +347872,7 @@ sub_80C1BCC: ; 80C1BCC strh r0, [r4] ldrh r0, [r5, 0x26] strh r0, [r6] -@080C1C50: +_080C1C50: ldr r0, =sub_80C16CC str r0, [r5] movs r0, 0 @@ -347880,30 +347880,30 @@ sub_80C1BCC: ; 80C1BCC bl CopyWindowToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080C1D2E + b _080C1D2E .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 @@ -347911,10 +347911,10 @@ sub_80C1BCC: ; 80C1BCC 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] @@ -347927,31 +347927,31 @@ sub_80C1BCC: ; 80C1BCC movs r0, 0 movs r1, 0x2 bl CopyWindowToVram - 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 @@ -347959,10 +347959,10 @@ sub_80C1BCC: ; 80C1BCC 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] @@ -347975,7 +347975,7 @@ sub_80C1BCC: ; 80C1BCC movs r0, 0 movs r1, 0x2 bl CopyWindowToVram -@080C1D2E: +_080C1D2E: pop {r3} mov r8, r3 pop {r4-r7} @@ -348021,11 +348021,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 @@ -348052,12 +348052,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 @@ -348075,8 +348075,8 @@ sub_80C1D98: ; 80C1D98 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bcc @080C1DC8 -@080C1DEC: + bcc _080C1DC8 +_080C1DEC: pop {r3} mov r8, r3 pop {r4-r7} @@ -348100,35 +348100,35 @@ 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 .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, =gUnknown_0856ED30 lsls r0, r4, 3 adds r0, r1 ldrb r1, [r0, 0x4] ldrb r2, [r0, 0x5] - b @080C1EC2 + b _080C1EC2 .pool -@080C1E64: +_080C1E64: ldr r2, =gUnknown_0856ED48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -348140,7 +348140,7 @@ sub_80C1DFC: ; 80C1DFC ldrb r3, [r0, 0x6] adds r0, r5, 0 bl sub_80C1D98 -@080C1E7C: +_080C1E7C: ldr r2, =gUnknown_0856ED48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -348150,19 +348150,19 @@ sub_80C1DFC: ; 80C1DFC ldrb r1, [r0, 0x7] ldrb r2, [r0, 0x8] ldrb r3, [r0, 0x9] - b @080C1EC4 + b _080C1EC4 .pool -@080C1E94: +_080C1E94: ldr r0, =gUnknown_0856ED48 ldrb r1, [r0, 0x1C] ldrb r2, [r0, 0x1D] ldrb r3, [r0, 0x1E] - b @080C1EC4 + b _080C1EC4 .pool -@080C1EA4: +_080C1EA4: bl sub_809D42C cmp r0, 0 - bne @080C1ED0 + bne _080C1ED0 ldr r2, =gUnknown_0856ED48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -348174,14 +348174,14 @@ sub_80C1DFC: ; 80C1DFC 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 .pool -@080C1ED0: +_080C1ED0: ldr r2, =gUnknown_0856ED48 subs r1, r4, 0x3 lsls r0, r1, 1 @@ -348193,7 +348193,7 @@ sub_80C1DFC: ; 80C1DFC ldrb r3, [r0, 0x6] adds r0, r5, 0 bl sub_80C1D98 -@080C1EE8: +_080C1EE8: pop {r4,r5} pop {r0} bx r0 @@ -348207,17 +348207,17 @@ sub_80C1EF4: ; 80C1EF4 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 @@ -348249,8 +348249,8 @@ sub_80C1EF4: ; 80C1EF4 movs r0, 0x6 movs r1, 0x1 movs r2, 0 - b @080C1FAA -@080C1F5E: + b _080C1FAA +_080C1F5E: movs r0, 0 movs r1, 0x1 movs r2, 0 @@ -348282,7 +348282,7 @@ sub_80C1EF4: ; 80C1EF4 movs r0, 0x6 movs r1, 0x1 movs r2, 0x1 -@080C1FAA: +_080C1FAA: bl sub_80C1DFC movs r0, 0x7 movs r1, 0x1 @@ -348296,8 +348296,8 @@ sub_80C1EF4: ; 80C1EF4 movs r1, 0x1 movs r2, 0 bl sub_80C1DFC - b @080C203C -@080C1FCE: + b _080C203C +_080C1FCE: movs r0, 0 movs r1, 0x1 movs r2, 0 @@ -348342,7 +348342,7 @@ sub_80C1EF4: ; 80C1EF4 movs r1, 0x1 movs r2, 0x1 bl sub_80C1DFC -@080C203C: +_080C203C: pop {r0} bx r0 thumb_func_end sub_80C1EF4 @@ -348375,58 +348375,58 @@ 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 .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, =gUnknown_0856ED48 lsls r1, r4, 1 adds r1, r4 @@ -348516,7 +348516,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 @@ -348529,7 +348529,7 @@ sub_80C20F8: ; 80C20F8 movs r1, 0x2D movs r2, 0x51 bl sub_80C1270 -@080C21B6: +_080C21B6: pop {r4,r5} pop {r0} bx r0 @@ -348546,14 +348546,14 @@ sub_80C21D4: ; 80C21D4 bl GetBgTilemap 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] @@ -348561,19 +348561,19 @@ sub_80C21D4: ; 80C21D4 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] @@ -348581,11 +348581,11 @@ sub_80C21D4: ; 80C21D4 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 @@ -348595,7 +348595,7 @@ sub_80C21D4: ; 80C21D4 movs r3, 0xD0 lsls r3, 2 movs r2, 0xD -@080C2242: +_080C2242: lsls r0, r1, 1 adds r0, r5 adds r0, r3 @@ -348604,18 +348604,18 @@ sub_80C21D4: ; 80C21D4 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x1E - bls @080C2242 - b @080C228C + bls _080C2242 + b _080C228C .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] @@ -348623,12 +348623,12 @@ sub_80C21D4: ; 80C21D4 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 @@ -348664,9 +348664,9 @@ sub_80C2294: ; 80C2294 bl sub_80C267C movs r5, 0 ldrh r4, [r7] - b @080C22F2 + b _080C22F2 .pool -@080C22D8: +_080C22D8: adds r0, r1, r6 ldr r1, [r0, 0x4] adds r0, r5, 0 @@ -348678,14 +348678,14 @@ sub_80C2294: ; 80C2294 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] @@ -348728,55 +348728,55 @@ 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 .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, =gUnknown_0856EFAC - b @080C23AC + b _080C23AC .pool -@080C2388: +_080C2388: ldr r0, =gUnknown_0856EFAE - b @080C23AC + b _080C23AC .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, =gUnknown_0856EFB4 -@080C23AC: +_080C23AC: adds r0, r2, r0 ldrb r0, [r0] -@080C23B0: +_080C23B0: pop {r1} bx r1 .pool @@ -348794,16 +348794,16 @@ 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 .pool -@080C23E0: +_080C23E0: movs r3, 0x1 -@080C23E2: +_080C23E2: ldr r1, =0x03005e00 lsls r2, r4, 2 adds r0, r2, r4 @@ -348817,39 +348817,39 @@ sub_80C23B8: ; 80C23B8 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 .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 @@ -348883,16 +348883,16 @@ 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 .pool -@080C248C: +_080C248C: movs r0, 0x1 -@080C248E: +_080C248E: pop {r1} bx r1 thumb_func_end sub_80C244C @@ -348921,17 +348921,17 @@ 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 .pool -@080C24D8: +_080C24D8: movs r0, 0x1 -@080C24DA: +_080C24DA: pop {r1} bx r1 thumb_func_end sub_80C2494 @@ -348950,47 +348950,47 @@ sub_80C24E0: ; 80C24E0 ldr r1, [r0] ldr r0, =sub_80C1BCC 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 .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 @@ -349004,24 +349004,24 @@ sub_80C24E0: ; 80C24E0 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 .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 @@ -349172,7 +349172,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] @@ -349183,7 +349183,7 @@ sub_80C2690: ; 80C2690 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -@080C26C0: +_080C26C0: pop {r0} bx r0 .pool @@ -349264,98 +349264,98 @@ 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - beq @080C27D8 - b @080C2ACA -@080C27D8: + beq _080C27D8 + b _080C2ACA +_080C27D8: movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer - 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 FillWindowPixelBuffer 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 .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 @@ -349378,55 +349378,55 @@ sub_80C2760: ; 80C2760 ldr r0, =sub_80C2690 bl SetVBlankCallback ldr r1, [r4] - b @080C28D8 + b _080C28D8 .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 IsDma3ManagerBusyWithBgCopy 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 .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 .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 @@ -349434,13 +349434,13 @@ sub_80C2760: ; 80C2760 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 @@ -349448,82 +349448,82 @@ sub_80C2760: ; 80C2760 ldr r1, [r0] movs r0, 0xC strb r0, [r1] - b @080C2ACA + b _080C2ACA .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 InUnionRoom cmp r0, 0x1 - beq @080C2A14 -@080C2960: + beq _080C2A14 +_080C2960: movs r0, 0x1 negs r0, r0 ldr r4, =0x02039ce8 - b @080C2A74 + b _080C2A74 .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 .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 InUnionRoom 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 .pool -@080C29DC: +_080C29DC: bl sub_80C4918 ldr r0, =0x02039ce8 ldr r1, [r0] @@ -349531,37 +349531,37 @@ sub_80C2760: ; 80C2760 strb r0, [r1] movs r0, 0xF9 bl audio_play - b @080C2ACA + b _080C2ACA .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 InUnionRoom cmp r0, 0x1 - bne @080C2A20 -@080C2A14: + bne _080C2A20 +_080C2A14: ldr r1, [r4] movs r0, 0xF strb r0, [r1] - b @080C2ACA + b _080C2ACA .pool -@080C2A20: +_080C2A20: movs r0, 0x1 negs r0, r0 ldr r4, =0x02039ce8 - b @080C2A74 + b _080C2A74 .pool -@080C2A2C: +_080C2A2C: bl sub_800AC34 movs r0, 0 movs r1, 0x1 @@ -349583,16 +349583,16 @@ sub_80C2760: ; 80C2760 ldr r1, [r0] movs r0, 0x10 strb r0, [r1] - b @080C2ACA + b _080C2ACA .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 @@ -349605,31 +349605,31 @@ sub_80C2760: ; 80C2760 ldr r1, [r4] movs r0, 0xE strb r0, [r1] - b @080C2ACA + b _080C2ACA .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} @@ -349644,156 +349644,156 @@ sub_80C2AD8: ; 80C2AD8 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 .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, =gUnknown_08DD1F78 ldr r2, =0x00000ef8 - b @080C2C4A + b _080C2C4A .pool -@080C2B34: +_080C2B34: ldr r0, =gUnknown_08DD2AE0 ldr r2, =0x00000ef8 - b @080C2C4A + b _080C2C4A .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, =gUnknown_08DD21B0 ldr r2, =0x00000a48 - b @080C2C4A + b _080C2C4A .pool -@080C2B68: +_080C2B68: ldr r0, =gUnknown_08DD2D30 ldr r2, =0x00000a48 - b @080C2C4A + b _080C2C4A .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, =gUnknown_08DD2010 adds r2, 0x6E - b @080C2C4A + b _080C2C4A .pool -@080C2BA0: +_080C2BA0: ldr r0, =gUnknown_08DD2B78 movs r2, 0xB3 lsls r2, 3 - b @080C2C4A + b _080C2C4A .pool -@080C2BAC: +_080C2BAC: ldr r2, =0x0000052a adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - beq @080C2BC4 + beq _080C2BC4 ldr r0, =gUnknown_08DD228C adds r2, 0x6E - b @080C2C4A + b _080C2C4A .pool -@080C2BC4: +_080C2BC4: ldr r0, =gUnknown_08DD2E5C movs r2, 0xB3 lsls r2, 3 - b @080C2C4A + b _080C2C4A .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, =gUnknown_0856F5CC ldr r2, =0x000013a8 - b @080C2C4A + b _080C2C4A .pool -@080C2BF4: +_080C2BF4: ldr r0, =gUnknown_0856F814 ldr r2, =0x000013a8 - b @080C2C4A + b _080C2C4A .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, =gUnknown_08DD1AB8 ldr r2, =0x000019a8 - b @080C2C4A + b _080C2C4A .pool -@080C2C28: +_080C2C28: ldr r0, =gUnknown_08DD246C ldr r2, =0x000019a8 - b @080C2C4A + b _080C2C4A .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, =gUnknown_0856F018 ldr r2, =0x000017a8 -@080C2C4A: +_080C2C4A: adds r1, r2 bl LZ77UnCompWram - b @080C2C6C + b _080C2C6C .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 .pool @@ -349810,38 +349810,38 @@ 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 .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 .pool -@080C2CEC: +_080C2CEC: movs r1, 0xE0 lsls r1, 19 movs r0, 0 @@ -349856,16 +349856,16 @@ sub_80C2C80: ; 80C2C80 movs r0, 0x87 lsls r0, 3 adds r1, r3, r0 - b @080C2DCC + b _080C2DCC .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 @@ -349876,13 +349876,13 @@ sub_80C2C80: ; 80C2C80 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 .pool -@080C2D50: +_080C2D50: bl ResetAllObjectData bl ResetObjectPaletteAllocator bl sub_80A1A74 @@ -349893,61 +349893,61 @@ sub_80C2C80: ; 80C2C80 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@080C2D6A: +_080C2D6A: bl sub_80C3388 - b @080C2DC4 + b _080C2DC4 .pool -@080C2D74: +_080C2D74: bl sub_80C41D8 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @080C2DCC + b _080C2DCC .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 .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 .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 .pool -@080C2DD8: +_080C2DD8: bl sub_80C3404 -@080C2DDC: +_080C2DDC: add sp, 0x8 pop {r0} bx r0 @@ -349961,9 +349961,9 @@ sav12_xor_get_clamped_above: ; 80C2DE4 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 @@ -349973,32 +349973,32 @@ sav12_xor_get_clamped_above: ; 80C2DE4 sub_80C2DFC: ; 80C2DFC push {r4,r5,lr} movs r5, 0 -@080C2E00: +_080C2E00: lsls r4, r5, 1 ldr r1, =0x000008c4 adds r0, r4, r1 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @080C2E1E + beq _080C2E1E ldr r1, =0x000008c5 adds r0, r4, r1 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @080C2E2C -@080C2E1E: + bne _080C2E2C +_080C2E1E: movs r0, 0 - b @080C2E38 + b _080C2E38 .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 @@ -350015,26 +350015,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} @@ -350048,34 +350048,34 @@ sub_80C2E84: ; 80C2E84 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 @@ -350104,9 +350104,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 @@ -350117,12 +350117,12 @@ sub_80C2EC4: ; 80C2EC4 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 FlagGet strb r0, [r5, 0x2] @@ -350164,7 +350164,7 @@ sub_80C2EC4: ; 80C2EC4 ldr r0, [r4] ldr r1, =0x00002bb0 adds r3, r0, r1 -@080C2F74: +_080C2F74: lsls r0, r2, 1 adds r1, r6, r0 adds r0, r3, r0 @@ -350174,28 +350174,28 @@ sub_80C2EC4: ; 80C2EC4 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 CopyString 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 .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 @@ -350208,16 +350208,16 @@ sub_80C2EC4: ; 80C2EC4 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 .pool -@080C3004: +_080C3004: movs r1, 0 movs r0, 0 strh r0, [r5, 0x18] @@ -350226,7 +350226,7 @@ sub_80C2EC4: ; 80C2EC4 strh r0, [r5, 0x1E] strb r1, [r5, 0x4] strb r1, [r5, 0x1] -@080C3014: +_080C3014: pop {r3} mov r8, r3 pop {r4-r7} @@ -350264,27 +350264,27 @@ 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, =gUnknown_08329D54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 adds r0, 0x8 - b @080C308C + b _080C308C .pool -@080C3084: +_080C3084: ldr r2, =gUnknown_08329D54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 -@080C308C: +_080C308C: lsls r0, 1 adds r0, r2 ldrh r1, [r0] @@ -350322,27 +350322,27 @@ 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, =gUnknown_08329D54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 adds r0, 0x8 - b @080C3108 + b _080C3108 .pool -@080C3100: +_080C3100: ldr r2, =gUnknown_08329D54 ldrh r0, [r4, 0xE] movs r1, 0x7 ands r0, r1 -@080C3108: +_080C3108: lsls r0, 1 adds r0, r2 ldrh r1, [r0] @@ -350373,29 +350373,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 @@ -350409,7 +350409,7 @@ sub_80C3120: ; 80C3120 ldrh r1, [r6, 0x3C] adds r0, 0x2 strh r1, [r0] -@080C318A: +_080C318A: pop {r4-r6} pop {r0} bx r0 @@ -350443,27 +350443,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 @@ -350471,40 +350471,40 @@ sub_80C3190: ; 80C3190 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 FlagGet lsls r0, 24 cmp r0, 0 - beq @080C3244 + beq _080C3244 ldr r0, =0x02039ce8 ldr r1, [r0] adds r1, 0x11 @@ -350512,14 +350512,14 @@ sub_80C3190: ; 80C3190 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 @@ -350562,15 +350562,15 @@ sub_80C3278: ; 80C3278 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq @080C32E0 + beq _080C32E0 movs r0, 0xC7 bl EnableInterrupts - b @080C32E6 + b _080C32E6 .pool -@080C32E0: +_080C32E0: movs r0, 0x3 bl EnableInterrupts -@080C32E6: +_080C32E6: pop {r0} bx r0 thumb_func_end sub_80C3278 @@ -350587,9 +350587,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 @@ -350730,52 +350730,52 @@ sub_80C3438: ; 80C3438 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 .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 .pool @@ -350788,63 +350788,63 @@ sub_80C34B0: ; 80C34B0 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 .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 .pool @@ -350891,7 +350891,7 @@ sub_80C3574: ; 80C3574 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080C35E0 + bne _080C35E0 ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -350904,9 +350904,9 @@ sub_80C3574: ; 80C3574 movs r2, 0x14 movs r3, 0x1C bl box_print - b @080C35FA + b _080C35FA .pool -@080C35E0: +_080C35E0: ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -350919,7 +350919,7 @@ sub_80C3574: ; 80C3574 movs r2, 0x10 movs r3, 0x21 bl box_print -@080C35FA: +_080C35FA: add sp, 0x2C pop {r4,r5} pop {r0} @@ -350947,21 +350947,21 @@ 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 GetStringCenterAlignXOffset adds r0, 0x84 - b @080C365C + b _080C365C .pool -@080C3650: +_080C3650: movs r0, 0x1 add r1, sp, 0xC movs r2, 0x60 bl GetStringCenterAlignXOffset adds r0, 0x78 -@080C365C: +_080C365C: movs r3, 0x9 lsls r2, r0, 24 lsrs r2, 24 @@ -350992,7 +350992,7 @@ sub_80C3684: ; 80C3684 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080C36C4 + bne _080C36C4 ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -351005,9 +351005,9 @@ sub_80C3684: ; 80C3684 movs r2, 0x14 movs r3, 0x38 bl box_print - b @080C36DE + b _080C36DE .pool -@080C36C4: +_080C36C4: ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -351020,7 +351020,7 @@ sub_80C3684: ; 80C3684 movs r2, 0x10 movs r3, 0x39 bl box_print -@080C36DE: +_080C36DE: ldr r0, =0x02021cc4 ldr r4, =0x02039ce8 ldr r1, [r4] @@ -351040,21 +351040,21 @@ sub_80C3684: ; 80C3684 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080C3734 + bne _080C3734 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x90 bl GetStringRightAlignXOffset movs r3, 0x38 - b @080C3740 + b _080C3740 .pool -@080C3734: +_080C3734: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 bl GetStringRightAlignXOffset movs r3, 0x39 -@080C3740: +_080C3740: lsls r2, r0, 24 lsrs r2, 24 ldr r0, =gUnknown_0856FB0C @@ -351079,14 +351079,14 @@ 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} @@ -351101,14 +351101,14 @@ sub_80C378C: ; 80C378C bl FlagGet 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, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -351121,9 +351121,9 @@ sub_80C378C: ; 80C378C movs r2, 0x14 movs r3, 0x48 bl box_print - b @080C37F6 + b _080C37F6 .pool -@080C37DC: +_080C37DC: ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -351136,7 +351136,7 @@ sub_80C378C: ; 80C378C movs r2, 0x10 movs r3, 0x49 bl box_print -@080C37F6: +_080C37F6: ldr r5, =0x02021fc4 ldr r4, =0x02039ce8 ldr r0, [r4] @@ -351155,21 +351155,21 @@ sub_80C378C: ; 80C378C adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080C3848 + bne _080C3848 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x90 bl GetStringRightAlignXOffset movs r3, 0x48 - b @080C3854 + b _080C3854 .pool -@080C3848: +_080C3848: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x80 bl GetStringRightAlignXOffset movs r3, 0x49 -@080C3854: +_080C3854: lsls r2, r0, 24 lsrs r2, 24 ldr r0, =gUnknown_0856FB0C @@ -351182,7 +351182,7 @@ sub_80C378C: ; 80C378C movs r0, 0x1 movs r1, 0x1 bl box_print -@080C386E: +_080C386E: add sp, 0xC pop {r4,r5} pop {r0} @@ -351204,7 +351204,7 @@ sub_80C3880: ; 80C3880 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080C38C8 + bne _080C38C8 ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -351217,9 +351217,9 @@ sub_80C3880: ; 80C3880 movs r2, 0x14 movs r3, 0x58 bl box_print - b @080C38E2 + b _080C38E2 .pool -@080C38C8: +_080C38C8: ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -351232,35 +351232,35 @@ sub_80C3880: ; 80C3880 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 .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, =gUnknown_085ECF8F movs r0, 0x1 movs r2, 0 @@ -351272,15 +351272,15 @@ sub_80C3880: ; 80C3880 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080C3958 + bne _080C3958 movs r7, 0x90 movs r4, 0x58 - b @080C395C + b _080C395C .pool -@080C3958: +_080C3958: movs r7, 0x80 movs r4, 0x59 -@080C395C: +_080C395C: mov r0, r10 adds r0, 0x1E subs r7, r0 @@ -351372,7 +351372,7 @@ sub_80C3A18: ; 80C3A18 ldr r1, [r7] ldrb r0, [r1, 0x5] cmp r0, 0 - beq @080C3ACE + beq _080C3ACE ldr r0, =gUnknown_0856FB48 mov r8, r0 ldr r4, =0x0000052b @@ -351449,7 +351449,7 @@ sub_80C3A18: ; 80C3A18 movs r0, 0x1 movs r1, 0x1 bl box_print -@080C3ACE: +_080C3ACE: add sp, 0xC pop {r3} mov r8, r3 @@ -351481,7 +351481,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 CopyString @@ -351489,7 +351489,7 @@ sub_80C3AF0: ; 80C3AF0 adds r0, 0x4D ldr r1, =gUnknown_085ECFA6 bl ExpandStringRefs -@080C3B30: +_080C3B30: pop {r4} pop {r0} bx r0 @@ -351506,7 +351506,7 @@ sub_80C3B50: ; 80C3B50 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0 - bne @080C3B8C + bne _080C3B8C ldr r0, =gUnknown_0856FB0C str r0, [sp] movs r0, 0x1 @@ -351520,9 +351520,9 @@ sub_80C3B50: ; 80C3B50 movs r2, 0x88 movs r3, 0x9 bl box_print - b @080C3BB6 + b _080C3BB6 .pool -@080C3B8C: +_080C3B8C: adds r1, 0x4D movs r0, 0x1 movs r2, 0xD8 @@ -351542,7 +351542,7 @@ sub_80C3B50: ; 80C3B50 movs r1, 0x1 movs r3, 0x9 bl box_print -@080C3BB6: +_080C3BB6: add sp, 0xC pop {r4} pop {r0} @@ -351557,7 +351557,7 @@ sub_80C3BC4: ; 80C3BC4 ldr r1, [r4] ldrb r0, [r1, 0xB] cmp r0, 0 - beq @080C3C0E + beq _080C3C0E ldr r0, =0x02021cc4 ldr r2, =0x0000053a adds r1, r2 @@ -351585,7 +351585,7 @@ sub_80C3BC4: ; 80C3BC4 adds r0, 0x93 ldr r1, =gUnknown_0856FB4C bl ExpandStringRefs -@080C3C0E: +_080C3C0E: pop {r4} pop {r0} bx r0 @@ -351667,13 +351667,13 @@ sub_80C3CCC: ; 80C3CCC ldr r2, [r0] ldrb r0, [r2, 0xB] cmp r0, 0 - beq @080C3CE4 + beq _080C3CE4 ldr r1, =gUnknown_085ECFB8 adds r2, 0x93 ldr r3, =gUnknown_0856FB0F movs r0, 0 bl sub_80C3C34 -@080C3CE4: +_080C3CE4: pop {r0} bx r0 .pool @@ -351686,7 +351686,7 @@ sub_80C3CF4: ; 80C3CF4 ldr r1, [r4] ldrb r0, [r1, 0xC] cmp r0, 0 - beq @080C3D40 + beq _080C3D40 adds r0, r1, 0 adds r0, 0xD9 ldr r2, =gUnknown_0856FB5C @@ -351716,7 +351716,7 @@ sub_80C3CF4: ; 80C3CF4 movs r2, 0 movs r3, 0x4 bl ConvertIntToDecimalString -@080C3D40: +_080C3D40: pop {r4} pop {r0} bx r0 @@ -351730,7 +351730,7 @@ sub_80C3D60: ; 80C3D60 ldr r1, [r5] ldrb r0, [r1, 0xC] cmp r0, 0 - beq @080C3D9A + beq _080C3D9A ldr r0, =0x02021cc4 ldr r2, =0x00000165 adds r1, r2 @@ -351750,7 +351750,7 @@ sub_80C3D60: ; 80C3D60 movs r0, 0x1 adds r2, r4, 0 bl sub_80C3C34 -@080C3D9A: +_080C3D9A: pop {r4,r5} pop {r0} bx r0 @@ -351764,7 +351764,7 @@ sub_80C3DC0: ; 80C3DC0 ldr r1, [r0] ldrb r0, [r1, 0x10] cmp r0, 0 - beq @080C3DDE + beq _080C3DDE ldr r2, =0x00000237 adds r0, r1, r2 ldr r2, =0x00000554 @@ -351773,7 +351773,7 @@ sub_80C3DC0: ; 80C3DC0 movs r2, 0x1 movs r3, 0x5 bl ConvertIntToDecimalString -@080C3DDE: +_080C3DDE: pop {r0} bx r0 .pool @@ -351786,14 +351786,14 @@ sub_80C3DF0: ; 80C3DF0 ldr r2, [r0] ldrb r0, [r2, 0x10] cmp r0, 0 - beq @080C3E0A + beq _080C3E0A ldr r1, =gUnknown_085ED010 ldr r0, =0x00000237 adds r2, r0 ldr r3, =gUnknown_0856FB0F movs r0, 0x2 bl sub_80C3C34 -@080C3E0A: +_080C3E0A: pop {r0} bx r0 .pool @@ -351808,19 +351808,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 ConvertIntToDecimalString -@080C3E48: +_080C3E48: pop {r0} bx r0 .pool @@ -351835,19 +351835,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, =gUnknown_085ED036 ldr r0, =0x000002c3 adds r2, r0 ldr r3, =gUnknown_0856FB0F movs r0, 0x4 bl sub_80C3C34 -@080C3E80: +_080C3E80: pop {r0} bx r0 .pool @@ -351862,18 +351862,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 ConvertIntToDecimalString -@080C3EBE: +_080C3EBE: pop {r0} bx r0 .pool @@ -351888,19 +351888,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, =gUnknown_085ED01F ldr r0, =0x0000034f adds r2, r0 ldr r3, =gUnknown_0856FB0F movs r0, 0x3 bl sub_80C3C34 -@080C3EFC: +_080C3EFC: pop {r0} bx r0 .pool @@ -351915,12 +351915,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 @@ -351931,7 +351931,7 @@ sub_80C3F14: ; 80C3F14 adds r0, r1 ldr r1, =gUnknown_085ED096 bl ExpandStringRefs -@080C3F46: +_080C3F46: pop {r4} pop {r0} bx r0 @@ -351947,19 +351947,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, =gUnknown_085ED085 ldr r0, =0x00000395 adds r2, r0 ldr r3, =gUnknown_0856FB0F movs r0, 0x3 bl sub_80C3C34 -@080C3F8C: +_080C3F8C: pop {r0} bx r0 .pool @@ -351974,20 +351974,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 ConvertIntToDecimalString -@080C3FCE: +_080C3FCE: pop {r0} bx r0 .pool @@ -352002,19 +352002,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, =gUnknown_085ED09F ldr r0, =0x000003db adds r2, r0 ldr r3, =gUnknown_0856FB0F movs r0, 0x4 bl sub_80C3C34 -@080C4008: +_080C4008: pop {r0} bx r0 .pool @@ -352029,17 +352029,17 @@ 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 .pool -@080C4044: +_080C4044: ldrb r0, [r1, 0xD] cmp r0, 0 - beq @080C40B6 + beq _080C40B6 ldr r0, =0x02021cc4 ldr r2, =0x0000054c adds r1, r2 @@ -352060,14 +352060,14 @@ sub_80C4020: ; 80C4020 adds r0, r1 ldr r1, =gUnknown_085ED0E0 bl ExpandStringRefs - b @080C40B6 + b _080C40B6 .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 @@ -352078,7 +352078,7 @@ sub_80C4020: ; 80C4020 adds r0, r1 ldr r1, =gUnknown_085ED0C8 bl ExpandStringRefs -@080C40B6: +_080C40B6: pop {r4} pop {r0} bx r0 @@ -352094,38 +352094,38 @@ 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 .pool -@080C40F0: +_080C40F0: ldrb r0, [r2, 0xD] cmp r0, 0 - beq @080C412C + beq _080C412C ldr r1, =gUnknown_085ED0D3 ldr r0, =0x00000421 adds r2, r0 ldr r3, =gUnknown_0856FB0C movs r0, 0x5 bl sub_80C3C34 - b @080C412C + b _080C412C .pool -@080C4114: +_080C4114: ldr r1, =0x00000596 adds r0, r2, r1 ldrh r0, [r0] cmp r0, 0 - beq @080C412C + beq _080C412C ldr r1, =gUnknown_085ED0B6 ldr r0, =0x00000421 adds r2, r0 ldr r3, =gUnknown_0856FB0F movs r0, 0x5 bl sub_80C3C34 -@080C412C: +_080C412C: pop {r0} bx r0 .pool @@ -352151,9 +352151,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 @@ -352163,7 +352163,7 @@ sub_80C4140: ; 80C4140 adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq @080C41B6 + beq _080C41B6 bl sub_80D30A0 lsls r0, 24 lsrs r0, 24 @@ -352189,13 +352189,13 @@ sub_80C4140: ; 80C4140 movs r0, 0x3 movs r3, 0xF bl WriteSequenceToBgTilemapBuffer -@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} @@ -352220,16 +352220,16 @@ 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 .pool -@080C4214: +_080C4214: movs r2, 0x8D lsls r2, 3 adds r0, r4, r2 @@ -352239,8 +352239,8 @@ sub_80C41D8: ; 80C41D8 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 @@ -352251,12 +352251,12 @@ sub_80C41D8: ; 80C41D8 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 @@ -352266,7 +352266,7 @@ sub_80C41D8: ; 80C41D8 movs r2, 0xC0 bl gpu_pal_apply movs r4, 0 -@080C425E: +_080C425E: ldr r0, =0x02039ce8 ldr r0, [r0] lsls r1, r4, 1 @@ -352276,7 +352276,7 @@ sub_80C41D8: ; 80C41D8 adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq @080C428E + beq _080C428E movs r1, 0 bl GetMonIconTiles adds r1, r0, 0 @@ -352289,12 +352289,12 @@ sub_80C41D8: ; 80C41D8 movs r2, 0x80 lsls r2, 2 bl LoadBgTiles -@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} @@ -352316,14 +352316,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 @@ -352331,7 +352331,7 @@ sub_80C42A4: ; 80C42A4 adds r0, r4 ldrb r3, [r0] cmp r3, 0 - beq @080C430C + beq _080C430C lsls r1, r4, 18 movs r2, 0xA0 lsls r2, 17 @@ -352355,13 +352355,13 @@ sub_80C42A4: ; 80C42A4 movs r0, 0x3 movs r3, 0x2 bl WriteSequenceToBgTilemapBuffer -@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} @@ -352426,23 +352426,23 @@ sub_80C43A8: ; 80C43A8 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 .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 @@ -352450,9 +352450,9 @@ sub_80C43A8: ; 80C43A8 movs r2, 0x80 lsls r2, 3 movs r0, 0x3 - b @080C4406 + b _080C4406 .pool -@080C43F8: +_080C43F8: ldr r0, =0x02039ce8 ldr r1, [r0] ldr r3, =0x000019a8 @@ -352460,19 +352460,19 @@ sub_80C43A8: ; 80C43A8 movs r2, 0xC0 lsls r2, 5 movs r0, 0 -@080C4406: +_080C4406: movs r3, 0 bl LoadBgTiles - b @080C4536 + b _080C4536 .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, =gUnknown_0856FAE4 ldr r3, =0x00000535 adds r0, r2, r3 @@ -352492,14 +352492,14 @@ sub_80C43A8: ; 80C43A8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @080C44B2 + beq _080C44B2 ldr r0, =gUnknown_0856F4AC movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply - b @080C44B2 + b _080C44B2 .pool -@080C447C: +_080C447C: ldr r1, =gUnknown_0856FAF8 ldr r3, =0x00000535 adds r0, r2, r3 @@ -352519,19 +352519,19 @@ sub_80C43A8: ; 80C43A8 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @080C44B2 + beq _080C44B2 ldr r0, =gUnknown_0856F4CC movs r1, 0x10 movs r2, 0x20 bl gpu_pal_apply -@080C44B2: +_080C44B2: ldr r0, =gUnknown_0856F52C movs r1, 0x40 movs r2, 0x20 bl gpu_pal_apply - b @080C4536 + b _080C4536 .pool -@080C44D8: +_080C44D8: ldr r4, =0x02039ce8 ldr r1, [r4] ldr r3, =0x00003ca8 @@ -352543,9 +352543,9 @@ sub_80C43A8: ; 80C43A8 adds r1, r0 movs r0, 0x2 bl SetBgTilemap - b @080C4536 + b _080C4536 .pool -@080C4500: +_080C4500: movs r4, 0x20 str r4, [sp] str r4, [sp, 0x4] @@ -352568,17 +352568,17 @@ sub_80C43A8: ; 80C43A8 movs r2, 0 movs r3, 0 bl FillBgTilemapBufferRect_Palette0 -@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} @@ -352595,7 +352595,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 @@ -352603,12 +352603,12 @@ sub_80C4550: ; 80C4550 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 @@ -352616,14 +352616,14 @@ sub_80C4550: ; 80C4550 lsls r1, 1 adds r1, r7 ldrh r1, [r1] - b @080C4598 + b _080C4598 .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 @@ -352631,12 +352631,12 @@ sub_80C4550: ; 80C4550 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 CopyBgTilemapBufferToVram pop {r4-r7} @@ -352653,7 +352653,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 @@ -352661,12 +352661,12 @@ sub_80C45C0: ; 80C45C0 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 @@ -352674,14 +352674,14 @@ sub_80C45C0: ; 80C45C0 lsls r1, 1 adds r1, r7 ldrh r1, [r1] - b @080C4608 + b _080C4608 .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 @@ -352689,12 +352689,12 @@ sub_80C45C0: ; 80C45C0 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 CopyBgTilemapBufferToVram pop {r4-r7} @@ -352737,12 +352737,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 @@ -352751,7 +352751,7 @@ sub_80C4630: ; 80C4630 adds r1, r7 ldrb r0, [r1] cmp r0, 0 - beq @080C4700 + beq _080C4700 mov r3, r9 lsls r5, r3, 24 lsrs r5, 24 @@ -352804,7 +352804,7 @@ sub_80C4630: ; 80C4630 adds r2, r4, 0 movs r3, 0x10 bl FillBgTilemapBufferRect -@080C4700: +_080C4700: adds r0, r7, 0x1 lsls r0, 16 mov r1, r8 @@ -352822,8 +352822,8 @@ sub_80C4630: ; 80C4630 lsrs r2, r0, 16 asrs r0, 16 cmp r0, 0x7 - ble @080C467E -@080C4724: + ble _080C467E +_080C4724: movs r0, 0x3 bl CopyBgTilemapBufferToVram add sp, 0xC @@ -352847,10 +352847,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] @@ -352868,14 +352868,14 @@ sub_80C474C: ; 80C474C movs r2, 0x1B movs r3, 0xA bl FillBgTilemapBufferRect -@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] @@ -352893,13 +352893,13 @@ sub_80C474C: ; 80C474C movs r2, 0x15 movs r3, 0xE bl FillBgTilemapBufferRect -@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] @@ -352917,12 +352917,12 @@ sub_80C474C: ; 80C474C movs r2, 0x1B movs r3, 0xC bl FillBgTilemapBufferRect - b @080C48B8 + b _080C48B8 .pool -@080C4800: +_080C4800: ldrb r0, [r1, 0x10] cmp r0, 0 - beq @080C482E + beq _080C482E movs r4, 0x1 str r4, [sp] str r4, [sp, 0x4] @@ -352941,14 +352941,14 @@ sub_80C474C: ; 80C474C movs r2, 0x1B movs r3, 0xA bl FillBgTilemapBufferRect -@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] @@ -352967,11 +352967,11 @@ sub_80C474C: ; 80C474C movs r2, 0x1B movs r3, 0xE bl FillBgTilemapBufferRect -@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] @@ -353006,7 +353006,7 @@ sub_80C474C: ; 80C474C movs r2, 0x1B movs r3, 0x10 bl FillBgTilemapBufferRect -@080C48B8: +_080C48B8: movs r0, 0x3 bl CopyBgTilemapBufferToVram add sp, 0xC @@ -353026,7 +353026,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] @@ -353040,7 +353040,7 @@ sub_80C48C8: ; 80C48C8 adds r0, r1 movs r1, 0x1 strb r1, [r0] -@080C48F6: +_080C48F6: pop {r0} bx r0 .pool @@ -353085,13 +353085,13 @@ sub_80C4940: ; 80C4940 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @080C4958 + beq _080C4958 movs r0, 0 - b @080C495A + b _080C495A .pool -@080C4958: +_080C4958: movs r0, 0x1 -@080C495A: +_080C495A: pop {r1} bx r1 thumb_func_end sub_80C4940 @@ -353107,7 +353107,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 @@ -353117,7 +353117,7 @@ sub_80C4960: ; 80C4960 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @080C4972 + bne _080C4972 pop {r4,r5} pop {r0} bx r0 @@ -353140,12 +353140,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] @@ -353174,17 +353174,17 @@ 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 .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 @@ -353221,9 +353221,9 @@ sub_80C49D8: ; 80C49D8 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 @@ -353235,8 +353235,8 @@ sub_80C49D8: ; 80C49D8 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 @@ -353246,11 +353246,11 @@ sub_80C49D8: ; 80C49D8 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 @@ -353265,15 +353265,15 @@ sub_80C49D8: ; 80C49D8 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 @@ -353282,8 +353282,8 @@ sub_80C49D8: ; 80C49D8 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 @@ -353292,11 +353292,11 @@ sub_80C49D8: ; 80C49D8 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} @@ -353321,26 +353321,26 @@ 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 .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 FillWindowPixelBuffer @@ -353352,62 +353352,62 @@ sub_80C4B08: ; 80C4B08 movs r2, 0 movs r3, 0 bl FillBgTilemapBufferRect_Palette0 - 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 .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 .pool -@080C4BC4: +_080C4BC4: movs r0, 0x2 movs r1, 0 bl FillWindowPixelBuffer - 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 .pool -@080C4BE4: +_080C4BE4: ldrh r0, [r5, 0x8] adds r0, 0x1 movs r1, 0 @@ -353416,8 +353416,8 @@ sub_80C4B08: ; 80C4B08 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] @@ -353426,8 +353426,8 @@ sub_80C4B08: ; 80C4B08 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq @080C4B20 -@080C4C08: + beq _080C4B20 +_080C4C08: movs r0, 0 add sp, 0x8 pop {r4,r5} @@ -353447,7 +353447,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] @@ -353460,7 +353460,7 @@ sub_80C4C1C: ; 80C4C1C adds r0, r1 bl sub_80C45C0 bl sub_80C4630 -@080C4C50: +_080C4C50: movs r0, 0x1 bl sub_80C438C ldr r2, [r4] @@ -353501,16 +353501,16 @@ 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 .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 @@ -353547,9 +353547,9 @@ sub_80C4C84: ; 80C4C84 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 @@ -353561,8 +353561,8 @@ sub_80C4C84: ; 80C4C84 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 @@ -353572,11 +353572,11 @@ sub_80C4C84: ; 80C4C84 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 @@ -353590,15 +353590,15 @@ sub_80C4C84: ; 80C4C84 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 @@ -353607,8 +353607,8 @@ sub_80C4C84: ; 80C4C84 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 @@ -353617,11 +353617,11 @@ sub_80C4C84: ; 80C4C84 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} @@ -353669,34 +353669,34 @@ sub_80C4DDC: ; 80C4DDC str r5, [r0] ldr r0, =sub_80C5868 cmp r5, r0 - bne @080C4E18 + bne _080C4E18 ldr r0, =0x0000052c adds r1, r0 ldr r0, =0x00007fff - b @080C4E1E + b _080C4E1E .pool -@080C4E18: +_080C4E18: ldr r2, =0x0000052c adds r1, r2 movs r0, 0 -@080C4E1E: +_080C4E1E: strh r0, [r1] bl InUnionRoom 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 .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 @@ -353785,7 +353785,7 @@ sub_80C4EE4: ; 80C4EE4 adds r1, r3 strb r0, [r1] movs r5, 0 -@080C4F18: +_080C4F18: movs r0, 0xD muls r0, r5 adds r0, 0x19 @@ -353801,7 +353801,7 @@ sub_80C4EE4: ; 80C4EE4 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @080C4F18 + bls _080C4F18 pop {r4,r5} pop {r0} bx r0 @@ -353814,23 +353814,23 @@ sub_80C4F50: ; 80C4F50 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 .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] @@ -353838,32 +353838,32 @@ sub_80C4F50: ; 80C4F50 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 .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 .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 .pool @@ -353879,17 +353879,17 @@ 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 @@ -353900,11 +353900,11 @@ sub_80C4FF0: ; 80C4FF0 sub sp, 0x8 bl InUnionRoom 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 @@ -353935,9 +353935,9 @@ sub_80C4FF0: ; 80C4FF0 str r1, [sp, 0x4] movs r1, 0x1 bl sub_818D938 - b @080C50AE + b _080C50AE .pool -@080C5060: +_080C5060: ldr r2, =gUnknown_0856FB20 ldr r6, =0x02039ce8 ldr r0, [r6] @@ -353975,7 +353975,7 @@ sub_80C4FF0: ; 80C4FF0 str r1, [sp, 0x4] movs r1, 0x1 bl sub_818D938 -@080C50AE: +_080C50AE: add sp, 0x8 pop {r4-r6} pop {r0} @@ -354113,34 +354113,34 @@ sub_80C51F0: ; 80C51F0 ldr r5, =0x02039cec ldr r0, [r5] cmp r0, 0 - beq @080C5204 + beq _080C5204 movs r0, 0x1 - b @080C52C8 + b _080C52C8 .pool -@080C5204: +_080C5204: movs r0, 0x18 bl AllocZeroed 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 @@ -354148,7 +354148,7 @@ sub_80C51F0: ; 80C51F0 movs r0, 0x30 strh r0, [r1, 0xA] adds r5, r2, 0 -@080C5240: +_080C5240: ldr r1, [r5] ldr r0, =0x03005d90 ldr r0, [r0] @@ -354182,41 +354182,41 @@ sub_80C51F0: ; 80C51F0 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 FlagGet 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 FlagGet 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 @@ -354229,7 +354229,7 @@ sub_80C52E4: ; 80C52E4 ldr r4, =0x02039cec ldr r0, [r4] cmp r0, 0 - beq @080C5308 + beq _080C5308 movs r1, 0 movs r2, 0x18 bl memset @@ -354237,11 +354237,11 @@ sub_80C52E4: ; 80C52E4 bl Free movs r0, 0 str r0, [r4] - b @080C530A + b _080C530A .pool -@080C5308: +_080C5308: movs r0, 0x1 -@080C530A: +_080C530A: pop {r4} pop {r1} bx r1 @@ -354253,22 +354253,22 @@ sub_80C5310: ; 80C5310 ldr r4, =0x02039cf0 ldr r0, [r4] cmp r0, 0 - beq @080C5324 + beq _080C5324 movs r0, 0x1 - b @080C533A + b _080C533A .pool -@080C5324: +_080C5324: ldr r0, =0x00002434 bl AllocZeroed str r0, [r4] cmp r0, 0 - beq @080C5338 + beq _080C5338 movs r0, 0 - b @080C533A + b _080C533A .pool -@080C5338: +_080C5338: movs r0, 0x2 -@080C533A: +_080C533A: pop {r4} pop {r1} bx r1 @@ -354281,37 +354281,37 @@ sub_80C5340: ; 80C5340 ldr r4, =0x02039cf0 ldr r0, [r4] cmp r0, 0 - bne @080C5358 + bne _080C5358 movs r0, 0x1 - b @080C53A0 + b _080C53A0 .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 @@ -354320,7 +354320,7 @@ sub_80C5340: ; 80C5340 bl Free movs r0, 0 str r0, [r4] -@080C53A0: +_080C53A0: pop {r4} pop {r1} bx r1 @@ -354337,7 +354337,7 @@ pokemon_details: ; 80C53AC adds r0, 0x2C ldrb r0, [r0] cmp r0, 0 - beq @080C5416 + beq _080C5416 ldr r3, =gUnknown_085713E0 ldr r0, =0x02039cec ldr r0, [r0] @@ -354381,7 +354381,7 @@ pokemon_details: ; 80C53AC str r0, [sp, 0xC] movs r0, 0x2 bl SetBgAffine -@080C5416: +_080C5416: bl LoadOamFromSprites bl ProcessObjectCopyRequests bl copy_pal_bg_faded_to_pal_ram @@ -354407,13 +354407,13 @@ sub_80C544C: ; 80C544C push {lr} bl sub_80C5484 cmp r0, 0 - beq @080C5464 + beq _080C5464 ldr r0, =sub_80C5A48 movs r1, 0 bl AddTask ldr r0, =sub_80C5438 bl SetMainCallback2 -@080C5464: +_080C5464: pop {r0} bx r0 .pool @@ -354424,9 +354424,9 @@ 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 @@ -354441,50 +354441,50 @@ 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 .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 DisableInterrupts - b @080C56F4 -@080C54EE: + b _080C56F4 +_080C54EE: bl sub_80C50D0 - b @080C56F4 -@080C54F4: + b _080C56F4 +_080C54F4: bl clear_tasks bl ResetAllObjectData bl ResetObjectPaletteAllocator 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 ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085713E8 @@ -354510,15 +354510,15 @@ sub_80C5484: ; 80C5484 movs r1, 0x6 movs r2, 0x1 bl SetBgAttribute - b @080C56F4 + b _080C56F4 .pool -@080C5560: +_080C5560: ldr r0, =gUnknown_08571400 bl InitWindows bl DeactivateAllTextPrinters - b @080C56F4 + b _080C56F4 .pool -@080C5570: +_080C5570: ldr r0, =gUnknown_085712F8 add r1, sp, 0x8 bl malloc_and_decompress @@ -354548,15 +354548,15 @@ sub_80C5484: ; 80C5484 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @080C56F4 + b _080C56F4 .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 @@ -354586,8 +354586,8 @@ sub_80C5484: ; 80C5484 bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @080C56F4 -@080C5624: + b _080C56F4 +_080C5624: ldr r4, =gUnknown_08DE07C8 movs r2, 0xD0 lsls r2, 1 @@ -354619,16 +354619,16 @@ sub_80C5484: ; 80C5484 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 .pool -@080C5684: +_080C5684: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -354655,31 +354655,31 @@ sub_80C5484: ; 80C5484 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @080C56F4 + b _080C56F4 .pool -@080C56D0: +_080C56D0: bl CallObjectCallbacks bl PrepareSpritesForOamLoad 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 .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} @@ -354696,30 +354696,30 @@ 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 .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 @@ -354727,18 +354727,18 @@ sub_80C570C: ; 80C570C movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 SetGpuReg @@ -354752,17 +354752,17 @@ sub_80C570C: ; 80C570C 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 ResetAllObjectData bl ResetObjectPaletteAllocator - b @080C57E4 -@080C57BE: + b _080C57E4 +_080C57BE: movs r0, 0 bl UnsetBgTilemap movs r0, 0x1 @@ -354775,18 +354775,18 @@ sub_80C570C: ; 80C570C movs r0, 0 strh r0, [r1, 0x4] movs r0, 0x1 - b @080C57F0 + b _080C57F0 .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 @@ -354802,50 +354802,50 @@ sub_80C57FC: ; 80C57FC ldr r7, =gUnknown_08571454 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 .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 @@ -354856,16 +354856,16 @@ 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 movs r1, 0 bl AddTask @@ -354878,9 +354878,9 @@ sub_80C5868: ; 80C5868 adds r1, r2 movs r0, 0x1 strh r0, [r1, 0x8] - b @080C58C0 + b _080C58C0 .pool -@080C58AC: +_080C58AC: ldr r2, [r1] ldrb r1, [r2, 0xE] movs r0, 0xF @@ -354890,10 +354890,10 @@ sub_80C5868: ; 80C5868 ldr r0, =sub_80C5A48 movs r1, 0 bl AddTask -@080C58C0: +_080C58C0: ldr r0, =sub_80C5438 bl SetMainCallback2 -@080C58C6: +_080C58C6: pop {r0} bx r0 .pool @@ -354919,22 +354919,22 @@ 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 .pool -@080C5914: +_080C5914: ldr r0, =0x000001cd - b @080C5920 + b _080C5920 .pool -@080C591C: +_080C591C: movs r0, 0xE7 lsls r0, 1 -@080C5920: +_080C5920: bl song_play_for_text -@080C5924: +_080C5924: ldr r0, =sub_80C5868 bl SetMainCallback2 pop {r4} @@ -354948,30 +354948,30 @@ 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 .pool -@080C595C: +_080C595C: cmp r0, 0x3 - beq @080C5970 - b @080C599A -@080C5962: + beq _080C5970 + b _080C599A +_080C5962: ldr r0, =sub_80C5868 bl sub_80C6454 - b @080C599A + b _080C599A .pool -@080C5970: +_080C5970: ldr r1, =0x02039cf8 ldr r0, [r2] str r0, [r1] @@ -354982,12 +354982,12 @@ sub_80C5934: ; 80C5934 bl sub_80C52E4 ldr r0, =sub_80C58D4 bl sub_8185E24 - b @080C599A + b _080C599A .pool -@080C5994: +_080C5994: ldr r0, =sub_80C5868 bl sub_80C4DDC -@080C599A: +_080C599A: pop {r0} bx r0 .pool @@ -355003,23 +355003,23 @@ 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 .pool -@080C59D4: +_080C59D4: movs r0, 0xF negs r0, r0 ands r0, r1 @@ -355030,9 +355030,9 @@ sub_80C59A4: ; 80C59A4 bl remove_task ldr r0, =sub_80C5934 bl SetMainCallback2 - b @080C5A1A + b _080C5A1A .pool -@080C59F4: +_080C59F4: ldr r0, =0x02039cec ldr r3, [r0] movs r0, 0x7 @@ -355052,7 +355052,7 @@ sub_80C59A4: ; 80C59A4 str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] -@080C5A1A: +_080C5A1A: ldr r0, =0x02039cec ldr r2, [r0] ldr r0, =0x02039cf0 @@ -355064,7 +355064,7 @@ sub_80C59A4: ; 80C59A4 ldrh r0, [r0, 0x22] strh r0, [r2, 0xA] movs r0, 0x1 -@080C5A30: +_080C5A30: pop {r4} pop {r1} bx r1 @@ -355082,7 +355082,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] @@ -355090,24 +355090,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] @@ -355115,24 +355115,24 @@ sub_80C5A48: ; 80C5A48 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] @@ -355140,24 +355140,24 @@ sub_80C5A48: ; 80C5A48 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] @@ -355165,33 +355165,33 @@ sub_80C5A48: ; 80C5A48 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] @@ -355199,34 +355199,34 @@ sub_80C5A48: ; 80C5A48 adds r0, r6, 0 bl sub_80C59A4 cmp r0, 0 - bne @080C5BCA - b @080C5B5E + bne _080C5BCA + b _080C5B5E .pool -@080C5B48: +_080C5B48: cmp r3, 0x4 - bne @080C5B5E + bne _080C5B5E movs r0, 0x3 bl audio_play ldr r0, =sub_80C5470 bl SetMainCallback2 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 bl SetMainCallback2 adds r0, r6, 0 bl remove_task - b @080C5BCA + b _080C5BCA .pool -@080C5B88: +_080C5B88: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0] @@ -355245,7 +355245,7 @@ sub_80C5A48: ; 80C5A48 ldr r0, [r4] ldrb r0, [r0, 0xC] cmp r0, r5 - beq @080C5BCA + beq _080C5BCA adds r0, r5, 0 bl sub_80C5ED0 ldr r1, [r4] @@ -355257,7 +355257,7 @@ sub_80C5A48: ; 80C5A48 ldrb r0, [r1, 0xC] ldrb r1, [r1, 0xD] bl sub_80C6104 -@080C5BCA: +_080C5BCA: pop {r4-r7} pop {r0} bx r0 @@ -355282,24 +355282,24 @@ 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 .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 @@ -355319,9 +355319,9 @@ sub_80C5BD8: ; 80C5BD8 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @080C5CA4 + b _080C5CA4 .pool -@080C5C4C: +_080C5C4C: movs r1, 0xFE lsls r1, 1 adds r0, r1, 0 @@ -355358,7 +355358,7 @@ sub_80C5BD8: ; 80C5BD8 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@080C5CA4: +_080C5CA4: ldr r4, =0x02039cf0 ldr r0, [r4] adds r0, 0x2C @@ -355374,9 +355374,9 @@ sub_80C5BD8: ; 80C5BD8 bl sub_8151624 ldr r1, [r4] strh r0, [r1, 0x30] - b @080C5D9C + b _080C5D9C .pool -@080C5CD4: +_080C5CD4: bl fade_and_return_progress_probably ldrh r0, [r6, 0x6] ldrh r1, [r6, 0x2] @@ -355400,49 +355400,49 @@ sub_80C5BD8: ; 80C5BD8 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 .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 bl SetMainCallback2 - b @080C5D82 + b _080C5D82 .pool -@080C5D64: +_080C5D64: movs r0, 0 movs r1, 0 bl sub_80C5F58 @@ -355457,7 +355457,7 @@ sub_80C5BD8: ; 80C5BD8 adds r0, r5, r0 ldr r1, =sub_80C5A48 str r1, [r0] -@080C5D82: +_080C5D82: movs r0, 0x2 movs r1, 0x6 movs r2, 0 @@ -355465,16 +355465,16 @@ sub_80C5BD8: ; 80C5BD8 ldr r0, =0x02039cec ldr r1, [r0] movs r0, 0 - b @080C5DA4 + b _080C5DA4 .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 @@ -355491,7 +355491,7 @@ sub_80C5DB8: ; 80C5DB8 push {r6} sub sp, 0xC movs r4, 0 -@080C5DC2: +_080C5DC2: adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0 @@ -355501,7 +355501,7 @@ sub_80C5DB8: ; 80C5DB8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls @080C5DC2 + bls _080C5DC2 ldr r4, =gUnknown_085ED8FF movs r0, 0x1 adds r1, r4, 0 @@ -355584,7 +355584,7 @@ sub_80C5DB8: ; 80C5DB8 ldrb r0, [r0, 0xC] bl sub_80C5ED0 movs r4, 0 -@080C5E92: +_080C5E92: adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -355592,7 +355592,7 @@ sub_80C5DB8: ; 80C5DB8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls @080C5E92 + bls _080C5E92 movs r0, 0 bl CopyBgTilemapBufferToVram add sp, 0xC @@ -355614,14 +355614,14 @@ sub_80C5ED0: ; 80C5ED0 movs r1, 0 bl FillWindowPixelBuffer 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, =gUnknown_0857144B str r0, [sp] str r1, [sp, 0x4] @@ -355633,11 +355633,11 @@ sub_80C5ED0: ; 80C5ED0 movs r2, 0x2 movs r3, 0 bl box_print - b @080C5F3A + b _080C5F3A .pool -@080C5F18: +_080C5F18: cmp r4, 0 - beq @080C5F3A + beq _080C5F3A ldr r0, =gUnknown_0857144B str r0, [sp] movs r0, 0 @@ -355652,7 +355652,7 @@ sub_80C5ED0: ; 80C5ED0 movs r2, 0x2 movs r3, 0 bl box_print -@080C5F3A: +_080C5F3A: movs r0, 0x3 movs r1, 0x3 bl CopyWindowToVram @@ -355681,14 +355681,14 @@ 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 .pool -@080C5F80: +_080C5F80: cmp r2, 0 - beq @080C5FA8 + beq _080C5FA8 ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x20] @@ -355702,9 +355702,9 @@ sub_80C5F58: ; 80C5F58 movs r2, 0x10 movs r3, 0x3 bl CopyToBgTilemapBufferRect_ChangePalette - b @080C6004 + b _080C6004 .pool -@080C5FA8: +_080C5FA8: movs r0, 0xC str r0, [sp] movs r0, 0x7 @@ -355716,10 +355716,10 @@ sub_80C5F58: ; 80C5F58 movs r2, 0x10 movs r3, 0x3 bl FillBgTilemapBufferRect - b @080C6004 -@080C5FC2: + b _080C6004 +_080C5FC2: cmp r2, 0 - beq @080C5FEC + beq _080C5FEC ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x20] @@ -355734,9 +355734,9 @@ sub_80C5F58: ; 80C5F58 movs r2, 0x10 movs r3, 0xA bl CopyToBgTilemapBufferRect_ChangePalette - b @080C6004 + b _080C6004 .pool -@080C5FEC: +_080C5FEC: movs r0, 0xC str r0, [sp] movs r0, 0x7 @@ -355748,11 +355748,11 @@ sub_80C5F58: ; 80C5F58 movs r2, 0x10 movs r3, 0xA bl FillBgTilemapBufferRect -@080C6004: +_080C6004: movs r0, 0x2 bl CopyBgTilemapBufferToVram cmp r7, 0 - beq @080C6084 + beq _080C6084 movs r4, 0xFE lsls r4, 1 adds r0, r4, 0 @@ -355804,9 +355804,9 @@ sub_80C5F58: ; 80C5F58 str r0, [sp, 0xC] movs r0, 0x2 bl SetBgAffine - b @080C60EE + b _080C60EE .pool -@080C6084: +_080C6084: movs r4, 0x80 lsls r4, 1 adds r0, r4, 0 @@ -355857,7 +355857,7 @@ sub_80C5F58: ; 80C5F58 str r7, [sp, 0xC] movs r0, 0x2 bl SetBgAffine -@080C60EE: +_080C60EE: add sp, 0x10 pop {r3} mov r8, r3 @@ -355876,19 +355876,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] @@ -355902,9 +355902,9 @@ sub_80C6104: ; 80C6104 movs r2, 0x10 movs r3, 0x3 bl CopyToBgTilemapBufferRect_ChangePalette - b @080C61CE + b _080C61CE .pool -@080C614C: +_080C614C: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] @@ -355919,16 +355919,16 @@ sub_80C6104: ; 80C6104 str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x10 - b @080C6192 + b _080C6192 .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] @@ -355939,12 +355939,12 @@ sub_80C6104: ; 80C6104 str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x2 -@080C6192: +_080C6192: movs r3, 0xA bl CopyToBgTilemapBufferRect_ChangePalette - b @080C61CE + b _080C61CE .pool -@080C61A4: +_080C61A4: ldr r1, =gUnknown_08DE3350 movs r0, 0x9 str r0, [sp] @@ -355956,29 +355956,29 @@ sub_80C6104: ; 80C6104 movs r2, 0x15 movs r3, 0 bl CopyToBgTilemapBufferRect_ChangePalette - b @080C61CE + b _080C61CE .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] @@ -355993,9 +355993,9 @@ sub_80C6104: ; 80C6104 movs r2, 0x10 movs r3, 0x3 bl CopyToBgTilemapBufferRect_ChangePalette - b @080C628E + b _080C628E .pool -@080C620C: +_080C620C: ldr r0, =0x02039cf0 ldr r0, [r0] ldr r1, [r0, 0x24] @@ -356010,16 +356010,16 @@ sub_80C6104: ; 80C6104 str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x10 - b @080C6254 + b _080C6254 .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] @@ -356031,12 +356031,12 @@ sub_80C6104: ; 80C6104 str r0, [sp, 0x8] movs r0, 0x1 movs r2, 0x2 -@080C6254: +_080C6254: movs r3, 0xA bl CopyToBgTilemapBufferRect_ChangePalette - b @080C628E + b _080C628E .pool -@080C6264: +_080C6264: ldr r1, =gUnknown_08DE3374 movs r0, 0x9 str r0, [sp] @@ -356048,18 +356048,18 @@ sub_80C6104: ; 80C6104 movs r2, 0x15 movs r3, 0 bl CopyToBgTilemapBufferRect_ChangePalette - b @080C628E + b _080C628E .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 CopyBgTilemapBufferToVram -@080C6294: +_080C6294: add sp, 0xC pop {r4,r5} pop {r0} @@ -356138,7 +356138,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 @@ -356146,7 +356146,7 @@ sub_80C62DC: ; 80C62DC ldrb r0, [r2] adds r4, r5, 0x1 cmp r0, 0 - beq @080C63C2 + beq _080C63C2 mov r1, sp ldr r0, =gUnknown_085715E4 ldm r0!, {r3,r6,r7} @@ -356204,11 +356204,11 @@ sub_80C62DC: ; 80C62DC ldr r0, [r0] adds r1, r5, 0 bl StartObjectImageAnim -@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 @@ -356230,26 +356230,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 RemoveObjectAndFreeTiles 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 ResetObjectPaletteAllocator movs r0, 0x2 bl FreeObjectTilesByTag @@ -356273,10 +356273,10 @@ sub_80C6454: ; 80C6454 ldr r5, =0x02039cf4 ldr r0, [r5] cmp r0, 0 - beq @080C6466 + beq _080C6466 adds r0, r4, 0 bl SetMainCallback2 -@080C6466: +_080C6466: ldr r0, =0x00003014 bl AllocZeroed str r0, [r5] @@ -356323,41 +356323,41 @@ sub_80C64CC: ; 80C64CC 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 .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 ResetAllObjectData bl ResetObjectPaletteAllocator bl sub_80A1A74 bl reset_temp_tile_data_buffers - b @080C6694 -@080C6538: + b _080C6694 +_080C6538: movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085713F4 @@ -356406,9 +356406,9 @@ sub_80C64CC: ; 80C64CC bl CopyBgTilemapBufferToVram movs r0, 0x1 bl CopyBgTilemapBufferToVram - b @080C6618 + b _080C6618 .pool -@080C65C0: +_080C65C0: ldr r0, =gUnknown_08571428 bl InitWindows bl DeactivateAllTextPrinters @@ -356420,13 +356420,13 @@ sub_80C64CC: ; 80C64CC movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @080C6694 + b _080C6694 .pool -@080C65E8: +_080C65E8: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne @080C669E + bne _080C669E ldr r0, =gUnknown_08DE07C8 movs r2, 0xD0 lsls r2, 1 @@ -356442,12 +356442,12 @@ sub_80C64CC: ; 80C64CC movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer -@080C6618: +_080C6618: movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @080C6694 + b _080C6694 .pool -@080C6628: +_080C6628: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -356474,29 +356474,29 @@ sub_80C64CC: ; 80C64CC movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @080C6694 + b _080C6694 .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 .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} @@ -356512,22 +356512,22 @@ sub_80C66AC: ; 80C66AC 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 .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 @@ -356536,13 +356536,13 @@ sub_80C66AC: ; 80C66AC movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @080C67A4 + b _080C67A4 .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 SetGpuReg @@ -356552,48 +356552,48 @@ sub_80C66AC: ; 80C66AC bl HideBg movs r0, 0x2 bl HideBg - 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 RemoveObjectAndFreeTiles movs r0, 0 bl FreeObjectTilesByTag -@080C6746: +_080C6746: ldr r0, [r4] ldr r0, [r0, 0xC] cmp r0, 0 - beq @080C6758 + beq _080C6758 bl RemoveObjectAndFreeTiles movs r0, 0x1 bl FreeObjectTilesByTag -@080C6758: +_080C6758: ldr r0, [r4] ldr r0, [r0, 0x8] cmp r0, 0 - beq @080C676A + beq _080C676A bl RemoveObjectAndFreeTiles movs r0, 0x4 bl FreeObjectTilesByTag -@080C676A: +_080C676A: bl FreeAllWindowBuffers - b @080C67A4 + b _080C67A4 .pool -@080C6774: +_080C6774: bl sub_80C50D0 bl ResetAllObjectData bl ResetObjectPaletteAllocator - b @080C67A4 -@080C6782: + b _080C67A4 +_080C6782: movs r0, 0 bl UnsetBgTilemap movs r0, 0x1 @@ -356605,17 +356605,17 @@ sub_80C66AC: ; 80C66AC movs r0, 0 strh r0, [r1, 0x4] movs r0, 0x1 - b @080C67B0 + b _080C67B0 .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} @@ -356636,133 +356636,133 @@ 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 .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 .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 .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 .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 .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 .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 @@ -356777,74 +356777,74 @@ 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 .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 @@ -356940,21 +356940,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] @@ -356963,37 +356963,37 @@ sub_80C6974: ; 80C6974 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 .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 @@ -357001,35 +357001,35 @@ sub_80C6974: ; 80C6974 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, =gUnknown_085714D4 bl LoadCompressedObjectPic mov r1, sp @@ -357045,13 +357045,13 @@ sub_80C6974: ; 80C6974 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 .pool -@080C6B2C: +_080C6B2C: lsls r1, r7, 19 lsls r2, r4, 19 movs r0, 0xA0 @@ -357061,7 +357061,7 @@ sub_80C6974: ; 80C6974 movs r3, 0x90 lsls r3, 14 adds r2, r3 -@080C6B3E: +_080C6B3E: asrs r2, 16 mov r0, sp movs r3, 0 @@ -357085,12 +357085,12 @@ sub_80C6974: ; 80C6974 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 StartObjectImageAnim -@080C6B7A: +_080C6B7A: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -357106,7 +357106,7 @@ sub_80C6B94: ; 80C6B94 push {r4-r6,lr} sub sp, 0xC movs r4, 0 -@080C6B9A: +_080C6B9A: adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0 @@ -357116,16 +357116,16 @@ sub_80C6B94: ; 80C6B94 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @080C6B9A + bls _080C6B9A movs r4, 0 movs r6, 0 ldr r5, =gUnknown_08571650 -@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 @@ -357140,9 +357140,9 @@ sub_80C6B94: ; 80C6B94 movs r1, 0x7 movs r2, 0x4 bl box_print - b @080C6C0E + b _080C6C0E .pool -@080C6BF0: +_080C6BF0: lsls r1, r4, 4 adds r3, r1, 0x1 lsls r3, 24 @@ -357157,12 +357157,12 @@ sub_80C6B94: ; 80C6B94 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, =gUnknown_08571448 str r0, [sp] movs r0, 0 @@ -357182,7 +357182,7 @@ sub_80C6B94: ; 80C6B94 movs r3, 0 bl box_print movs r4, 0 -@080C6C40: +_080C6C40: adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -357190,7 +357190,7 @@ sub_80C6B94: ; 80C6B94 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @080C6C40 + bls _080C6C40 movs r0, 0 bl CopyBgTilemapBufferToVram add sp, 0xC @@ -357208,19 +357208,19 @@ sub_80C6C70: ; 80C6C70 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 .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] @@ -357306,7 +357306,7 @@ sub_80C6C70: ; 80C6C70 movs r3, 0 bl box_print movs r4, 0 -@080C6D4A: +_080C6D4A: adds r0, r4, 0 movs r1, 0x3 bl CopyWindowToVram @@ -357314,7 +357314,7 @@ sub_80C6C70: ; 80C6C70 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @080C6D4A + bls _080C6D4A movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0x6C @@ -357386,14 +357386,14 @@ 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 .pool -@080C6E04: +_080C6E04: add r0, sp, 0x14 mov r1, r9 -@080C6E08: +_080C6E08: strb r1, [r0] add r1, sp, 0x14 movs r2, 0 @@ -357418,15 +357418,15 @@ sub_80C6D80: ; 80C6D80 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 @@ -357444,10 +357444,10 @@ sub_80C6D80: ; 80C6D80 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 @@ -357461,7 +357461,7 @@ sub_80C6D80: ; 80C6D80 orrs r2, r1 adds r1, r7, 0 bl CpuSet -@080C6E90: +_080C6E90: mov r1, r10 lsrs r0, r1, 24 bl RemoveWindow @@ -357598,23 +357598,23 @@ sub_80C6FA0: ; 80C6FA0 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} @@ -357628,26 +357628,26 @@ sub_80C6FD4: ; 80C6FD4 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 @@ -357658,7 +357658,7 @@ 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 @@ -357668,21 +357668,21 @@ sub_80C7008: ; 80C7008 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} @@ -357698,9 +357698,9 @@ sub_80C7050: ; 80C7050 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 @@ -357710,26 +357710,26 @@ sub_80C7050: ; 80C7050 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} @@ -357756,7 +357756,7 @@ sub_80C70C4: ; 80C70C4 push {r4,r5,lr} movs r4, 0 movs r5, 0 -@080C70CA: +_080C70CA: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -357764,16 +357764,16 @@ sub_80C70C4: ; 80C70C4 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} @@ -357792,14 +357792,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 @@ -357848,12 +357848,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 @@ -357865,8 +357865,8 @@ sub_80C7128: ; 80C7128 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 @@ -357900,7 +357900,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 @@ -357912,7 +357912,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 @@ -357921,7 +357921,7 @@ sub_80C71A4: ; 80C71A4 adds r0, 0x1 mov r12, r0 cmp r2, r6 - bhi @080C7214 + bhi _080C7214 movs r0, 0 strh r0, [r5] mov r2, sp @@ -357930,9 +357930,9 @@ sub_80C71A4: ; 80C71A4 mov r0, r9 str r0, [r7, 0x8] ldr r0, [r7, 0x8] - b @080C7242 + b _080C7242 .pool -@080C7214: +_080C7214: movs r4, 0 strh r4, [r5] ldr r1, =0x040000d4 @@ -357945,7 +357945,7 @@ sub_80C71A4: ; 80C71A4 adds r3, r6 subs r2, r6 cmp r2, r6 - bhi @080C7214 + bhi _080C7214 strh r4, [r5] mov r0, sp str r0, [r1] @@ -357956,14 +357956,14 @@ sub_80C71A4: ; 80C71A4 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 @@ -357989,23 +357989,23 @@ 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 .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 @@ -358044,20 +358044,20 @@ c3_0808C39C: ; 80C7268 lsrs r0, 24 movs r1, 0x3 bl CopyWindowToVram - b @080C7318 + b _080C7318 .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 @@ -358067,18 +358067,18 @@ c3_0808C39C: ; 80C7268 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 @@ -358086,39 +358086,39 @@ c3_0808C39C: ; 80C7268 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 @@ -358142,9 +358142,9 @@ c3_0808C39C: ; 80C7268 movs r1, 0x1 movs r3, 0 bl AddTextPrinterParametrized - b @080C756A + b _080C756A .pool -@080C73D0: +_080C73D0: ldrh r0, [r5, 0x26] lsls r0, 24 lsrs r0, 24 @@ -358158,17 +358158,17 @@ c3_0808C39C: ; 80C7268 bl RemoveWindow 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 FillWindowPixelBuffer @@ -358180,18 +358180,18 @@ c3_0808C39C: ; 80C7268 str r0, [sp, 0x8] movs r4, 0x3 str r4, [sp, 0xC] - b @080C7532 + b _080C7532 .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 FillWindowPixelBuffer @@ -358203,23 +358203,23 @@ c3_0808C39C: ; 80C7268 str r4, [sp, 0x8] movs r4, 0x3 str r4, [sp, 0xC] - b @080C7532 + b _080C7532 .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 FillWindowPixelBuffer @@ -358232,24 +358232,24 @@ c3_0808C39C: ; 80C7268 ldr r2, [r0] movs r0, 0 str r0, [sp] - b @080C7528 + b _080C7528 .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 @@ -358268,22 +358268,22 @@ c3_0808C39C: ; 80C7268 adds r0, r1 ldr r2, [r0] str r4, [sp] - b @080C7528 + b _080C7528 .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 @@ -358301,27 +358301,27 @@ c3_0808C39C: ; 80C7268 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 AddTextPrinterParametrized strh r4, [r5, 0x8] - b @080C756A + b _080C756A .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 @@ -358331,7 +358331,7 @@ c3_0808C39C: ; 80C7268 bl RemoveWindow adds r0, r4, 0 bl remove_task -@080C756A: +_080C756A: add sp, 0x10 pop {r4-r7} pop {r0} @@ -358481,14 +358481,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 @@ -358498,10 +358498,10 @@ sub_80C76A4: ; 80C76A4 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 @@ -358510,24 +358510,24 @@ sub_80C76A4: ; 80C76A4 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 .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 @@ -358537,10 +358537,10 @@ sub_80C76A4: ; 80C76A4 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 @@ -358551,25 +358551,25 @@ sub_80C76A4: ; 80C76A4 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} @@ -358583,10 +358583,10 @@ sub_80C7770: ; 80C7770 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 @@ -358595,14 +358595,14 @@ sub_80C7770: ; 80C7770 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 @@ -358616,9 +358616,9 @@ sub_80C7770: ; 80C7770 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 @@ -358628,7 +358628,7 @@ sub_80C7770: ; 80C7770 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xD - bls @080C77C2 + bls _080C77C2 bl sub_80D242C pop {r4-r6} pop {r0} @@ -358680,10 +358680,10 @@ sub_80C77E8: ; 80C77E8 bl memset ldr r0, [sp, 0x38] cmp r0, 0 - beq @080C7846 + beq _080C7846 adds r0, r4, 0 bl LoadTaggedObjectPalette -@080C7846: +_080C7846: mov r0, sp bl LoadObjectPics ldr r0, =0x02039d04 @@ -358723,12 +358723,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 FreeObjectPaletteByTag -@080C78AC: +_080C78AC: ldr r0, [r5] movs r4, 0x90 lsls r4, 2 @@ -358774,17 +358774,17 @@ sub_80C78F0: ; 80C78F0 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 .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 @@ -358793,28 +358793,28 @@ sub_80C78F0: ; 80C78F0 lsls r1, 2 adds r0, r1 ldrb r0, [r0] - b @080C7954 + b _080C7954 .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 @@ -358911,7 +358911,7 @@ sub_80C7958: ; 80C7958 ldr r0, =gUnknown_08571710 str r0, [sp, 0xC] movs r4, 0 -@080C7A10: +_080C7A10: ldr r0, [r6] ldr r1, =0x00000246 adds r0, r1 @@ -358936,15 +358936,15 @@ sub_80C7958: ; 80C7958 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 @@ -358959,7 +358959,7 @@ sub_80C7958: ; 80C7958 adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 -@080C7A6E: +_080C7A6E: ldr r0, [r6] adds r0, 0x4 adds r0, r3 @@ -358971,10 +358971,10 @@ sub_80C7958: ; 80C7958 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 @@ -358999,24 +358999,24 @@ sub_80C7958: ; 80C7958 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 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} @@ -359032,36 +359032,36 @@ sub_80C7B14: ; 80C7B14 ldr r0, [r4] ldr r0, [r0] cmp r0, 0 - beq @080C7B2A + beq _080C7B2A bl RemoveObjectAndFreeTiles 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 RemoveObjectAndFreeTiles 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 @@ -359069,14 +359069,14 @@ sub_80C7B14: ; 80C7B14 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq @080C7B6A + beq _080C7B6A bl RemoveObjectAndFreeTiles -@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 @@ -359097,14 +359097,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 @@ -359121,13 +359121,13 @@ 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 .pool -@080C7BD0: +_080C7BD0: movs r1, 0xD -@080C7BD2: +_080C7BD2: movs r3, 0x91 lsls r3, 2 adds r0, r2, r3 @@ -359263,7 +359263,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] @@ -359275,10 +359275,10 @@ 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 @@ -359329,12 +359329,12 @@ sub_80C7D74: ; 80C7D74 bl Alloc str r0, [r4] cmp r0, 0 - bne @080C7DA8 + bne _080C7DA8 ldr r0, =sub_80C7678 bl SetMainCallback2 - b @080C7DD4 + b _080C7DD4 .pool -@080C7DA8: +_080C7DA8: movs r2, 0 strb r5, [r0, 0x1] ldr r0, [r4] @@ -359354,7 +359354,7 @@ sub_80C7D74: ; 80C7D74 strb r0, [r1] ldr r0, =c2_Box bl SetMainCallback2 -@080C7DD4: +_080C7DD4: pop {r4,r5} pop {r0} bx r0 @@ -359371,12 +359371,12 @@ c2_808CE60: ; 80C7DEC adds r1, r0, 0 str r1, [r4] cmp r1, 0 - bne @080C7E18 + bne _080C7E18 ldr r0, =sub_80C7678 bl SetMainCallback2 - b @080C7E3C + b _080C7E3C .pool -@080C7E18: +_080C7E18: ldr r0, =0x02039d0d ldrb r0, [r0] movs r2, 0 @@ -359393,7 +359393,7 @@ c2_808CE60: ; 80C7DEC strb r0, [r1, 0x4] ldr r0, =c2_Box bl SetMainCallback2 -@080C7E3C: +_080C7E3C: pop {r4} pop {r0} bx r0 @@ -359491,9 +359491,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 @@ -359510,7 +359510,7 @@ sub_80C7F4C: ; 80C7F4C ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne @080C7F6A + bne _080C7F6A movs r1, 0xFC lsls r1, 6 movs r0, 0x50 @@ -359518,7 +359518,7 @@ sub_80C7F4C: ; 80C7F4C ldr r1, =0x00000b07 movs r0, 0x52 bl SetGpuReg -@080C7F6A: +_080C7F6A: movs r1, 0xFA lsls r1, 5 movs r0, 0 @@ -359556,29 +359556,29 @@ task_box_related_3: ; 80C7FA8 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 .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 @@ -359589,42 +359589,42 @@ task_box_related_3: ; 80C7FA8 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 .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 PutWindowTilemap movs r0, 0x1 @@ -359640,69 +359640,69 @@ task_box_related_3: ; 80C7FA8 movs r1, 0xB movs r2, 0xE0 bl sub_809882C - b @080C8198 + b _080C8198 .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 .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 .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 bl add_to_c3_somehow - b @080C81A2 + b _080C81A2 .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 @@ -359713,19 +359713,19 @@ task_box_related_3: ; 80C7FA8 strh r1, [r2] bl sub_811F90C bl sub_811FA90 - b @080C8198 + b _080C8198 .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 @@ -359733,9 +359733,9 @@ task_box_related_3: ; 80C7FA8 bl sub_80A2A20 ldr r0, =sub_80C81AC bl add_to_c3_somehow - b @080C8186 + b _080C8186 .pool -@080C8174: +_080C8174: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -359743,18 +359743,18 @@ task_box_related_3: ; 80C7FA8 bl sub_80A2A20 ldr r0, =box_related_2 bl add_to_c3_somehow -@080C8186: +_080C8186: ldr r0, =sub_80C7D28 bl SetVBlankCallback - b @080C81A2 + b _080C81A2 .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 @@ -359768,12 +359768,12 @@ sub_80C81AC: ; 80C81AC ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - beq @080C81C4 + beq _080C81C4 cmp r0, 0x1 - beq @080C81DE - b @080C81EE + beq _080C81DE + b _080C81EE .pool -@080C81C4: +_080C81C4: movs r0, 0x2 bl audio_play movs r0, 0x14 @@ -359784,15 +359784,15 @@ sub_80C81AC: ; 80C81AC 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 bl add_to_c3_somehow -@080C81EE: +_080C81EE: pop {r4} pop {r0} bx r0 @@ -359807,20 +359807,20 @@ box_related_2: ; 80C81F8 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 .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] @@ -359828,56 +359828,56 @@ box_related_2: ; 80C81F8 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - 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 .pool -@080C825C: +_080C825C: ldr r0, =task_pokemon_box_related bl add_to_c3_somehow - b @080C82A0 + b _080C82A0 .pool -@080C8268: +_080C8268: bl IsDma3ManagerBusyWithBgCopy 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 .pool -@080C8290: +_080C8290: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C82A0 + bne _080C82A0 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C82A0: +_080C82A0: add sp, 0x4 pop {r4} pop {r0} @@ -359892,82 +359892,82 @@ task_pokemon_box_related: ; 80C82AC 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 .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 .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 .pool -@080C8398: +_080C8398: ldr r4, =0x02039d08 ldr r0, [r4] ldrb r0, [r0, 0x1] @@ -359975,30 +359975,30 @@ task_pokemon_box_related: ; 80C82AC 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 .pool -@080C83BC: +_080C83BC: bl sub_80CDC0C ldr r0, =sub_80C87A8 bl add_to_c3_somehow - b @080C879E + b _080C879E .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 @@ -360006,43 +360006,43 @@ task_pokemon_box_related: ; 80C82AC bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq @080C83F4 - b @080C84E6 -@080C83F4: - b @080C8406 + beq _080C83F4 + b _080C84E6 +_080C83F4: + b _080C8406 .pool -@080C8400: +_080C8400: cmp r0, 0x3 - beq @080C8406 - b @080C879E -@080C8406: + beq _080C8406 + b _080C879E +_080C8406: ldr r0, =sub_80C87E8 bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C8414: +_080C8414: ldr r0, =sub_80C9BE8 bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C8420: +_080C8420: ldr r0, =sub_80C9D1C bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C842C: +_080C842C: movs r0, 0x5 bl audio_play ldr r0, =box_related bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C8440: +_080C8440: ldr r0, =sub_80C8864 bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C844C: +_080C844C: movs r0, 0x5 bl audio_play bl get_preferred_box @@ -360055,18 +360055,18 @@ task_pokemon_box_related: ; 80C82AC 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 .pool -@080C8484: +_080C8484: movs r0, 0x5 bl audio_play bl get_preferred_box @@ -360079,28 +360079,28 @@ task_pokemon_box_related: ; 80C82AC 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 .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 @@ -360109,167 +360109,167 @@ task_pokemon_box_related: ; 80C82AC 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 .pool -@080C84F8: +_080C84F8: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8D78 bl add_to_c3_somehow - b @080C879E + b _080C879E .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 .pool -@080C8538: +_080C8538: movs r0, 0x5 bl audio_play ldr r0, =c3_0808DC50 bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C854C: +_080C854C: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8C90 bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C8560: +_080C8560: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8BEC bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C8574: +_080C8574: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9128 bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C8588: +_080C8588: movs r0, 0x5 bl audio_play ldr r0, =sub_80C91DC bl add_to_c3_somehow - b @080C879E + b _080C879E .pool -@080C859C: +_080C859C: movs r0, 0x5 bl audio_play ldr r0, =sub_80C93B0 bl add_to_c3_somehow - b @080C879E + b _080C879E .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 .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 .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 .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 .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 @@ -360279,129 +360279,129 @@ task_pokemon_box_related: ; 80C82AC 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 .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 .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 .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 bl add_to_c3_somehow - b @080C879E + b _080C879E .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 bl add_to_c3_somehow - b @080C879E + b _080C879E .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 .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 .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 @@ -360415,26 +360415,26 @@ sub_80C87A8: ; 80C87A8 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - beq @080C87C0 + beq _080C87C0 cmp r0, 0x1 - beq @080C87CE - b @080C87DE + beq _080C87CE + b _080C87DE .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 bl add_to_c3_somehow -@080C87DE: +_080C87DE: pop {r4} pop {r0} bx r0 @@ -360448,53 +360448,53 @@ sub_80C87E8: ; 80C87E8 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 .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 bl add_to_c3_somehow -@080C8856: +_080C8856: pop {r4} pop {r0} bx r0 @@ -360508,169 +360508,169 @@ sub_80C8864: ; 80C8864 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 .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 .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 .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 .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 .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 .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 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .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 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C89BC: +_080C89BC: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C8BEC bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .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 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C89F4: +_080C89F4: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C8C90 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .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 @@ -360679,144 +360679,144 @@ sub_80C8864: ; 80C8864 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 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .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 .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 .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 .pool -@080C8A98: +_080C8A98: movs r0, 0x5 bl audio_play ldr r0, =sub_80C8EB4 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8AAC: +_080C8AAC: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9B28 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8AC0: +_080C8AC0: movs r0, 0x5 bl audio_play ldr r0, =sub_80C90A4 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8AD4: +_080C8AD4: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9128 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8AE8: +_080C8AE8: movs r0, 0x5 bl audio_play ldr r0, =sub_80C91DC bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8AFC: +_080C8AFC: ldr r0, =sub_80C9298 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8B08: +_080C8B08: movs r0, 0x5 bl audio_play ldr r0, =sub_80C93B0 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8B1C: +_080C8B1C: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9B88 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .pool -@080C8B30: +_080C8B30: ldr r0, =sub_80C9498 bl add_to_c3_somehow - b @080C8B82 + b _080C8B82 .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 .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 bl add_to_c3_somehow -@080C8B82: +_080C8B82: pop {r4} pop {r0} bx r0 @@ -360830,36 +360830,36 @@ sub_80C8B90: ; 80C8B90 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - beq @080C8BA8 + beq _080C8BA8 cmp r0, 0x1 - beq @080C8BB8 - b @080C8BE2 + beq _080C8BB8 + b _080C8BE2 .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 bl add_to_c3_somehow - b @080C8BE2 + b _080C8BE2 .pool -@080C8BDC: +_080C8BDC: ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C8BE2: +_080C8BE2: pop {r4} pop {r0} bx r0 @@ -360873,36 +360873,36 @@ sub_80C8BEC: ; 80C8BEC ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - beq @080C8C04 + beq _080C8C04 cmp r0, 0x1 - beq @080C8C14 - b @080C8C3E + beq _080C8C14 + b _080C8C3E .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 bl add_to_c3_somehow - b @080C8C3E + b _080C8C3E .pool -@080C8C38: +_080C8C38: ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C8C3E: +_080C8C3E: pop {r4} pop {r0} bx r0 @@ -360916,28 +360916,28 @@ c3_0808DC50: ; 80C8C48 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - beq @080C8C60 + beq _080C8C60 cmp r0, 0x1 - beq @080C8C70 - b @080C8C84 + beq _080C8C70 + b _080C8C84 .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 bl add_to_c3_somehow -@080C8C84: +_080C8C84: pop {r4} pop {r0} bx r0 @@ -360951,36 +360951,36 @@ sub_80C8C90: ; 80C8C90 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 .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 .pool -@080C8CE8: +_080C8CE8: bl sub_80CDC18 movs r0, 0 bl sub_80CDC38 @@ -360988,55 +360988,55 @@ sub_80C8C90: ; 80C8C90 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b @080C8D6E + b _080C8D6E .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 bl add_to_c3_somehow - b @080C8D6E + b _080C8D6E .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 .pool -@080C8D68: +_080C8D68: ldr r0, =sub_80C87E8 bl add_to_c3_somehow -@080C8D6E: +_080C8D6E: pop {r0} bx r0 .pool @@ -361050,23 +361050,23 @@ sub_80C8D78: ; 80C8D78 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 .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 @@ -361085,27 +361085,27 @@ sub_80C8D78: ; 80C8D78 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 - b @080C8EA0 + b _080C8EA0 .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 @@ -361114,53 +361114,53 @@ sub_80C8D78: ; 80C8D78 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x2 - b @080C8EA0 + b _080C8EA0 .pool -@080C8E38: +_080C8E38: movs r0, 0x8 bl sub_80CAC58 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 - b @080C8EA0 + b _080C8EA0 .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 .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 bl add_to_c3_somehow - b @080C8EA2 + b _080C8EA2 .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} @@ -361175,32 +361175,32 @@ sub_80C8EB4: ; 80C8EB4 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 .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 @@ -361210,174 +361210,174 @@ sub_80C8EB4: ; 80C8EB4 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 .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 .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 .pool -@080C8FD0: +_080C8FD0: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x7 strb r0, [r1] - b @080C9096 + b _080C9096 .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 bl add_to_c3_somehow - b @080C9096 + b _080C9096 .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 .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 .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 .pool -@080C9070: +_080C9070: ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x8 strb r0, [r1] - b @080C9096 + b _080C9096 .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 bl add_to_c3_somehow -@080C9096: +_080C9096: pop {r0} bx r0 .pool @@ -361390,12 +361390,12 @@ sub_80C90A4: ; 80C90A4 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - beq @080C90BC + beq _080C90BC cmp r0, 0x1 - beq @080C90F0 - b @080C9118 + beq _080C90F0 + b _080C9118 .pool -@080C90BC: +_080C90BC: movs r0, 0xC bl sub_80CAC58 ldr r0, [r4] @@ -361415,13 +361415,13 @@ sub_80C90A4: ; 80C90A4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @080C9118 + b _080C9118 .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] @@ -361432,7 +361432,7 @@ sub_80C90A4: ; 80C90A4 bl sub_80CA230 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C9118: +_080C9118: pop {r4} pop {r0} bx r0 @@ -361446,36 +361446,36 @@ sub_80C9128: ; 80C9128 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 .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 .pool -@080C9168: +_080C9168: ldr r0, =sub_80C96B8 bl add_to_c3_somehow - b @080C91D2 + b _080C91D2 .pool -@080C9174: +_080C9174: movs r0, 0x2 bl sub_80CFE54 ldr r0, =0x02039d0c @@ -361489,32 +361489,32 @@ sub_80C9128: ; 80C9128 lsrs r1, 24 adds r0, r4, 0 bl sub_80D0E90 - b @080C91B8 + b _080C91B8 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C91D2 + bne _080C91D2 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C91D2: +_080C91D2: pop {r4,r5} pop {r0} bx r0 @@ -361528,21 +361528,21 @@ sub_80C91DC: ; 80C91DC 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 .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 @@ -361556,45 +361556,45 @@ sub_80C91DC: ; 80C91DC lsrs r1, 24 adds r0, r4, 0 bl sub_80D1080 - b @080C9268 + b _080C9268 .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 .pool -@080C927C: +_080C927C: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C928C + bne _080C928C ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C928C: +_080C928C: pop {r4} pop {r0} bx r0 @@ -361609,23 +361609,23 @@ sub_80C9298: ; 80C9298 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 .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 @@ -361634,7 +361634,7 @@ sub_80C9298: ; 80C9298 bl bag_add_item lsls r0, 24 cmp r0, 0 - bne @080C92FC + bne _080C92FC movs r0, 0x20 bl audio_play movs r0, 0x1A @@ -361642,9 +361642,9 @@ sub_80C9298: ; 80C9298 ldr r1, [r5] movs r0, 0x3 strb r0, [r1] - b @080C93A2 + b _080C93A2 .pool -@080C92FC: +_080C92FC: movs r0, 0x5 bl audio_play ldr r0, =0x02039d0c @@ -361661,28 +361661,28 @@ sub_80C9298: ; 80C9298 ldr r1, [r5] movs r0, 0x1 strb r0, [r1] - b @080C93A2 + b _080C93A2 .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 .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 @@ -361690,28 +361690,28 @@ sub_80C9298: ; 80C9298 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] - b @080C93A2 + b _080C93A2 .pool -@080C9374: +_080C9374: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C93A2 + bne _080C93A2 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow - b @080C93A2 + b _080C93A2 .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 bl add_to_c3_somehow -@080C93A2: +_080C93A2: pop {r4,r5} pop {r0} bx r0 @@ -361726,21 +361726,21 @@ sub_80C93B0: ; 80C93B0 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 .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 @@ -361748,17 +361748,17 @@ sub_80C93B0: ; 80C93B0 bl itemid_is_mail lsls r0, 24 cmp r0, 0 - bne @080C9404 + bne _080C9404 bl sub_80CADC4 ldr r1, [r4] - b @080C946C + b _080C946C .pool -@080C9404: +_080C9404: ldr r0, =sub_80C96B8 bl add_to_c3_somehow - b @080C948C + b _080C948C .pool -@080C9410: +_080C9410: movs r0, 0x2 bl sub_80CFE54 ldr r0, =0x02039d0c @@ -361772,45 +361772,45 @@ sub_80C93B0: ; 80C93B0 lsrs r1, 24 adds r0, r4, 0 bl sub_80D0FAC - b @080C9468 + b _080C9468 .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 .pool -@080C947C: +_080C947C: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C948C + bne _080C948C ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C948C: +_080C948C: pop {r4} pop {r0} bx r0 @@ -361824,74 +361824,74 @@ sub_80C9498: ; 80C9498 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 .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 IsDma3ManagerBusyWithBgCopy 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 IsDma3ManagerBusyWithBgCopy - 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 .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 .pool -@080C9534: +_080C9534: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C9544 + bne _080C9544 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C9544: +_080C9544: pop {r0} bx r0 .pool @@ -361904,24 +361904,24 @@ sub_80C954C: ; 80C954C 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 .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 @@ -361932,28 +361932,28 @@ sub_80C954C: ; 80C954C ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b @080C9664 + b _080C9664 .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 @@ -361964,62 +361964,62 @@ sub_80C954C: ; 80C954C 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 .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 .pool -@080C9624: +_080C9624: bl sub_80D1194 ldr r0, =0x02039d08 ldr r1, [r0] movs r0, 0x4 strb r0, [r1] - b @080C9664 + b _080C9664 .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 bl add_to_c3_somehow - b @080C9664 + b _080C9664 .pool -@080C9654: +_080C9654: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C9664 + bne _080C9664 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C9664: +_080C9664: pop {r4} pop {r0} bx r0 @@ -362033,28 +362033,28 @@ sub_80C9670: ; 80C9670 ldr r0, [r4] ldrb r0, [r0] cmp r0, 0 - beq @080C9688 + beq _080C9688 cmp r0, 0x1 - beq @080C969A - b @080C96AE + beq _080C969A + b _080C96AE .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 bl add_to_c3_somehow -@080C96AE: +_080C96AE: pop {r4} pop {r0} bx r0 @@ -362068,52 +362068,52 @@ sub_80C96B8: ; 80C96B8 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 .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 IsDma3ManagerBusyWithBgCopy 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 .pool -@080C9710: +_080C9710: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C9720 + bne _080C9720 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C9720: +_080C9720: pop {r4} pop {r0} bx r0 @@ -362127,18 +362127,18 @@ box_related: ; 80C972C 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 .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 @@ -362146,74 +362146,74 @@ box_related: ; 80C972C 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 .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 bl add_to_c3_somehow - b @080C9818 + b _080C9818 .pool -@080C97DC: +_080C97DC: movs r0, 0x5 bl audio_play ldr r0, =sub_80C9AC8 bl add_to_c3_somehow - b @080C9818 + b _080C9818 .pool -@080C97F0: +_080C97F0: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C9824 bl add_to_c3_somehow - b @080C9818 + b _080C9818 .pool -@080C9808: +_080C9808: movs r0, 0x5 bl audio_play bl sub_80CADC4 ldr r0, =sub_80C99D8 bl add_to_c3_somehow -@080C9818: +_080C9818: pop {r4} pop {r0} bx r0 @@ -362227,25 +362227,25 @@ sub_80C9824: ; 80C9824 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 .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 @@ -362253,22 +362253,22 @@ sub_80C9824: ; 80C9824 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b @080C99CA + b _080C99CA .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 .pool -@080C9894: +_080C9894: bl sub_80D00AC ldr r4, =0x02039d08 ldr r1, [r4] @@ -362278,25 +362278,25 @@ sub_80C9824: ; 80C9824 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 .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 @@ -362307,8 +362307,8 @@ sub_80C9824: ; 80C9824 strh r0, [r2] ldrb r0, [r1] adds r0, 0x1 - b @080C99CA -@080C98EC: + b _080C99CA +_080C98EC: movs r0, 0x5 bl audio_play ldr r0, [r4] @@ -362321,12 +362321,12 @@ sub_80C9824: ; 80C9824 bl sub_80CADC4 ldr r1, [r4] movs r0, 0x6 - b @080C99CA -@080C990C: + b _080C99CA +_080C990C: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C99CC + bne _080C99CC ldr r4, =0x02039d08 ldr r0, [r4] ldr r1, =0x0000078e @@ -362338,9 +362338,9 @@ sub_80C9824: ; 80C9824 ldr r1, [r4] ldrb r0, [r1] adds r0, 0x1 - b @080C99CA + b _080C99CA .pool -@080C993C: +_080C993C: bl sub_80D00AC ldr r4, =0x02039d08 ldr r1, [r4] @@ -362353,16 +362353,16 @@ sub_80C9824: ; 80C9824 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 .pool -@080C996C: +_080C996C: movs r0, 0x5 bl audio_play bl sub_80CADC4 @@ -362377,24 +362377,24 @@ sub_80C9824: ; 80C9824 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 bl add_to_c3_somehow - b @080C99CC + b _080C99CC .pool -@080C99AC: +_080C99AC: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080C99CC + bne _080C99CC ldr r4, =0x02039d08 ldr r0, [r4] movs r1, 0xF2 @@ -362404,9 +362404,9 @@ sub_80C9824: ; 80C9824 bl sub_80CC680 ldr r1, [r4] movs r0, 0x5 -@080C99CA: +_080C99CA: strb r0, [r1] -@080C99CC: +_080C99CC: pop {r4,r5} pop {r0} bx r0 @@ -362421,20 +362421,20 @@ sub_80C99D8: ; 80C99D8 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 .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] @@ -362449,9 +362449,9 @@ sub_80C99D8: ; 80C99D8 lsls r0, 24 lsrs r0, 24 bl sub_80C78D4 - b @080C9A8E + b _080C9A8E .pool -@080C9A2C: +_080C9A2C: bl sub_80C78F0 ldr r1, [r5] lsls r0, 24 @@ -362462,7 +362462,7 @@ sub_80C99D8: ; 80C99D8 movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0xC8 - beq @080C9AB8 + beq _080C9AB8 bl sub_80CADC4 bl sub_80C78E4 bl sub_80C7890 @@ -362472,37 +362472,37 @@ sub_80C99D8: ; 80C99D8 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 bl add_to_c3_somehow - b @080C9AB8 + b _080C9AB8 .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 .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 @@ -362510,7 +362510,7 @@ sub_80C99D8: ; 80C99D8 bl sub_80D1D18 ldr r0, =task_pokemon_box_related bl add_to_c3_somehow -@080C9AB8: +_080C9AB8: add sp, 0x4 pop {r4,r5} pop {r0} @@ -362526,12 +362526,12 @@ sub_80C9AC8: ; 80C9AC8 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0 - beq @080C9AE0 + beq _080C9AE0 cmp r4, 0x1 - beq @080C9AFE - b @080C9B18 + beq _080C9AFE + b _080C9B18 .pool -@080C9AE0: +_080C9AE0: bl sub_80CE760 movs r0, 0x1 negs r0, r0 @@ -362544,12 +362544,12 @@ sub_80C9AC8: ; 80C9AC8 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] @@ -362557,7 +362557,7 @@ sub_80C9AC8: ; 80C9AC8 strb r0, [r1, 0x2] ldr r0, =sub_80C9E50 bl add_to_c3_somehow -@080C9B18: +_080C9B18: add sp, 0x4 pop {r4,r5} pop {r0} @@ -362573,12 +362573,12 @@ sub_80C9B28: ; 80C9B28 ldr r0, [r5] ldrb r4, [r0] cmp r4, 0 - beq @080C9B40 + beq _080C9B40 cmp r4, 0x1 - beq @080C9B5E - b @080C9B78 + beq _080C9B5E + b _080C9B78 .pool -@080C9B40: +_080C9B40: bl sub_80CE7E8 movs r0, 0x1 negs r0, r0 @@ -362591,20 +362591,20 @@ sub_80C9B28: ; 80C9B28 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 bl add_to_c3_somehow -@080C9B78: +_080C9B78: add sp, 0x4 pop {r4,r5} pop {r0} @@ -362620,12 +362620,12 @@ sub_80C9B88: ; 80C9B88 ldr r0, [r4] ldrb r1, [r0] cmp r1, 0 - beq @080C9BA0 + beq _080C9BA0 cmp r1, 0x1 - beq @080C9BBA - b @080C9BD6 + beq _080C9BBA + b _080C9BD6 .pool -@080C9BA0: +_080C9BA0: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -362637,12 +362637,12 @@ sub_80C9B88: ; 80C9B88 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] @@ -362651,7 +362651,7 @@ sub_80C9B88: ; 80C9B88 strb r0, [r1, 0x2] ldr r0, =sub_80C9E50 bl add_to_c3_somehow -@080C9BD6: +_080C9BD6: add sp, 0x4 pop {r4} pop {r0} @@ -362666,27 +362666,27 @@ sub_80C9BE8: ; 80C9BE8 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 .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 @@ -362695,18 +362695,18 @@ sub_80C9BE8: ; 80C9BE8 ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b @080C9D08 + b _080C9D08 .pool -@080C9C40: +_080C9C40: bl sub_80D127C lsls r0, 24 cmp r0, 0 - beq @080C9C58 + beq _080C9C58 ldr r0, =sub_80C954C bl add_to_c3_somehow - b @080C9D08 + b _080C9D08 .pool -@080C9C58: +_080C9C58: movs r0, 0x5 bl audio_play movs r0, 0 @@ -362717,63 +362717,63 @@ sub_80C9BE8: ; 80C9BE8 ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b @080C9D08 + b _080C9D08 .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 .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 bl add_to_c3_somehow - b @080C9D08 + b _080C9D08 .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 .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 @@ -362783,7 +362783,7 @@ sub_80C9BE8: ; 80C9BE8 strb r4, [r0, 0x2] ldr r0, =sub_80C9E50 bl add_to_c3_somehow -@080C9D08: +_080C9D08: pop {r4} pop {r0} bx r0 @@ -362797,27 +362797,27 @@ sub_80C9D1C: ; 80C9D1C 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 .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 @@ -362826,18 +362826,18 @@ sub_80C9D1C: ; 80C9D1C ldr r1, [r0] movs r0, 0x1 strb r0, [r1] - b @080C9E3C + b _080C9E3C .pool -@080C9D74: +_080C9D74: bl sub_80D127C lsls r0, 24 cmp r0, 0 - beq @080C9D8C + beq _080C9D8C ldr r0, =sub_80C954C bl add_to_c3_somehow - b @080C9E3C + b _080C9E3C .pool -@080C9D8C: +_080C9D8C: movs r0, 0x5 bl audio_play movs r0, 0x12 @@ -362848,64 +362848,64 @@ sub_80C9D1C: ; 80C9D1C ldr r1, [r0] movs r0, 0x2 strb r0, [r1] - b @080C9E3C + b _080C9E3C .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 .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 bl add_to_c3_somehow - b @080C9E3C + b _080C9E3C .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 .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 @@ -362915,7 +362915,7 @@ sub_80C9D1C: ; 80C9D1C strb r4, [r0, 0x2] ldr r0, =sub_80C9E50 bl add_to_c3_somehow -@080C9E3C: +_080C9E3C: pop {r4} pop {r0} bx r0 @@ -362936,36 +362936,36 @@ 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 .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 bl SetMainCallback2 - b @080C9F56 + b _080C9F56 .pool -@080C9EB4: +_080C9EB4: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x0000218c @@ -362982,10 +362982,10 @@ sub_80C9E50: ; 80C9E50 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 str r0, [sp] movs r0, 0 @@ -362993,9 +362993,9 @@ sub_80C9E50: ; 80C9E50 adds r2, r7, 0 adds r3, r6, 0 bl sub_81BFA80 - b @080C9F56 + b _080C9F56 .pool -@080C9F04: +_080C9F04: ldr r0, =c2_808CE60 str r0, [sp] adds r0, r5, 0 @@ -363003,9 +363003,9 @@ sub_80C9E50: ; 80C9E50 adds r2, r7, 0 adds r3, r6, 0 bl sub_81BF8EC - b @080C9F56 + b _080C9F56 .pool -@080C9F1C: +_080C9F1C: bl sub_80C9FC8 bl get_preferred_box lsls r0, 24 @@ -363020,15 +363020,15 @@ sub_80C9E50: ; 80C9E50 movs r2, 0 movs r3, 0 bl do_choose_name_or_words_screen - b @080C9F56 + b _080C9F56 .pool -@080C9F48: +_080C9F48: bl sub_80C9FC8 ldr r2, =c2_808CE60 movs r0, 0xB movs r1, 0 bl sub_81AAC90 -@080C9F56: +_080C9F56: mov r0, r8 bl remove_task add sp, 0x8 @@ -363049,14 +363049,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 @@ -363064,19 +363064,19 @@ sub_80C9F6C: ; 80C9F6C movs r1, 0xC mov r2, sp bl pokemon_setattr - b @080C9FB6 + b _080C9FB6 .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 @@ -363180,14 +363180,14 @@ sub_80CA0A4: ; 80CA0A4 bl InitWindows lsls r0, 16 cmp r0, 0 - beq @080CA0C0 + beq _080CA0C0 bl DeactivateAllTextPrinters movs r0, 0x1 - b @080CA0C2 + b _080CA0C2 .pool -@080CA0C0: +_080CA0C0: movs r0, 0 -@080CA0C2: +_080CA0C2: pop {r1} bx r1 thumb_func_end sub_80CA0A4 @@ -363221,19 +363221,19 @@ sub_80CA0D8: ; 80CA0D8 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - beq @080CA124 + beq _080CA124 ldr r0, =gUnknown_0857241C movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply - b @080CA12E + b _080CA12E .pool -@080CA124: +_080CA124: ldr r0, =gUnknown_0857243C movs r1, 0x30 movs r2, 0x20 bl gpu_pal_apply -@080CA12E: +_080CA12E: ldr r1, =0x00001e05 movs r0, 0xA bl SetGpuReg @@ -363308,7 +363308,7 @@ sub_80CA1C4: ; 80CA1C4 mov r0, sp bl LoadObjectPic movs r4, 0 -@080CA1DA: +_080CA1DA: lsls r1, r4, 6 subs r1, r4 adds r1, 0x8 @@ -363336,7 +363336,7 @@ sub_80CA1C4: ; 80CA1C4 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls @080CA1DA + bls _080CA1DA add sp, 0x8 pop {r4} pop {r0} @@ -363376,7 +363376,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 @@ -363403,7 +363403,7 @@ BoxSetMosaic: ; 80CA260 lsrs r1, 16 movs r0, 0x4C bl SetGpuReg -@080CA2AC: +_080CA2AC: pop {r0} bx r0 .pool @@ -363434,10 +363434,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 @@ -363449,7 +363449,7 @@ BoxSetMosaic2: ; 80CA2D0 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @080CA30E + bne _080CA30E ldrb r0, [r4, 0x1] movs r1, 0x11 negs r1, r1 @@ -363457,7 +363457,7 @@ BoxSetMosaic2: ; 80CA2D0 strb r1, [r4, 0x1] ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@080CA30E: +_080CA30E: pop {r4} pop {r0} bx r0 @@ -363495,7 +363495,7 @@ sub_80CA318: ; 80CA318 mov r5, r12 movs r2, 0 ldr r1, =0x000007ff -@080CA352: +_080CA352: ldr r0, [r5] adds r0, r4 adds r0, r6 @@ -363504,12 +363504,12 @@ sub_80CA318: ; 80CA318 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 @@ -363519,7 +363519,7 @@ sub_80CA318: ; 80CA318 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0xF - bls @080CA36C + bls _080CA36C ldr r0, =0x02039d08 ldr r0, [r0] movs r6, 0x89 @@ -363532,16 +363532,16 @@ sub_80CA318: ; 80CA318 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq @080CA420 + beq _080CA420 adds r0, r7, 0 bl LoadTaggedObjectPalette lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF - beq @080CA420 - b @080CA40C + beq _080CA420 + b _080CA40C .pool -@080CA3C4: +_080CA3C4: ldr r0, =0x02039d08 ldr r2, [r0] movs r7, 0x89 @@ -363566,9 +363566,9 @@ sub_80CA318: ; 80CA318 ldr r7, =0x06010000 adds r0, r7 str r0, [r2] - b @080CA420 + b _080CA420 .pool -@080CA40C: +_080CA40C: mov r0, sp movs r1, 0x28 movs r2, 0x30 @@ -363577,8 +363577,8 @@ sub_80CA318: ; 80CA318 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 @@ -363586,12 +363586,12 @@ sub_80CA318: ; 80CA318 adds r0, r1 ldr r0, [r0] cmp r0, 0 - bne @080CA43C + bne _080CA43C movs r0, 0x2 bl FreeObjectTilesByTag ldr r0, =0x0000dac6 bl FreeObjectPaletteByTag -@080CA43C: +_080CA43C: add sp, 0x28 pop {r4-r7} pop {r0} @@ -363613,9 +363613,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, =gMonFrontPicTable adds r0, r1 @@ -363657,15 +363657,15 @@ sub_80CA44C: ; 80CA44C negs r0, r0 ands r0, r2 strb r0, [r1] - b @080CA4F2 + b _080CA4F2 .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} @@ -363683,7 +363683,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 @@ -363728,9 +363728,9 @@ sub_80CA4FC: ; 80CA4FC movs r1, 0 movs r3, 0x6 bl Print - b @080CA5E8 + b _080CA5E8 .pool -@080CA588: +_080CA588: ldr r0, =0x00000d65 adds r2, r0 movs r4, 0 @@ -363775,7 +363775,7 @@ sub_80CA4FC: ; 80CA4FC movs r1, 0x2 movs r3, 0xA bl Print -@080CA5E8: +_080CA5E8: movs r0, 0 movs r1, 0x2 bl CopyWindowToVram @@ -363785,7 +363785,7 @@ sub_80CA4FC: ; 80CA4FC adds r0, r1, r2 ldrh r0, [r0] cmp r0, 0 - beq @080CA640 + beq _080CA640 adds r2, 0x7 adds r0, r1, r2 ldrb r0, [r0] @@ -363802,9 +363802,9 @@ sub_80CA4FC: ; 80CA4FC movs r0, 0x5 negs r0, r0 ands r0, r2 - b @080CA64E + b _080CA64E .pool -@080CA640: +_080CA640: ldr r2, =0x00000d94 adds r0, r1, r2 ldr r1, [r0] @@ -363812,7 +363812,7 @@ sub_80CA4FC: ; 80CA4FC ldrb r0, [r1] movs r2, 0x4 orrs r0, r2 -@080CA64E: +_080CA64E: strb r0, [r1] add sp, 0xC pop {r4-r6} @@ -363831,7 +363831,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 @@ -363840,7 +363840,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 @@ -363857,10 +363857,10 @@ sub_80CA65C: ; 80CA65C lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls @080CA680 - b @080CA6E6 + bls _080CA680 + b _080CA6E6 .pool -@080CA6B4: +_080CA6B4: movs r0, 0x2 str r0, [sp] movs r0, 0 @@ -363869,7 +363869,7 @@ sub_80CA65C: ; 80CA65C movs r3, 0x8 bl sub_80D27AC movs r4, 0 -@080CA6C6: +_080CA6C6: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 2 @@ -363884,8 +363884,8 @@ sub_80CA65C: ; 80CA65C 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 @@ -363937,7 +363937,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 @@ -363946,9 +363946,9 @@ sub_80CA704: ; 80CA704 bl sub_80D2918 movs r0, 0x1 bl sub_80D2918 - b @080CA7B2 + b _080CA7B2 .pool -@080CA790: +_080CA790: movs r0, 0x2 str r0, [sp] movs r0, 0x1 @@ -363962,7 +363962,7 @@ sub_80CA704: ; 80CA704 bl sub_80D2918 movs r0, 0x2 bl sub_80D2918 -@080CA7B2: +_080CA7B2: movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x02039d08 @@ -364012,7 +364012,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 @@ -364043,17 +364043,17 @@ sub_80CA80C: ; 80CA80C lsls r0, 24 lsrs r0, 24 cmp r0, 0x14 - beq @080CA874 + beq _080CA874 movs r0, 0x1 - b @080CA87C + b _080CA87C .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 @@ -364081,9 +364081,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 @@ -364100,7 +364100,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 @@ -364142,13 +364142,13 @@ 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 .pool -@080CA94C: +_080CA94C: ldr r0, =0x02039d0c movs r1, 0 strb r1, [r0] @@ -364164,9 +364164,9 @@ sub_80CA8C8: ; 80CA8C8 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} @@ -364180,22 +364180,22 @@ sub_80CA984: ; 80CA984 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 @@ -364235,12 +364235,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 .pool @@ -364255,7 +364255,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 @@ -364265,7 +364265,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 @@ -364278,15 +364278,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 @@ -364297,7 +364297,7 @@ sub_80CAA14: ; 80CAA14 sub_80CAA74: ; 80CAA74 push {r4,lr} movs r4, 0x1 -@080CAA78: +_080CAA78: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -364313,7 +364313,7 @@ sub_80CAA74: ; 80CAA74 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @080CAA78 + bls _080CAA78 pop {r4} pop {r0} bx r0 @@ -364328,9 +364328,9 @@ sub_80CAAA8: ; 80CAAA8 lsls r1, 24 ldr r7, =gUnknown_085724BC cmp r1, 0 - beq @080CAAB8 + beq _080CAAB8 ldr r7, =gUnknown_085724A4 -@080CAAB8: +_080CAAB8: subs r0, 0x1 lsls r1, r0, 1 adds r1, r0 @@ -364345,14 +364345,14 @@ sub_80CAAA8: ; 80CAAA8 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 @@ -364367,14 +364367,14 @@ sub_80CAAA8: ; 80CAAA8 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 @@ -364428,50 +364428,50 @@ 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 .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 .pool -@080CABD4: +_080CABD4: movs r0, 0 - b @080CABDA -@080CABD8: + b _080CABDA +_080CABD8: movs r0, 0x1 -@080CABDA: +_080CABDA: pop {r4,r5} pop {r1} bx r1 @@ -364486,7 +364486,7 @@ sub_80CABE0: ; 80CABE0 lsls r0, 24 lsrs r0, 24 cmp r1, r0 - beq @080CAC0A + beq _080CAC0A ldr r0, =0x000008d7 bl FlagReset ldr r4, =0x00004036 @@ -364496,7 +364496,7 @@ sub_80CABE0: ; 80CABE0 lsrs r1, 24 adds r0, r4, 0 bl VarSet -@080CAC0A: +_080CAC0A: pop {r4} pop {r0} bx r0 @@ -364545,45 +364545,45 @@ 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 .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 .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 .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 @@ -364591,27 +364591,27 @@ sub_80CAC58: ; 80CAC58 bl sub_80D12B8 adds r1, r0, 0 adds r0, r4, 0 - b @080CAD00 + b _080CAD00 .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 CopyString adds r2, r0, 0 - b @080CAD16 + b _080CAD16 .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 @@ -364620,7 +364620,7 @@ sub_80CAC58: ; 80CAC58 adds r1, r0 movs r0, 0 bl sub_81AFC0C -@080CAD30: +_080CAD30: ldr r5, =0x02039d08 ldr r0, [r5] ldr r4, =0x00002190 @@ -364710,10 +364710,10 @@ 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 @@ -364727,19 +364727,19 @@ sub_80CAE0C: ; 80CAE0C 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 @@ -364748,8 +364748,8 @@ sub_80CAE0C: ; 80CAE0C bl sub_80CFF34 movs r0, 0x1A bl sub_80CFF34 - b @080CAE96 -@080CAE4A: + b _080CAE96 +_080CAE4A: movs r0, 0x1B bl sub_80CFF34 movs r0, 0x1C @@ -364758,8 +364758,8 @@ sub_80CAE0C: ; 80CAE0C bl sub_80CFF34 movs r0, 0x1E bl sub_80CFF34 - b @080CAE96 -@080CAE64: + b _080CAE96 +_080CAE64: movs r0, 0x1F bl sub_80CFF34 movs r0, 0x20 @@ -364768,8 +364768,8 @@ sub_80CAE0C: ; 80CAE0C bl sub_80CFF34 movs r0, 0x22 bl sub_80CFF34 - b @080CAE96 -@080CAE7E: + b _080CAE96 +_080CAE7E: movs r0, 0x23 bl sub_80CFF34 movs r0, 0x24 @@ -364778,7 +364778,7 @@ sub_80CAE0C: ; 80CAE0C bl sub_80CFF34 movs r0, 0x26 bl sub_80CFF34 -@080CAE96: +_080CAE96: bl sub_80CFFD0 pop {r4,r5} pop {r0} @@ -364799,35 +364799,35 @@ sub_80CAEAC: ; 80CAEAC 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 .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 .pool @@ -364842,7 +364842,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 @@ -364852,12 +364852,12 @@ sub_80CAF04: ; 80CAF04 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 @@ -364867,13 +364867,13 @@ sub_80CAF04: ; 80CAF04 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 @@ -364883,12 +364883,12 @@ sub_80CAF04: ; 80CAF04 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 @@ -364898,7 +364898,7 @@ sub_80CAF04: ; 80CAF04 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1D - bls @080CAF6A + bls _080CAF6A ldr r0, [r6] ldr r2, =0x00000a6c adds r1, r0, r2 @@ -364920,9 +364920,9 @@ sub_80CAFAC: ; 80CAFAC 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 @@ -364985,11 +364985,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 @@ -364997,7 +364997,7 @@ sub_80CB028: ; 80CB028 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @080CB0B0 + beq _080CB0B0 mov r0, r9 adds r1, r6, 0 movs r2, 0 @@ -365034,9 +365034,9 @@ sub_80CB028: ; 80CB028 adds r1, r3 adds r1, r2 str r0, [r1] - b @080CB0C0 + b _080CB0C0 .pool -@080CB0B0: +_080CB0B0: ldr r0, =0x02039d08 ldr r0, [r0] mov r2, r8 @@ -365045,7 +365045,7 @@ sub_80CB028: ; 80CB028 adds r0, r3 adds r0, r1 str r4, [r0] -@080CB0C0: +_080CB0C0: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 @@ -365058,28 +365058,28 @@ sub_80CB028: ; 80CB028 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 @@ -365092,13 +365092,13 @@ sub_80CB028: ; 80CB028 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 @@ -365125,7 +365125,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 @@ -365176,7 +365176,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 @@ -365184,7 +365184,7 @@ sub_80CB140: ; 80CB140 movs r0, 0x4 orrs r1, r0 strb r1, [r3, 0x1] -@080CB1DA: +_080CB1DA: add sp, 0x8 pop {r3} mov r8, r3 @@ -365204,25 +365204,25 @@ sub_80CB1F0: ; 80CB1F0 ldr r6, =0x00000a88 movs r5, 0x1 ldr r4, =sub_80CB278 -@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 @@ -365237,15 +365237,15 @@ sub_80CB234: ; 80CB234 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 @@ -365257,7 +365257,7 @@ sub_80CB234: ; 80CB234 strh r0, [r2, 0x20] ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] -@080CB266: +_080CB266: pop {r0} bx r0 .pool @@ -365271,11 +365271,11 @@ sub_80CB278: ; 80CB278 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 @@ -365287,10 +365287,10 @@ sub_80CB278: ; 80CB278 lsls r0, 16 lsrs r0, 16 cmp r0, 0xB6 - bls @080CB2A8 + bls _080CB2A8 ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] -@080CB2A8: +_080CB2A8: pop {r0} bx r0 .pool @@ -365303,7 +365303,7 @@ sub_80CB2B0: ; 80CB2B0 lsrs r5, r0, 24 movs r6, 0 ldr r7, =0x02039d08 -@080CB2BA: +_080CB2BA: ldr r0, [r7] lsls r4, r5, 2 ldr r1, =0x00000a88 @@ -365311,7 +365311,7 @@ sub_80CB2B0: ; 80CB2B0 adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq @080CB2DA + beq _080CB2DA bl sub_80CC314 ldr r0, [r7] ldr r1, =0x00000a88 @@ -365319,7 +365319,7 @@ sub_80CB2B0: ; 80CB2B0 adds r0, r4 movs r1, 0 str r1, [r0] -@080CB2DA: +_080CB2DA: adds r0, r5, 0x6 lsls r0, 24 lsrs r5, r0, 24 @@ -365327,7 +365327,7 @@ sub_80CB2B0: ; 80CB2B0 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x4 - bls @080CB2BA + bls _080CB2BA pop {r4-r7} pop {r0} bx r0 @@ -365380,11 +365380,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 @@ -365393,7 +365393,7 @@ sub_80CB2F8: ; 80CB2F8 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq @080CB3C2 + beq _080CB3C2 lsls r4, r5, 2 ldr r6, =0x00000be4 adds r1, r2, r6 @@ -365417,7 +365417,7 @@ sub_80CB2F8: ; 80CB2F8 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] @@ -365437,7 +365437,7 @@ sub_80CB2F8: ; 80CB2F8 lsls r0, 24 lsrs r0, 24 mov r9, r0 -@080CB3C2: +_080CB3C2: adds r0, r5, 0x6 lsls r0, 24 lsrs r5, r0, 24 @@ -365448,15 +365448,15 @@ sub_80CB2F8: ; 80CB2F8 mov r8, r0 subs r7, 0x1 cmp r7, 0 - bge @080CB358 - b @080CB4A6 + bge _080CB358 + b _080CB4A6 .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 @@ -365465,7 +365465,7 @@ sub_80CB2F8: ; 80CB2F8 adds r1, r0 ldrh r0, [r1] cmp r0, 0 - beq @080CB490 + beq _080CB490 lsls r4, r5, 2 ldr r6, =0x00000be4 adds r1, r2, r6 @@ -365489,7 +365489,7 @@ sub_80CB2F8: ; 80CB2F8 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] @@ -365511,7 +365511,7 @@ sub_80CB2F8: ; 80CB2F8 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 @@ -365526,13 +365526,13 @@ sub_80CB2F8: ; 80CB2F8 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 @@ -365543,8 +365543,8 @@ sub_80CB2F8: ; 80CB2F8 mov r8, r0 subs r7, 0x1 cmp r7, 0 - bge @080CB3F8 -@080CB4A6: + bge _080CB3F8 +_080CB4A6: mov r0, r9 add sp, 0x1C pop {r3-r5} @@ -365599,19 +365599,19 @@ 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 .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] @@ -365646,29 +365646,29 @@ 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 .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 @@ -365681,9 +365681,9 @@ sub_80CB584: ; 80CB584 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] @@ -365705,9 +365705,9 @@ sub_80CB584: ; 80CB584 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] - b @080CB6E8 + b _080CB6E8 .pool -@080CB61C: +_080CB61C: ldr r2, =0x00000c62 adds r1, r3, r2 ldr r6, =0x00000c64 @@ -365737,19 +365737,19 @@ sub_80CB584: ; 80CB584 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 @@ -365757,9 +365757,9 @@ sub_80CB584: ; 80CB584 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @080CB6E8 + b _080CB6E8 .pool -@080CB69C: +_080CB69C: ldr r3, =0x02039d08 ldr r0, [r3] ldr r6, =0x00000c68 @@ -365775,25 +365775,25 @@ sub_80CB584: ; 80CB584 ldr r1, =0x00000c6a adds r0, r1 strb r2, [r0] - b @080CB6E8 + b _080CB6E8 .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 .pool -@080CB6E8: +_080CB6E8: movs r0, 0x1 -@080CB6EA: +_080CB6EA: pop {r4-r6} pop {r1} bx r1 @@ -365811,11 +365811,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 @@ -365831,7 +365831,7 @@ sub_80CB6F0: ; 80CB6F0 strh r0, [r1] lsls r0, 16 cmp r0, 0 - beq @080CB744 + beq _080CB744 adds r0, r6, 0 adds r1, r4, 0 movs r2, 0 @@ -365843,14 +365843,14 @@ sub_80CB6F0: ; 80CB6F0 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 @@ -365877,7 +365877,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 @@ -365885,7 +365885,7 @@ sub_80CB778: ; 80CB778 adds r0, r4 movs r1, 0 str r1, [r0] -@080CB79E: +_080CB79E: pop {r4,r5} pop {r0} bx r0 @@ -365906,7 +365906,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 @@ -365917,7 +365917,7 @@ sub_80CB7AC: ; 80CB7AC ands r0, r2 orrs r0, r1 strb r0, [r3, 0x1] -@080CB7DA: +_080CB7DA: pop {r0} bx r0 .pool @@ -365958,7 +365958,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 @@ -365970,7 +365970,7 @@ sub_80CB7E8: ; 80CB7E8 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq @080CB894 + beq _080CB894 adds r0, r4, 0 movs r1, 0 bl pokemon_getattr @@ -366001,9 +366001,9 @@ sub_80CB7E8: ; 80CB7E8 adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 - b @080CB8A4 + b _080CB8A4 .pool -@080CB894: +_080CB894: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r6, 2 @@ -366012,24 +366012,24 @@ sub_80CB7E8: ; 80CB7E8 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 @@ -366048,24 +366048,24 @@ sub_80CB7E8: ; 80CB7E8 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 @@ -366073,7 +366073,7 @@ sub_80CB7E8: ; 80CB7E8 movs r1, 0xC bl pokemon_getattr cmp r0, 0 - bne @080CB932 + bne _080CB932 ldr r0, [r7] adds r0, r5 adds r0, r4 @@ -366086,13 +366086,13 @@ sub_80CB7E8: ; 80CB7E8 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 @@ -366117,16 +366117,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 @@ -366141,16 +366141,16 @@ sub_80CB950: ; 80CB950 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} @@ -366177,11 +366177,11 @@ sub_80CB9D0: ; 80CB9D0 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 @@ -366191,7 +366191,7 @@ sub_80CB9D0: ; 80CB9D0 lsls r1, 13 adds r0, r1 lsrs r4, r0, 16 -@080CB9F6: +_080CB9F6: ldrh r0, [r2, 0x20] lsls r0, 3 strh r0, [r2, 0x32] @@ -366203,9 +366203,9 @@ sub_80CB9D0: ; 80CB9D0 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 @@ -366214,9 +366214,9 @@ sub_80CB9D0: ; 80CB9D0 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 @@ -366237,7 +366237,7 @@ sub_80CBA3C: ; 80CBA3C 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 @@ -366254,17 +366254,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 @@ -366274,7 +366274,7 @@ sub_80CBA3C: ; 80CBA3C adds r0, r1 lsls r0, 3 adds r0, 0x10 -@080CBA8E: +_080CBA8E: strh r0, [r3, 0x22] ldr r0, =DummyObjectCallback str r0, [r3, 0x1C] @@ -366293,7 +366293,7 @@ sub_80CBA3C: ; 80CBA3C ldrb r0, [r2] subs r0, 0x1 strb r0, [r2] -@080CBAB2: +_080CBAB2: pop {r4} pop {r0} bx r0 @@ -366309,14 +366309,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 @@ -366332,7 +366332,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 @@ -366341,7 +366341,7 @@ sub_80CBAF0: ; 80CBAF0 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] @@ -366361,27 +366361,27 @@ sub_80CBAF0: ; 80CBAF0 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 .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 @@ -366400,7 +366400,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 @@ -366409,7 +366409,7 @@ sub_80CBB68: ; 80CBB68 adds r0, r4 movs r1, 0 str r1, [r0] -@080CBB92: +_080CBB92: pop {r4,r5} pop {r0} bx r0 @@ -366421,7 +366421,7 @@ 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 @@ -366430,7 +366430,7 @@ sub_80CBB9C: ; 80CBB9C adds r0, r4 ldr r0, [r0] cmp r0, 0 - beq @080CBBC6 + beq _080CBBC6 bl sub_80CC314 ldr r0, [r6] movs r1, 0xA7 @@ -366439,12 +366439,12 @@ sub_80CBB9C: ; 80CBB9C 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 @@ -366466,7 +366466,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 @@ -366477,7 +366477,7 @@ sub_80CBBDC: ; 80CBBDC ands r0, r2 orrs r0, r1 strb r0, [r3, 0x1] -@080CBC0C: +_080CBC0C: pop {r0} bx r0 .pool @@ -366492,7 +366492,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 @@ -366504,11 +366504,11 @@ sub_80CBC14: ; 80CBC14 ldr r1, [r0] str r1, [r2] str r4, [r0] - b @080CBC60 + b _080CBC60 .pool -@080CBC44: +_080CBC44: cmp r4, 0x1 - bne @080CBC96 + bne _080CBC96 ldr r3, =0x02039d08 ldr r0, [r3] ldr r1, =0x00000a6c @@ -366521,7 +366521,7 @@ sub_80CBC14: ; 80CBC14 str r1, [r2] movs r1, 0 str r1, [r0] -@080CBC60: +_080CBC60: adds r5, r3, 0 ldr r0, [r5] ldr r4, =0x00000a6c @@ -366548,7 +366548,7 @@ sub_80CBC14: ; 80CBC14 adds r0, 0x43 movs r1, 0x7 strb r1, [r0] -@080CBC96: +_080CBC96: pop {r4,r5} pop {r0} bx r0 @@ -366563,7 +366563,7 @@ sub_80CBCAC: ; 80CBCAC lsls r1, 24 lsrs r6, r1, 24 cmp r0, 0xE - bne @080CBCF8 + bne _080CBCF8 ldr r3, =0x02039d08 ldr r1, [r3] lsls r5, r6, 2 @@ -366589,9 +366589,9 @@ sub_80CBCAC: ; 80CBCAC adds r0, 0x43 movs r1, 0xC strb r1, [r0] - b @080CBD34 + b _080CBD34 .pool -@080CBCF8: +_080CBCF8: ldr r5, =0x02039d08 ldr r1, [r5] lsls r4, r6, 2 @@ -366621,7 +366621,7 @@ sub_80CBCAC: ; 80CBCAC adds r4, 0x43 strb r1, [r4] adds r3, r5, 0 -@080CBD34: +_080CBD34: ldr r1, [r3] ldr r0, =0x00000a6c adds r1, r0 @@ -366644,7 +366644,7 @@ sub_80CBD5C: ; 80CBD5C lsls r1, 24 lsrs r4, r1, 24 cmp r0, 0xE - bne @080CBD80 + bne _080CBD80 ldr r3, =0x02039d08 ldr r1, [r3] movs r0, 0xB0 @@ -366653,9 +366653,9 @@ sub_80CBD5C: ; 80CBD5C lsls r0, r4, 2 movs r4, 0xA7 lsls r4, 4 - b @080CBD8E + b _080CBD8E .pool -@080CBD80: +_080CBD80: ldr r3, =0x02039d08 ldr r1, [r3] movs r0, 0xB0 @@ -366663,7 +366663,7 @@ sub_80CBD5C: ; 80CBD5C adds r2, r1, r0 lsls r0, r4, 2 ldr r4, =0x00000a88 -@080CBD8E: +_080CBD8E: adds r0, r4 adds r1, r0 str r1, [r2] @@ -366696,11 +366696,11 @@ sub_80CBDC4: ; 80CBDC4 adds r1, r0, r1 ldrb r0, [r1] cmp r0, 0x10 - bne @080CBDE8 + bne _080CBDE8 movs r0, 0 - b @080CBEF4 + b _080CBEF4 .pool -@080CBDE8: +_080CBDE8: adds r0, 0x1 strb r0, [r1] ldr r2, [r6] @@ -366710,7 +366710,7 @@ sub_80CBDC4: ; 80CBDC4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080CBE18 + beq _080CBE18 movs r1, 0xB0 lsls r1, 4 adds r0, r2, r1 @@ -366725,7 +366725,7 @@ sub_80CBDC4: ; 80CBDC4 ldrh r0, [r1, 0x22] adds r0, 0x1 strh r0, [r1, 0x22] -@080CBE18: +_080CBE18: ldr r3, [r6] movs r7, 0xB0 lsls r7, 4 @@ -366742,9 +366742,9 @@ sub_80CBDC4: ; 80CBDC4 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] @@ -366758,15 +366758,15 @@ sub_80CBDC4: ; 80CBDC4 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] @@ -366810,13 +366810,13 @@ sub_80CBDC4: ; 80CBDC4 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] @@ -366837,9 +366837,9 @@ sub_80CBDC4: ; 80CBDC4 ldr r1, [r0] ldr r0, =DummyObjectCallback str r0, [r1, 0x1C] -@080CBEF2: +_080CBEF2: movs r0, 0x1 -@080CBEF4: +_080CBEF4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -366858,17 +366858,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 @@ -366876,23 +366876,23 @@ sub_80CBF14: ; 80CBF14 lsls r0, r4, 2 movs r4, 0xA7 lsls r4, 4 - b @080CBF58 + b _080CBF58 .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 .pool -@080CBF70: +_080CBF70: ldr r0, =0x02039d08 ldr r1, [r0] ldr r3, =0x00000b04 @@ -366901,14 +366901,14 @@ sub_80CBF14: ; 80CBF14 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 @@ -366932,7 +366932,7 @@ sub_80CBF14: ; 80CBF14 ldr r0, [r0] movs r1, 0 bl StartObjectRotScalAnim -@080CBFC0: +_080CBFC0: pop {r4} pop {r0} bx r0 @@ -366949,32 +366949,32 @@ 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 .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 @@ -366989,7 +366989,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 @@ -367006,7 +367006,7 @@ sub_80CC020: ; 80CC020 ldr r1, [r0] movs r0, 0 str r0, [r1] -@080CC056: +_080CC056: pop {r4} pop {r0} bx r0 @@ -367023,7 +367023,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] @@ -367038,7 +367038,7 @@ sub_80CC064: ; 80CC064 ldr r0, [r0] movs r1, 0x1 bl StartObjectRotScalAnim -@080CC094: +_080CC094: pop {r0} bx r0 .pool @@ -367053,23 +367053,23 @@ sub_80CC0A0: ; 80CC0A0 adds r2, r0, r1 ldr r0, [r2] cmp r0, 0 - bne @080CC0BC + bne _080CC0BC movs r0, 0 - b @080CC0D0 + b _080CC0D0 .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 @@ -367128,53 +367128,53 @@ 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 .pool -@080CC198: +_080CC198: ldr r1, [r2] lsls r2, r4, 1 ldr r5, =0x00000b58 @@ -367198,7 +367198,7 @@ sub_80CC124: ; 80CC124 ldr r2, =0x04000080 bl CpuSet adds r0, r4, 0 -@080CC1CA: +_080CC1CA: pop {r4-r6} pop {r1} bx r1 @@ -367212,7 +367212,7 @@ sub_80CC1E0: ; 80CC1E0 lsrs r5, r0, 16 movs r3, 0 ldr r6, =0x02039d08 -@080CC1EA: +_080CC1EA: ldr r1, [r6] lsls r2, r3, 1 ldr r4, =0x00000b58 @@ -367220,7 +367220,7 @@ sub_80CC1E0: ; 80CC1E0 adds r4, r0, r2 ldrh r0, [r4] cmp r0, r5 - bne @080CC220 + bne _080CC220 ldr r0, =0x00000b08 adds r1, r0 adds r1, r2 @@ -367230,17 +367230,17 @@ sub_80CC1E0: ; 80CC1E0 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @080CC22A + bne _080CC22A strh r0, [r4] - b @080CC22A + b _080CC22A .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 @@ -367294,7 +367294,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 @@ -367307,7 +367307,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 @@ -367331,14 +367331,14 @@ sub_80CC230: ; 80CC230 strb r1, [r0, 0x5] mov r1, r10 strh r1, [r0, 0x2E] - b @080CC304 + b _080CC304 .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 @@ -367410,21 +367410,21 @@ 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 .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 @@ -367444,9 +367444,9 @@ sub_80CC370: ; 80CC370 movs r3, 0x1 bl RequestDma3Fill strh r0, [r4, 0xA] - b @080CC458 + b _080CC458 .pool -@080CC3E8: +_080CC3E8: movs r1, 0xA ldrsh r0, [r4, r1] bl CheckForSpaceForDma3Request @@ -367455,7 +367455,7 @@ sub_80CC370: ; 80CC370 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @080CC45E + beq _080CC45E ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00004ac4 @@ -367464,17 +367464,17 @@ sub_80CC370: ; 80CC370 bl SetBgTilemap movs r0, 0x2 bl ShowBg - b @080CC458 + b _080CC458 .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 @@ -367483,21 +367483,21 @@ sub_80CC370: ; 80CC370 ldr r1, =0x00005b0a movs r0, 0xC bl SetGpuReg - b @080CC458 + b _080CC458 .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 @@ -367524,17 +367524,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] @@ -367551,9 +367551,9 @@ sub_80CC464: ; 80CC464 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] @@ -367563,19 +367563,19 @@ sub_80CC464: ; 80CC464 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 @@ -367619,18 +367619,18 @@ 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 .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] @@ -367645,10 +367645,10 @@ sub_80CC54C: ; 80CC54C 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 @@ -367674,9 +367674,9 @@ sub_80CC54C: ; 80CC54C lsls r0, 24 asrs r0, 24 bl sub_80CD0B8 - b @080CC624 + b _080CC624 .pool -@080CC5E4: +_080CC5E4: bl sub_80CB584 lsls r0, 24 lsrs r5, r0, 24 @@ -367686,7 +367686,7 @@ sub_80CC54C: ; 80CC54C adds r3, r2, r4 ldrh r0, [r3] cmp r0, 0 - beq @080CC620 + beq _080CC620 movs r0, 0xB3 lsls r0, 2 adds r1, r2, r0 @@ -367701,13 +367701,13 @@ sub_80CC54C: ; 80CC54C 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 @@ -367715,9 +367715,9 @@ sub_80CC54C: ; 80CC54C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@080CC632: +_080CC632: movs r0, 0x1 -@080CC634: +_080CC634: pop {r4-r6} pop {r1} bx r1 @@ -367734,27 +367734,27 @@ 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 @@ -367794,21 +367794,21 @@ 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 .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 @@ -367823,23 +367823,23 @@ sub_80CC6B0: ; 80CC6B0 ldr r1, [r4] ldr r2, =0x00000a62 adds r1, r2 - b @080CC77E + b _080CC77E .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] @@ -367856,30 +367856,30 @@ sub_80CC6B0: ; 80CC6B0 ldr r1, [r4] ldr r2, =0x00000a62 adds r1, r2 - b @080CC77E + b _080CC77E .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 .pool -@080CC790: +_080CC790: movs r0, 0 - b @080CC796 -@080CC794: + b _080CC796 +_080CC794: movs r0, 0x1 -@080CC796: +_080CC796: add sp, 0x4 pop {r4} pop {r1} @@ -367909,21 +367909,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 @@ -367933,7 +367933,7 @@ sub_80CC7A0: ; 80CC7A0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x10 - beq @080CC8C4 + beq _080CC8C4 lsls r0, r1, 1 adds r0, r1 lsls r0, 2 @@ -367961,7 +367961,7 @@ sub_80CC7A0: ; 80CC7A0 movs r0, 0 ldrsb r0, [r4, r0] cmp r0, 0 - beq @080CC874 + beq _080CC874 ldr r0, [r6, 0x8] ldr r2, =0x000002d2 adds r1, r2 @@ -367973,9 +367973,9 @@ sub_80CC7A0: ; 80CC7A0 lsrs r1, 16 movs r2, 0x40 bl gpu_pal_apply - b @080CC888 + b _080CC888 .pool -@080CC874: +_080CC874: ldr r0, [r6, 0x8] ldr r2, =0x000002d2 adds r1, r2 @@ -367985,7 +367985,7 @@ sub_80CC7A0: ; 80CC7A0 adds r1, r2 movs r2, 0x20 bl CpuSet -@080CC888: +_080CC888: ldr r0, [r6] mov r1, sp bl malloc_and_decompress @@ -368004,9 +368004,9 @@ sub_80CC7A0: ; 80CC7A0 lsls r3, 8 movs r0, 0x2 bl LoadBgTiles - b @080CC9DA + b _080CC9DA .pool -@080CC8C4: +_080CC8C4: bl sub_80D24A8 lsls r1, r0, 1 adds r1, r0 @@ -368051,7 +368051,7 @@ sub_80CC7A0: ; 80CC7A0 movs r0, 0 ldrsb r0, [r5, r0] cmp r0, 0 - beq @080CC960 + beq _080CC960 adds r0, r1, r4 ldr r2, =0x000002d2 adds r1, r2 @@ -368063,9 +368063,9 @@ sub_80CC7A0: ; 80CC7A0 lsrs r1, 16 movs r2, 0x40 bl gpu_pal_apply - b @080CC976 + b _080CC976 .pool -@080CC960: +_080CC960: ldr r2, =0x00000792 adds r0, r1, r2 ldr r3, =0x000002d2 @@ -368076,7 +368076,7 @@ sub_80CC7A0: ; 80CC7A0 adds r1, r2 movs r2, 0x20 bl CpuSet -@080CC976: +_080CC976: ldr r0, [r6] mov r1, sp bl malloc_and_decompress @@ -368121,7 +368121,7 @@ sub_80CC7A0: ; 80CC7A0 lsls r3, 8 movs r0, 0x2 bl LoadBgTiles -@080CC9DA: +_080CC9DA: movs r0, 0x2 bl CopyBgTilemapBufferToVram add sp, 0x8 @@ -368138,25 +368138,25 @@ sub_80CCA00: ; 80CCA00 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 @@ -368212,20 +368212,20 @@ sub_80CCA3C: ; 80CCA3C movs r3, 0 bl CopyRectToBgTilemapBufferRect 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 .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 @@ -368239,7 +368239,7 @@ sub_80CCA3C: ; 80CCA3C movs r1, 0 movs r3, 0x2 bl FillBgTilemapBufferRect -@080CCAD2: +_080CCAD2: add sp, 0x24 pop {r4-r7} pop {r0} @@ -368264,45 +368264,45 @@ 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 .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 @@ -368443,7 +368443,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 @@ -368475,7 +368475,7 @@ sub_80CCB50: ; 80CCB50 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x1 - bls @080CCC70 + bls _080CCC70 ldr r0, [r5] movs r4, 0xDF lsls r4, 3 @@ -368535,16 +368535,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 @@ -368556,9 +368556,9 @@ sub_80CCCFC: ; 80CCCFC adds r0, r5 ldrh r0, [r0] mov r9, r0 - b @080CCDB0 + b _080CCDB0 .pool -@080CCD8C: +_080CCD8C: ldr r0, [r6, 0x4] mov r7, r12 ands r0, r7 @@ -368577,7 +368577,7 @@ sub_80CCCFC: ; 80CCCFC strh r0, [r1] ldr r0, =0x0000dac9 strh r0, [r1, 0x2] -@080CCDB0: +_080CCDB0: mov r5, r8 ldr r4, [r5] ldr r5, =0x000021b8 @@ -368633,7 +368633,7 @@ sub_80CCCFC: ; 80CCCFC mov r9, r8 negs r2, r2 mov r8, r2 -@080CCE2E: +_080CCE2E: lsls r6, r7, 5 mov r5, r10 lsls r1, r5, 16 @@ -368698,7 +368698,7 @@ sub_80CCCFC: ; 80CCCFC lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x1 - bls @080CCE2E + bls _080CCE2E add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -368720,15 +368720,15 @@ sub_80CCEE0: ; 80CCEE0 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080CCF00 + bne _080CCF00 movs r0, 0x4 bl FreeObjectTilesByTag - b @080CCF06 + b _080CCF06 .pool -@080CCF00: +_080CCF00: movs r0, 0x3 bl FreeObjectTilesByTag -@080CCF06: +_080CCF06: ldr r0, =0x02039d08 ldr r0, [r0] movs r3, 0xE4 @@ -368757,11 +368757,11 @@ sub_80CCF30: ; 80CCF30 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 @@ -368771,10 +368771,10 @@ sub_80CCF30: ; 80CCF30 movs r3, 0x30 ldrsh r1, [r2, r3] cmp r0, r1 - bne @080CCF5C + bne _080CCF5C ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] -@080CCF5C: +_080CCF5C: pop {r0} bx r0 .pool @@ -368788,11 +368788,11 @@ sub_80CCF64: ; 80CCF64 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 @@ -368804,10 +368804,10 @@ sub_80CCF64: ; 80CCF64 lsls r0, 16 lsrs r0, 16 cmp r0, 0xC0 - bls @080CCF96 + bls _080CCF96 adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@080CCF96: +_080CCF96: pop {r0} bx r0 thumb_func_end sub_80CCF64 @@ -368828,7 +368828,7 @@ sub_80CCF9C: ; 80CCF9C adds r0, r2, r3 ldrb r0, [r0] cmp r0, 0 - bne @080CCFE4 + bne _080CCFE4 lsls r0, r1, 2 ldr r1, =gUnknown_08577574 adds r0, r1 @@ -368840,9 +368840,9 @@ sub_80CCF9C: ; 80CCF9C adds r1, r2 movs r2, 0x2 bl CpuSet - b @080CCFFC + b _080CCFFC .pool -@080CCFE4: +_080CCFE4: lsls r0, r1, 2 ldr r1, =gUnknown_08577574 adds r0, r1 @@ -368854,7 +368854,7 @@ sub_80CCF9C: ; 80CCF9C adds r1, r2 movs r2, 0x2 bl CpuSet -@080CCFFC: +_080CCFFC: pop {r0} bx r0 .pool @@ -368885,7 +368885,7 @@ sub_80CD02C: ; 80CD02C ldr r0, =gUnknown_0857B080 bl LoadObjectPic movs r5, 0 -@080CD036: +_080CD036: lsls r1, r5, 4 adds r1, r5 lsls r1, 19 @@ -368900,7 +368900,7 @@ sub_80CD02C: ; 80CD02C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @080CD088 + beq _080CD088 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -368912,11 +368912,11 @@ sub_80CD02C: ; 80CD02C bl StartObjectImageAnim 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] @@ -368926,19 +368926,19 @@ sub_80CD02C: ; 80CD02C 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 @@ -368957,7 +368957,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 @@ -368971,10 +368971,10 @@ sub_80CD0B8: ; 80CD0B8 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 @@ -368989,9 +368989,9 @@ sub_80CD0B8: ; 80CD0B8 strh r0, [r2, 0x30] ldr r0, [r3] movs r2, 0x48 - b @080CD130 + b _080CD130 .pool -@080CD114: +_080CD114: ldr r1, [r7] movs r2, 0xE6 lsls r2, 3 @@ -369006,7 +369006,7 @@ sub_80CD0B8: ; 80CD0B8 strh r0, [r2, 0x30] ldr r0, [r3] movs r2, 0xF8 -@080CD130: +_080CD130: strh r2, [r0, 0x32] ldr r0, [r1] strh r2, [r0, 0x32] @@ -369036,7 +369036,7 @@ sub_80CD158: ; 80CD158 movs r6, 0x5 negs r6, r6 ldr r4, =0x02039d08 -@080CD164: +_080CD164: ldr r1, [r4] lsls r0, r3, 2 movs r2, 0xE6 @@ -369061,7 +369061,7 @@ sub_80CD158: ; 80CD158 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x1 - bls @080CD164 + bls _080CD164 movs r0, 0x1 bl sub_80CD1A8 pop {r4-r6} @@ -369075,14 +369075,14 @@ 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 @@ -369099,16 +369099,16 @@ sub_80CD1A8: ; 80CD1A8 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1 - bls @080CD1BC - b @080CD204 + bls _080CD1BC + b _080CD204 .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 @@ -369119,8 +369119,8 @@ sub_80CD1A8: ; 80CD1A8 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x1 - bls @080CD1EE -@080CD204: + bls _080CD1EE +_080CD204: pop {r4-r6} pop {r0} bx r0 @@ -369134,25 +369134,25 @@ sub_80CD210: ; 80CD210 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 .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 @@ -369160,7 +369160,7 @@ sub_80CD210: ; 80CD210 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] @@ -369172,15 +369172,15 @@ sub_80CD210: ; 80CD210 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 @@ -369193,20 +369193,20 @@ sub_80CD210: ; 80CD210 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 @@ -369218,9 +369218,9 @@ sub_80CD210: ; 80CD210 strb r0, [r3] movs r0, 0x4 strh r0, [r2, 0x2E] - b @080CD2DC + b _080CD2DC .pool -@080CD2CC: +_080CD2CC: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000002ce @@ -369229,7 +369229,7 @@ sub_80CD210: ; 80CD210 ldrh r0, [r0] subs r1, r0 strh r1, [r2, 0x20] -@080CD2DC: +_080CD2DC: pop {r0} bx r0 .pool @@ -369262,7 +369262,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 @@ -369287,11 +369287,11 @@ sub_80CD2E8: ; 80CD2E8 ldr r0, =DummyObjectCallback str r0, [r4] adds r0, r6, 0 - b @080CD362 + b _080CD362 .pool -@080CD360: +_080CD360: movs r0, 0 -@080CD362: +_080CD362: pop {r3} mov r8, r3 pop {r4-r7} @@ -369306,16 +369306,16 @@ sub_80CD36C: ; 80CD36C 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 .pool -@080CD388: +_080CD388: ldr r0, =0x02039d78 strb r1, [r0] -@080CD38C: +_080CD38C: ldr r0, =0x02039d79 movs r1, 0 strb r1, [r0] @@ -369365,7 +369365,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 @@ -369373,7 +369373,7 @@ sub_80CD3EC: ; 80CD3EC movs r2, 0x64 bl memcpy bl sub_80CAFC4 -@080CD426: +_080CD426: pop {r0} bx r0 .pool @@ -369389,21 +369389,21 @@ 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 .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 @@ -369424,22 +369424,22 @@ sub_80CD444: ; 80CD444 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 @@ -369447,34 +369447,34 @@ sub_80CD444: ; 80CD444 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 .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 @@ -369488,9 +369488,9 @@ sub_80CD504: ; 80CD504 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] @@ -369500,21 +369500,21 @@ sub_80CD504: ; 80CD504 adds r0, r1 movs r1, 0xB bl pokemon_getattr - b @080CD542 + b _080CD542 .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 .pool -@080CD54C: +_080CD54C: movs r0, 0 -@080CD54E: +_080CD54E: pop {r1} bx r1 thumb_func_end sub_80CD504 @@ -369529,24 +369529,24 @@ 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 .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 @@ -369581,14 +369581,14 @@ sub_80CD554: ; 80CD554 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] @@ -369596,14 +369596,14 @@ sub_80CD554: ; 80CD554 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] @@ -369611,14 +369611,14 @@ sub_80CD554: ; 80CD554 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] @@ -369628,25 +369628,25 @@ sub_80CD554: ; 80CD554 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] @@ -369662,9 +369662,9 @@ sub_80CD554: ; 80CD554 ands r0, r3 orrs r0, r1 strb r0, [r2] - b @080CD698 + b _080CD698 .pool -@080CD67C: +_080CD67C: ldr r3, =0x00000cb4 adds r2, r5, r3 ldr r1, [r2] @@ -369678,9 +369678,9 @@ sub_80CD554: ; 80CD554 ldrh r0, [r0] strh r0, [r1, 0x22] bl sub_80CDA68 -@080CD698: +_080CD698: movs r0, 0x1 -@080CD69A: +_080CD69A: pop {r4-r7} pop {r1} bx r1 @@ -369740,33 +369740,33 @@ 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 .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 @@ -369775,9 +369775,9 @@ sub_80CD70C: ; 80CD70C 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 @@ -369787,9 +369787,9 @@ sub_80CD70C: ; 80CD70C ldr r0, [r0] movs r2, 0x22 ldrsh r0, [r0, r2] - b @080CD7C0 + b _080CD7C0 .pool -@080CD78C: +_080CD78C: ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 @@ -369800,9 +369800,9 @@ sub_80CD70C: ; 80CD70C movs r2, 0x22 ldrsh r0, [r0, r2] adds r0, 0xC0 - b @080CD7C0 + b _080CD7C0 .pool -@080CD7AC: +_080CD7AC: ldr r3, =0x00000cce adds r0, r2, r3 movs r3, 0 @@ -369813,7 +369813,7 @@ sub_80CD70C: ; 80CD70C movs r2, 0x22 ldrsh r0, [r0, r2] subs r0, 0xC0 -@080CD7C0: +_080CD7C0: subs r7, r1, r0 ldr r2, [r4] ldr r3, =0x00000cd3 @@ -369823,9 +369823,9 @@ sub_80CD70C: ; 80CD70C 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 @@ -369835,9 +369835,9 @@ sub_80CD70C: ; 80CD70C ldr r0, [r0] movs r2, 0x20 ldrsh r0, [r0, r2] - b @080CD830 + b _080CD830 .pool -@080CD7FC: +_080CD7FC: ldr r3, =0x00000ccc adds r0, r2, r3 movs r3, 0 @@ -369848,9 +369848,9 @@ sub_80CD70C: ; 80CD70C movs r2, 0x20 ldrsh r0, [r0, r2] adds r0, 0xC0 - b @080CD830 + b _080CD830 .pool -@080CD81C: +_080CD81C: ldr r3, =0x00000ccc adds r0, r2, r3 movs r3, 0 @@ -369861,7 +369861,7 @@ sub_80CD70C: ; 80CD70C movs r2, 0x20 ldrsh r0, [r0, r2] subs r0, 0xC0 -@080CD830: +_080CD830: subs r0, r1, r0 lsls r7, 8 lsls r0, 8 @@ -369918,82 +369918,82 @@ 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 StartObjectImageAnim - b @080CD8FC + b _080CD8FC .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 StartObjectImageAnim -@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 .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 .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 @@ -370008,13 +370008,13 @@ sub_80CD894: ; 80CD894 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 @@ -370043,16 +370043,16 @@ sub_80CD894: ; 80CD894 ands r2, r0 orrs r2, r3 strb r2, [r1, 0x5] - b @080CDA56 + b _080CDA56 .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] @@ -370070,9 +370070,9 @@ sub_80CD894: ; 80CD894 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b @080CDA56 + b _080CDA56 .pool -@080CDA28: +_080CDA28: ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r2, [r0] @@ -370088,14 +370088,14 @@ sub_80CD894: ; 80CD894 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 @@ -370119,59 +370119,59 @@ 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 StartObjectImageAnim - b @080CDAD8 + b _080CDAD8 .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 StartObjectImageAnim -@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 .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 @@ -370180,19 +370180,19 @@ sub_80CDA68: ; 80CDA68 adds r0, 0x43 movs r1, 0xD strb r1, [r0] -@080CDB1E: +_080CDB1E: movs r0, 0x1 bl sub_80CC0D4 - b @080CDB8A + b _080CDB8A .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] @@ -370230,7 +370230,7 @@ sub_80CDA68: ; 80CDA68 strb r0, [r1] movs r0, 0x2 bl sub_80CC0D4 -@080CDB8A: +_080CDB8A: pop {r4} pop {r0} bx r0 @@ -370243,18 +370243,18 @@ sub_80CDBA0: ; 80CDBA0 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - bne @080CDBB4 + bne _080CDBB4 movs r3, 0 - b @080CDBC2 + b _080CDBC2 .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 @@ -370265,12 +370265,12 @@ sub_80CDBA0: ; 80CDBA0 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 @@ -370344,21 +370344,21 @@ 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 - b @080CDC8E + b _080CDC8E .pool -@080CDC84: +_080CDC84: ldr r0, =0x02039d08 ldr r1, [r0] ldr r2, =0x00000d8c adds r1, r2 ldr r2, =sub_80CDEC4 -@080CDC8E: +_080CDC8E: str r2, [r1] ldr r0, [r0] movs r1, 0xD9 @@ -370397,41 +370397,41 @@ 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 .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 .pool -@080CDD08: +_080CDD08: ldr r2, =0x00000cb4 adds r0, r1, r2 ldr r0, [r0] movs r1, 0x2 bl StartObjectImageAnim - b @080CDD4A + b _080CDD4A .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 @@ -370439,22 +370439,22 @@ sub_80CDCCC: ; 80CDCCC movs r1, 0x3 bl StartObjectImageAnim bl sub_80CDF38 - b @080CDD4A + b _080CDD4A .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 @@ -370470,22 +370470,22 @@ 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 .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 @@ -370493,33 +370493,33 @@ sub_80CDD5C: ; 80CDD5C movs r1, 0x2 bl StartObjectImageAnim bl sub_80CDFAC - b @080CDDBC + b _080CDDBC .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 StartObjectImageAnim -@080CDDBC: +_080CDDBC: ldr r1, [r4] adds r1, r5 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @080CDDD0 + b _080CDDD0 .pool -@080CDDCC: +_080CDDCC: movs r0, 0 - b @080CDDD2 -@080CDDD0: + b _080CDDD2 +_080CDDD0: movs r0, 0x1 -@080CDDD2: +_080CDDD2: pop {r4,r5} pop {r1} bx r1 @@ -370535,37 +370535,37 @@ 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 .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 .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] @@ -370585,13 +370585,13 @@ sub_80CDDD8: ; 80CDDD8 movs r0, 0xD9 lsls r0, 4 adds r1, r0 - b @080CDE94 + b _080CDE94 .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 @@ -370607,18 +370607,18 @@ sub_80CDDD8: ; 80CDDD8 bl diegohint1 ldr r1, [r4] adds r1, r5 -@080CDE94: +_080CDE94: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @080CDEAC + b _080CDEAC .pool -@080CDEA8: +_080CDEA8: movs r0, 0 - b @080CDEAE -@080CDEAC: + b _080CDEAE +_080CDEAC: movs r0, 0x1 -@080CDEAE: +_080CDEAE: pop {r4,r5} pop {r1} bx r1 @@ -370655,21 +370655,21 @@ 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 .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 @@ -370685,16 +370685,16 @@ 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 .pool -@080CDF30: +_080CDF30: movs r0, 0 -@080CDF32: +_080CDF32: pop {r1} bx r1 thumb_func_end sub_80CDF08 @@ -370707,9 +370707,9 @@ sub_80CDF38: ; 80CDF38 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 @@ -370717,16 +370717,16 @@ sub_80CDF38: ; 80CDF38 ldrb r1, [r4] movs r0, 0 bl sub_80CBC14 - b @080CDF8E + b _080CDF8E .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 @@ -370736,11 +370736,11 @@ sub_80CDF38: ; 80CDF38 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 @@ -370755,9 +370755,9 @@ sub_80CDFAC: ; 80CDFAC 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 @@ -370765,9 +370765,9 @@ sub_80CDFAC: ; 80CDFAC ldrb r1, [r4] movs r0, 0xE bl sub_80CBCAC - b @080CDFF8 + b _080CDFF8 .pool -@080CDFDC: +_080CDFDC: bl get_preferred_box adds r4, r0, 0 lsls r4, 24 @@ -370779,11 +370779,11 @@ sub_80CDFAC: ; 80CDFAC 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 @@ -370806,7 +370806,7 @@ sub_80CE018: ; 80CE018 lsls r1, 24 lsrs r5, r1, 24 cmp r4, 0xE - bne @080CE054 + bne _080CE054 ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000020a4 @@ -370820,9 +370820,9 @@ sub_80CE018: ; 80CE018 adds r1, r3 movs r2, 0x64 bl memcpy - b @080CE064 + b _080CE064 .pool -@080CE054: +_080CE054: ldr r0, =0x02039d08 ldr r2, [r0] ldr r0, =0x000020a4 @@ -370830,7 +370830,7 @@ sub_80CE018: ; 80CE018 adds r0, r4, 0 adds r1, r5, 0 bl sub_80D2054 -@080CE064: +_080CE064: adds r0, r4, 0 adds r1, r5, 0 bl sub_80CE0E8 @@ -370852,7 +370852,7 @@ diegohint2: ; 80CE08C lsls r1, 24 lsrs r7, r1, 24 cmp r6, 0xE - bne @080CE0C0 + bne _080CE0C0 ldr r1, =0x020244ec movs r0, 0x64 muls r0, r7 @@ -370863,9 +370863,9 @@ diegohint2: ; 80CE08C adds r1, r2 movs r2, 0x64 bl memcpy - b @080CE0D8 + b _080CE0D8 .pool -@080CE0C0: +_080CE0C0: ldr r5, =0x02039d08 ldr r0, [r5] ldr r4, =0x000020a4 @@ -370876,7 +370876,7 @@ diegohint2: ; 80CE08C adds r0, r6, 0 adds r1, r7, 0 bl sub_80D1F18 -@080CE0D8: +_080CE0D8: pop {r4-r7} pop {r0} bx r0 @@ -370891,17 +370891,17 @@ sub_80CE0E8: ; 80CE0E8 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 .pool -@080CE108: +_080CE108: bl sub_80D2018 -@080CE10C: +_080CE10C: pop {r0} bx r0 thumb_func_end sub_80CE0E8 @@ -370914,7 +370914,7 @@ diegohint1: ; 80CE110 lsls r1, 24 lsrs r7, r1, 24 cmp r6, 0xE - bne @080CE144 + bne _080CE144 ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00002108 @@ -370925,9 +370925,9 @@ diegohint1: ; 80CE110 adds r1, r2 movs r2, 0x64 bl memcpy - b @080CE154 + b _080CE154 .pool -@080CE144: +_080CE144: ldr r0, =0x02039d08 ldr r2, [r0] ldr r0, =0x00002108 @@ -370935,7 +370935,7 @@ diegohint1: ; 80CE110 adds r0, r6, 0 adds r1, r7, 0 bl sub_80D2054 -@080CE154: +_080CE154: adds r0, r6, 0 adds r1, r7, 0 bl diegohint2 @@ -370974,14 +370974,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 @@ -370989,9 +370989,9 @@ sub_80CE19C: ; 80CE19C bl sub_80CBAC4 movs r0, 0 strb r0, [r5] - b @080CE1F6 + b _080CE1F6 .pool -@080CE1DC: +_080CE1DC: ldr r5, =0x02039d79 ldrb r1, [r5] movs r0, 0xE @@ -371002,15 +371002,15 @@ sub_80CE19C: ; 80CE19C 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 @@ -371019,7 +371019,7 @@ sub_80CE19C: ; 80CE19C movs r1, 0x1 bl StartObjectImageAnim movs r0, 0x1 -@080CE21A: +_080CE21A: pop {r4-r6} pop {r1} bx r1 @@ -371048,11 +371048,11 @@ sub_80CE250: ; 80CE250 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq @080CE264 + beq _080CE264 movs r2, 0x2 - b @080CE274 + b _080CE274 .pool -@080CE264: +_080CE264: ldr r0, =0x02039d78 movs r1, 0 ldrsb r1, [r0, r1] @@ -371061,7 +371061,7 @@ sub_80CE250: ; 80CE250 negs r0, r1 orrs r0, r1 lsrs r2, r0, 31 -@080CE274: +_080CE274: ldr r0, =0x02039d79 ldrb r1, [r0] adds r0, r2, 0 @@ -371084,10 +371084,10 @@ sub_80CE2A8: ; 80CE2A8 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 @@ -371096,7 +371096,7 @@ sub_80CE2A8: ; 80CE2A8 movs r1, 0 bl StartObjectImageAnim movs r0, 0 -@080CE2CA: +_080CE2CA: pop {r1} bx r1 .pool @@ -371109,31 +371109,31 @@ sub_80CE2D8: ; 80CE2D8 ldr r1, =0x02039d7a ldrb r0, [r1] cmp r0, 0 - beq @080CE2F0 + beq _080CE2F0 movs r0, 0 strb r0, [r1] - b @080CE316 + b _080CE316 .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 .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 @@ -371146,7 +371146,7 @@ sub_80CE324: ; 80CE324 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq @080CE33E + beq _080CE33E ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00000cb4 @@ -371154,7 +371154,7 @@ sub_80CE324: ; 80CE324 ldr r0, [r0] movs r1, 0x3 bl StartObjectImageAnim -@080CE33E: +_080CE33E: pop {r0} bx r0 .pool @@ -371166,32 +371166,32 @@ sub_80CE350: ; 80CE350 adds r3, r0, 0 movs r5, 0 ldr r4, =gUnknown_0857B9A4 -@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] @@ -371207,7 +371207,7 @@ sub_80CE3A0: ; 80CE3A0 bl sub_80CE51C adds r3, r0, 0 cmp r3, 0 - bne @080CE3D0 + bne _080CE3D0 ldr r2, =0x02039d08 ldr r0, [r2] ldr r1, =0x0000216d @@ -371218,13 +371218,13 @@ sub_80CE3A0: ; 80CE3A0 ldr r2, =0x0000216c adds r0, r2 strb r3, [r0] - b @080CE504 + b _080CE504 .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 @@ -371243,15 +371243,15 @@ sub_80CE3A0: ; 80CE3A0 adds r0, r1 movs r1, 0x1 negs r1, r1 - b @080CE494 + b _080CE494 .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 @@ -371270,9 +371270,9 @@ sub_80CE3A0: ; 80CE3A0 adds r0, r3 movs r1, 0xE strb r1, [r0] - b @080CE488 + b _080CE488 .pool -@080CE464: +_080CE464: bl get_preferred_box lsls r0, 24 lsrs r0, 24 @@ -371288,14 +371288,14 @@ sub_80CE3A0: ; 80CE3A0 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] @@ -371314,14 +371314,14 @@ sub_80CE3A0: ; 80CE3A0 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 .pool -@080CE4E8: +_080CE4E8: ldr r1, =0x0000216d adds r0, r2, r1 movs r1, 0x1 @@ -371330,14 +371330,14 @@ sub_80CE3A0: ; 80CE3A0 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 @@ -371353,7 +371353,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 @@ -371361,40 +371361,40 @@ sub_80CE51C: ; 80CE51C 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 .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 @@ -371412,27 +371412,27 @@ 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 .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 .pool -@080CE5C4: +_080CE5C4: movs r6, 0 -@080CE5C6: +_080CE5C6: ldr r2, [r5] ldr r1, =0x00002170 adds r0, r2, r1 @@ -371440,15 +371440,15 @@ sub_80CE580: ; 80CE580 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 @@ -371465,19 +371465,19 @@ sub_80CE580: ; 80CE580 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 @@ -371486,9 +371486,9 @@ sub_80CE580: ; 80CE580 ldr r2, =0x0000216c adds r0, r2 strb r1, [r0] - b @080CE732 + b _080CE732 .pool -@080CE64C: +_080CE64C: ldr r3, =0x0000216e adds r0, r1, r3 movs r1, 0 @@ -371503,9 +371503,9 @@ sub_80CE580: ; 80CE580 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @080CE732 + b _080CE732 .pool -@080CE674: +_080CE674: ldr r1, =0x0000216d adds r0, r5, r1 movs r1, 0x1 @@ -371515,13 +371515,13 @@ sub_80CE580: ; 80CE580 ldr r3, =0x0000216c adds r0, r3 strb r1, [r0] - b @080CE732 + b _080CE732 .pool -@080CE690: +_080CE690: movs r6, 0 mov r8, r5 ldr r7, =0x0000ffff -@080CE696: +_080CE696: mov r0, r8 ldr r3, [r0] ldr r1, =0x0000216e @@ -371537,7 +371537,7 @@ sub_80CE580: ; 80CE580 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0 - beq @080CE6E0 + beq _080CE6E0 ldr r5, [r5] ldr r3, =0x00002170 adds r0, r5, r3 @@ -371550,15 +371550,15 @@ sub_80CE580: ; 80CE580 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 @@ -371571,7 +371571,7 @@ sub_80CE580: ; 80CE580 asrs r0, 24 adds r5, r2, 0 cmp r0, 0x1D - ble @080CE728 + ble _080CE728 ldr r0, [r2] ldr r1, =0x0000216f adds r0, r1 @@ -371585,7 +371585,7 @@ sub_80CE580: ; 80CE580 lsls r0, 24 asrs r0, 24 cmp r0, 0xD - ble @080CE728 + ble _080CE728 ldr r0, [r2] ldr r1, =0x0000216d adds r0, r1 @@ -371595,16 +371595,16 @@ sub_80CE580: ; 80CE580 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} @@ -371619,7 +371619,7 @@ sub_80CE760: ; 80CE760 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq @080CE77A + beq _080CE77A ldr r0, =0x02039d14 ldr r1, =0x02039d08 ldr r1, [r1] @@ -371627,7 +371627,7 @@ sub_80CE760: ; 80CE760 adds r1, r2 movs r2, 0x64 bl memcpy -@080CE77A: +_080CE77A: pop {r0} bx r0 .pool @@ -371639,11 +371639,11 @@ sub_80CE790: ; 80CE790 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 @@ -371651,9 +371651,9 @@ sub_80CE790: ; 80CE790 ldr r1, =0x02039d14 movs r2, 0x64 bl memcpy - b @080CE7D8 + b _080CE7D8 .pool -@080CE7C8: +_080CE7C8: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x000020a4 @@ -371661,7 +371661,7 @@ sub_80CE790: ; 80CE790 ldr r1, =0x02039d14 movs r2, 0x50 bl memcpy -@080CE7D8: +_080CE7D8: pop {r0} bx r0 .pool @@ -371673,7 +371673,7 @@ sub_80CE7E8: ; 80CE7E8 ldr r0, =0x02039d7a ldrb r5, [r0] cmp r5, 0 - beq @080CE838 + beq _080CE838 bl sub_80CE760 ldr r3, =0x02039d08 ldr r1, [r3] @@ -371693,15 +371693,15 @@ sub_80CE7E8: ; 80CE7E8 ldr r1, =0x00002188 adds r0, r1 strb r2, [r0] - b @080CE8CA + b _080CE8CA .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 @@ -371723,9 +371723,9 @@ sub_80CE7E8: ; 80CE7E8 ldr r4, =0x00002188 adds r0, r4 strb r5, [r0] - b @080CE8CA + b _080CE8CA .pool -@080CE894: +_080CE894: bl get_preferred_box lsls r0, 24 lsrs r0, 24 @@ -371751,7 +371751,7 @@ sub_80CE7E8: ; 80CE7E8 adds r0, r4 movs r1, 0x2 strb r1, [r0] -@080CE8CA: +_080CE8CA: pop {r4,r5} pop {r0} bx r0 @@ -371764,16 +371764,16 @@ sub_80CE8E4: ; 80CE8E4 ldr r0, =0x02039d7a ldrb r0, [r0] cmp r0, 0 - beq @080CE8F8 + beq _080CE8F8 bl sub_80CE790 - b @080CE900 + b _080CE900 .pool -@080CE8F8: +_080CE8F8: ldr r0, =0x02039d79 ldr r1, =0x0203cf20 ldrb r1, [r1] strb r1, [r0] -@080CE900: +_080CE900: pop {r0} bx r0 .pool @@ -371795,7 +371795,7 @@ party_compaction: ; 80CE90C mov r8, r1 subs r0, 0x65 mov r10, r0 -@080CE928: +_080CE928: mov r0, r9 muls r0, r6 mov r1, r8 @@ -371805,39 +371805,39 @@ party_compaction: ; 80CE90C 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 .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 @@ -371846,8 +371846,8 @@ party_compaction: ; 80CE90C 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 @@ -371875,21 +371875,21 @@ 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 .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] @@ -371900,17 +371900,17 @@ sub_80CE9A8: ; 80CE9A8 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} @@ -371926,23 +371926,23 @@ sub_80CEA30: ; 80CEA30 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 .pool -@080CEA64: +_080CEA64: movs r0, 0 -@080CEA66: +_080CEA66: pop {r1} bx r1 thumb_func_end sub_80CEA30 @@ -371953,39 +371953,39 @@ sub_80CEA6C: ; 80CEA6C 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 .pool -@080CEAC8: +_080CEAC8: movs r0, 0 -@080CEACA: +_080CEACA: pop {r1} bx r1 thumb_func_end sub_80CEA6C @@ -372007,9 +372007,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 @@ -372025,15 +372025,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 @@ -372049,9 +372049,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 @@ -372067,37 +372067,37 @@ 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 .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 @@ -372105,14 +372105,14 @@ sub_80CEB40: ; 80CEB40 adds r0, r1 movs r1, 0 bl sub_80CEC00 - b @080CEBD0 + b _080CEBD0 .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 @@ -372121,7 +372121,7 @@ sub_80CEB40: ; 80CEB40 bl get_pokemon_by_box_and_pos movs r1, 0x1 bl sub_80CEC00 -@080CEBD0: +_080CEBD0: pop {r4} pop {r0} bx r0 @@ -372134,15 +372134,15 @@ sub_80CEBDC: ; 80CEBDC 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 .pool -@080CEBF8: +_080CEBF8: bl sub_80CEB40 -@080CEBFC: +_080CEBFC: pop {r0} bx r0 thumb_func_end sub_80CEBDC @@ -372168,7 +372168,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 @@ -372180,9 +372180,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 @@ -372190,16 +372190,16 @@ sub_80CEC00: ; 80CEC00 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 .pool -@080CEC74: +_080CEC74: adds r0, r4, 0 movs r1, 0x2D bl pokemon_getattr @@ -372208,7 +372208,7 @@ sub_80CEC00: ; 80CEC00 ldr r2, =0x00000ced adds r1, r2 strb r0, [r1] -@080CEC86: +_080CEC86: ldr r4, =0x02039d08 ldr r2, [r4] ldr r5, =0x00000cee @@ -372259,13 +372259,13 @@ sub_80CEC00: ; 80CEC00 ldr r3, =0x00000ce6 adds r1, r3 strh r0, [r1] - b @080CEE26 + b _080CEE26 .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 @@ -372277,9 +372277,9 @@ sub_80CEC00: ; 80CEC00 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 @@ -372291,15 +372291,15 @@ sub_80CEC00: ; 80CEC00 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 .pool -@080CED6C: +_080CED6C: adds r0, r7, 0 movs r1, 0x2D bl pokemon_getattr_encrypted @@ -372308,7 +372308,7 @@ sub_80CEC00: ; 80CEC00 ldr r2, =0x00000ced adds r1, r2 strb r0, [r1] -@080CED7E: +_080CED7E: ldr r5, =0x02039d08 ldr r2, [r5] ldr r4, =0x00000cee @@ -372365,23 +372365,23 @@ sub_80CEC00: ; 80CEC00 ldr r2, =0x00000ce6 adds r1, r2 strh r0, [r1] - b @080CEE26 + b _080CEE26 .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 @@ -372410,17 +372410,17 @@ sub_80CEC00: ; 80CEC00 ldr r0, [r4] ldr r1, =0x00000d65 adds r0, r1 - b @080CEEF2 + b _080CEEF2 .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 @@ -372428,16 +372428,16 @@ sub_80CEC00: ; 80CEC00 movs r2, 0 movs r3, 0x5 bl CopyStringPadded - b @080CEECE + b _080CEECE .pool -@080CEEC0: +_080CEEC0: ldr r2, =0x00000cf9 adds r0, r1, r2 ldr r1, =gUnknown_085E8264 movs r2, 0 movs r3, 0x8 bl CopyStringPadded -@080CEECE: +_080CEECE: ldr r4, =0x02039d08 ldr r0, [r4] ldr r3, =0x00000d1d @@ -372454,21 +372454,21 @@ sub_80CEC00: ; 80CEC00 ldr r0, [r4] ldr r2, =0x00000d65 adds r0, r2 -@080CEEF2: +_080CEEF2: movs r1, 0 movs r2, 0x8 bl RepeatChar - b @080CF0B8 + b _080CF0B8 .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 @@ -372510,9 +372510,9 @@ sub_80CEC00: ; 80CEC00 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 @@ -372529,9 +372529,9 @@ sub_80CEC00: ; 80CEC00 strb r0, [r2] ldr r0, =0x00000d47 adds r2, r4, r0 - b @080CF020 + b _080CF020 .pool -@080CEFD4: +_080CEFD4: strb r0, [r2] ldr r1, =0x00000d44 adds r2, r4, r1 @@ -372547,9 +372547,9 @@ sub_80CEC00: ; 80CEC00 strb r0, [r2] adds r1, 0x3 adds r2, r4, r1 - b @080CF020 + b _080CF020 .pool -@080CF000: +_080CF000: movs r0, 0x6 strb r0, [r2] ldr r3, =0x00000d44 @@ -372566,7 +372566,7 @@ sub_80CEC00: ; 80CEC00 strb r0, [r2] adds r3, 0x3 adds r2, r4, r3 -@080CF020: +_080CF020: movs r0, 0xFC strb r0, [r2] adds r2, 0x1 @@ -372609,7 +372609,7 @@ sub_80CEC00: ; 80CEC00 adds r1, r4, r2 ldrh r0, [r1] cmp r0, 0 - beq @080CF0AC + beq _080CF0AC ldr r3, =0x00000d65 adds r4, r3 bl itemid_get_item @@ -372618,15 +372618,15 @@ sub_80CEC00: ; 80CEC00 movs r2, 0 movs r3, 0x8 bl CopyStringPadded - b @080CF0B8 + b _080CF0B8 .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 @@ -372646,21 +372646,21 @@ 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 .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} @@ -372701,13 +372701,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 @@ -372716,9 +372716,9 @@ sub_80CF108: ; 80CF108 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 @@ -372734,13 +372734,13 @@ sub_80CF108: ; 80CF108 ldr r0, [r5] add r0, r9 strb r6, [r0] - b @080CF358 + b _080CF358 .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] @@ -372748,12 +372748,12 @@ sub_80CF108: ; 80CF108 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 @@ -372763,12 +372763,12 @@ sub_80CF108: ; 80CF108 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] @@ -372776,188 +372776,188 @@ sub_80CF108: ; 80CF108 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 .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 .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 .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 .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 .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 @@ -372975,12 +372975,12 @@ sub_80CF374: ; 80CF374 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] @@ -372988,31 +372988,31 @@ 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 .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 .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] @@ -373020,16 +373020,16 @@ sub_80CF374: ; 80CF374 bl __modsi3 lsls r0, 24 cmp r0, 0 - beq @080CF420 + beq _080CF420 ldrb r1, [r4] subs r1, 0x1 - b @080CF40E + b _080CF40E .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] @@ -373037,24 +373037,24 @@ sub_80CF374: ; 80CF374 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 .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 @@ -373063,7 +373063,7 @@ sub_80CF374: ; 80CF374 lsls r1, 24 asrs r1, 24 cmp r0, r1 - beq @080CF47C + beq _080CF47C ldr r2, =0x02039d7a ldr r0, =0x02039d08 ldr r1, [r0] @@ -373081,9 +373081,9 @@ sub_80CF374: ; 80CF374 ldr r1, =0x02039d7b strb r0, [r1] movs r0, 0x17 - b @080CF49C + b _080CF49C .pool -@080CF47C: +_080CF47C: ldr r1, =0x02039d08 ldr r0, [r1] ldr r2, =0x000021ff @@ -373100,7 +373100,7 @@ sub_80CF374: ; 80CF374 ands r0, r2 strb r0, [r1] movs r0, 0x16 -@080CF49C: +_080CF49C: pop {r4} pop {r1} bx r1 @@ -373115,80 +373115,80 @@ sub_80CF4B0: ; 80CF4B0 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 .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 .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 .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 .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 @@ -373197,44 +373197,44 @@ sub_80CF4B0: ; 80CF4B0 adds r0, r1 strb r4, [r0] movs r0, 0x1A - b @080CF5BC + b _080CF5BC .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 .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 @@ -373274,13 +373274,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 @@ -373288,217 +373288,217 @@ sub_80CF5C4: ; 80CF5C4 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 .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 .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 .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 .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 .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 .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 @@ -373529,101 +373529,101 @@ 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 .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 .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 @@ -373660,23 +373660,23 @@ 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 .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 @@ -373684,14 +373684,14 @@ sub_80CF8D8: ; 80CF8D8 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 @@ -373700,39 +373700,39 @@ sub_80CF8D8: ; 80CF8D8 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 @@ -373745,22 +373745,22 @@ sub_80CF8D8: ; 80CF8D8 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} @@ -373776,9 +373776,9 @@ sub_80CF9EC: ; 80CF9EC 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 @@ -373786,14 +373786,14 @@ sub_80CF9EC: ; 80CF9EC 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 .pool -@080CFA20: +_080CFA20: adds r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -373801,10 +373801,10 @@ sub_80CF9EC: ; 80CF9EC 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 @@ -373834,13 +373834,13 @@ sub_80CFA5C: ; 80CFA5C ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne @080CFA78 + bne _080CFA78 bl sub_80CFB44 - b @080CFA7C + b _080CFA7C .pool -@080CFA78: +_080CFA78: bl sub_80CFA84 -@080CFA7C: +_080CFA7C: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -373857,75 +373857,75 @@ 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 .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 .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 .pool -@080CFB24: +_080CFB24: movs r0, 0x1 bl sub_80CFF34 -@080CFB2A: +_080CFB2A: movs r0, 0x8 bl sub_80CFF34 movs r0, 0x7 @@ -373933,7 +373933,7 @@ sub_80CFA84: ; 80CFA84 movs r0, 0 bl sub_80CFF34 movs r0, 0x1 -@080CFB3E: +_080CFB3E: pop {r1} bx r1 thumb_func_end sub_80CFA84 @@ -373949,72 +373949,72 @@ 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 .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 .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 @@ -374091,7 +374091,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 @@ -374126,35 +374126,35 @@ 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 StartObjectImageAnim - b @080CFD22 + b _080CFD22 .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 .pool -@080CFD3C: +_080CFD3C: movs r3, 0x15 movs r4, 0x2 -@080CFD40: +_080CFD40: ldr r0, =gUnknown_0857BA68 movs r1, 0 movs r2, 0 @@ -374162,7 +374162,7 @@ sub_80CFC14: ; 80CFC14 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @080CFDA8 + beq _080CFDA8 ldr r5, =0x02039d08 ldr r2, [r5] ldr r3, =0x00000cb8 @@ -374185,7 +374185,7 @@ sub_80CFC14: ; 80CFC14 lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq @080CFDB4 + beq _080CFDB4 ldr r0, [r5] ldr r4, =0x00000cb8 adds r0, r4 @@ -374195,16 +374195,16 @@ sub_80CFC14: ; 80CFC14 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b @080CFDB4 + b _080CFDB4 .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} @@ -374219,9 +374219,9 @@ sub_80CFDC4: ; 80CFDC4 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] @@ -374262,7 +374262,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] @@ -374273,12 +374273,12 @@ sub_80CFE14: ; 80CFE14 ldrsb r0, [r4, r0] movs r1, 0x6 bl __divsi3 - b @080CFE4C + b _080CFE4C .pool -@080CFE48: +_080CFE48: movs r0, 0 strb r0, [r5] -@080CFE4C: +_080CFE4C: strb r0, [r6] pop {r4-r6} pop {r0} @@ -374336,12 +374336,12 @@ sub_80CFEA8: ; 80CFEA8 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 .pool @@ -374355,12 +374355,12 @@ sub_80CFECC: ; 80CFECC 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 .pool @@ -374407,7 +374407,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 @@ -374427,15 +374427,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 @@ -374453,19 +374453,19 @@ 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 .pool -@080CFFC8: +_080CFFC8: movs r0, 0x1 negs r0, r0 -@080CFFCC: +_080CFFCC: pop {r1} bx r1 thumb_func_end sub_80CFF98 @@ -374576,50 +374576,50 @@ 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 .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 @@ -374627,7 +374627,7 @@ sub_80D00AC: ; 80D00AC adds r0, r2 adds r0, r1 ldr r5, [r0] -@080D0128: +_080D0128: lsls r0, r5, 16 asrs r0, 16 pop {r4,r5} @@ -374665,7 +374665,7 @@ sub_80D0164: ; 80D0164 bl Alloc str r0, [r4] cmp r0, 0 - beq @080D01B0 + beq _080D01B0 ldr r0, =gUnknown_0857BB1C bl AddWindow8Bit adds r1, r0, 0 @@ -374678,17 +374678,17 @@ 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 FillWindowPixelBuffer movs r0, 0x1 - b @080D01B2 + b _080D01B2 .pool -@080D01B0: +_080D01B0: movs r0, 0 -@080D01B2: +_080D01B2: pop {r4} pop {r1} bx r1 @@ -374700,9 +374700,9 @@ sub_80D01B8: ; 80D01B8 ldr r0, =0x02039d80 ldr r0, [r0] cmp r0, 0 - beq @080D01C6 + beq _080D01C6 bl Free -@080D01C6: +_080D01C6: pop {r0} bx r0 .pool @@ -374727,45 +374727,45 @@ sub_80D01E4: ; 80D01E4 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 .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 @@ -374778,24 +374778,24 @@ sub_80D024C: ; 80D024C 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 .pool -@080D0268: +_080D0268: cmp r0, 0x2 - beq @080D0324 - b @080D0338 -@080D026E: + beq _080D0324 + b _080D0338 +_080D026E: movs r0, 0 bl HideBg movs r0, 0x80 bl sub_80D304C - b @080D030E -@080D027C: + b _080D030E +_080D027C: adds r0, r1, 0x2 adds r1, 0x3 bl sub_80CFE14 @@ -374857,25 +374857,25 @@ sub_80D024C: ; 80D024C movs r0, 0x8 movs r1, 0x80 bl SetGpuRegBits -@080D030E: +_080D030E: ldr r1, [r6] ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b @080D0338 + b _080D0338 .pool -@080D0324: +_080D0324: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080D0338 + bne _080D0338 movs r0, 0 bl ShowBg movs r0, 0 - b @080D033A -@080D0338: + b _080D033A +_080D0338: movs r0, 0x1 -@080D033A: +_080D033A: add sp, 0x8 pop {r4-r6} pop {r1} @@ -374889,36 +374889,36 @@ sub_80D0344: ; 80D0344 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 .pool -@080D0360: +_080D0360: cmp r0, 0x2 - beq @080D0382 - b @080D03A8 -@080D0366: + beq _080D0382 + b _080D03A8 +_080D0366: movs r0, 0 bl HideBg - 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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080D03A8 + bne _080D03A8 bl sub_80CFE84 movs r0, 0x3 bl stdpal_get @@ -374928,10 +374928,10 @@ sub_80D0344: ; 80D0344 movs r0, 0 bl ShowBg movs r0, 0 - b @080D03AA -@080D03A8: + b _080D03AA +_080D03A8: movs r0, 0x1 -@080D03AA: +_080D03AA: pop {r4} pop {r1} bx r1 @@ -374944,16 +374944,16 @@ sub_80D03B0: ; 80D03B0 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 .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 @@ -374977,16 +374977,16 @@ sub_80D03B0: ; 80D03B0 ldrb r0, [r1, 0x1] adds r0, 0x1 strb r0, [r1, 0x1] - b @080D0416 + b _080D0416 .pool -@080D040C: +_080D040C: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @080D0418 -@080D0416: + b _080D0418 +_080D0416: movs r0, 0x1 -@080D0418: +_080D0418: pop {r4} pop {r1} bx r1 @@ -374999,27 +374999,27 @@ sub_80D0420: ; 80D0420 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 .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 @@ -375028,14 +375028,14 @@ sub_80D0420: ; 80D0420 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 @@ -375044,14 +375044,14 @@ sub_80D0420: ; 80D0420 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 @@ -375068,14 +375068,14 @@ 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 @@ -375088,20 +375088,20 @@ sub_80D04C8: ; 80D04C8 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 .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 @@ -375110,16 +375110,16 @@ sub_80D04C8: ; 80D04C8 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 @@ -375127,26 +375127,26 @@ sub_80D04C8: ; 80D04C8 bl sub_80CDC64 movs r0, 0 bl HideBg - 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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @080D0576 + bne _080D0576 movs r0, 0x3 bl stdpal_get movs r1, 0xD0 @@ -375156,10 +375156,10 @@ sub_80D04C8: ; 80D04C8 movs r0, 0 bl ShowBg movs r0, 0 - b @080D0578 -@080D0576: + b _080D0578 +_080D0576: movs r0, 0x1 -@080D0578: +_080D0578: pop {r4} pop {r1} bx r1 @@ -375172,75 +375172,75 @@ sub_80D0580: ; 80D0580 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 .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 .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 .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 .pool -@080D0614: +_080D0614: adds r0, r2, 0x1 strb r0, [r1, 0x8] movs r0, 0xFC @@ -375248,9 +375248,9 @@ sub_80D0580: ; 80D0580 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 @@ -375264,15 +375264,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 @@ -375280,27 +375280,27 @@ sub_80D062C: ; 80D062C 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] @@ -375311,19 +375311,19 @@ sub_80D062C: ; 80D062C 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] @@ -375334,7 +375334,7 @@ sub_80D062C: ; 80D062C ldrb r1, [r2, 0x2] ldrb r2, [r2, 0x4] bl sub_80D0708 -@080D06C4: +_080D06C4: pop {r4-r7} pop {r0} bx r0 @@ -375353,12 +375353,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 @@ -375366,8 +375366,8 @@ sub_80D06D0: ; 80D06D0 adds r0, r6, 0 bl sub_80D07B0 cmp r4, r5 - bls @080D06EE -@080D0700: + bls _080D06EE +_080D0700: pop {r4-r6} pop {r0} bx r0 @@ -375385,12 +375385,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 @@ -375398,8 +375398,8 @@ sub_80D0708: ; 80D0708 adds r1, r6, 0 bl sub_80D07B0 cmp r4, r5 - bls @080D0726 -@080D0738: + bls _080D0726 +_080D0738: pop {r4-r6} pop {r0} bx r0 @@ -375417,12 +375417,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 @@ -375430,8 +375430,8 @@ sub_80D0740: ; 80D0740 adds r0, r6, 0 bl sub_80D0834 cmp r4, r5 - bls @080D075E -@080D0770: + bls _080D075E +_080D0770: pop {r4-r6} pop {r0} bx r0 @@ -375449,12 +375449,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 @@ -375462,8 +375462,8 @@ sub_80D0778: ; 80D0778 adds r1, r6, 0 bl sub_80D0834 cmp r4, r5 - bls @080D0796 -@080D07A8: + bls _080D0796 +_080D07A8: pop {r4-r6} pop {r0} bx r0 @@ -375493,7 +375493,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 @@ -375526,7 +375526,7 @@ sub_80D07B0: ; 80D07B0 movs r2, 0 movs r3, 0 bl BlitBitmapRectToWindow4BitTo8Bit -@080D0828: +_080D0828: add sp, 0x1C pop {r4-r7} pop {r0} @@ -375552,7 +375552,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 @@ -375568,7 +375568,7 @@ sub_80D0834: ; 80D0834 str r1, [sp, 0x4] movs r1, 0 bl FillWindowPixelRect8Bit -@080D0878: +_080D0878: add sp, 0x8 pop {r4,r5} pop {r0} @@ -375594,7 +375594,7 @@ sub_80D0894: ; 80D0894 ldr r1, [r4] ldrh r0, [r1, 0x10] cmp r0, 0 - beq @080D08BE + beq _080D08BE ldrh r1, [r1, 0xC] movs r0, 0 movs r2, 0x1 @@ -375608,7 +375608,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} @@ -375629,26 +375629,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] @@ -375656,9 +375656,9 @@ sub_80D08CC: ; 80D08CC 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 @@ -375677,8 +375677,8 @@ sub_80D08CC: ; 80D08CC 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 @@ -375691,10 +375691,10 @@ sub_80D08CC: ; 80D08CC 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 @@ -375716,12 +375716,12 @@ sub_80D08CC: ; 80D08CC 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 @@ -375754,8 +375754,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 @@ -375768,9 +375768,9 @@ sub_80D09A4: ; 80D09A4 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 @@ -375781,12 +375781,12 @@ sub_80D09A4: ; 80D09A4 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 @@ -375816,8 +375816,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 @@ -375830,11 +375830,11 @@ sub_80D0A1C: ; 80D0A1C 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 @@ -375845,10 +375845,10 @@ sub_80D0A1C: ; 80D0A1C 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 @@ -375857,12 +375857,12 @@ sub_80D0A1C: ; 80D0A1C 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 @@ -375900,8 +375900,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 @@ -375915,11 +375915,11 @@ sub_80D0AAC: ; 80D0AAC 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 @@ -375931,14 +375931,14 @@ sub_80D0AAC: ; 80D0AAC 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 @@ -375947,13 +375947,13 @@ sub_80D0AAC: ; 80D0AAC 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 @@ -376036,12 +376036,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] @@ -376050,9 +376050,9 @@ sub_80D0BC0: ; 80D0BC0 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 @@ -376063,16 +376063,16 @@ sub_80D0BC0: ; 80D0BC0 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 .pool -@080D0C30: +_080D0C30: adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 @@ -376081,17 +376081,17 @@ sub_80D0BC0: ; 80D0BC0 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 @@ -376114,7 +376114,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 @@ -376136,7 +376136,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 @@ -376211,8 +376211,8 @@ sub_80D0C60: ; 80D0C60 strb r2, [r0] adds r7, 0x1 cmp r7, 0x2 - ble @080D0CA0 -@080D0D3E: + ble _080D0CA0 +_080D0D3E: ldr r0, =0x02039d08 ldr r0, [r0] ldr r4, =0x00002234 @@ -376244,32 +376244,32 @@ 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 .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 @@ -376279,15 +376279,15 @@ sub_80D0D8C: ; 80D0D8C 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 GetItemIconPic adds r6, r0, 0 @@ -376312,7 +376312,7 @@ sub_80D0D8C: ; 80D0D8C adds r0, r4, 0 movs r1, 0x1 bl sub_80D1740 -@080D0E42: +_080D0E42: pop {r3} mov r8, r3 pop {r4-r7} @@ -376332,7 +376332,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 @@ -376347,7 +376347,7 @@ sub_80D0E50: ; 80D0E50 adds r2, r6, 0 adds r3, r5, 0 bl sub_80D1604 -@080D0E86: +_080D0E86: pop {r4-r6} pop {r0} bx r0 @@ -376367,7 +376367,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 @@ -376390,7 +376390,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 @@ -376398,9 +376398,9 @@ sub_80D0E90: ; 80D0E90 adds r0, r5, 0 movs r1, 0x1 bl sub_80CB7AC - b @080D0F10 + b _080D0F10 .pool -@080D0EF8: +_080D0EF8: movs r0, 0x64 muls r0, r7 ldr r1, =0x020244ec @@ -376411,7 +376411,7 @@ sub_80D0E90: ; 80D0E90 adds r0, r7, 0 movs r1, 0x1 bl sub_80CBBDC -@080D0F10: +_080D0F10: ldr r0, =0x02039d08 ldr r0, [r0] ldr r2, =0x00000ce6 @@ -376420,7 +376420,7 @@ sub_80D0E90: ; 80D0E90 ldr r2, =0x00002234 adds r0, r2 strh r1, [r0] -@080D0F20: +_080D0F20: add sp, 0x4 pop {r4-r7} pop {r0} @@ -376494,7 +376494,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 @@ -376510,7 +376510,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 @@ -376526,9 +376526,9 @@ sub_80D0FAC: ; 80D0FAC mov r1, r8 ldr r0, [r1] adds r0, r4 - b @080D1048 + b _080D1048 .pool -@080D101C: +_080D101C: movs r0, 0x64 adds r4, r7, 0 muls r4, r0 @@ -376549,7 +376549,7 @@ sub_80D0FAC: ; 80D0FAC mov r1, r8 ldr r0, [r1] adds r0, r5 -@080D1048: +_080D1048: strh r6, [r0] movs r0, 0x2 movs r1, 0 @@ -376564,7 +376564,7 @@ sub_80D0FAC: ; 80D0FAC mov r2, r9 adds r3, r7, 0 bl sub_80D1604 -@080D106A: +_080D106A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -376588,7 +376588,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 @@ -376604,7 +376604,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 @@ -376614,9 +376614,9 @@ sub_80D1080: ; 80D1080 adds r0, r5, 0 movs r1, 0 bl sub_80CB7AC - b @080D1100 + b _080D1100 .pool -@080D10E0: +_080D10E0: movs r0, 0x64 mov r1, r8 muls r1, r0 @@ -376631,7 +376631,7 @@ sub_80D1080: ; 80D1080 mov r0, r8 movs r1, 0 bl sub_80CBBDC -@080D1100: +_080D1100: pop {r3} mov r8, r3 pop {r4-r7} @@ -376653,7 +376653,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] @@ -376672,7 +376672,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 @@ -376680,9 +376680,9 @@ sub_80D1114: ; 80D1114 adds r0, r5, 0 movs r1, 0x1 bl sub_80CB7AC - b @080D1188 + b _080D1188 .pool -@080D1170: +_080D1170: movs r0, 0x64 muls r0, r7 ldr r1, =0x020244ec @@ -376693,7 +376693,7 @@ sub_80D1114: ; 80D1114 adds r0, r7, 0 movs r1, 0x1 bl sub_80CBBDC -@080D1188: +_080D1188: add sp, 0x4 pop {r4-r7} pop {r0} @@ -376708,7 +376708,7 @@ sub_80D1194: ; 80D1194 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x3 - bne @080D11C2 + bne _080D11C2 movs r0, 0x2 movs r1, 0 bl sub_80D1370 @@ -376723,7 +376723,7 @@ sub_80D1194: ; 80D1194 movs r2, 0x2 movs r3, 0 bl sub_80D1604 -@080D11C2: +_080D11C2: pop {r4} pop {r0} bx r0 @@ -376737,9 +376737,9 @@ sub_80D11CC: ; 80D11CC 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 @@ -376748,23 +376748,23 @@ sub_80D11CC: ; 80D11CC 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 @@ -376780,12 +376780,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 @@ -376793,26 +376793,26 @@ sub_80D1218: ; 80D1218 movs r0, 0x28 ands r0, r1 cmp r0, 0x8 - beq @080D124E + beq _080D124E ldr r1, [r2, 0x1C] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @080D1268 + beq _080D1268 ldr r0, =sub_80D1AD8 cmp r1, r0 - beq @080D1268 -@080D124E: + beq _080D1268 +_080D124E: movs r0, 0x1 - b @080D1274 + b _080D1274 .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 @@ -376825,28 +376825,28 @@ sub_80D127C: ; 80D127C 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 .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 @@ -376883,26 +376883,26 @@ sub_80D12E8: ; 80D12E8 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 .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 @@ -376918,32 +376918,32 @@ 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 .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 @@ -376959,35 +376959,35 @@ 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 .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 @@ -377003,28 +377003,28 @@ 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 .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 @@ -377043,16 +377043,16 @@ 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 .pool -@080D1438: +_080D1438: adds r0, r7, 0 movs r1, 0x6 bl __umodsi3 @@ -377092,11 +377092,11 @@ sub_80D140C: ; 80D140C strb r0, [r2, 0x5] adds r4, r6, 0 adds r3, r5, 0 - b @080D14F4 + b _080D14F4 .pool -@080D1494: +_080D1494: cmp r7, 0 - bne @080D14BC + bne _080D14BC ldr r4, =0x02039d08 ldr r0, [r4] lsls r3, r5, 4 @@ -377109,9 +377109,9 @@ sub_80D140C: ; 80D140C ldr r1, [r0] movs r0, 0x4C strh r0, [r1, 0x22] - b @080D14DC + b _080D14DC .pool -@080D14BC: +_080D14BC: ldr r4, =0x02039d08 ldr r0, [r4] lsls r3, r5, 4 @@ -377128,7 +377128,7 @@ sub_80D140C: ; 80D140C lsls r0, 3 adds r0, 0x1C strh r0, [r2, 0x22] -@080D14DC: +_080D14DC: ldr r0, [r4] ldr r1, =0x00002204 adds r0, r1 @@ -377141,7 +377141,7 @@ sub_80D140C: ; 80D140C movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x5] -@080D14F4: +_080D14F4: ldr r0, [r4] adds r0, r3 ldr r1, =0x0000220e @@ -377153,7 +377153,7 @@ sub_80D140C: ; 80D140C ldr r1, =0x0000220f adds r0, r1 strb r7, [r0] -@080D150A: +_080D150A: pop {r3} mov r8, r3 pop {r4-r7} @@ -377174,7 +377174,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 @@ -377193,7 +377193,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 @@ -377203,7 +377203,7 @@ sub_80D1524: ; 80D1524 adds r5, 0x60 subs r4, 0x1 cmp r4, 0 - bge @080D1562 + bge _080D1562 ldr r5, =0x02039d08 ldr r1, [r5] ldr r4, =0x000042c4 @@ -377227,7 +377227,7 @@ sub_80D1524: ; 80D1524 adds r0, r4, 0 movs r2, 0x20 bl gpu_pal_apply -@080D15AC: +_080D15AC: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -377246,7 +377246,7 @@ sub_80D15D4: ; 80D15D4 lsls r1, 24 lsrs r3, r1, 24 cmp r2, 0x2 - bhi @080D15F6 + bhi _080D15F6 ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r2, 4 @@ -377256,7 +377256,7 @@ sub_80D15D4: ; 80D15D4 ldr r0, [r0] adds r1, r3, 0 bl StartObjectRotScalAnim -@080D15F6: +_080D15F6: pop {r0} bx r0 .pool @@ -377274,30 +377274,30 @@ 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 .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 @@ -377308,9 +377308,9 @@ sub_80D1604: ; 80D1604 strh r4, [r1, 0x2E] ldr r1, [r0] ldr r0, =sub_80D1A48 - b @080D172C + b _080D172C .pool -@080D1674: +_080D1674: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -377322,9 +377322,9 @@ sub_80D1604: ; 80D1604 strh r1, [r2, 0x2E] ldr r1, [r0] ldr r0, =sub_80D1A74 - b @080D172C + b _080D172C .pool -@080D1698: +_080D1698: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -377340,9 +377340,9 @@ sub_80D1604: ; 80D1604 strh r3, [r1, 0x3C] ldr r1, [r0] ldr r0, =sub_80D1B14 - b @080D172C + b _080D172C .pool -@080D16C4: +_080D16C4: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -377358,9 +377358,9 @@ sub_80D1604: ; 80D1604 strh r5, [r2, 0x3A] ldr r0, [r0] strh r3, [r0, 0x3C] - b @080D172E + b _080D172E .pool -@080D16F0: +_080D16F0: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -377376,9 +377376,9 @@ sub_80D1604: ; 80D1604 strh r3, [r1, 0x3C] ldr r1, [r0] ldr r0, =sub_80D1C30 - b @080D172C + b _080D172C .pool -@080D171C: +_080D171C: ldr r0, =0x02039d08 ldr r0, [r0] lsls r1, r4, 4 @@ -377387,9 +377387,9 @@ sub_80D1604: ; 80D1604 adds r0, r1 ldr r1, [r0] ldr r0, =sub_80D1CCC -@080D172C: +_080D172C: str r0, [r1, 0x1C] -@080D172E: +_080D172E: pop {r4,r5} pop {r0} bx r0 @@ -377404,7 +377404,7 @@ sub_80D1740: ; 80D1740 lsls r1, 24 lsrs r4, r1, 24 cmp r2, 0x2 - bhi @080D1780 + bhi _080D1780 ldr r1, =0x02039d08 ldr r0, [r1] lsls r2, 4 @@ -377419,9 +377419,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 @@ -377431,7 +377431,7 @@ sub_80D1740: ; 80D1740 ands r0, r1 orrs r0, r3 strb r0, [r2] -@080D1780: +_080D1780: pop {r4} pop {r0} bx r0 @@ -377467,17 +377467,17 @@ sub_80D17B4: ; 80D17B4 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 .pool -@080D17D4: +_080D17D4: ldr r0, =0x02039d08 ldr r0, [r0] ldr r1, =0x00000ce6 -@080D17DA: +_080D17DA: adds r0, r1 ldrh r0, [r0] bl itemid_get_description @@ -377536,11 +377536,11 @@ sub_80D184C: ; 80D184C adds r1, r0, r2 ldrh r0, [r1] cmp r0, 0 - bne @080D186C + bne _080D186C movs r0, 0 - b @080D18D2 + b _080D18D2 .pool -@080D186C: +_080D186C: subs r0, 0x1 strh r0, [r1] ldrh r1, [r1] @@ -377548,8 +377548,8 @@ sub_80D184C: ; 80D184C subs r5, r0, r1 movs r4, 0 cmp r4, r5 - bge @080D18BC -@080D187C: + bge _080D18BC +_080D187C: movs r0, 0 movs r1, 0xA bl GetBgAttribute @@ -377579,8 +377579,8 @@ sub_80D184C: ; 80D184C bl WriteSequenceToBgTilemapBuffer adds r4, 0x1 cmp r4, r5 - blt @080D187C -@080D18BC: + blt _080D187C +_080D18BC: adds r0, r5, 0 bl sub_80D19B4 ldr r0, =0x02039d08 @@ -377591,7 +377591,7 @@ sub_80D184C: ; 80D184C negs r0, r1 orrs r0, r1 lsrs r0, 31 -@080D18D2: +_080D18D2: add sp, 0x10 pop {r4,r5} pop {r1} @@ -377609,13 +377609,13 @@ sub_80D18E4: ; 80D18E4 adds r0, r4 ldrh r0, [r0] cmp r0, 0x16 - bne @080D1904 + bne _080D1904 movs r0, 0 - b @080D19A4 + b _080D19A4 .pool -@080D1904: +_080D1904: cmp r0, 0 - bne @080D1920 + bne _080D1920 movs r0, 0x1 str r0, [sp] movs r0, 0x9 @@ -377627,7 +377627,7 @@ sub_80D18E4: ; 80D18E4 movs r2, 0x15 movs r3, 0xC bl FillBgTilemapBufferRect -@080D1920: +_080D1920: ldr r1, [r5] adds r1, r4 ldrh r0, [r1] @@ -377638,8 +377638,8 @@ sub_80D18E4: ; 80D18E4 subs r5, r0, r1 movs r4, 0 cmp r4, r5 - bge @080D1976 -@080D1936: + bge _080D1976 +_080D1936: movs r0, 0 movs r1, 0xA bl GetBgAttribute @@ -377669,13 +377669,13 @@ sub_80D18E4: ; 80D18E4 bl WriteSequenceToBgTilemapBuffer 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 @@ -377692,7 +377692,7 @@ sub_80D18E4: ; 80D18E4 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 -@080D19A4: +_080D19A4: add sp, 0x10 pop {r4,r5} pop {r1} @@ -377706,7 +377706,7 @@ sub_80D19B4: ; 80D19B4 sub sp, 0xC adds r7, r0, 0 cmp r7, 0 - beq @080D19EC + beq _080D19EC movs r1, 0x9D lsls r1, 1 lsls r4, r7, 24 @@ -377728,7 +377728,7 @@ sub_80D19B4: ; 80D19B4 movs r2, 0 movs r3, 0x14 bl FillBgTilemapBufferRect -@080D19EC: +_080D19EC: ldr r1, =0x0000013b lsls r5, r7, 24 lsrs r5, 24 @@ -377777,7 +377777,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 @@ -377785,7 +377785,7 @@ sub_80D1A48: ; 80D1A48 bl sub_80D1740 ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@080D1A68: +_080D1A68: pop {r4} pop {r0} bx r0 @@ -377799,11 +377799,11 @@ sub_80D1A74: ; 80D1A74 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] @@ -377818,7 +377818,7 @@ sub_80D1A74: ; 80D1A74 ldrh r0, [r3, 0x2E] adds r0, 0x1 strh r0, [r3, 0x2E] -@080D1AA2: +_080D1AA2: ldrh r1, [r3, 0x30] ldrh r0, [r3, 0x34] subs r1, r0 @@ -377839,10 +377839,10 @@ sub_80D1A74: ; 80D1A74 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble @080D1AD0 + ble _080D1AD0 ldr r0, =sub_80D1AD8 str r0, [r3, 0x1C] -@080D1AD0: +_080D1AD0: pop {r0} bx r0 .pool @@ -377885,11 +377885,11 @@ sub_80D1B14: ; 80D1B14 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] @@ -377904,7 +377904,7 @@ sub_80D1B14: ; 80D1B14 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@080D1B42: +_080D1B42: ldrh r0, [r4, 0x34] ldrh r1, [r4, 0x30] adds r0, r1 @@ -377925,7 +377925,7 @@ sub_80D1B14: ; 80D1B14 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble @080D1B8A + ble _080D1B8A adds r0, r4, 0 bl sub_80D13C4 lsls r0, 24 @@ -377939,7 +377939,7 @@ sub_80D1B14: ; 80D1B14 bl sub_80D140C ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@080D1B8A: +_080D1B8A: pop {r4} pop {r0} bx r0 @@ -377953,11 +377953,11 @@ sub_80D1B94: ; 80D1B94 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] @@ -377972,7 +377972,7 @@ sub_80D1B94: ; 80D1B94 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@080D1BC2: +_080D1BC2: ldrh r1, [r4, 0x30] ldrh r0, [r4, 0x34] subs r1, r0 @@ -378002,7 +378002,7 @@ sub_80D1B94: ; 80D1B94 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble @080D1C20 + ble _080D1C20 adds r0, r4, 0 bl sub_80D13C4 lsls r0, 24 @@ -378018,7 +378018,7 @@ sub_80D1B94: ; 80D1B94 strh r0, [r4, 0x24] ldr r0, =sub_80D1AD8 str r0, [r4, 0x1C] -@080D1C20: +_080D1C20: pop {r4} pop {r0} bx r0 @@ -378032,11 +378032,11 @@ sub_80D1C30: ; 80D1C30 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] @@ -378051,7 +378051,7 @@ sub_80D1C30: ; 80D1C30 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@080D1C5E: +_080D1C5E: ldrh r0, [r4, 0x34] ldrh r1, [r4, 0x30] adds r0, r1 @@ -378082,7 +378082,7 @@ sub_80D1C30: ; 80D1C30 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble @080D1CBE + ble _080D1CBE adds r0, r4, 0 bl sub_80D13C4 lsls r0, 24 @@ -378098,7 +378098,7 @@ sub_80D1C30: ; 80D1C30 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] -@080D1CBE: +_080D1CBE: pop {r4} pop {r0} bx r0 @@ -378120,7 +378120,7 @@ sub_80D1CCC: ; 80D1CCC movs r1, 0x10 negs r1, r1 cmp r0, r1 - bge @080D1CFC + bge _080D1CFC ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] adds r0, r2, 0 @@ -378129,7 +378129,7 @@ sub_80D1CCC: ; 80D1CCC lsrs r0, 24 movs r1, 0 bl sub_80D1740 -@080D1CFC: +_080D1CFC: pop {r0} bx r0 .pool @@ -378161,11 +378161,11 @@ sub_80D1D18: ; 80D1D18 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 .pool @@ -378180,9 +378180,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 @@ -378198,11 +378198,11 @@ get_pokemon_data_from_any_box: ; 80D1D30 adds r0, r1 adds r1, r5, 0 bl pokemon_getattr_encrypted - b @080D1D6E + b _080D1D6E .pool -@080D1D6C: +_080D1D6C: movs r0, 0 -@080D1D6E: +_080D1D6E: pop {r4,r5} pop {r1} bx r1 @@ -378218,9 +378218,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 @@ -378237,7 +378237,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 @@ -378290,9 +378290,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 @@ -378309,12 +378309,12 @@ sub_80D1DFC: ; 80D1DFC movs r1, 0x2 adds r2, r5, 0 bl pokemon_getattr_encrypted - b @080D1E3C + b _080D1E3C .pool -@080D1E38: +_080D1E38: movs r0, 0xFF strb r0, [r5] -@080D1E3C: +_080D1E3C: pop {r4,r5} pop {r0} bx r0 @@ -378328,9 +378328,9 @@ sub_80D1E44: ; 80D1E44 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 @@ -378347,12 +378347,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} @@ -378369,9 +378369,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 @@ -378388,7 +378388,7 @@ sub_80D1E90: ; 80D1E90 movs r1, 0x2 adds r2, r5, 0 bl pokemon_setattr_encrypted -@080D1EC6: +_080D1EC6: pop {r4,r5} pop {r0} bx r0 @@ -378405,9 +378405,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 @@ -378424,11 +378424,11 @@ sub_80D1ED0: ; 80D1ED0 adds r1, r5, 0 adds r2, r6, 0 bl pokemon_getattr_encrypted - b @080D1F12 + b _080D1F12 .pool -@080D1F10: +_080D1F10: movs r0, 0 -@080D1F12: +_080D1F12: pop {r4-r6} pop {r1} bx r1 @@ -378443,9 +378443,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 @@ -378462,7 +378462,7 @@ sub_80D1F18: ; 80D1F18 adds r1, r5, 0 movs r2, 0x50 bl memcpy -@080D1F4E: +_080D1F4E: pop {r4,r5} pop {r0} bx r0 @@ -378478,9 +378478,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 @@ -378497,7 +378497,7 @@ sub_80D1F58: ; 80D1F58 adds r0, r5, 0 movs r2, 0x50 bl memcpy -@080D1F8E: +_080D1F8E: pop {r4,r5} pop {r0} bx r0 @@ -378533,9 +378533,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 @@ -378559,7 +378559,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 @@ -378578,9 +378578,9 @@ sub_80D2018: ; 80D2018 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 @@ -378595,7 +378595,7 @@ sub_80D2018: ; 80D2018 lsls r1, 4 adds r0, r1 bl zero_pokemon_boxed_data -@080D2048: +_080D2048: pop {r4} pop {r0} bx r0 @@ -378611,9 +378611,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 @@ -378629,7 +378629,7 @@ sub_80D2054: ; 80D2054 adds r0, r1 adds r1, r5, 0 bl sub_8069004 -@080D2088: +_080D2088: pop {r4,r5} pop {r0} bx r0 @@ -378645,9 +378645,9 @@ get_pokemon_by_box_and_pos: ; 80D2094 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 @@ -378661,11 +378661,11 @@ get_pokemon_by_box_and_pos: ; 80D2094 adds r1, r4 lsls r1, 4 adds r0, r1 - b @080D20CA + b _080D20CA .pool -@080D20C8: +_080D20C8: movs r0, 0 -@080D20CA: +_080D20CA: pop {r4} pop {r1} bx r1 @@ -378677,10 +378677,10 @@ sav3_get_box_name: ; 80D20D0 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 @@ -378688,7 +378688,7 @@ sav3_get_box_name: ; 80D20D0 adds r1, r2 ldr r0, [r0] adds r0, r1 -@080D20EC: +_080D20EC: pop {r1} bx r1 .pool @@ -378700,17 +378700,17 @@ sub_80D20F8: ; 80D20F8 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 .pool @@ -378724,16 +378724,16 @@ sub_80D2120: ; 80D2120 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 .pool @@ -378754,14 +378754,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 @@ -378771,10 +378771,10 @@ sub_80D214C: ; 80D214C 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 @@ -378783,24 +378783,24 @@ sub_80D214C: ; 80D214C 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 .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 @@ -378810,10 +378810,10 @@ sub_80D214C: ; 80D214C 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 @@ -378824,25 +378824,25 @@ sub_80D214C: ; 80D214C 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} @@ -378860,11 +378860,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 @@ -378874,23 +378874,23 @@ sub_80D2218: ; 80D2218 bl pokemon_getattr_encrypted ldr r2, [sp] cmp r0, 0 - bne @080D224C + bne _080D224C movs r0, 0x1 - b @080D2262 + b _080D2262 .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 @@ -378904,9 +378904,9 @@ 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 @@ -378923,27 +378923,27 @@ 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 .pool -@080D22C8: +_080D22C8: movs r0, 0 -@080D22CA: +_080D22CA: pop {r4-r6} pop {r1} bx r1 @@ -378959,7 +378959,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 @@ -378970,7 +378970,7 @@ sub_80D22D0: ; 80D22D0 lsls r0, 5 adds r4, r0, 0x4 movs r6, 0x1D -@080D22F4: +_080D22F4: mov r1, r9 ldr r0, [r1] adds r0, r4 @@ -378978,7 +378978,7 @@ sub_80D22D0: ; 80D22D0 movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - beq @080D231A + beq _080D231A mov r2, r9 ldr r0, [r2] adds r0, r4 @@ -378986,16 +378986,16 @@ sub_80D22D0: ; 80D22D0 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 @@ -379016,7 +379016,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 @@ -379027,7 +379027,7 @@ sub_80D233C: ; 80D233C lsls r0, 5 adds r4, r0, 0x4 movs r6, 0x1D -@080D2360: +_080D2360: mov r1, r9 ldr r0, [r1] adds r0, r4 @@ -379035,7 +379035,7 @@ sub_80D233C: ; 80D233C movs r1, 0x5 bl pokemon_getattr_encrypted cmp r0, 0 - bne @080D2384 + bne _080D2384 mov r2, r9 ldr r0, [r2] adds r0, r4 @@ -379043,17 +379043,17 @@ sub_80D233C: ; 80D233C 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 @@ -379078,24 +379078,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 @@ -379103,15 +379103,15 @@ sub_80D23A8: ; 80D23A8 mov r2, sp bl pokemon_getattr_encrypted cmp r0, 0 - beq @080D2404 + beq _080D2404 movs r0, 0x1 - b @080D241E + b _080D241E .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 @@ -379119,9 +379119,9 @@ sub_80D23A8: ; 80D23A8 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 @@ -379202,13 +379202,13 @@ sub_80D24BC: ; 80D24BC 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 .pool @@ -379231,13 +379231,13 @@ sub_80D24F0: ; 80D24F0 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 .pool @@ -379304,9 +379304,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 @@ -379327,16 +379327,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 @@ -379350,8 +379350,8 @@ sub_80D259C: ; 80D259C lsrs r2, r0, 16 ldrh r0, [r4] cmp r2, r0 - bcc @080D25C6 -@080D25E2: + bcc _080D25C6 +_080D25E2: pop {r4-r6} pop {r0} bx r0 @@ -379376,27 +379376,27 @@ sub_80D2604: ; 80D2604 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 @@ -379426,7 +379426,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] @@ -379473,17 +379473,17 @@ 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 .pool -@080D26E8: +_080D26E8: adds r1, r5, 0 adds r1, 0x2A movs r0, 0x2 -@080D26EE: +_080D26EE: strb r0, [r1] ldr r4, =0x02039d84 ldr r1, [r4] @@ -379515,7 +379515,7 @@ sub_80D2644: ; 80D2644 adds r2, 0x2C movs r0, 0x1 strb r0, [r2] -@080D272C: +_080D272C: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -379536,7 +379536,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 @@ -379547,7 +379547,7 @@ sub_80D2740: ; 80D2740 adds r0, 0x2C movs r1, 0x1 strb r1, [r0] -@080D2764: +_080D2764: pop {r0} bx r0 .pool @@ -379565,7 +379565,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 @@ -379577,7 +379577,7 @@ sub_80D2770: ; 80D2770 adds r0, 0x2C movs r1, 0x1 strb r1, [r0] -@080D279C: +_080D279C: pop {r4} pop {r0} bx r0 @@ -379601,7 +379601,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 @@ -379615,7 +379615,7 @@ sub_80D27AC: ; 80D27AC adds r0, 0x2C movs r1, 0x1 strb r1, [r0] -@080D27E6: +_080D27E6: pop {r4-r6} pop {r0} bx r0 @@ -379634,30 +379634,30 @@ 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 .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 @@ -379671,9 +379671,9 @@ sub_80D27F4: ; 80D27F4 strh r0, [r1, 0x14] ldrh r0, [r1, 0x10] subs r0, r2 - b @080D287E + b _080D287E .pool -@080D2864: +_080D2864: ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 @@ -379687,12 +379687,12 @@ sub_80D27F4: ; 80D27F4 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 .pool -@080D2888: +_080D2888: ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 @@ -379706,9 +379706,9 @@ sub_80D27F4: ; 80D27F4 strh r0, [r1, 0x16] ldrh r0, [r1, 0x12] subs r0, r2 - b @080D28C2 + b _080D28C2 .pool -@080D28A8: +_080D28A8: ldr r4, =0x02039d84 ldr r0, [r4] lsls r3, r5, 1 @@ -379722,12 +379722,12 @@ sub_80D27F4: ; 80D27F4 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 .pool -@080D28CC: +_080D28CC: ldr r3, =0x02039d84 ldr r0, [r3] lsls r2, r5, 1 @@ -379739,9 +379739,9 @@ sub_80D27F4: ; 80D27F4 ldrh r4, [r1, 0x14] adds r0, r4 strh r0, [r1, 0x14] - b @080D28FE + b _080D28FE .pool -@080D28E8: +_080D28E8: ldr r3, =0x02039d84 ldr r0, [r3] lsls r2, r5, 1 @@ -379753,9 +379753,9 @@ sub_80D27F4: ; 80D27F4 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 @@ -379763,7 +379763,7 @@ sub_80D27F4: ; 80D27F4 adds r1, 0x2C movs r0, 0x1 strb r0, [r1] -@080D290E: +_080D290E: pop {r4-r6} pop {r0} bx r0 @@ -379779,7 +379779,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 @@ -379788,10 +379788,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] @@ -379800,7 +379800,7 @@ sub_80D2918: ; 80D2918 adds r0, 0xC ldm r0!, {r2-r4} stm r1!, {r2-r4} -@080D2952: +_080D2952: pop {r4-r6} pop {r0} bx r0 @@ -379844,9 +379844,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 @@ -379874,8 +379874,8 @@ sub_80D2960: ; 80D2960 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 @@ -379924,9 +379924,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 @@ -379954,8 +379954,8 @@ sub_80D29F8: ; 80D29F8 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 @@ -379986,13 +379986,13 @@ sub_80D2AA4: ; 80D2AA4 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 @@ -380007,13 +380007,13 @@ sub_80D2AA4: ; 80D2AA4 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 @@ -380058,7 +380058,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 @@ -380085,11 +380085,11 @@ sub_80D2AEC: ; 80D2AEC ldr r0, =sub_80D2B88 str r0, [r1, 0x10] movs r0, 0x1 - b @080D2B76 + b _080D2B76 .pool -@080D2B74: +_080D2B74: movs r0, 0 -@080D2B76: +_080D2B76: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -380105,8 +380105,8 @@ 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] @@ -380123,10 +380123,10 @@ sub_80D2B88: ; 80D2B88 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 @@ -380151,7 +380151,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 @@ -380170,11 +380170,11 @@ sub_80D2BC0: ; 80D2BC0 ldr r0, =sub_80D2C1C str r0, [r1, 0x10] movs r0, 0x1 - b @080D2C16 + b _080D2C16 .pool -@080D2C14: +_080D2C14: movs r0, 0 -@080D2C16: +_080D2C16: pop {r4-r7} pop {r1} bx r1 @@ -380192,7 +380192,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 @@ -380201,14 +380201,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 @@ -380220,9 +380220,9 @@ sub_80D2C1C: ; 80D2C1C mov r2, r10 orrs r0, r2 mov r1, r8 - b @080D2C94 + b _080D2C94 .pool -@080D2C6C: +_080D2C6C: movs r4, 0 strh r4, [r5] ldr r1, =0x040000d4 @@ -380235,7 +380235,7 @@ sub_80D2C1C: ; 80D2C1C adds r2, r7 subs r3, r7 cmp r3, r7 - bhi @080D2C6C + bhi _080D2C6C strh r4, [r5] mov r0, sp str r0, [r1] @@ -380243,7 +380243,7 @@ sub_80D2C1C: ; 80D2C1C lsrs r0, r3, 1 mov r2, r10 orrs r0, r2 -@080D2C94: +_080D2C94: str r0, [r1, 0x8] ldr r0, [r1, 0x8] mov r0, r12 @@ -380254,8 +380254,8 @@ sub_80D2C1C: ; 80D2C1C 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 @@ -380316,10 +380316,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 @@ -380416,33 +380416,33 @@ mon_icon_convert_unown_species_id: ; 80D2E08 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xC9 - bne @080D2E32 + bne _080D2E32 adds r0, r1, 0 bl mon_icon_personality_to_unown_id 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 @@ -380453,7 +380453,7 @@ mon_icon_personality_to_unown_id: ; 80D2E48 push {lr} adds r2, r0, 0 cmp r2, 0 - beq @080D2E7E + beq _080D2E7E movs r0, 0xC0 lsls r0, 18 ands r0, r2 @@ -380475,10 +380475,10 @@ mon_icon_personality_to_unown_id: ; 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 mon_icon_personality_to_unown_id @@ -380495,38 +380495,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 mon_icon_convert_unown_species_id lsls r0, 16 lsrs r0, 16 -@080D2ED2: +_080D2ED2: add sp, 0x4 pop {r4} pop {r1} @@ -380563,7 +380563,7 @@ sub_80D2F04: ; 80D2F04 push {r4,r5,lr} movs r4, 0 ldr r5, =gMonIconPaletteTable -@080D2F0A: +_080D2F0A: lsls r0, r4, 3 adds r0, r5 bl LoadTaggedObjectPalette @@ -380571,7 +380571,7 @@ sub_80D2F04: ; 80D2F04 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @080D2F0A + bls _080D2F0A pop {r4,r5} pop {r0} bx r0 @@ -380586,10 +380586,10 @@ sub_80D2F28: ; 80D2F28 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bls @080D2F3A + bls _080D2F3A movs r1, 0x82 lsls r1, 1 -@080D2F3A: +_080D2F3A: ldr r0, =gMonIconPaletteIndices adds r0, r1, r0 ldrb r0, [r0] @@ -380601,10 +380601,10 @@ sub_80D2F28: ; 80D2F28 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne @080D2F5A + bne _080D2F5A adds r0, r4, 0 bl LoadTaggedObjectPalette -@080D2F5A: +_080D2F5A: pop {r4} pop {r0} bx r0 @@ -380627,10 +380627,10 @@ sub_80D2F68: ; 80D2F68 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne @080D2F8E + bne _080D2F8E adds r0, r4, 0 bl LoadTaggedObjectPalette -@080D2F8E: +_080D2F8E: pop {r4} pop {r0} bx r0 @@ -380642,7 +380642,7 @@ sub_80D2F9C: ; 80D2F9C push {r4,r5,lr} movs r4, 0 ldr r5, =gMonIconPaletteTable -@080D2FA2: +_080D2FA2: lsls r0, r4, 3 adds r0, r5 ldrh r0, [r0, 0x4] @@ -380651,7 +380651,7 @@ sub_80D2F9C: ; 80D2F9C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @080D2FA2 + bls _080D2FA2 pop {r4,r5} pop {r0} bx r0 @@ -380666,10 +380666,10 @@ sub_80D2FC0: ; 80D2FC0 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bls @080D2FD2 + bls _080D2FD2 movs r1, 0x82 lsls r1, 1 -@080D2FD2: +_080D2FD2: ldr r0, =gMonIconPaletteIndices adds r0, r1, r0 ldrb r0, [r0] @@ -380723,13 +380723,13 @@ GetMonIconTiles: ; 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 @@ -380742,10 +380742,10 @@ sub_80D304C: ; 80D304C lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xA0 - bhi @080D3074 + bhi _080D3074 ldr r6, =gMonIconPaletteTable movs r5, 0x5 -@080D305A: +_080D305A: ldr r0, [r6] adds r1, r4, 0 movs r2, 0x20 @@ -380757,8 +380757,8 @@ sub_80D304C: ; 80D304C adds r6, 0x8 subs r5, 0x1 cmp r5, 0 - bge @080D305A -@080D3074: + bge _080D305A +_080D3074: pop {r4-r6} pop {r0} bx r0 @@ -380773,10 +380773,10 @@ sub_80D3080: ; 80D3080 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - bls @080D3092 + bls _080D3092 movs r1, 0x82 lsls r1, 1 -@080D3092: +_080D3092: ldr r0, =gMonIconPaletteIndices adds r0, r1, r0 ldrb r0, [r0] @@ -380804,10 +380804,10 @@ sub_80D30B0: ; 80D30B0 movs r0, 0xCE lsls r0, 1 cmp r2, r0 - bls @080D30C2 + bls _080D30C2 movs r2, 0x82 lsls r2, 1 -@080D30C2: +_080D30C2: ldr r1, =gMonIconPaletteTable ldr r0, =gMonIconPaletteIndices adds r0, r2, r0 @@ -380835,7 +380835,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 @@ -380854,15 +380854,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, =gUnknown_0857C5F0 ldrb r1, [r4, 0x3] lsrs r1, 6 @@ -380907,9 +380907,9 @@ sub_80D30DC: ; 80D30DC adds r0, 0x1 strb r0, [r5] ldrb r7, [r5] - b @080D31A4 + b _080D31A4 .pool -@080D3190: +_080D3190: lsls r0, r2, 26 lsrs r0, 26 subs r0, 0x1 @@ -380920,7 +380920,7 @@ sub_80D30DC: ; 80D30DC ands r1, r2 orrs r1, r0 strb r1, [r6] -@080D31A4: +_080D31A4: adds r0, r7, 0 pop {r3,r4} mov r8, r3 @@ -381096,18 +381096,18 @@ exec_movement: ; 80D32E8 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - beq @080D330A + beq _080D330A movs r0, 0x1 - b @080D3332 -@080D330A: + b _080D3332 +_080D330A: ldr r0, =sub_80D3660 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 @@ -381117,7 +381117,7 @@ exec_movement: ; 80D32E8 bl sub_80D3408 lsls r0, 24 lsrs r0, 24 -@080D3332: +_080D3332: add sp, 0x4 pop {r4} pop {r1} @@ -381139,7 +381139,7 @@ sub_80D3340: ; 80D3340 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @080D3382 + bne _080D3382 bl sub_80D33F4 lsls r0, 24 lsrs r4, r0, 24 @@ -381150,15 +381150,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} @@ -381172,12 +381172,12 @@ sub_80D338C: ; 80D338C 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 @@ -381200,7 +381200,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 @@ -381211,7 +381211,7 @@ sub_80D33AC: ; 80D33AC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls @080D33CC + bls _080D33CC pop {r4,r5} pop {r0} bx r0 @@ -381249,36 +381249,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 @@ -381301,22 +381301,22 @@ 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 .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 @@ -381337,16 +381337,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 .pool @@ -381456,13 +381456,13 @@ sub_80D3584: ; 80D3584 ldrh r1, [r2, 0x8] ands r0, r1 cmp r0, 0 - bne @080D35B4 + bne _080D35B4 movs r0, 0 - b @080D35B6 + b _080D35B6 .pool -@080D35B4: +_080D35B4: movs r0, 0x1 -@080D35B6: +_080D35B6: pop {r1} bx r1 thumb_func_end sub_80D3584 @@ -381533,10 +381533,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 @@ -381544,13 +381544,13 @@ sub_80D361C: ; 80D361C 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 @@ -381565,14 +381565,14 @@ sub_80D3660: ; 80D3660 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 @@ -381581,12 +381581,12 @@ sub_80D3660: ; 80D3660 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} @@ -381615,34 +381615,34 @@ sub_80D36A4: ; 80D36A4 bl FieldObjectIsSpecialAnimActive lsls r0, 24 cmp r0, 0 - beq @080D36DC + beq _080D36DC adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished 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 .pool -@080D36F8: +_080D36F8: adds r0, r4, 0 bl FieldObjectSetSpecialAnim 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} @@ -381663,7 +381663,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 str r0, [r1] @@ -381671,9 +381671,9 @@ sub_80D3718: ; 80D3718 ldr r0, =sub_80D3A9C str r0, [r1] movs r0, 0x1 - b @080D3A2C + b _080D3A2C .pool -@080D3754: +_080D3754: ldr r0, =0x0203ab40 adds r1, r0, 0x2 bl PlayerGetDestCoords @@ -381689,27 +381689,27 @@ sub_80D3718: ; 80D3718 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 .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] @@ -381717,22 +381717,22 @@ sub_80D3718: ; 80D3718 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 @@ -381749,7 +381749,7 @@ sub_80D3718: ; 80D3718 lsls r0, r6, 2 adds r0, r6 mov r9, r0 -@080D37F6: +_080D37F6: ldr r3, =0x0000ffff adds r0, r5, r3 ldr r4, =0x0203ab40 @@ -381768,7 +381768,7 @@ sub_80D3718: ; 80D3718 movs r1, 0x4 ldrsb r1, [r2, r1] cmp r0, r1 - bne @080D38BC + bne _080D38BC adds r0, r4, 0 mov r1, r10 bl MapGridGetMetatileBehaviorAt @@ -381779,14 +381779,14 @@ sub_80D3718: ; 80D3718 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080D3846 + beq _080D3846 adds r0, r4, 0 bl MetatileBehavior_IsAsh 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 @@ -381795,7 +381795,7 @@ sub_80D3718: ; 80D3718 strb r1, [r0] movs r0, 0x1 str r0, [sp, 0x10] -@080D3856: +_080D3856: mov r1, r8 lsls r0, r1, 16 asrs r0, 16 @@ -381805,14 +381805,14 @@ sub_80D3718: ; 80D3718 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 .pool -@080D3890: +_080D3890: adds r0, r7, r6 adds r0, r5 mov r2, sp @@ -381824,51 +381824,51 @@ sub_80D3718: ; 80D3718 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 .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, =gUnknown_0857C608 mov r10, r0 -@080D38F8: +_080D38F8: lsls r2, r6, 2 mov r3, r10 adds r1, r2, r3 @@ -381896,8 +381896,8 @@ sub_80D3718: ; 80D3718 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 @@ -381908,20 +381908,20 @@ sub_80D3718: ; 80D3718 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 @@ -381936,7 +381936,7 @@ sub_80D3718: ; 80D3718 movs r1, 0x4 ldrsb r1, [r2, r1] cmp r0, r1 - bne @080D3A0C + bne _080D3A0C mov r3, r10 adds r2, r6, r3 movs r1, 0x1 @@ -381958,14 +381958,14 @@ sub_80D3718: ; 80D3718 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080D39BC + beq _080D39BC adds r0, r4, 0 bl MetatileBehavior_IsAsh 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 str r0, [r1] @@ -381977,42 +381977,42 @@ sub_80D3718: ; 80D3718 strb r7, [r0] movs r4, 0x1 str r4, [sp, 0x10] - b @080D3A0C + b _080D3A0C .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 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =hm2_ruin_valley str r0, [r1] -@080D3A2A: +_080D3A2A: ldr r0, [sp, 0x10] -@080D3A2C: +_080D3A2C: add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -382122,12 +382122,12 @@ sub_80D3B00: ; 80D3B00 adds r0, r4, 0 bl PlayerGetDestCoords 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 @@ -382158,12 +382158,12 @@ sub_80D3B00: ; 80D3B00 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] @@ -382186,7 +382186,7 @@ sub_80D3B00: ; 80D3B00 str r0, [r4] movs r6, 0 ldr r5, =0x02020630 -@080D3BA0: +_080D3BA0: ldr r0, =0x02037590 ldrb r1, [r0, 0x4] lsls r0, r1, 4 @@ -382221,7 +382221,7 @@ sub_80D3B00: ; 80D3B00 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x7 - bls @080D3BA0 + bls _080D3BA0 movs r0, 0 pop {r4-r7} pop {r1} @@ -382244,97 +382244,97 @@ 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 .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 .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 .pool -@080D3C90: +_080D3C90: ldr r0, =0x00000283 cmp r1, r0 - beq @080D3CCC - b @080D3D00 + beq _080D3CCC + b _080D3D00 .pool -@080D3C9C: +_080D3C9C: lsls r0, r6, 16 asrs r0, 16 lsls r1, r7, 16 asrs r1, 16 movs r2, 0x1 bl MapGridSetMetatileIdAt - 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 .pool -@080D3CBC: +_080D3CBC: ldr r2, =0x00000279 - b @080D3CD6 + b _080D3CD6 .pool -@080D3CC4: +_080D3CC4: ldr r2, =0x0000027a - b @080D3CD6 + b _080D3CD6 .pool -@080D3CCC: +_080D3CCC: ldr r2, =0x0000027b - b @080D3CD6 + b _080D3CD6 .pool -@080D3CD4: +_080D3CD4: ldr r2, =0x00000271 -@080D3CD6: +_080D3CD6: adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt - b @080D3D00 + b _080D3D00 .pool -@080D3CE4: +_080D3CE4: lsls r0, r6, 16 asrs r0, 16 lsls r1, r7, 16 @@ -382342,13 +382342,13 @@ sub_80D3C10: ; 80D3C10 movs r2, 0x86 lsls r2, 2 bl MapGridSetMetatileIdAt - b @080D3D00 -@080D3CF6: + b _080D3D00 +_080D3CF6: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0xE bl MapGridSetMetatileIdAt -@080D3D00: +_080D3D00: pop {r4-r7} pop {r0} bx r0 @@ -382366,33 +382366,33 @@ 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 .pool -@080D3D34: +_080D3D34: ldr r0, =0x0000027a cmp r1, r0 - bne @080D3D44 + bne _080D3D44 movs r0, 0x3 - b @080D3D56 + b _080D3D56 .pool -@080D3D44: +_080D3D44: ldr r0, =0x0000027b cmp r2, r0 - beq @080D3D54 + beq _080D3D54 movs r0, 0 - b @080D3D56 + b _080D3D56 .pool -@080D3D54: +_080D3D54: movs r0, 0x4 -@080D3D56: +_080D3D56: pop {r1} bx r1 thumb_func_end sub_80D3D08 @@ -382420,12 +382420,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 @@ -382440,7 +382440,7 @@ sub_80D3D5C: ; 80D3D5C bl MapGridGetMetatileIdAt mov r8, r4 cmp r0, 0x15 - bne @080D3E12 + bne _080D3E12 adds r4, r7, 0x1 lsls r1, r4, 16 asrs r1, 16 @@ -382449,46 +382449,46 @@ sub_80D3D5C: ; 80D3D5C 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 .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 MapGridSetMetatileIdAt - b @080D3E12 -@080D3DE8: + b _080D3E12 +_080D3DE8: adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000281 bl MapGridSetMetatileIdAt - b @080D3E12 + b _080D3E12 .pool -@080D3DF8: +_080D3DF8: adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000282 bl MapGridSetMetatileIdAt - b @080D3E12 + b _080D3E12 .pool -@080D3E08: +_080D3E08: adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000283 bl MapGridSetMetatileIdAt -@080D3E12: +_080D3E12: lsls r0, r6, 16 asrs r5, r0, 16 ldr r3, [sp] @@ -382498,7 +382498,7 @@ sub_80D3D5C: ; 80D3D5C adds r1, r4, 0 bl MapGridGetMetatileIdAt cmp r0, 0x1 - bne @080D3E8C + bne _080D3E8C adds r4, 0x1 adds r0, r5, 0 adds r1, r4, 0 @@ -382506,45 +382506,45 @@ sub_80D3D5C: ; 80D3D5C 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 MapGridSetMetatileIdAt -@080D3E44: +_080D3E44: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000281 cmp r0, r1 - bne @080D3E5C + bne _080D3E5C adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x00000279 bl MapGridSetMetatileIdAt -@080D3E5C: +_080D3E5C: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000282 cmp r0, r1 - bne @080D3E74 + bne _080D3E74 adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x0000027a bl MapGridSetMetatileIdAt -@080D3E74: +_080D3E74: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000283 cmp r0, r1 - bne @080D3E8C + bne _080D3E8C adds r0, r5, 0 adds r1, r4, 0 ldr r2, =0x0000027b bl MapGridSetMetatileIdAt -@080D3E8C: +_080D3E8C: movs r1, 0x80 lsls r1, 9 add r1, r8 @@ -382553,13 +382553,13 @@ sub_80D3D5C: ; 80D3D5C 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 @@ -382574,7 +382574,7 @@ sub_80D3D5C: ; 80D3D5C adds r1, r5, 0 adds r2, r4, 0 bl sub_80D3EF4 -@080D3EC8: +_080D3EC8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -382603,7 +382603,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] @@ -382613,13 +382613,13 @@ sub_80D3EF4: ; 80D3EF4 ldrb r0, [r1, 0xF] strb r0, [r2, 0x2] mov r8, r5 - b @080D3F4E + b _080D3F4E .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] @@ -382634,11 +382634,11 @@ sub_80D3EF4: ; 80D3EF4 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 @@ -382652,49 +382652,49 @@ sub_80D3EF4: ; 80D3EF4 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 MapGridSetMetatileIdAt -@080D3F7E: +_080D3F7E: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000281 cmp r0, r1 - bne @080D3F96 + bne _080D3F96 ldr r2, =0x00000279 adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@080D3F96: +_080D3F96: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000282 cmp r0, r1 - bne @080D3FAE + bne _080D3FAE ldr r2, =0x0000027a adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@080D3FAE: +_080D3FAE: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000283 cmp r0, r1 - bne @080D3FC6 + bne _080D3FC6 ldr r2, =0x0000027b adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@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 @@ -382706,7 +382706,7 @@ sub_80D3EF4: ; 80D3EF4 bl MapGridGetMetatileIdAt mov r9, r4 cmp r0, 0x15 - bne @080D4056 + bne _080D4056 adds r4, r7, 0x3 lsls r1, r4, 16 asrs r1, 16 @@ -382715,41 +382715,41 @@ sub_80D3EF4: ; 80D3EF4 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 .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 .pool -@080D403C: +_080D403C: ldr r2, =0x00000282 -@080D403E: +_080D403E: adds r0, r6, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt - b @080D4056 + b _080D4056 .pool -@080D404C: +_080D404C: ldr r2, =0x00000283 adds r0, r6, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@080D4056: +_080D4056: asrs r5, 16 mov r1, r9 asrs r0, r1, 16 @@ -382760,49 +382760,49 @@ sub_80D3EF4: ; 80D3EF4 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 MapGridSetMetatileIdAt -@080D4078: +_080D4078: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000281 cmp r0, r1 - bne @080D4090 + bne _080D4090 ldr r2, =0x00000279 adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@080D4090: +_080D4090: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000282 cmp r0, r1 - bne @080D40A8 + bne _080D40A8 ldr r2, =0x0000027a adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@080D40A8: +_080D40A8: adds r0, r5, 0 adds r1, r4, 0 bl MapGridGetMetatileIdAt ldr r1, =0x00000283 cmp r0, r1 - bne @080D40C0 + bne _080D40C0 ldr r2, =0x0000027b adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@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 @@ -382813,7 +382813,7 @@ sub_80D3EF4: ; 80D3EF4 adds r0, r5, 0 bl MapGridGetMetatileIdAt cmp r0, 0x15 - bne @080D414A + bne _080D414A adds r4, 0x4 lsls r1, r4, 16 asrs r1, 16 @@ -382822,41 +382822,41 @@ sub_80D3EF4: ; 80D3EF4 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 .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 .pool -@080D4130: +_080D4130: ldr r2, =0x00000282 -@080D4132: +_080D4132: adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt - b @080D414A + b _080D414A .pool -@080D4140: +_080D4140: ldr r2, =0x00000283 adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@080D414A: +_080D414A: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -382915,14 +382915,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 str r0, [r4, 0x1C] -@080D41C4: +_080D41C4: pop {r4} pop {r0} bx r0 @@ -382933,7 +382933,7 @@ objc_8097BBC: ; 80D4174 sub_80D41D0: ; 80D41D0 push {r4-r6,lr} movs r4, 0x1 -@080D41D4: +_080D41D4: ldr r6, =0x02039dd0 ldr r0, [r6] adds r0, r4 @@ -382948,7 +382948,7 @@ sub_80D41D0: ; 80D41D0 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls @080D41D4 + bls _080D41D4 ldr r0, [r6] ldrb r1, [r0] lsls r0, r1, 4 @@ -382967,10 +382967,10 @@ sub_80D41D0: ; 80D41D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080D422A + bne _080D422A ldr r0, =gUnknown_08267EDB bl script_env_1_execute_new_script -@080D422A: +_080D422A: pop {r4-r6} pop {r0} bx r0 @@ -382992,7 +382992,7 @@ sub_80D423C: ; 80D423C bl MetatileBehavior_IsLongGrass2 lsls r0, 24 cmp r0, 0 - beq @080D42AE + beq _080D42AE adds r4, 0x1 lsls r1, r4, 16 asrs r1, 16 @@ -383001,40 +383001,40 @@ 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 .pool -@080D4294: +_080D4294: ldr r2, =0x00000282 -@080D4296: +_080D4296: adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt - b @080D42AE + b _080D42AE .pool -@080D42A4: +_080D42A4: ldr r2, =0x00000283 adds r0, r5, 0 adds r1, r4, 0 bl MapGridSetMetatileIdAt -@080D42AE: +_080D42AE: pop {r4,r5} pop {r0} bx r0 @@ -383052,7 +383052,7 @@ sub_80D42B8: ; 80D42B8 adds r1, r5, 0 bl MapGridGetMetatileIdAt cmp r0, 0x1 - bne @080D434A + bne _080D434A adds r5, 0x1 adds r0, r4, 0 adds r1, r5, 0 @@ -383062,54 +383062,54 @@ sub_80D42B8: ; 80D42B8 bl MetatileBehavior_IsLongGrassSouthEdge lsls r0, 24 cmp r0, 0 - beq @080D434A + beq _080D434A adds r0, r4, 0 adds r1, r5, 0 bl MapGridGetMetatileIdAt 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 .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 .pool -@080D431C: +_080D431C: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x1 bl MapGridSetMetatileIdAt - b @080D434A -@080D4328: + b _080D434A +_080D4328: ldr r2, =0x00000279 - b @080D4332 + b _080D4332 .pool -@080D4330: +_080D4330: ldr r2, =0x0000027a -@080D4332: +_080D4332: adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt - b @080D434A + b _080D434A .pool -@080D4340: +_080D4340: ldr r2, =0x0000027b adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt -@080D434A: +_080D434A: pop {r4,r5} pop {r0} bx r0 @@ -383133,7 +383133,7 @@ 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 @@ -383146,7 +383146,7 @@ sub_80D436C: ; 80D436C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls @080D4372 + bls _080D4372 pop {r4,r5} pop {r0} bx r0 @@ -383161,36 +383161,36 @@ sub_80D439C: ; 80D439C 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] @@ -383212,17 +383212,17 @@ 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 @@ -383252,7 +383252,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] @@ -383265,9 +383265,9 @@ sub_80D4420: ; 80D4420 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 @@ -383275,7 +383275,7 @@ sub_80D4420: ; 80D4420 add r5, sp, 0x4 ldr r3, =0x0000ffff adds r6, r3, 0 -@080D4476: +_080D4476: ldr r2, [r7] lsls r3, r4, 1 ldrb r1, [r5] @@ -383293,11 +383293,11 @@ sub_80D4420: ; 80D4420 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 @@ -383316,7 +383316,7 @@ sub_80D4420: ; 80D4420 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @080D44A0 + bls _080D44A0 mov r3, r10 ldr r2, [r3] mov r0, r9 @@ -383345,7 +383345,7 @@ sub_80D4420: ; 80D4420 ldr r6, =0x03005d8c add r3, sp, 0x4 ldr r5, =0x03005d90 -@080D4500: +_080D4500: ldr r2, [r6] ldrb r1, [r3] lsls r0, r1, 3 @@ -383364,7 +383364,7 @@ sub_80D4420: ; 80D4420 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @080D4500 + bls _080D4500 mov r0, r8 movs r1, 0xB bl pokemon_getattr_encrypted @@ -383409,18 +383409,18 @@ sub_80D4420: ; 80D4420 bl pokemon_setattr mov r1, r9 ldrb r0, [r1] - b @080D45B6 + b _080D45B6 .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 @@ -383437,14 +383437,14 @@ sub_80D45C8: ; 80D45C8 lsls r0, 16 lsrs r0, 16 cmp r0, 0xC9 - bne @080D45E0 + bne _080D45E0 adds r0, r1, 0 bl mon_icon_personality_to_unown_id lsls r0, 16 ldr r1, =0x75300000 adds r0, r1 lsrs r0, 16 -@080D45E0: +_080D45E0: pop {r1} bx r1 .pool @@ -383460,14 +383460,14 @@ 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 .pool -@080D4604: +_080D4604: adds r0, r3, 0 -@080D4606: +_080D4606: pop {r1} bx r1 thumb_func_end sub_80D45E8 @@ -383485,7 +383485,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 @@ -383515,11 +383515,11 @@ sub_80D460C: ; 80D460C mov r2, sp bl pokemon_setattr ldrb r0, [r4] - b @080D4672 + b _080D4672 .pool -@080D4670: +_080D4670: movs r0, 0xFF -@080D4672: +_080D4672: add sp, 0x8 pop {r4-r7} pop {r1} @@ -383540,7 +383540,7 @@ sub_80D4680: ; 80D4680 bl sub_80D43F0 lsls r0, 24 cmp r0, 0 - beq @080D46D2 + beq _080D46D2 adds r0, r4, 0 movs r1, 0x40 bl pokemon_getattr @@ -383571,7 +383571,7 @@ sub_80D4680: ; 80D4680 movs r1, 0xC mov r2, sp bl pokemon_setattr -@080D46D2: +_080D46D2: add sp, 0x8 pop {r4} pop {r0} @@ -383618,7 +383618,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 @@ -383630,7 +383630,7 @@ sub_80D4700: ; 80D4700 adds r0, r4, r2 ldrh r6, [r0] cmp r6, 0 - bne @080D47A0 + bne _080D47A0 adds r4, r3 adds r0, r5, 0 movs r1, 0x40 @@ -383672,16 +383672,16 @@ sub_80D4700: ; 80D4700 mov r2, sp bl pokemon_setattr adds r0, r7, 0 - b @080D47AC + b _080D47AC .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 @@ -383697,14 +383697,14 @@ itemid_is_mail: ; 80D47BC 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 @@ -383728,13 +383728,13 @@ AddMapNamePopUpWindowTask: ; 80D47E4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080D486C + beq _080D486C ldr r4, =Task_MapNamePopUpWindow 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 @@ -383758,9 +383758,9 @@ AddMapNamePopUpWindowTask: ; 80D47E4 adds r0, r2 movs r1, 0x28 strh r1, [r0, 0xC] - b @080D486C + b _080D486C .pool -@080D4844: +_080D4844: ldr r3, =0x03005e00 ldr r2, =0x02039dd4 ldrb r0, [r2] @@ -383771,10 +383771,10 @@ AddMapNamePopUpWindowTask: ; 80D47E4 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 @@ -383782,7 +383782,7 @@ AddMapNamePopUpWindowTask: ; 80D47E4 adds r1, r3 movs r0, 0x1 strh r0, [r1, 0xE] -@080D486C: +_080D486C: pop {r4} pop {r0} bx r0 @@ -383803,23 +383803,23 @@ Task_MapNamePopUpWindow: ; 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 .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 @@ -383827,19 +383827,19 @@ Task_MapNamePopUpWindow: ; 80D487C lsls r0, 16 asrs r0, 16 cmp r0, 0x1E - ble @080D4966 + ble _080D4966 strh r1, [r4, 0x8] strh r1, [r4, 0x10] bl ShowMapNamePopUpWindow - 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] @@ -383850,22 +383850,22 @@ Task_MapNamePopUpWindow: ; 80D487C lsls r0, 3 adds r0, r3 strh r2, [r0, 0xA] - b @080D4966 + b _080D4966 .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 @@ -383873,23 +383873,23 @@ Task_MapNamePopUpWindow: ; 80D487C 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 GetMapNamePopUpWindowId lsls r0, 24 lsrs r0, 24 @@ -383897,15 +383897,15 @@ Task_MapNamePopUpWindow: ; 80D487C bl sub_819746C movs r0, 0x5 strh r0, [r4, 0x8] - b @080D4966 -@080D4960: + b _080D4966 +_080D4960: bl HideMapNamePopUpWindow - b @080D496E -@080D4966: + b _080D496E +_080D4966: ldrh r1, [r4, 0xC] movs r0, 0x12 bl SetGpuReg -@080D496E: +_080D496E: pop {r4} pop {r0} bx r0 @@ -383918,7 +383918,7 @@ HideMapNamePopUpWindow: ; 80D4974 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - beq @080D49A4 + beq _080D49A4 bl GetMapNamePopUpWindowId lsls r0, 24 lsrs r0, 24 @@ -383931,7 +383931,7 @@ HideMapNamePopUpWindow: ; 80D4974 ldr r0, =0x02039dd4 ldrb r0, [r0] bl remove_task -@080D49A4: +_080D49A4: pop {r0} bx r0 .pool @@ -383944,20 +383944,20 @@ ShowMapNamePopUpWindow: ; 80D49B0 bl InBattlePyramid 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, =gUnknown_0857F544 ldr r1, [r0, 0x1C] - b @080D49F2 + b _080D49F2 .pool -@080D49DC: +_080D49DC: mov r4, sp adds r4, 0xF ldr r1, =gUnknown_0857F544 @@ -383969,12 +383969,12 @@ ShowMapNamePopUpWindow: ; 80D49B0 lsls r0, 2 adds r0, r1 ldr r1, [r0] -@080D49F2: +_080D49F2: adds r0, r4, 0 bl CopyString - b @080D4A18 + b _080D4A18 .pool -@080D4A08: +_080D4A08: mov r4, sp adds r4, 0xF ldr r0, =0x02037318 @@ -383982,7 +383982,7 @@ ShowMapNamePopUpWindow: ; 80D49B0 adds r0, r4, 0 movs r2, 0 bl GetMapName -@080D4A18: +_080D4A18: bl AddMapNamePopUpWindow bl LoadMapNamePopUpWindowBg movs r0, 0x7 @@ -384056,7 +384056,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 @@ -384076,7 +384076,7 @@ sub_80D4A78: ; 80D4A78 adds r4, 0x1 adds r5, 0x1 cmp r5, 0xB - ble @080D4AB4 + ble _080D4AB4 ldr r1, =0x00000229 movs r0, 0x1 negs r0, r0 @@ -384157,7 +384157,7 @@ sub_80D4A78: ; 80D4A78 adds r0, r1, r2 lsls r4, r0, 24 movs r6, 0x1 -@080D4B8A: +_080D4B8A: ldr r3, =0x0000022f adds r1, r5, r3 lsls r1, 16 @@ -384177,7 +384177,7 @@ sub_80D4A78: ; 80D4A78 bl FillBgTilemapBufferRect adds r5, 0x1 cmp r5, 0xB - ble @080D4B8A + ble _080D4B8A add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -384199,18 +384199,18 @@ LoadMapNamePopUpWindowBg: ; 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 .pool -@080D4C08: +_080D4C08: movs r1, 0 -@080D4C0A: +_080D4C0A: ldr r0, =gUnknown_0857F464 adds r0, r1, r0 ldrb r4, [r0] @@ -384236,21 +384236,21 @@ LoadMapNamePopUpWindowBg: ; 80D4BE0 ldr r0, =0x02037318 ldrb r0, [r0, 0x16] cmp r0, 0xE - bne @080D4C6C + bne _080D4C6C ldr r0, =gUnknown_0857F444 movs r1, 0xE0 movs r2, 0x20 bl gpu_pal_apply - b @080D4C7A + b _080D4C7A .pool -@080D4C6C: +_080D4C6C: lsls r0, r4, 5 ldr r1, =gUnknown_0857F384 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 @@ -384284,7 +384284,7 @@ RemoveBagObject: ; 80D4CA8 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - beq @080D4CEE + beq _080D4CEE adds r4, 0x64 adds r0, r4, 0 bl FreeObjectTilesByTag @@ -384305,7 +384305,7 @@ RemoveBagObject: ; 80D4CA8 bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] -@080D4CEE: +_080D4CEE: pop {r4,r5} pop {r0} bx r0 @@ -384356,7 +384356,7 @@ SetBagVisualPocketId: ; 80D4D38 ldr r2, =0x02020630 adds r2, r0, r2 cmp r1, 0 - beq @080D4D84 + beq _080D4D84 ldr r0, =0x0000fffb strh r0, [r2, 0x26] ldr r0, =ObjectCB_BagVisualSwitchingPockets @@ -384366,15 +384366,15 @@ SetBagVisualPocketId: ; 80D4D38 adds r0, r2, 0 movs r1, 0 bl StartObjectImageAnim - b @080D4D90 + b _080D4D90 .pool -@080D4D84: +_080D4D84: adds r1, r3, 0x1 lsls r1, 24 lsrs r1, 24 adds r0, r2, 0 bl StartObjectImageAnim -@080D4D90: +_080D4D90: pop {r0} bx r0 thumb_func_end SetBagVisualPocketId @@ -384388,11 +384388,11 @@ ObjectCB_BagVisualSwitchingPockets: ; 80D4D94 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 @@ -384400,7 +384400,7 @@ ObjectCB_BagVisualSwitchingPockets: ; 80D4D94 bl StartObjectImageAnim ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@080D4DB8: +_080D4DB8: pop {r4} pop {r0} bx r0 @@ -384427,13 +384427,13 @@ ShakeBagVisual: ; 80D4DC4 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @080D4DF4 + beq _080D4DF4 adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim ldr r0, =ObjectCB_ShakeBagVisual str r0, [r4, 0x1C] -@080D4DF4: +_080D4DF4: pop {r4} pop {r0} bx r0 @@ -384450,13 +384450,13 @@ ObjectCB_ShakeBagVisual: ; 80D4E0C movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @080D4E28 + beq _080D4E28 adds r0, r4, 0 movs r1, 0 bl StartObjectRotScalAnim ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@080D4E28: +_080D4E28: pop {r4} pop {r0} bx r0 @@ -384536,13 +384536,13 @@ ObjectCB_SwitchPocketRotatingBallInit: ; 80D4EB0 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne @080D4ED8 + bne _080D4ED8 ldr r0, =gUnknown_0857FB98 - b @080D4EDA + b _080D4EDA .pool -@080D4ED8: +_080D4ED8: ldr r0, =gUnknown_0857FB9C -@080D4EDA: +_080D4EDA: str r0, [r4, 0x10] adds r0, r4, 0 bl obj_alloc_rotscale_entry @@ -384581,10 +384581,10 @@ ObjectCB_SwitchPocketRotatingBallContinue: ; 80D4F14 movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0x10 - bne @080D4F32 + bne _080D4F32 movs r0, 0x1 bl RemoveBagObject -@080D4F32: +_080D4F32: pop {r4} pop {r0} bx r0 @@ -384605,7 +384605,7 @@ AddBagItemIconObject: ; 80D4F38 adds r5, r0, r1 ldrb r0, [r5] cmp r0, 0xFF - bne @080D4F86 + bne _080D4F86 adds r4, 0x66 adds r0, r4, 0 bl FreeObjectTilesByTag @@ -384618,7 +384618,7 @@ AddBagItemIconObject: ; 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 @@ -384629,7 +384629,7 @@ AddBagItemIconObject: ; 80D4F38 strh r1, [r0, 0x24] movs r1, 0x58 strh r1, [r0, 0x26] -@080D4F86: +_080D4F86: pop {r4-r6} pop {r0} bx r0 @@ -384719,12 +384719,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 @@ -384735,16 +384735,16 @@ sub_80D5018: ; 80D5018 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} @@ -384760,9 +384760,9 @@ sub_80D5070: ; 80D5070 lsrs r0, 24 adds r4, r0, 0 cmp r4, 0x2A - bne @080D5082 + bne _080D5082 bl sub_80E162C -@080D5082: +_080D5082: ldr r5, =gBerryPicTable lsls r4, 3 adds r0, r5, 0x4 @@ -384865,7 +384865,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 @@ -384873,7 +384873,7 @@ sub_80D511C: ; 80D511C adds r0, r1 movs r1, 0x1 bl StartObjectRotScalAnim -@080D5172: +_080D5172: adds r0, r4, 0 pop {r3} mov r8, r3 @@ -384911,12 +384911,12 @@ 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 .pool -@080D51D0: +_080D51D0: ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -384946,7 +384946,7 @@ sub_80D51AC: ; 80D51AC str r1, [r0] adds r0, r5, 0 bl _call_via_r1 -@080D520C: +_080D520C: pop {r4,r5} pop {r0} bx r0 @@ -384968,7 +384968,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] @@ -384980,14 +384980,14 @@ 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 .pool -@080D5264: +_080D5264: strh r5, [r1, 0x24] -@080D5266: +_080D5266: lsls r2, r4, 2 adds r0, r2, r4 lsls r0, 3 @@ -385001,12 +385001,12 @@ sub_80D5220: ; 80D5220 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 @@ -385019,7 +385019,7 @@ sub_80D5220: ; 80D5220 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 @@ -385036,11 +385036,11 @@ sub_80D5220: ; 80D5220 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 @@ -385057,44 +385057,44 @@ 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 .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 @@ -385102,29 +385102,29 @@ sub_80D52D0: ; 80D52D0 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 .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 .pool -@080D5368: +_080D5368: ldr r1, =0x02020630 lsls r0, r3, 4 adds r0, r3 @@ -385155,7 +385155,7 @@ sub_80D52D0: ; 80D52D0 str r1, [r0] adds r0, r5, 0 bl _call_via_r1 -@080D53A6: +_080D53A6: pop {r4-r6} pop {r0} bx r0 @@ -385179,7 +385179,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] @@ -385194,14 +385194,14 @@ 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 .pool -@080D5408: +_080D5408: strh r5, [r4, 0x24] -@080D540A: +_080D540A: lsls r3, r6, 2 adds r1, r3, r6 lsls r1, 3 @@ -385219,13 +385219,13 @@ sub_80D53BC: ; 80D53BC 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 @@ -385238,7 +385238,7 @@ sub_80D53BC: ; 80D53BC 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 @@ -385255,11 +385255,11 @@ sub_80D53BC: ; 80D53BC 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} @@ -385278,12 +385278,12 @@ 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 .pool -@080D54A8: +_080D54A8: ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 @@ -385322,7 +385322,7 @@ sub_80D5484: ; 80D5484 str r2, [r1] adds r0, r5, 0 bl _call_via_r2 -@080D54F6: +_080D54F6: pop {r4-r6} pop {r0} bx r0 @@ -385344,14 +385344,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] @@ -385374,9 +385374,9 @@ sub_80D5508: ; 80D5508 adds r1, r3 strh r1, [r0, 0x26] adds r3, r2, 0 - b @080D5592 + b _080D5592 .pool -@080D5568: +_080D5568: ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -385398,7 +385398,7 @@ sub_80D5508: ; 80D5508 ldrh r2, [r4, 0x14] subs r1, r2 strh r1, [r0, 0x26] -@080D5592: +_080D5592: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -385413,11 +385413,11 @@ sub_80D5508: ; 80D5508 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 @@ -385446,9 +385446,9 @@ sub_80D5508: ; 80D5508 ldrh r3, [r1, 0x26] adds r0, r3 strh r0, [r1, 0x26] - b @080D5630 + b _080D5630 .pool -@080D55F8: +_080D55F8: movs r6, 0x8 ldrsh r0, [r4, r6] lsls r2, r0, 4 @@ -385477,14 +385477,14 @@ sub_80D5508: ; 80D5508 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 @@ -385554,7 +385554,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 @@ -385567,16 +385567,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 @@ -385598,10 +385598,10 @@ sub_80D56A4: ; 80D56A4 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 @@ -385624,10 +385624,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] @@ -385638,17 +385638,17 @@ sub_80D5738: ; 80D5738 ldr r2, =sub_80D57B8 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 @@ -385712,20 +385712,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 @@ -385742,12 +385742,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} @@ -385771,16 +385771,16 @@ 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 .pool -@080D5890: +_080D5890: ldr r1, =0x0203841e ldrh r0, [r1, 0x2] -@080D5894: +_080D5894: strh r0, [r4, 0x30] ldrh r2, [r1] movs r0, 0 @@ -385881,15 +385881,15 @@ 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 .pool -@080D598C: +_080D598C: ldr r1, =0x020241e4 ldr r0, =0x02038437 -@080D5990: +_080D5990: ldrb r0, [r0] adds r0, r1 ldrb r7, [r0] @@ -385933,15 +385933,15 @@ sub_80D5968: ; 80D5968 movs r1, 0x2 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne @080D5A00 + bne _080D5A00 strh r3, [r6, 0x32] - b @080D5A06 + b _080D5A06 .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 @@ -385975,23 +385975,23 @@ 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 .pool -@080D5A64: +_080D5A64: subs r0, 0x1 strh r0, [r2, 0x2E] ldrh r1, [r2, 0x30] @@ -386013,7 +386013,7 @@ sub_80D5A24: ; 80D5A24 ldrh r2, [r2, 0x3A] adds r0, r2 strh r0, [r3, 0x26] -@080D5A8E: +_080D5A8E: pop {r4-r6} pop {r0} bx r0 @@ -386027,13 +386027,13 @@ sub_80D5A94: ; 80D5A94 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @080D5AB0 + bne _080D5AB0 ldr r0, =0x02038436 - b @080D5AB2 + b _080D5AB2 .pool -@080D5AB0: +_080D5AB0: ldr r0, =0x02038437 -@080D5AB2: +_080D5AB2: ldrb r2, [r0] ldr r0, =0x020241e4 adds r0, r2, r0 @@ -386042,7 +386042,7 @@ sub_80D5A94: ; 80D5A94 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 @@ -386050,11 +386050,11 @@ sub_80D5A94: ; 80D5A94 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 @@ -386112,13 +386112,13 @@ sub_80D5B48: ; 80D5B48 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @080D5B70 + bne _080D5B70 ldr r0, =0x02038436 - b @080D5B72 + b _080D5B72 .pool -@080D5B70: +_080D5B70: ldr r0, =0x02038437 -@080D5B72: +_080D5B72: ldrb r1, [r0] ldr r0, =0x020241e4 adds r0, r1, r0 @@ -386127,7 +386127,7 @@ sub_80D5B48: ; 80D5B48 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 @@ -386135,11 +386135,11 @@ sub_80D5B48: ; 80D5B48 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] @@ -386175,17 +386175,17 @@ sub_80D5B48: ; 80D5B48 strh r0, [r6, 0x3A] lsls r0, 16 cmp r0, 0 - bne @080D5C04 + bne _080D5C04 ldr r1, =move_anim_8072740 adds r0, r6, 0 bl oamt_set_x3A_32 - b @080D5C0C + b _080D5C0C .pool -@080D5C04: +_080D5C04: ldr r1, =sub_80D5C20 adds r0, r6, 0 bl oamt_set_x3A_32 -@080D5C0C: +_080D5C0C: ldr r0, =sub_80A6680 str r0, [r6, 0x1C] pop {r4-r7} @@ -386238,14 +386238,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 @@ -386325,10 +386325,10 @@ sub_80D5CE4: ; 80D5CE4 strh r0, [r5, 0xE] lsls r0, 16 cmp r0, 0 - bne @080D5D34 + bne _080D5D34 ldr r0, =sub_80D5D48 str r0, [r5] -@080D5D34: +_080D5D34: pop {r4,r5} pop {r0} bx r0 @@ -386350,12 +386350,12 @@ 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 .pool -@080D5D70: +_080D5D70: ldrb r0, [r4, 0x8] ldrh r2, [r4, 0x12] ldrh r1, [r4, 0x20] @@ -386378,10 +386378,10 @@ sub_80D5D48: ; 80D5D48 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 @@ -386397,47 +386397,47 @@ 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 .pool -@080D5DD8: +_080D5DD8: cmp r0, 0x3 - beq @080D5DE8 - b @080D5E10 -@080D5DDE: + beq _080D5DE8 + b _080D5E10 +_080D5DDE: ldr r5, =0x02038436 - b @080D5DEA + b _080D5DEA .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 .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 @@ -386449,16 +386449,16 @@ sub_80D5DB0: ; 80D5DB0 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 .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 @@ -386466,7 +386466,7 @@ sub_80D5DB0: ; 80D5DB0 adds r1, r0 ldr r0, =sub_80D5E6C str r0, [r1] -@080D5E58: +_080D5E58: pop {r4-r6} pop {r0} bx r0 @@ -386502,10 +386502,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 @@ -386522,12 +386522,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 @@ -386550,14 +386550,14 @@ sub_80D5EB8: ; 80D5EB8 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bne @080D5F14 + bne _080D5F14 ldrb r0, [r6] - b @080D5F18 + b _080D5F18 .pool -@080D5F14: +_080D5F14: ldr r0, =0x02038437 ldrb r0, [r0] -@080D5F18: +_080D5F18: strh r0, [r2, 0x12] ldr r1, =0x03005e00 adds r0, r3, r5 @@ -386604,7 +386604,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 @@ -386613,14 +386613,14 @@ sub_80D5F3C: ; 80D5F3C strh r5, [r1, 0x24] mov r9, r0 adds r4, r2, 0 - b @080D5FDA + b _080D5FDA .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 @@ -386631,10 +386631,10 @@ sub_80D5F3C: ; 80D5F3C mov r9, r1 adds r4, r2, 0 cmp r0, 0 - bge @080D5FD8 - b @080D5FD6 + bge _080D5FD8 + b _080D5FD6 .pool -@080D5FBC: +_080D5FBC: ldr r1, =0x02020630 lsls r2, r7, 4 adds r0, r2, r7 @@ -386646,16 +386646,16 @@ sub_80D5F3C: ; 80D5F3C 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 @@ -386665,15 +386665,15 @@ sub_80D5F3C: ; 80D5F3C 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 @@ -386683,12 +386683,12 @@ sub_80D5F3C: ; 80D5F3C 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 @@ -386705,7 +386705,7 @@ sub_80D5F3C: ; 80D5F3C lsls r0, 16 asrs r3, r0, 16 cmp r3, 0 - bne @080D6050 + bne _080D6050 adds r0, r4, r7 lsls r0, 2 add r0, r9 @@ -386713,7 +386713,7 @@ sub_80D5F3C: ; 80D5F3C strh r3, [r0, 0x26] adds r0, r6, 0 bl move_anim_task_del -@080D6050: +_080D6050: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -386798,12 +386798,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] @@ -386812,14 +386812,14 @@ sub_80D60BC: ; 80D60BC strh r0, [r4, 0xA] strh r2, [r4, 0xC] strh r1, [r4, 0xE] - b @080D612C + b _080D612C .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 @@ -386852,18 +386852,18 @@ 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 .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 @@ -386880,32 +386880,32 @@ sub_80D6134: ; 80D6134 lsls r0, 24 mov r8, r4 cmp r0, 0 - beq @080D61B8 + beq _080D61B8 movs r0, 0x1 strh r0, [r5, 0x16] - b @080D61DC + b _080D61DC .pool -@080D61B8: +_080D61B8: movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0 - bne @080D61C8 + bne _080D61C8 ldr r0, =0x02038436 - b @080D61CA + b _080D61CA .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 @@ -386914,11 +386914,11 @@ sub_80D6134: ; 80D6134 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 @@ -386927,7 +386927,7 @@ sub_80D6134: ; 80D6134 ldrsh r0, [r4, r2] negs r0, r0 strh r0, [r4, 0x10] -@080D6208: +_080D6208: ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 @@ -386970,28 +386970,28 @@ sub_80D622C: ; 80D622C movs r1, 0x4 ldrsh r0, [r4, r1] cmp r0, 0 - bne @080D6274 + bne _080D6274 ldr r0, =0x02038436 - b @080D6276 + b _080D6276 .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 @@ -386999,9 +386999,9 @@ sub_80D622C: ; 80D622C adds r0, r2 movs r1, 0 strh r1, [r0, 0xE] - b @080D62CA + b _080D62CA .pool -@080D62B0: +_080D62B0: ldr r3, =0x03005e00 lsls r4, r5, 2 adds r0, r4, r5 @@ -387015,7 +387015,7 @@ sub_80D622C: ; 80D622C strh r1, [r0, 0xE] adds r2, r3, 0 adds r3, r4, 0 -@080D62CA: +_080D62CA: adds r1, r3, r5 lsls r1, 3 adds r1, r2 @@ -387068,10 +387068,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] @@ -387080,25 +387080,25 @@ sub_80D6308: ; 80D6308 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 .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 @@ -387107,7 +387107,7 @@ sub_80D6308: ; 80D6308 strh r0, [r4, 0x10] movs r0, 0x1 strh r0, [r4, 0x14] -@080D6382: +_080D6382: pop {r4,r5} pop {r0} bx r0 @@ -387125,7 +387125,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 @@ -387135,9 +387135,9 @@ sub_80D6388: ; 80D6388 ldrh r0, [r0] movs r1, 0xC bl __udivsi3 - b @080D63D4 + b _080D63D4 .pool -@080D63C0: +_080D63C0: ldr r4, =0x03005e00 lsls r5, r7, 2 adds r0, r5, r7 @@ -387147,22 +387147,22 @@ sub_80D6388: ; 80D6388 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 @@ -387238,7 +387238,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] @@ -387249,9 +387249,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] @@ -387262,9 +387262,9 @@ sub_80D646C: ; 80D646C ldrh r1, [r3, 0x22] ldrh r2, [r3, 0x18] adds r1, r2 - b @080D64DC + b _080D64DC .pool -@080D64C8: +_080D64C8: ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] @@ -387275,17 +387275,17 @@ sub_80D646C: ; 80D646C 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] @@ -387295,9 +387295,9 @@ sub_80D646C: ; 80D646C adds r0, r2 ldrh r1, [r3, 0x26] strh r1, [r0, 0x26] - b @080D6518 + b _080D6518 .pool -@080D6508: +_080D6508: ldr r2, =0x02020630 movs r0, 0x16 ldrsh r1, [r3, r0] @@ -387306,14 +387306,14 @@ sub_80D646C: ; 80D646C 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] @@ -387331,7 +387331,7 @@ sub_80D646C: ; 80D646C strh r4, [r0, 0x26] adds r0, r5, 0 bl move_anim_task_del -@080D654A: +_080D654A: pop {r4,r5} pop {r0} bx r0 @@ -387390,7 +387390,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 @@ -387398,9 +387398,9 @@ encrypt_decrypt_all_item_quantities: ; 80D658C 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] @@ -387413,11 +387413,11 @@ encrypt_decrypt_all_item_quantities: ; 80D658C 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 @@ -387503,27 +387503,27 @@ sub_80D6660: ; 80D6660 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, =gUnknown_085EFCD4 -@080D667E: +_080D667E: adds r0, r4, 0 bl CopyString - b @080D66BE + b _080D66BE .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 @@ -387531,15 +387531,15 @@ sub_80D6660: ; 80D6660 adds r1, r0 adds r0, r4, 0 bl GetBerryCountString - b @080D66BE + b _080D66BE .pool -@080D66B0: +_080D66B0: adds r0, r1, 0 bl itemid_get_item adds r1, r0, 0 adds r0, r4, 0 bl CopyString -@080D66BE: +_080D66BE: pop {r4} pop {r0} bx r0 @@ -387551,9 +387551,9 @@ GetBerryCountString: ; 80D66C4 push {r4,lr} ldr r4, =gUnknown_085EFCE5 cmp r2, 0x1 - bhi @080D66CE + bhi _080D66CE ldr r4, =gUnknown_085EFCDF -@080D66CE: +_080D66CE: bl CopyString movs r1, 0 strb r1, [r0] @@ -387578,26 +387578,26 @@ IsBagPocketNonEmpty: ; 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 .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 IsBagPocketNonEmpty @@ -387613,29 +387613,29 @@ sub_80D6724: ; 80D6724 bl itemid_get_pocket_number lsls r0, 24 cmp r0, 0 - beq @080D67B6 + beq _080D67B6 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080D6752 + bne _080D6752 ldr r0, =0x00004004 bl FlagGet 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 .pool -@080D6764: +_080D6764: movs r0, 0x1 - b @080D67B8 -@080D6768: + b _080D67B8 +_080D6768: adds r0, r7, 0 bl itemid_get_pocket_number subs r0, 0x1 @@ -387643,40 +387643,40 @@ sub_80D6724: ; 80D6724 movs r6, 0 ldr r1, =0x02039dd8 lsrs r4, r0, 21 - b @080D67AE + b _080D67AE .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 @@ -387687,30 +387687,30 @@ sub_80D6724: ; 80D6724 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 .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 @@ -387733,26 +387733,26 @@ sub_80D6800: ; 80D6800 bl itemid_get_pocket_number lsls r0, 24 cmp r0, 0 - beq @080D6906 + beq _080D6906 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080D6838 + bne _080D6838 ldr r0, =0x00004004 bl FlagGet 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 .pool -@080D684C: +_080D684C: mov r0, r8 bl itemid_get_pocket_number subs r0, 0x1 @@ -387760,9 +387760,9 @@ sub_80D6800: ; 80D6800 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 @@ -387770,19 +387770,19 @@ sub_80D6800: ; 80D6800 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 @@ -387791,17 +387791,17 @@ sub_80D6800: ; 80D6800 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 @@ -387809,37 +387809,37 @@ sub_80D6800: ; 80D6800 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 @@ -387847,17 +387847,17 @@ sub_80D6800: ; 80D6800 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 .pool -@080D6914: +_080D6914: movs r0, 0x1 -@080D6916: +_080D6916: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -387885,29 +387885,29 @@ 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 InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080D6964 + bne _080D6964 ldr r0, =0x00004004 bl FlagGet 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 .pool -@080D6978: +_080D6978: mov r0, r9 bl itemid_get_pocket_number subs r0, 0x1 @@ -387928,25 +387928,25 @@ bag_add_item: ; 80D6928 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] @@ -387956,10 +387956,10 @@ bag_add_item: ; 80D6928 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 @@ -387969,43 +387969,43 @@ bag_add_item: ; 80D6928 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 .pool -@080D6A40: +_080D6A40: cmp r4, 0x1 - bls @080D6A74 + bls _080D6A74 subs r0, r5, r2 lsls r0, 16 lsrs r5, r0, 16 @@ -388014,29 +388014,29 @@ bag_add_item: ; 80D6928 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 @@ -388045,7 +388045,7 @@ bag_add_item: ; 80D6928 mov r0, r8 bl Free movs r0, 0x1 -@080D6A92: +_080D6A92: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -388071,29 +388071,29 @@ 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 InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080D6AE0 + bne _080D6AE0 ldr r0, =0x00004004 bl FlagGet 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 .pool -@080D6AF4: +_080D6AF4: mov r0, r8 bl itemid_get_pocket_number subs r0, 0x1 @@ -388106,39 +388106,39 @@ sub_80D6AA4: ; 80D6AA4 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 .pool -@080D6B40: +_080D6B40: bl CurrentMapIsSecretBase lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080D6B70 + bne _080D6B70 ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet @@ -388154,27 +388154,27 @@ sub_80D6AA4: ; 80D6AA4 ldr r0, =0x000040ed mov r1, r8 bl VarSet -@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 @@ -388183,9 +388183,9 @@ sub_80D6AA4: ; 80D6AA4 lsrs r1, 16 bl encrypt_bag_item_quantity movs r7, 0 - b @080D6BCA + b _080D6BCA .pool -@080D6BB8: +_080D6BB8: subs r0, r7, r1 lsls r0, 16 lsrs r7, r0, 16 @@ -388194,7 +388194,7 @@ sub_80D6AA4: ; 80D6AA4 adds r0, 0x2 movs r1, 0 bl encrypt_bag_item_quantity -@080D6BCA: +_080D6BCA: ldr r0, [r5] adds r0, r4 adds r0, 0x2 @@ -388202,32 +388202,32 @@ sub_80D6AA4: ; 80D6AA4 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 @@ -388236,8 +388236,8 @@ sub_80D6AA4: ; 80D6AA4 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 @@ -388246,7 +388246,7 @@ sub_80D6AA4: ; 80D6AA4 adds r0, 0x2 movs r1, 0 bl encrypt_bag_item_quantity -@080D6C30: +_080D6C30: ldr r0, [r5] adds r0, r4 adds r0, 0x2 @@ -388254,23 +388254,23 @@ sub_80D6AA4: ; 80D6AA4 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 @@ -388299,10 +388299,10 @@ sub_80D6C7C: ; 80D6C7C 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] @@ -388313,8 +388313,8 @@ sub_80D6C7C: ; 80D6C7C lsls r0, 16 lsrs r4, r0, 16 cmp r4, r5 - bcc @080D6C8E -@080D6CA6: + bcc _080D6C8E +_080D6CA6: pop {r4-r7} pop {r0} bx r0 @@ -388328,7 +388328,7 @@ sub_80D6CAC: ; 80D6CAC ldr r2, [r0] movs r3, 0x93 lsls r3, 3 -@080D6CB8: +_080D6CB8: lsls r0, r1, 24 asrs r1, r0, 24 lsls r0, r1, 2 @@ -388336,20 +388336,20 @@ sub_80D6CAC: ; 80D6CAC adds r0, r3 ldrh r0, [r0] cmp r0, 0 - bne @080D6CD0 + bne _080D6CD0 adds r0, r1, 0 - b @080D6CE0 + b _080D6CE0 .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 @@ -388363,22 +388363,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} @@ -388394,7 +388394,7 @@ sub_80D6D1C: ; 80D6D1C lsls r1, 16 lsrs r5, r1, 16 movs r4, 0 -@080D6D28: +_080D6D28: ldr r0, =0x03005d8c ldr r2, [r0] lsls r1, r4, 2 @@ -388404,7 +388404,7 @@ sub_80D6D1C: ; 80D6D1C adds r0, r3 ldrh r0, [r0] cmp r0, r6 - bne @080D6D5C + bne _080D6D5C adds r0, r1, r2 ldr r1, =0x0000049a adds r0, r1 @@ -388412,18 +388412,18 @@ sub_80D6D1C: ; 80D6D1C lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bcc @080D6D5C + bcc _080D6D5C movs r0, 0x1 - b @080D6D68 + b _080D6D68 .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 @@ -388451,12 +388451,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 @@ -388465,7 +388465,7 @@ sub_80D6D70: ; 80D6D70 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 @@ -388475,34 +388475,34 @@ sub_80D6D70: ; 80D6D70 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 .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 @@ -388510,7 +388510,7 @@ sub_80D6D70: ; 80D6D70 adds r0, 0x2 adds r1, r5, 0 bl sub_80D6588 -@080D6E20: +_080D6E20: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x93 @@ -388522,7 +388522,7 @@ sub_80D6D70: ; 80D6D70 adds r0, r7, 0 bl Free movs r0, 0x1 -@080D6E3A: +_080D6E3A: pop {r3} mov r8, r3 pop {r4-r7} @@ -388549,13 +388549,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 .pool @@ -388565,26 +388565,26 @@ sub_80D6E48: ; 80D6E48 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 @@ -388595,17 +388595,17 @@ sub_80D6E84: ; 80D6E84 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 @@ -388622,21 +388622,21 @@ 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 .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 @@ -388694,43 +388694,43 @@ 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 @@ -388743,16 +388743,16 @@ sub_80D6FB4: ; 80D6FB4 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 @@ -388760,42 +388760,42 @@ sub_80D6FB4: ; 80D6FB4 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} @@ -388809,20 +388809,20 @@ sub_80D702C: ; 80D702C 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 @@ -388832,16 +388832,16 @@ sub_80D702C: ; 80D702C 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 @@ -388852,12 +388852,12 @@ sub_80D702C: ; 80D702C 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 @@ -388868,7 +388868,7 @@ 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] @@ -388878,7 +388878,7 @@ sub_80D7094: ; 80D7094 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls @080D709A + bls _080D709A pop {r4,r5} pop {r0} bx r0 @@ -388900,27 +388900,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} @@ -388956,33 +388956,33 @@ 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 .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 @@ -389016,37 +389016,37 @@ 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 .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 @@ -389099,84 +389099,84 @@ 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 .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 @@ -389190,7 +389190,7 @@ sub_80D7204: ; 80D7204 adds r0, r6, 0 bl Free movs r0, 0x1 -@080D7326: +_080D7326: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -389242,21 +389242,21 @@ 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 .pool -@080D73B4: +_080D73B4: movs r0, 0x14 bl Alloc adds r5, r0, 0 @@ -389272,25 +389272,25 @@ sub_80D7334: ; 80D7334 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 @@ -389298,24 +389298,24 @@ sub_80D7334: ; 80D7334 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 @@ -389328,9 +389328,9 @@ sub_80D7334: ; 80D7334 bl Free adds r0, r6, 0 bl Free -@080D744C: +_080D744C: movs r0, 0x1 -@080D744E: +_080D744E: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -389347,12 +389347,12 @@ itemid_sanitize: ; 80D745C 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 @@ -389723,7 +389723,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 @@ -389736,7 +389736,7 @@ sub_80D7724: ; 80D7724 adds r5, 0x20 adds r4, 0x1 cmp r4, 0x3 - ble @080D775E + ble _080D775E pop {r4,r5} pop {r0} bx r0 @@ -389757,7 +389757,7 @@ sub_80D779C: ; 80D779C movs r2, 0x1 bl SetBgAttribute movs r4, 0 -@080D77BA: +_080D77BA: lsls r0, r4, 24 lsrs r0, 24 ldr r1, =0x02039f34 @@ -389769,7 +389769,7 @@ sub_80D779C: ; 80D779C bl SetBgTilemap adds r4, 0x1 cmp r4, 0x3 - ble @080D77BA + ble _080D77BA pop {r4} pop {r0} bx r0 @@ -389787,22 +389787,22 @@ 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 .pool -@080D7818: +_080D7818: ldr r0, =0x03003014 ldrb r1, [r0] movs r2, 0x1 orrs r1, r2 strb r1, [r0] -@080D7822: +_080D7822: pop {r0} bx r0 .pool @@ -389822,7 +389822,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 @@ -389832,7 +389832,7 @@ sub_80D782C: ; 80D782C adds r4, r0 adds r5, 0x1 cmp r5, 0xD - ble @080D7848 + ble _080D7848 ldr r0, =0x00007e3f movs r1, 0xF3 movs r2, 0x2 @@ -389854,7 +389854,7 @@ sub_80D787C: ; 80D787C bl memset movs r5, 0 movs r2, 0xFF -@080D7890: +_080D7890: ldr r0, [r4] ldr r1, [r0] adds r1, 0x2 @@ -389864,11 +389864,11 @@ sub_80D787C: ; 80D787C 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 @@ -389878,14 +389878,14 @@ sub_80D787C: ; 80D787C 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 @@ -389908,7 +389908,7 @@ sub_80D787C: ; 80D787C adds r3, 0x1C subs r5, 0x1 cmp r5, 0 - bge @080D78CC + bge _080D78CC ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x8] @@ -389933,16 +389933,16 @@ sub_80D787C: ; 80D787C 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 @@ -389959,7 +389959,7 @@ sub_80D787C: ; 80D787C adds r3, 0x1C adds r5, 0x1 cmp r5, 0x3 - ble @080D7942 + ble _080D7942 bl sub_80DD590 ldr r0, =0x02039f34 ldr r0, [r0] @@ -390151,20 +390151,20 @@ 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 .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 @@ -390205,13 +390205,13 @@ sub_80D7B24: ; 80D7B24 strb r5, [r0] bl sub_806E414 bl sub_80D787C - b @080D7BF6 + b _080D7BF6 .pool -@080D7BD4: +_080D7BD4: movs r0, 0x2 strb r0, [r6] - b @080D7C56 -@080D7BDA: + b _080D7C56 +_080D7BDA: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -390219,19 +390219,19 @@ sub_80D7B24: ; 80D7B24 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 .pool -@080D7C04: +_080D7C04: bl sub_80DE224 ldr r0, =0x02022e18 movs r1, 0 @@ -390261,12 +390261,12 @@ sub_80D7B24: ; 80D7B24 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 @@ -390285,7 +390285,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 @@ -390294,7 +390294,7 @@ sub_80D7C7C: ; 80D7C7C strh r2, [r1, 0x8] ldr r0, =sub_80D7CB4 str r0, [r1] -@080D7CA2: +_080D7CA2: pop {r0} bx r0 .pool @@ -390310,11 +390310,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 @@ -390324,27 +390324,27 @@ 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 .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 @@ -390353,18 +390353,18 @@ sub_80D7CB4: ; 80D7CB4 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080D7D9E + b _080D7D9E .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 @@ -390372,7 +390372,7 @@ sub_80D7CB4: ; 80D7CB4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @080D7D9E + bne _080D7D9E ldrb r1, [r2, 0x8] movs r0, 0x7F ands r0, r1 @@ -390382,9 +390382,9 @@ sub_80D7CB4: ; 80D7CB4 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @080D7D62 + bne _080D7D62 bl sub_80DBF68 -@080D7D62: +_080D7D62: ldr r0, =sub_80D7DAC movs r1, 0 bl AddTask @@ -390396,9 +390396,9 @@ sub_80D7CB4: ; 80D7CB4 strh r4, [r0, 0x8] ldr r1, =nullsub_41 str r1, [r0] - b @080D7D9E + b _080D7D9E .pool -@080D7D90: +_080D7D90: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -390406,7 +390406,7 @@ sub_80D7CB4: ; 80D7CB4 adds r1, r0 ldr r0, =sub_80D80C8 str r0, [r1] -@080D7D9E: +_080D7D9E: pop {r4-r6} pop {r0} bx r0 @@ -390458,7 +390458,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 @@ -390476,7 +390476,7 @@ sub_80D7DE8: ; 80D7DE8 ldr r0, =0x030060b8 ldr r0, [r0] str r0, [r1] -@080D7E2A: +_080D7E2A: pop {r4,r5} pop {r0} bx r0 @@ -390494,25 +390494,25 @@ 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 .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 @@ -390536,16 +390536,16 @@ sub_80D7E44: ; 80D7E44 adds r2, r4, 0 movs r3, 0x1 bl RequestDma3Fill - b @080D80AE + b _080D80AE .pool -@080D7EC8: +_080D7EC8: ldr r0, =gUnknown_08C17AB0 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - b @080D80AE + b _080D80AE .pool -@080D7ED8: +_080D7ED8: ldr r0, =gUnknown_08C1850C ldr r4, =0x06002000 adds r1, r4, 0 @@ -390559,7 +390559,7 @@ sub_80D7E44: ; 80D7E44 lsls r2, 5 movs r7, 0x84 lsls r7, 24 -@080D7EF4: +_080D7EF4: str r4, [r1] str r3, [r1, 0x4] str r6, [r1, 0x8] @@ -390568,16 +390568,16 @@ sub_80D7E44: ; 80D7E44 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 .pool -@080D7F28: +_080D7F28: ldr r1, =gUnknown_08C16FA8 movs r0, 0x3 movs r2, 0 @@ -390585,9 +390585,9 @@ sub_80D7E44: ; 80D7E44 bl CopyToBgTilemapBuffer movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @080D80AE + b _080D80AE .pool -@080D7F40: +_080D7F40: ldr r1, =gUnknown_08C17170 movs r0, 0x2 movs r2, 0 @@ -390605,9 +390605,9 @@ sub_80D7E44: ; 80D7E44 ldr r1, =0x84000200 str r1, [r0, 0x8] ldr r0, [r0, 0x8] - b @080D80AE + b _080D80AE .pool -@080D7F7C: +_080D7F7C: ldr r0, =gUnknown_08C16E90 movs r2, 0x80 lsls r2, 2 @@ -390653,9 +390653,9 @@ sub_80D7E44: ; 80D7E44 str r1, [r0, 0x8] ldr r0, [r0, 0x8] bl sub_80D782C - b @080D80AE + b _080D80AE .pool -@080D8004: +_080D8004: bl sub_80DD04C bl sub_80DBF90 bl sub_80DB2BC @@ -390704,21 +390704,21 @@ sub_80D7E44: ; 80D7E44 bl ShowBg movs r0, 0x1 bl ShowBg - b @080D80AE + b _080D80AE .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 @@ -390745,7 +390745,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 @@ -390755,7 +390755,7 @@ sub_80D80C8: ; 80D80C8 strh r2, [r1, 0xA] ldr r0, =sub_80D8108 str r0, [r1] -@080D80F8: +_080D80F8: pop {r0} bx r0 .pool @@ -390776,21 +390776,21 @@ 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 .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 @@ -390801,7 +390801,7 @@ sub_80D8108: ; 80D8108 lsls r0, 16 asrs r0, 16 cmp r0, 0x3C - ble @080D822C + ble _080D822C movs r0, 0 strh r0, [r4, 0xA] movs r0, 0x61 @@ -390810,8 +390810,8 @@ sub_80D8108: ; 80D8108 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 @@ -390819,14 +390819,14 @@ sub_80D8108: ; 80D8108 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 .pool -@080D8194: +_080D8194: bl sub_80DE350 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -390836,9 +390836,9 @@ sub_80D8108: ; 80D8108 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080D822C + b _080D822C .pool -@080D81B0: +_080D81B0: movs r0, 0x8 bl GetGpuReg mov r1, sp @@ -390871,13 +390871,13 @@ sub_80D8108: ; 80D8108 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 .pool -@080D8208: +_080D8208: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -390887,7 +390887,7 @@ sub_80D8108: ; 80D8108 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @080D822C + bne _080D822C lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -390896,7 +390896,7 @@ sub_80D8108: ; 80D8108 strh r1, [r0, 0xA] ldr r1, =sub_80D833C str r1, [r0] -@080D822C: +_080D822C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -390912,21 +390912,21 @@ sub_80D823C: ; 80D823C bl PrepareSpritesForOamLoad 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 CopyBgTilemapBufferToVram -@080D8266: +_080D8266: adds r4, 0x1 cmp r4, 0x3 - ble @080D8250 + ble _080D8250 movs r0, 0 strb r0, [r5] pop {r4,r5} @@ -391008,7 +391008,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 @@ -391036,17 +391036,17 @@ sub_80D833C: ; 80D833C bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne @080D83CC + bne _080D83CC ldr r0, =0x02022e2c ldr r1, =gUnknown_0827D507 bl CopyString - b @080D83D4 + b _080D83D4 .pool -@080D83CC: +_080D83CC: ldr r0, =0x02022e2c ldr r1, =gUnknown_0827D531 bl CopyString -@080D83D4: +_080D83D4: bl sub_80DB89C ldr r4, =0x02021fc4 ldr r1, =0x02022e2c @@ -391063,16 +391063,16 @@ sub_80D833C: ; 80D833C ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @080D841A + b _080D841A .pool -@080D840C: +_080D840C: bl sub_80DED4C cmp r0, 0 - bne @080D841A + bne _080D841A strh r0, [r4, 0x8] ldr r0, =sub_80D8424 str r0, [r4] -@080D841A: +_080D841A: pop {r4,r5} pop {r0} bx r0 @@ -391090,10 +391090,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 @@ -391101,7 +391101,7 @@ sub_80D8424: ; 80D8424 bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne @080D8474 + bne _080D8474 movs r0, 0x1 bl sub_80DC490 ldr r0, =0x03005e00 @@ -391110,18 +391110,18 @@ sub_80D8424: ; 80D8424 lsls r1, 3 adds r1, r0 ldr r0, =sub_80D8490 - b @080D8480 + b _080D8480 .pool -@080D8474: +_080D8474: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_80D8894 -@080D8480: +_080D8480: str r0, [r1] -@080D8482: +_080D8482: pop {r4,r5} pop {r0} bx r0 @@ -391150,7 +391150,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] @@ -391167,12 +391167,12 @@ sub_80D8490: ; 80D8490 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] @@ -391186,7 +391186,7 @@ sub_80D8490: ; 80D8490 bl AreMovesContestCombo lsls r0, 24 cmp r0, 0 - beq @080D853C + beq _080D853C ldr r0, [r7] mov r2, r8 ldrb r1, [r2] @@ -391199,14 +391199,14 @@ sub_80D8490: ; 80D8490 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @080D853C + beq _080D853C add r0, sp, 0x4 ldr r1, =gUnknown_085ED1A0 - b @080D8566 + b _080D8566 .pool -@080D853C: +_080D853C: cmp r4, 0 - beq @080D856C + beq _080D856C ldr r0, [r7] mov r2, r8 ldrb r1, [r2] @@ -391217,19 +391217,19 @@ sub_80D8490: ; 80D8490 adds r0, r2 ldrh r0, [r0, 0x8] cmp r0, r4 - bne @080D856C + bne _080D856C ldr r0, =gContestMoves lsls r1, r4, 3 adds r1, r0 ldrb r0, [r1] cmp r0, 0x3 - beq @080D856C + beq _080D856C add r0, sp, 0x4 ldr r1, =gUnknown_085ED1A7 -@080D8566: +_080D8566: bl CopyString adds r5, r0, 0 -@080D856C: +_080D856C: movs r0, 0xD adds r1, r4, 0 muls r1, r0 @@ -391253,7 +391253,7 @@ sub_80D8490: ; 80D8490 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls @080D84B8 + bls _080D84B8 ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -391307,23 +391307,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 @@ -391333,28 +391333,28 @@ sub_80D8610: ; 80D8610 adds r1, r0 ldr r0, =sub_80D8894 str r0, [r1] - b @080D87FA + b _080D87FA .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 @@ -391373,17 +391373,17 @@ sub_80D8610: ; 80D8610 bl sub_80DBCA8 lsls r0, 24 cmp r0, 0 - bne @080D86DC + bne _080D86DC ldr r0, =0x02022e2c ldr r1, =gUnknown_0827D507 bl CopyString - b @080D86E4 + b _080D86E4 .pool -@080D86DC: +_080D86DC: ldr r0, =0x02022e2c ldr r1, =gUnknown_0827D531 bl CopyString -@080D86E4: +_080D86E4: bl sub_80DB89C ldr r4, =0x02021fc4 ldr r1, =0x02022e2c @@ -391404,9 +391404,9 @@ sub_80D8610: ; 80D8610 adds r0, r1 ldr r1, =sub_80D8424 str r1, [r0] - b @080D87FA + b _080D87FA .pool -@080D8730: +_080D8730: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -391418,13 +391418,13 @@ sub_80D8610: ; 80D8610 ldr r1, [r0] ldrb r0, [r1] cmp r0, 0 - bne @080D8754 + bne _080D8754 subs r0, r6, 0x1 - b @080D8756 + b _080D8756 .pool -@080D8754: +_080D8754: subs r0, 0x1 -@080D8756: +_080D8756: strb r0, [r1] ldr r4, =0x02039f34 ldr r0, [r4] @@ -391447,12 +391447,12 @@ sub_80D8610: ; 80D8610 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 .pool -@080D879C: +_080D879C: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -391465,14 +391465,14 @@ sub_80D8610: ; 80D8610 ldrb r2, [r1] subs r0, r6, 0x1 cmp r2, r0 - bne @080D87C0 + bne _080D87C0 strb r5, [r1] - b @080D87C4 + b _080D87C4 .pool -@080D87C0: +_080D87C0: adds r0, r2, 0x1 strb r0, [r1] -@080D87C4: +_080D87C4: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0] @@ -391494,10 +391494,10 @@ sub_80D8610: ; 80D8610 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 @@ -391585,7 +391585,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 @@ -391617,9 +391617,9 @@ sub_80D8894: ; 80D8894 bl sub_80DBF68 movs r0, 0 bl sub_80DC490 - b @080D891E + b _080D891E .pool -@080D890C: +_080D890C: bl sub_80DB918 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -391628,7 +391628,7 @@ sub_80D8894: ; 80D8894 adds r1, r0 ldr r0, =sub_80D895C str r0, [r1] -@080D891E: +_080D891E: pop {r4,r5} pop {r0} bx r0 @@ -391673,7 +391673,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 @@ -391688,7 +391688,7 @@ sub_80D895C: ; 80D895C adds r5, r0 adds r6, 0x1 cmp r6, 0x3 - ble @080D897C + ble _080D897C movs r0, 0 bl sub_80DED60 ldr r1, =0x02037b14 @@ -391740,7 +391740,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] @@ -391749,13 +391749,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 str r0, [r4] -@080D8A42: +_080D8A42: pop {r4} pop {r0} bx r0 @@ -391775,7 +391775,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 @@ -391783,7 +391783,7 @@ sub_80D8A50: ; 80D8A50 adds r1, r0 ldr r0, =sub_80D8A88 str r0, [r1] -@080D8A76: +_080D8A76: pop {r0} bx r0 .pool @@ -391805,7 +391805,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] @@ -391822,18 +391822,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 @@ -391853,8 +391853,8 @@ sub_80D8A88: ; 80D8A88 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 @@ -391863,7 +391863,7 @@ sub_80D8A88: ; 80D8A88 strh r1, [r0, 0x8] ldr r1, =sub_80D8B38 str r1, [r0] -@080D8B18: +_080D8B18: pop {r4-r7} pop {r0} bx r0 @@ -391896,78 +391896,78 @@ 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 .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 @@ -391980,15 +391980,15 @@ sub_80D8B38: ; 80D8B38 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] @@ -392002,7 +392002,7 @@ sub_80D8B38: ; 80D8B38 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq @080D8D14 + beq _080D8D14 ldrb r0, [r2, 0x7] movs r1, 0x4 orrs r0, r1 @@ -392010,12 +392010,12 @@ sub_80D8B38: ; 80D8B38 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 adds r0, r4, 0 movs r1, 0 @@ -392032,9 +392032,9 @@ sub_80D8B38: ; 80D8B38 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D8D14: +_080D8D14: adds r0, r6, 0 bl sub_80DD080 ldr r0, =0x03005e00 @@ -392044,9 +392044,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x2 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D8D30: +_080D8D30: mov r3, r9 ldr r0, [r3] ldr r0, [r0] @@ -392054,9 +392054,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -392064,8 +392064,8 @@ sub_80D8B38: ; 80D8B38 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 @@ -392080,15 +392080,15 @@ sub_80D8B38: ; 80D8B38 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 @@ -392097,9 +392097,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x1F strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D8DA4: +_080D8DA4: bl sub_80DB89C ldr r0, =0x03005e00 mov r3, r8 @@ -392110,20 +392110,20 @@ sub_80D8B38: ; 80D8B38 strh r6, [r1, 0x1C] movs r0, 0x3 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .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] @@ -392184,9 +392184,9 @@ sub_80D8B38: ; 80D8B38 movs r1, 0 bl sub_80DCBE8 strh r7, [r4, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D8E7C: +_080D8E7C: mov r2, r8 lsls r0, r2, 2 add r0, r8 @@ -392202,9 +392202,9 @@ sub_80D8B38: ; 80D8B38 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @080D8EA0 - bl @080DA100 -@080D8EA0: + beq _080D8EA0 + bl _080DA100 +_080D8EA0: mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x14] @@ -392214,14 +392214,14 @@ sub_80D8B38: ; 80D8B38 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 .pool -@080D8EC8: +_080D8EC8: mov r5, r9 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -392233,7 +392233,7 @@ sub_80D8B38: ; 80D8B38 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080D8EF2 + beq _080D8EF2 mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -392241,8 +392241,8 @@ sub_80D8B38: ; 80D8B38 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 @@ -392257,7 +392257,7 @@ sub_80D8B38: ; 80D8B38 movs r0, 0xB1 lsls r0, 1 cmp r1, r0 - bhi @080D8F38 + bhi _080D8F38 ldr r0, =0x02021dc4 adds r2, r1, 0 movs r1, 0xD @@ -392265,9 +392265,9 @@ sub_80D8B38: ; 80D8B38 ldr r2, =gMoveNames adds r1, r2 bl CopyString - b @080D8F48 + b _080D8F48 .pool -@080D8F38: +_080D8F38: ldr r0, =0x02021dc4 ldr r2, =gUnknown_08587F1C ldrb r1, [r3, 0xA] @@ -392275,7 +392275,7 @@ sub_80D8B38: ; 80D8B38 adds r1, r2 ldr r1, [r1] bl CopyString -@080D8F48: +_080D8F48: ldr r4, =0x02021fc4 ldr r1, =gUnknown_0827D55A adds r0, r4, 0 @@ -392291,15 +392291,15 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x6 strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .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] @@ -392313,9 +392313,9 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x7 strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D8FB8: +_080D8FB8: mov r5, r9 ldr r1, [r5] ldr r0, [r1] @@ -392350,18 +392350,18 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x8 strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .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 @@ -392370,7 +392370,7 @@ sub_80D8B38: ; 80D8B38 adds r0, 0x5A ldrb r0, [r0] cmp r0, 0 - beq @080D9060 + beq _080D9060 ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -392380,9 +392380,9 @@ sub_80D8B38: ; 80D8B38 strh r4, [r1, 0x1C] movs r0, 0x9 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9060: +_080D9060: ldr r1, [r1, 0x4] lsls r0, r6, 3 subs r0, r6 @@ -392392,17 +392392,17 @@ sub_80D8B38: ; 80D8B38 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 .pool -@080D908C: +_080D908C: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -392414,15 +392414,15 @@ sub_80D8B38: ; 80D8B38 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 @@ -392443,7 +392443,7 @@ sub_80D8B38: ; 80D8B38 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 @@ -392455,24 +392455,24 @@ sub_80D8B38: ; 80D8B38 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] @@ -392482,10 +392482,10 @@ sub_80D8B38: ; 80D8B38 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] @@ -392509,38 +392509,38 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x18 strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .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 .pool -@080D91A4: +_080D91A4: mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x4] @@ -392552,22 +392552,22 @@ sub_80D8B38: ; 80D8B38 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 @@ -392576,9 +392576,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x31 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D91F4: +_080D91F4: mov r3, r9 ldr r0, [r3] ldr r0, [r0] @@ -392586,9 +392586,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -392596,8 +392596,8 @@ sub_80D8B38: ; 80D8B38 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 @@ -392608,9 +392608,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0xC strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9238: +_080D9238: mov r3, r9 ldr r0, [r3] ldr r1, [r0, 0x4] @@ -392631,9 +392631,9 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0xD strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D926C: +_080D926C: mov r0, r9 ldr r1, [r0] ldr r0, [r1] @@ -392645,9 +392645,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -392655,8 +392655,8 @@ sub_80D8B38: ; 80D8B38 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] @@ -392668,10 +392668,10 @@ sub_80D8B38: ; 80D8B38 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 @@ -392680,9 +392680,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x24 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D92D0: +_080D92D0: mov r5, r9 ldr r0, [r5] ldr r0, [r0] @@ -392690,9 +392690,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -392700,14 +392700,14 @@ sub_80D8B38: ; 80D8B38 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 @@ -392718,18 +392718,18 @@ sub_80D8B38: ; 80D8B38 strh r1, [r0, 0x1C] movs r1, 0x26 strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .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 .pool -@080D9334: +_080D9334: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -392741,24 +392741,24 @@ sub_80D8B38: ; 80D8B38 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 @@ -392767,9 +392767,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x19 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9388: +_080D9388: mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -392779,8 +392779,8 @@ sub_80D8B38: ; 80D8B38 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] @@ -392793,37 +392793,37 @@ sub_80D8B38: ; 80D8B38 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 .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 @@ -392832,23 +392832,23 @@ sub_80D8B38: ; 80D8B38 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 @@ -392876,9 +392876,9 @@ sub_80D8B38: ; 80D8B38 strb r0, [r4, 0x13] movs r0, 0x1B strh r0, [r5, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9464: +_080D9464: mov r0, r10 add r0, r8 lsls r0, 3 @@ -392888,13 +392888,13 @@ sub_80D8B38: ; 80D8B38 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 @@ -392903,9 +392903,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x1C strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D94A0: +_080D94A0: movs r7, 0 mov r3, r8 lsls r0, r3, 2 @@ -392919,16 +392919,16 @@ sub_80D8B38: ; 80D8B38 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] @@ -392952,9 +392952,9 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x1D strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9508: +_080D9508: movs r7, 0 mov r2, r8 lsls r0, r2, 2 @@ -392968,14 +392968,14 @@ sub_80D8B38: ; 80D8B38 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] @@ -392985,18 +392985,18 @@ sub_80D8B38: ; 80D8B38 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 .pool -@080D955C: +_080D955C: movs r7, 0 mov r2, r8 lsls r0, r2, 2 @@ -393010,23 +393010,23 @@ sub_80D8B38: ; 80D8B38 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 @@ -393036,17 +393036,17 @@ sub_80D8B38: ; 80D8B38 strh r1, [r0, 0x1C] movs r1, 0x28 strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D95B4: +_080D95B4: ldr r0, =0x03005e00 mov r1, r10 add r1, r8 lsls r1, 3 adds r1, r0 - b @080D95E4 + b _080D95E4 .pool -@080D95C4: +_080D95C4: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -393058,16 +393058,16 @@ sub_80D8B38: ; 80D8B38 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] @@ -393081,35 +393081,35 @@ sub_80D8B38: ; 80D8B38 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 .pool -@080D963C: +_080D963C: movs r0, 0x64 bl audio_play -@080D9642: +_080D9642: ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -393121,7 +393121,7 @@ sub_80D8B38: ; 80D8B38 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @080D9670 + beq _080D9670 lsrs r0, r6, 24 bl sub_80DC674 ldr r0, [r5] @@ -393132,7 +393132,7 @@ sub_80D8B38: ; 80D8B38 negs r0, r0 ands r0, r2 strb r0, [r1, 0x15] -@080D9670: +_080D9670: ldr r0, =0x03005e00 mov r1, r10 add r1, r8 @@ -393143,9 +393143,9 @@ sub_80D8B38: ; 80D8B38 strh r0, [r1, 0xA] movs r0, 0x1A strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9690: +_080D9690: mov r5, r8 lsls r2, r5, 2 adds r0, r2, r5 @@ -393158,9 +393158,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393174,13 +393174,13 @@ sub_80D8B38: ; 80D8B38 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 @@ -393194,7 +393194,7 @@ sub_80D8B38: ; 80D8B38 adds r0, r4, 0 movs r1, 0x1 bl sub_80DEC30 -@080D96F6: +_080D96F6: ldr r0, =0x03005e00 mov r1, r10 add r1, r8 @@ -393202,14 +393202,14 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x34 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .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] @@ -393221,7 +393221,7 @@ sub_80D8B38: ; 80D8B38 movs r0, 0x40 ands r0, r1 cmp r0, 0 - bne @080D975C + bne _080D975C ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -393230,9 +393230,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x11 strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D975C: +_080D975C: ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -393241,9 +393241,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0xE strh r0, [r1, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9774: +_080D9774: mov r4, r9 ldr r0, [r4] ldr r1, [r0, 0x4] @@ -393255,28 +393255,28 @@ sub_80D8B38: ; 80D8B38 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, =gUnknown_0827E32E - b @080D97A6 + b _080D97A6 .pool -@080D97A0: +_080D97A0: cmp r0, 0x2 - bne @080D97B4 + bne _080D97B4 ldr r0, =gUnknown_0827E35B -@080D97A6: +_080D97A6: movs r1, 0x1 bl sub_80DEC30 - b @080D97BC + b _080D97BC .pool -@080D97B4: +_080D97B4: ldr r0, =gUnknown_0827E38D movs r1, 0x1 bl sub_80DEC30 -@080D97BC: +_080D97BC: movs r0, 0x3 bl sub_80DD720 ldr r1, =0x03005e00 @@ -393287,9 +393287,9 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0 strh r1, [r0, 0x1C] - b @080D9812 + b _080D9812 .pool -@080D97DC: +_080D97DC: bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -393312,12 +393312,12 @@ sub_80D8B38: ; 80D8B38 lsls r0, 3 adds r0, r1 strh r5, [r0, 0x1C] -@080D9812: +_080D9812: movs r1, 0x2D strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D9830: +_080D9830: mov r3, r9 ldr r0, [r3] ldr r2, [r0] @@ -393325,9 +393325,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393338,14 +393338,14 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0xF strh r1, [r0, 0x8] - bl @080DA100 + bl _080DA100 .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 @@ -393358,9 +393358,9 @@ sub_80D8B38: ; 80D8B38 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] @@ -393373,7 +393373,7 @@ sub_80D8B38: ; 80D8B38 mov r8, r0 ands r0, r1 cmp r0, 0 - bne @080D98C2 + bne _080D98C2 movs r1, 0x2 ldrsh r0, [r2, r1] ldrb r1, [r2, 0x17] @@ -393386,12 +393386,12 @@ sub_80D8B38: ; 80D8B38 ldrb r2, [r1, 0x17] adds r0, r2 strh r0, [r1, 0x2] -@080D98C2: +_080D98C2: mov r3, r8 strh r3, [r4, 0x8] - bl @080DA100 + bl _080DA100 .pool -@080D98D4: +_080D98D4: mov r5, r9 ldr r0, [r5] ldr r1, [r0, 0x14] @@ -393403,9 +393403,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393414,8 +393414,8 @@ sub_80D8B38: ; 80D8B38 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] @@ -393427,7 +393427,7 @@ sub_80D8B38: ; 80D8B38 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080D996C + beq _080D996C bl sub_80DB89C ldr r0, =0x02021cc4 lsls r1, r6, 6 @@ -393452,9 +393452,9 @@ sub_80D8B38: ; 80D8B38 bl sub_80DD720 movs r0, 0x2E strh r0, [r4, 0x8] - b @080DA100 + b _080DA100 .pool -@080D996C: +_080D996C: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -393462,8 +393462,8 @@ sub_80D8B38: ; 80D8B38 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] @@ -393471,9 +393471,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393481,13 +393481,13 @@ sub_80D8B38: ; 80D8B38 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] @@ -393516,9 +393516,9 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x12 strh r1, [r0, 0x8] - b @080DA100 + b _080DA100 .pool -@080D99EC: +_080D99EC: bl sub_80DCD48 ldr r0, =0x02039f34 ldr r0, [r0] @@ -393531,9 +393531,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393544,9 +393544,9 @@ sub_80D8B38: ; 80D8B38 bl sub_80DB89C movs r0, 0x29 strh r0, [r4, 0x8] - b @080DA100 + b _080DA100 .pool -@080D9A2C: +_080D9A2C: mov r1, r9 ldr r0, [r1] ldr r2, [r0, 0x10] @@ -393554,12 +393554,12 @@ sub_80D8B38: ; 80D8B38 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 @@ -393567,8 +393567,8 @@ sub_80D8B38: ; 80D8B38 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] @@ -393584,7 +393584,7 @@ sub_80D8B38: ; 80D8B38 ands r0, r1 str r2, [sp, 0x4] cmp r0, 0 - beq @080D9A94 + beq _080D9A94 movs r4, 0x1 str r4, [sp] ldr r0, =0x02021ec4 @@ -393594,9 +393594,9 @@ sub_80D8B38: ; 80D8B38 ldr r2, =gMoveNames adds r1, r2 bl CopyString - b @080D9AAE + b _080D9AAE .pool -@080D9A94: +_080D9A94: ldr r0, =0x02021ec4 ldr r3, =gUnknown_08587F08 ldr r2, =gContestMoves @@ -393609,11 +393609,11 @@ sub_80D8B38: ; 80D8B38 adds r1, r3 ldr r1, [r1] bl CopyString -@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] @@ -393625,10 +393625,10 @@ sub_80D8B38: ; 80D8B38 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 @@ -393650,45 +393650,45 @@ sub_80D8B38: ; 80D8B38 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 .pool -@080D9B30: +_080D9B30: cmp r3, 0 - bge @080D9B48 + bge _080D9B48 ldr r0, =0x02021fc4 ldr r1, =gUnknown_0827E73C bl ExpandStringRefs - b @080D9B74 + b _080D9B74 .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, =gUnknown_0827E717 bl ExpandStringRefs - b @080D9B74 + b _080D9B74 .pool -@080D9B6C: +_080D9B6C: ldr r0, =0x02021fc4 ldr r1, =gUnknown_0827E76A bl ExpandStringRefs -@080D9B74: +_080D9B74: ldr r0, =0x02021fc4 movs r1, 0x1 bl sub_80DEC30 @@ -393702,16 +393702,16 @@ sub_80D8B38: ; 80D8B38 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 .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 @@ -393720,47 +393720,47 @@ sub_80D8B38: ; 80D8B38 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 .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] @@ -393770,29 +393770,29 @@ sub_80D8B38: ; 80D8B38 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 @@ -393800,16 +393800,16 @@ sub_80D8B38: ; 80D8B38 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 .pool -@080D9C68: +_080D9C68: mov r3, r8 lsls r1, r3, 2 adds r0, r1, r3 @@ -393819,32 +393819,32 @@ sub_80D8B38: ; 80D8B38 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 .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] @@ -393852,16 +393852,16 @@ sub_80D8B38: ; 80D8B38 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] @@ -393871,9 +393871,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393884,9 +393884,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393915,8 +393915,8 @@ sub_80D8B38: ; 80D8B38 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] @@ -393926,23 +393926,23 @@ sub_80D8B38: ; 80D8B38 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 @@ -393951,9 +393951,9 @@ sub_80D8B38: ; 80D8B38 ldrh r0, [r1, 0x1C] adds r0, 0x1 strh r0, [r1, 0x1C] - b @080DA100 + b _080DA100 .pool -@080D9D84: +_080D9D84: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -393961,9 +393961,9 @@ sub_80D8B38: ; 80D8B38 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 @@ -393972,9 +393972,9 @@ sub_80D8B38: ; 80D8B38 strh r3, [r0, 0x1E] movs r1, 0x2B strh r1, [r0, 0x8] - b @080DA100 + b _080DA100 .pool -@080D9DAC: +_080D9DAC: mov r5, r9 ldr r0, [r5] ldr r1, [r0, 0x14] @@ -393984,16 +393984,16 @@ sub_80D8B38: ; 80D8B38 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 .pool -@080D9DD4: +_080D9DD4: bl sub_80DB89C ldr r0, =0x02021ec4 ldr r5, =0x02039f34 @@ -394038,14 +394038,14 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x3A strh r1, [r0, 0x8] - b @080DA100 + b _080DA100 .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, =gUnknown_0827E817 @@ -394062,21 +394062,21 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x3B strh r1, [r0, 0x8] - b @080DA100 + b _080DA100 .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 .pool -@080D9EBC: +_080D9EBC: mov r1, r9 ldr r0, [r1] ldr r1, [r0, 0x4] @@ -394088,12 +394088,12 @@ sub_80D8B38: ; 80D8B38 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 @@ -394127,26 +394127,26 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x22 strh r1, [r0, 0x8] - b @080DA100 + b _080DA100 .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 .pool -@080D9F68: +_080D9F68: bl sub_80DDBE8 ldr r0, =0x03005e00 mov r5, r8 @@ -394156,9 +394156,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x38 strh r0, [r1, 0x8] - b @080DA100 + b _080DA100 .pool -@080D9F84: +_080D9F84: mov r1, r9 ldr r0, [r1] ldr r2, [r0] @@ -394168,16 +394168,16 @@ sub_80D8B38: ; 80D8B38 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 @@ -394186,9 +394186,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0xA strh r0, [r1, 0x8] - b @080DA100 + b _080DA100 .pool -@080D9FC0: +_080D9FC0: mov r3, r8 lsls r2, r3, 2 add r2, r8 @@ -394205,9 +394205,9 @@ sub_80D8B38: ; 80D8B38 str r1, [r0] movs r0, 0xB strh r0, [r2, 0x8] - b @080DA100 + b _080DA100 .pool -@080D9FEC: +_080D9FEC: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -394224,16 +394224,16 @@ sub_80D8B38: ; 80D8B38 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 RemoveObjectAndFreeTiles movs r0, 0x14 strh r0, [r4, 0x8] - b @080DA100 + b _080DA100 .pool -@080DA024: +_080DA024: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -394243,8 +394243,8 @@ sub_80D8B38: ; 80D8B38 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 @@ -394266,12 +394266,12 @@ sub_80D8B38: ; 80D8B38 adds r0, r1 movs r1, 0x20 strh r1, [r0, 0x8] - b @080DA100 + b _080DA100 .pool -@080DA080: +_080DA080: bl sub_80DED4C cmp r0, 0 - bne @080DA100 + bne _080DA100 ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -394280,9 +394280,9 @@ sub_80D8B38: ; 80D8B38 adds r1, r0 movs r0, 0x15 strh r0, [r1, 0x8] - b @080DA100 + b _080DA100 .pool -@080DA0A0: +_080DA0A0: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -394294,13 +394294,13 @@ sub_80D8B38: ; 80D8B38 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] @@ -394311,7 +394311,7 @@ sub_80D8B38: ; 80D8B38 lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bne @080DA0F4 + bne _080DA0F4 mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -394322,16 +394322,16 @@ sub_80D8B38: ; 80D8B38 strh r2, [r0, 0xC] ldr r1, =sub_80DA198 str r1, [r0] - b @080DA100 + b _080DA100 .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 @@ -394369,22 +394369,22 @@ sub_80DA134: ; 80DA134 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, =DummyObjectCallback str r0, [r1, 0x1C] -@080DA15C: +_080DA15C: pop {r0} bx r0 .pool @@ -394405,7 +394405,7 @@ sub_80DA164: ; 80DA164 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge @080DA18E + bge _080DA18E ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] adds r2, 0x3E @@ -394413,7 +394413,7 @@ sub_80DA164: ; 80DA164 movs r1, 0x4 orrs r0, r1 strb r0, [r2] -@080DA18E: +_080DA18E: pop {r0} bx r0 .pool @@ -394432,25 +394432,25 @@ 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 .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] @@ -394461,10 +394461,10 @@ sub_80DA198: ; 80DA198 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 adds r0, r4, 0 movs r1, 0 @@ -394476,13 +394476,13 @@ sub_80DA198: ; 80DA198 bl set_task_function_and_args_14_15 bl sub_80DBF68 strh r6, [r5, 0x8] - b @080DA250 + b _080DA250 .pool -@080DA224: +_080DA224: bl sub_80DB944 bl sub_80DBA18 - b @080DA23E -@080DA22E: + b _080DA23E +_080DA22E: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -394490,18 +394490,18 @@ sub_80DA198: ; 80DA198 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 .pool -@080DA248: +_080DA248: movs r0, 0 strh r0, [r5, 0x8] ldr r0, =sub_80DA25C str r0, [r5] -@080DA250: +_080DA250: pop {r4-r6} pop {r0} bx r0 @@ -394545,30 +394545,30 @@ 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 .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] @@ -394578,29 +394578,29 @@ sub_80DA28C: ; 80DA28C 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 .pool -@080DA304: +_080DA304: bl sub_80DC3AC movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0xA] ldr r0, =sub_80DA31C str r0, [r4] -@080DA312: +_080DA312: pop {r4,r5} pop {r0} bx r0 @@ -394615,7 +394615,7 @@ sub_80DA31C: ; 80DA31C bl sub_80DC3C4 lsls r0, 24 cmp r0, 0 - beq @080DA33A + beq _080DA33A ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -394623,7 +394623,7 @@ sub_80DA31C: ; 80DA31C adds r1, r0 ldr r0, =sub_80DA348 str r0, [r1] -@080DA33A: +_080DA33A: pop {r4} pop {r0} bx r0 @@ -394673,7 +394673,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] @@ -394681,10 +394681,10 @@ sub_80DA38C: ; 80DA38C strh r0, [r1, 0xA] lsls r0, 16 cmp r0, 0 - bne @080DA3BE + bne _080DA3BE ldr r0, =sub_80DA3CC str r0, [r1] -@080DA3BE: +_080DA3BE: pop {r0} bx r0 .pool @@ -394703,7 +394703,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 @@ -394734,17 +394734,17 @@ sub_80DA3CC: ; 80DA3CC ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b @080DA45A + b _080DA45A .pool -@080DA448: +_080DA448: bl sub_80DED4C cmp r0, 0 - bne @080DA45A + bne _080DA45A strh r0, [r6, 0x8] ldr r0, =sub_80DA464 str r0, [r6] bl sub_80DCD48 -@080DA45A: +_080DA45A: pop {r4-r6} pop {r0} bx r0 @@ -394767,13 +394767,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 str r0, [r4] -@080DA48E: +_080DA48E: pop {r4} pop {r0} bx r0 @@ -394788,7 +394788,7 @@ sub_80DA49C: ; 80DA49C bl sub_80DC3C4 lsls r0, 24 cmp r0, 0 - beq @080DA4BE + beq _080DA4BE ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -394798,7 +394798,7 @@ sub_80DA49C: ; 80DA49C strh r1, [r0, 0x8] ldr r1, =sub_80DA4CC str r1, [r0] -@080DA4BE: +_080DA4BE: pop {r4} pop {r0} bx r0 @@ -394887,16 +394887,16 @@ 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 - b @080DA5A0 + b _080DA5A0 .pool -@080DA590: +_080DA590: bl sub_80DDB0C ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -394904,7 +394904,7 @@ sub_80DA51C: ; 80DA51C lsls r1, 3 adds r1, r0 ldr r0, =sub_80DA5B4 -@080DA5A0: +_080DA5A0: str r0, [r1] add sp, 0x4 pop {r4,r5} @@ -394925,7 +394925,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 @@ -394933,7 +394933,7 @@ sub_80DA5B4: ; 80DA5B4 adds r1, r0 ldr r0, =sub_80D833C str r0, [r1] -@080DA5D8: +_080DA5D8: pop {r0} bx r0 .pool @@ -394953,7 +394953,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 @@ -394963,7 +394963,7 @@ sub_80DA5E8: ; 80DA5E8 adds r2, 0x2 subs r1, 0x1 cmp r1, 0 - bge @080DA600 + bge _080DA600 bl sub_80DBD18 bl sub_80DB89C ldr r0, =0x02039f2a @@ -394971,7 +394971,7 @@ sub_80DA5E8: ; 80DA5E8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @080DA65C + bne _080DA65C ldr r0, =0x02039f34 ldr r2, [r0] ldr r0, =0x02039f25 @@ -394983,13 +394983,13 @@ sub_80DA5E8: ; 80DA5E8 adds r0, r2 ldrh r0, [r0, 0x8] bl sub_80ED03C - b @080DA668 + b _080DA668 .pool -@080DA65C: +_080DA65C: bl sub_80DF250 bl sub_80DF4F8 bl sub_80DF750 -@080DA668: +_080DA668: ldr r1, =0x030060b8 ldr r0, =0x03005d80 ldr r0, [r0] @@ -395024,7 +395024,7 @@ sub_80DA6B4: ; 80DA6B4 bl sub_80DED4C adds r4, r0, 0 cmp r4, 0 - bne @080DA6EA + bne _080DA6EA bl sub_80DE224 ldr r0, =0x02022e18 strh r4, [r0] @@ -395042,7 +395042,7 @@ sub_80DA6B4: ; 80DA6B4 strh r4, [r0, 0x8] ldr r1, =sub_80DA700 str r1, [r0] -@080DA6EA: +_080DA6EA: pop {r4,r5} pop {r0} bx r0 @@ -395060,13 +395060,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 @@ -395075,7 +395075,7 @@ sub_80DA700: ; 80DA700 ldr r0, =sub_80DA740 str r0, [r1] strh r2, [r1, 0x8] -@080DA72E: +_080DA72E: pop {r0} bx r0 .pool @@ -395098,7 +395098,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 @@ -395106,11 +395106,11 @@ sub_80DA740: ; 80DA740 movs r1, 0x1 ands r1, r0 cmp r1, 0 - beq @080DA780 + beq _080DA780 ldr r0, =sub_80DA7A0 - b @080DA792 + b _080DA792 .pool -@080DA780: +_080DA780: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -395119,9 +395119,9 @@ sub_80DA740: ; 80DA740 movs r3, 0x10 bl pal_fade_maybe ldr r0, =sub_80DA830 -@080DA792: +_080DA792: str r0, [r4] -@080DA794: +_080DA794: add sp, 0x4 pop {r4} pop {r0} @@ -395201,7 +395201,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 @@ -395212,7 +395212,7 @@ sub_80DA830: ; 80DA830 bl sub_805F094 ldr r0, =c2_exit_to_overworld_2_switch bl SetMainCallback2 -@080DA860: +_080DA860: pop {r0} bx r0 .pool @@ -395235,11 +395235,11 @@ sub_80DA884: ; 80DA884 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 .pool @@ -395253,13 +395253,13 @@ sub_80DA8A4: ; 80DA8A4 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq @080DA8C0 + beq _080DA8C0 movs r0, 0 - b @080DA8C2 + b _080DA8C2 .pool -@080DA8C0: +_080DA8C0: movs r0, 0x1 -@080DA8C2: +_080DA8C2: pop {r1} bx r1 thumb_func_end sub_80DA8A4 @@ -395282,10 +395282,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 @@ -395297,19 +395297,19 @@ sub_80DA8C8: ; 80DA8C8 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 .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 @@ -395348,14 +395348,14 @@ sub_80DA8C8: ; 80DA8C8 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 @@ -395482,80 +395482,80 @@ sub_80DA8C8: ; 80DA8C8 adds r0, 0x1 ldrb r4, [r0] cmp r2, 0xFE - bne @080DAAC4 + bne _080DAAC4 adds r3, 0x14 - b @080DAB12 + b _080DAB12 .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 .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] @@ -395610,90 +395610,90 @@ sub_80DAB8C: ; 80DAB8C bl FlagGet 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, =gUnknown_085880A4 ldr r3, =gUnknown_085898A4 -@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 .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, =gUnknown_085880A4 -@080DAC50: +_080DAC50: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -395716,21 +395716,21 @@ sub_80DAB8C: ; 80DAB8C 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 @@ -395760,78 +395760,78 @@ 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, =gUnknown_085880A4 ldr r6, =gUnknown_085898A4 -@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 .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 @@ -395842,14 +395842,14 @@ sub_80DACBC: ; 80DACBC 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 @@ -395887,16 +395887,16 @@ sub_80DACBC: ; 80DACBC 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 @@ -395904,8 +395904,8 @@ sub_80DACBC: ; 80DACBC movs r0, 0x4 subs r0, r1 cmp r5, r0 - blt @080DAD82 -@080DADF6: + blt _080DAD82 +_080DADF6: add sp, 0x64 pop {r3,r4} mov r8, r3 @@ -395923,74 +395923,74 @@ sub_80DAE0C: ; 80DAE0C 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 .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 @@ -396001,7 +396001,7 @@ sub_80DAE0C: ; 80DAE0C sub_80DAEA4: ; 80DAEA4 push {r4,r5,lr} movs r5, 0 -@080DAEA8: +_080DAEA8: ldr r0, =0x02039f26 adds r0, r5, r0 ldrb r0, [r0] @@ -396015,7 +396015,7 @@ sub_80DAEA4: ; 80DAEA4 bl sub_80DAF88 adds r5, 0x1 cmp r5, 0x3 - ble @080DAEA8 + ble _080DAEA8 pop {r4,r5} pop {r0} bx r0 @@ -396087,9 +396087,9 @@ sub_80DAF1C: ; 80DAF1C bl GetStringRightAlignXOffset 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] @@ -396157,21 +396157,21 @@ sub_80DAFE0: ; 80DAFE0 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 .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 @@ -396181,9 +396181,9 @@ sub_80DAFE0: ; 80DAFE0 adds r3, 0x4 ldrb r4, [r3] adds r1, 0x27 - b @080DB07E + b _080DB07E .pool -@080DB028: +_080DB028: ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 @@ -396193,32 +396193,32 @@ sub_80DAFE0: ; 80DAFE0 subs r3, 0x1 ldrb r4, [r3] adds r1, 0x28 - b @080DB07E + b _080DB07E .pool -@080DB040: +_080DB040: ldr r1, =0x02039e00 lsls r2, 6 adds r3, r2, r1 adds r0, r3, 0 adds r0, 0x28 - b @080DB05A + b _080DB05A .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 .pool -@080DB06C: +_080DB06C: ldr r0, =0x02039e00 lsls r2, 6 adds r1, r2, r0 @@ -396228,9 +396228,9 @@ sub_80DAFE0: ; 80DAFE0 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 @@ -396253,7 +396253,7 @@ sub_80DB09C: ; 80DB09C lsrs r6, r0, 24 movs r4, 0 ldr r5, =0x02039f00 -@080DB0A6: +_080DB0A6: lsls r0, r4, 24 lsrs r0, 24 adds r1, r6, 0 @@ -396262,7 +396262,7 @@ sub_80DB09C: ; 80DB09C adds r5, 0x2 adds r4, 0x1 cmp r4, 0x3 - ble @080DB0A6 + ble _080DB0A6 pop {r4-r6} pop {r0} bx r0 @@ -396359,7 +396359,7 @@ sub_80DB174: ; 80DB174 ldr r0, =0x02039f25 ldrb r0, [r0] cmp r4, r0 - bne @080DB1B8 + bne _080DB1B8 lsls r0, r5, 3 ldr r1, =gMonBackPicTable adds r0, r1 @@ -396369,9 +396369,9 @@ sub_80DB174: ; 80DB174 adds r2, r5, 0 adds r3, r6, 0 bl DecompressMonPic_DetectFrontOrBack_2 - b @080DB1CC + b _080DB1CC .pool -@080DB1B8: +_080DB1B8: lsls r0, r5, 3 ldr r1, =gMonBackPicTable adds r0, r1 @@ -396381,7 +396381,7 @@ sub_80DB174: ; 80DB174 adds r2, r5, 0 adds r3, r6, 0 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack -@080DB1CC: +_080DB1CC: adds r0, r5, 0 adds r1, r7, 0 adds r2, r6, 0 @@ -396443,19 +396443,19 @@ sub_80DB174: ; 80DB174 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, =gUnknown_082FF6C0 - b @080DB280 + b _080DB280 .pool -@080DB278: +_080DB278: mov r0, r8 adds r0, 0x10 adds r0, r6, r0 ldr r1, =gUnknown_082FF694 -@080DB280: +_080DB280: str r1, [r0] lsls r0, r7, 4 adds r0, r7 @@ -396479,12 +396479,12 @@ sub_80DB2A8: ; 80DB2A8 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 @@ -396529,35 +396529,35 @@ 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 .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 .pool -@080DB34C: +_080DB34C: ldr r0, =0x00009088 - b @080DB356 + b _080DB356 .pool -@080DB354: +_080DB354: ldr r0, =0x00009086 -@080DB356: +_080DB356: lsls r1, r3, 12 movs r2, 0x90 lsls r2, 8 @@ -396589,18 +396589,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 @@ -396634,21 +396634,21 @@ prints_contest_move_description: ; 80DB370 ldrb r0, [r2, 0x1] adds r7, r1, 0 cmp r0, 0xFF - bne @080DB3FC + bne _080DB3FC movs r6, 0 - b @080DB408 + b _080DB408 .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] @@ -396676,21 +396676,21 @@ prints_contest_move_description: ; 80DB370 adds r1, r0, r1 ldrb r0, [r1, 0x2] cmp r0, 0xFF - bne @080DB460 + bne _080DB460 movs r6, 0 - b @080DB46C + b _080DB46C .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] @@ -396756,9 +396756,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 @@ -396793,9 +396793,9 @@ sub_80DB4E0: ; 80DB4E0 adds r1, r4, 0 movs r2, 0x14 bl sub_80DECB8 - b @080DB576 + b _080DB576 .pool -@080DB560: +_080DB560: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] @@ -396806,7 +396806,7 @@ sub_80DB4E0: ; 80DB4E0 movs r2, 0x14 adds r3, r7, 0 bl sub_80DED10 -@080DB576: +_080DB576: add sp, 0x10 pop {r3} mov r8, r3 @@ -396820,7 +396820,7 @@ 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] @@ -396832,7 +396832,7 @@ sub_80DB584: ; 80DB584 adds r5, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble @080DB58A + ble _080DB58A pop {r4,r5} pop {r0} bx r0 @@ -396872,11 +396872,11 @@ sub_80DB5B8: ; 80DB5B8 movs r5, 0x30 ands r5, r0 cmp r5, 0 - bne @080DB5F4 + bne _080DB5F4 movs r0, 0 - b @080DB68A + b _080DB68A .pool -@080DB5F4: +_080DB5F4: ldr r0, =0x02039f26 adds r0, r2, r0 ldrb r1, [r0] @@ -396892,7 +396892,7 @@ sub_80DB5B8: ; 80DB5B8 lsls r0, 24 asrs r4, r0, 24 cmp r5, 0x10 - bne @080DB648 + bne _080DB648 bl sub_80DB5B0 adds r1, r0, 0 lsls r1, 16 @@ -396910,11 +396910,11 @@ sub_80DB5B8: ; 80DB5B8 bl sub_80DED10 mov r1, r8 cmp r1, 0 - beq @080DB688 + beq _080DB688 movs r0, 0x5B - b @080DB672 + b _080DB672 .pool -@080DB648: +_080DB648: adds r3, r6, r4 lsls r3, 24 lsrs r3, 24 @@ -396933,9 +396933,9 @@ sub_80DB5B8: ; 80DB5B8 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] @@ -396946,9 +396946,9 @@ sub_80DB5B8: ; 80DB5B8 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 @@ -396974,7 +396974,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] @@ -397030,7 +397030,7 @@ sub_80DB69C: ; 80DB69C add r8, r1 adds r7, 0x1 cmp r7, 0x3 - ble @080DB6B6 + ble _080DB6B6 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -397049,35 +397049,35 @@ sub_80DB748: ; 80DB748 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 .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 @@ -397119,47 +397119,47 @@ 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 .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 @@ -397186,8 +397186,8 @@ sub_80DB798: ; 80DB798 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] @@ -397198,7 +397198,7 @@ sub_80DB798: ; 80DB798 movs r2, 0x14 adds r3, r7, 0 bl sub_80DED10 -@080DB874: +_080DB874: mov r0, r9 add sp, 0x10 pop {r3,r4} @@ -397213,13 +397213,13 @@ sub_80DB798: ; 80DB798 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 @@ -397250,14 +397250,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 @@ -397265,9 +397265,9 @@ sub_80DB8B8: ; 80DB8B8 ldr r2, =0x02039e00 lsrs r0, 23 lsls r1, r4, 6 - b @080DB902 + b _080DB902 .pool -@080DB8F4: +_080DB8F4: ldr r2, =0x02039e00 ldr r0, =0x02039f34 ldr r0, [r0] @@ -397275,12 +397275,12 @@ sub_80DB8B8: ; 80DB8B8 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 @@ -397292,7 +397292,7 @@ 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 @@ -397304,7 +397304,7 @@ sub_80DB918: ; 80DB918 adds r5, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble @080DB91E + ble _080DB91E pop {r4,r5} pop {r0} bx r0 @@ -397322,7 +397322,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 @@ -397338,13 +397338,13 @@ sub_80DB944: ; 80DB944 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 @@ -397357,18 +397357,18 @@ sub_80DB944: ; 80DB944 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 @@ -397377,14 +397377,14 @@ sub_80DB944: ; 80DB944 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] @@ -397394,7 +397394,7 @@ sub_80DB944: ; 80DB944 movs r6, 0 ldrsh r0, [r3, r6] cmp r1, r0 - bne @080DB9F0 + bne _080DB9F0 mov r0, r12 ands r4, r0 ldrb r1, [r2, 0xB] @@ -397402,17 +397402,17 @@ sub_80DB944: ; 80DB944 ands r0, r1 orrs r0, r4 strb r0, [r2, 0xB] - b @080DB9F8 + b _080DB9F8 .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 @@ -397431,33 +397431,33 @@ sub_80DBA18: ; 80DBA18 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 .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 @@ -397465,7 +397465,7 @@ sub_80DBA18: ; 80DBA18 adds r2, 0x1C subs r3, 0x1 cmp r3, 0 - bge @080DBA20 + bge _080DBA20 pop {r4,r5} pop {r0} bx r0 @@ -397487,19 +397487,19 @@ 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 .pool -@080DBA98: +_080DBA98: movs r0, 0x1 -@080DBA9A: +_080DBA9A: pop {r1} bx r1 thumb_func_end sub_80DBA68 @@ -397522,7 +397522,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 @@ -397542,7 +397542,7 @@ sub_80DBAA0: ; 80DBAA0 movs r0, 0x6 ands r0, r2 cmp r0, 0 - beq @080DBAFC + beq _080DBAFC lsls r0, r2, 29 lsrs r0, 30 subs r0, 0x1 @@ -397553,7 +397553,7 @@ sub_80DBAA0: ; 80DBAA0 ands r1, r2 orrs r1, r0 strb r1, [r3, 0xC] -@080DBAFC: +_080DBAFC: ldr r0, [r5] ldr r0, [r0, 0x4] adds r0, r4, r0 @@ -397664,7 +397664,7 @@ sub_80DBAA0: ; 80DBAA0 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @080DBBF4 + beq _080DBBF4 ldrb r1, [r2, 0xC] mov r0, r10 ands r0, r1 @@ -397678,7 +397678,7 @@ sub_80DBAA0: ; 80DBAA0 adds r0, r7, 0 ands r0, r2 strb r0, [r1, 0x11] -@080DBBF4: +_080DBBF4: ldr r0, [r5] ldr r0, [r0, 0x4] adds r2, r4, r0 @@ -397686,7 +397686,7 @@ sub_80DBAA0: ; 80DBAA0 movs r0, 0x8 ands r0, r1 cmp r0, 0 - beq @080DBC1A + beq _080DBC1A ldrb r0, [r2, 0xB] movs r1, 0x80 orrs r0, r1 @@ -397698,7 +397698,7 @@ sub_80DBAA0: ; 80DBAA0 mov r0, r12 ands r0, r2 strb r0, [r1, 0x11] -@080DBC1A: +_080DBC1A: ldr r0, [r5] ldr r1, [r0, 0x4] adds r1, r4, r1 @@ -397710,14 +397710,14 @@ sub_80DBAA0: ; 80DBAA0 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 @@ -397753,7 +397753,7 @@ sub_80DBAA0: ; 80DBAA0 adds r4, 0x1C adds r6, 0x1 cmp r6, 0x3 - ble @080DBC3C + ble _080DBC3C ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0x10] @@ -397788,19 +397788,19 @@ 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 .pool -@080DBCD8: +_080DBCD8: movs r0, 0 -@080DBCDA: +_080DBCDA: pop {r1} bx r1 thumb_func_end sub_80DBCA8 @@ -397834,13 +397834,13 @@ sub_80DBCE0: ; 80DBCE0 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} @@ -397885,45 +397885,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 @@ -397931,7 +397931,7 @@ sub_80DBD4C: ; 80DBD4C ldr r2, [sp, 0x64] ldr r5, =0x02039f00 ldr r3, [sp, 0x68] -@080DBDD2: +_080DBDD2: mov r7, r9 lsls r1, r7, 4 movs r7, 0 @@ -397955,13 +397955,13 @@ sub_80DBD4C: ; 80DBD4C 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] @@ -397970,7 +397970,7 @@ sub_80DBD4C: ; 80DBD4C str r0, [sp, 0x5C] ldr r1, [sp, 0x6C] str r1, [sp, 0x60] -@080DBE1C: +_080DBE1C: subs r3, r4, 0x1 mov r10, r3 mov r0, r10 @@ -397979,7 +397979,7 @@ sub_80DBD4C: ; 80DBD4C bl sub_80DBF30 lsls r0, 24 cmp r0, 0 - beq @080DBE8A + beq _080DBE8A mov r6, r10 lsls r2, r6, 4 ldr r0, [sp, 0x64] @@ -398025,21 +398025,21 @@ sub_80DBD4C: ; 80DBD4C 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 @@ -398049,7 +398049,7 @@ sub_80DBD4C: ; 80DBD4C add r9, r0 mov r3, r9 cmp r3, 0x3 - ble @080DBEA2 + ble _080DBEA2 add sp, 0x70 pop {r3-r5} mov r8, r3 @@ -398069,7 +398069,7 @@ sub_80DBED4: ; 80DBED4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080DBF0E + beq _080DBF0E ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, =0x02039f20 @@ -398089,11 +398089,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 .pool @@ -398109,27 +398109,27 @@ 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 @@ -398159,7 +398159,7 @@ sub_80DBF90: ; 80DBF90 movs r5, 0x80 lsls r5, 18 movs r4, 0x3 -@080DBF9A: +_080DBF9A: lsrs r3, r5, 24 movs r0, 0x8 str r0, [sp] @@ -398176,7 +398176,7 @@ sub_80DBF90: ; 80DBF90 adds r5, r0 subs r4, 0x1 cmp r4, 0 - bge @080DBF9A + bge _080DBF9A add sp, 0xC pop {r4,r5} pop {r0} @@ -398190,15 +398190,15 @@ sub_80DBFC8: ; 80DBFC8 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 @@ -398218,16 +398218,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} @@ -398290,25 +398290,25 @@ 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 .pool -@080DC0C8: +_080DC0C8: ldr r2, =0x03005e00 lsls r3, r7, 2 adds r0, r3, r7 @@ -398316,7 +398316,7 @@ sub_80DC028: ; 80DC028 adds r0, r2 ldr r1, =0x0000ffff strh r1, [r0, 0xC] -@080DC0D6: +_080DC0D6: adds r0, r3, r7 lsls r0, 3 adds r0, r2 @@ -398356,16 +398356,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 @@ -398379,15 +398379,15 @@ sub_80DC0F4: ; 80DC0F4 negs r0, r0 ands r0, r2 strb r0, [r1, 0x2] - b @080DC2A8 + b _080DC2A8 .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 @@ -398395,15 +398395,15 @@ sub_80DC0F4: ; 80DC0F4 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 @@ -398415,17 +398415,17 @@ sub_80DC0F4: ; 80DC0F4 strh r2, [r0, 0x8] lsls r1, 24 lsrs r5, r1, 24 - b @080DC210 + b _080DC210 .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] @@ -398436,8 +398436,8 @@ sub_80DC0F4: ; 80DC0F4 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] @@ -398446,12 +398446,12 @@ sub_80DC0F4: ; 80DC0F4 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] @@ -398460,8 +398460,8 @@ sub_80DC0F4: ; 80DC0F4 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] @@ -398471,22 +398471,22 @@ sub_80DC0F4: ; 80DC0F4 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 @@ -398510,7 +398510,7 @@ sub_80DC0F4: ; 80DC0F4 bl sub_80DED10 mov r3, r8 cmp r3, 0 - ble @080DC284 + ble _080DC284 movs r0, 0x60 bl audio_play ldr r4, =0x030075f0 @@ -398522,19 +398522,19 @@ sub_80DC0F4: ; 80DC0F4 asrs r2, 16 adds r0, r4, 0 bl MPlayPitchControl - b @080DC28A + b _080DC28A .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 @@ -398543,7 +398543,7 @@ sub_80DC0F4: ; 80DC0F4 ldrh r0, [r1, 0xC] negs r0, r0 strh r0, [r1, 0xC] -@080DC2A8: +_080DC2A8: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -398562,7 +398562,7 @@ sub_80DC2BC: ; 80DC2BC bl LoadObjectPic movs r4, 0 ldr r5, =gUnknown_08587A6C -@080DC2C8: +_080DC2C8: ldr r0, =0x02039f26 adds r0, r4, r0 ldrb r0, [r0] @@ -398580,7 +398580,7 @@ sub_80DC2BC: ; 80DC2BC strb r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble @080DC2C8 + ble _080DC2C8 pop {r4,r5} pop {r0} bx r0 @@ -398618,15 +398618,15 @@ sub_80DC308: ; 80DC308 lsrs r5, r0, 16 asrs r0, 16 cmp r0, 0x38 - ble @080DC350 + ble _080DC350 movs r5, 0x38 - b @080DC356 + b _080DC356 .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 @@ -398648,13 +398648,13 @@ sub_80DC308: ; 80DC308 movs r5, 0x24 ldrsh r1, [r4, r5] cmp r0, r1 - ble @080DC38C + ble _080DC38C movs r0, 0x1 - b @080DC38E + b _080DC38E .pool -@080DC38C: +_080DC38C: ldr r0, =0x0000ffff -@080DC38E: +_080DC38E: strh r0, [r4, 0x32] adds r0, r3, r7 lsls r0, 2 @@ -398673,13 +398673,13 @@ sub_80DC308: ; 80DC308 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 @@ -398696,12 +398696,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 @@ -398710,16 +398710,16 @@ sub_80DC3C4: ; 80DC3C4 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 .pool -@080DC400: +_080DC400: movs r0, 0x1 -@080DC402: +_080DC402: pop {r4} pop {r1} bx r1 @@ -398735,7 +398735,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 @@ -398750,13 +398750,13 @@ sub_80DC408: ; 80DC408 strb r0, [r1, 0x2] ldr r0, =DummyObjectCallback str r0, [r3, 0x1C] - b @080DC446 + b _080DC446 .pool -@080DC440: +_080DC440: ldrh r0, [r3, 0x32] adds r0, r2, r0 strh r0, [r3, 0x24] -@080DC446: +_080DC446: pop {r4} pop {r0} bx r0 @@ -398770,7 +398770,7 @@ sub_80DC44C: ; 80DC44C ldr r5, =0x02039f34 ldr r4, =gUnknown_08587A6C ldr r3, =0x02039f26 -@080DC458: +_080DC458: ldr r0, [r5] ldr r1, [r0, 0x14] lsls r0, r2, 2 @@ -398787,7 +398787,7 @@ sub_80DC44C: ; 80DC44C strh r0, [r1, 0x22] adds r2, 0x1 cmp r2, 0x3 - ble @080DC458 + ble _080DC458 pop {r4-r6} pop {r0} bx r0 @@ -398804,13 +398804,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 @@ -398820,9 +398820,9 @@ sub_80DC490: ; 80DC490 lsls r0, 2 adds r0, r5 movs r1, 0xB4 - b @080DC4E0 + b _080DC4E0 .pool -@080DC4CC: +_080DC4CC: ldr r0, [r4] ldr r0, [r0, 0x14] adds r0, r2, r0 @@ -398833,13 +398833,13 @@ sub_80DC490: ; 80DC490 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 @@ -398857,7 +398857,7 @@ sub_80DC4F0: ; 80DC4F0 ldr r0, =0x02020630 mov r8, r0 movs r6, 0 -@080DC506: +_080DC506: lsls r0, r5, 3 ldr r1, =gUnknown_08587AE8 adds r0, r1 @@ -398904,7 +398904,7 @@ sub_80DC4F0: ; 80DC4F0 adds r6, 0x18 adds r5, 0x1 cmp r5, 0x3 - ble @080DC506 + ble _080DC506 pop {r3} mov r8, r3 pop {r4-r7} @@ -398965,7 +398965,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 @@ -398974,7 +398974,7 @@ sub_80DC5E8: ; 80DC5E8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls @080DC60A + bls _080DC60A pop {r4} pop {r0} bx r0 @@ -399066,10 +399066,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] @@ -399097,7 +399097,7 @@ sub_80DC6A4: ; 80DC6A4 bl pal_fade_1 adds r0, r6, 0 bl remove_task -@080DC716: +_080DC716: pop {r4-r7} pop {r0} bx r0 @@ -399124,7 +399124,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 @@ -399135,7 +399135,7 @@ sub_80DC728: ; 80DC728 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 @@ -399144,13 +399144,13 @@ sub_80DC728: ; 80DC728 ldrsh r1, [r1, r5] adds r5, r0, 0 cmp r1, 0 - bne @080DC77C + bne _080DC77C adds r0, r4, 0x1 - b @080DC77E + b _080DC77E .pool -@080DC77C: +_080DC77C: subs r0, r4, 0x1 -@080DC77E: +_080DC77E: strh r0, [r2] lsls r1, r3, 1 mov r0, r9 @@ -399163,10 +399163,10 @@ sub_80DC728: ; 80DC728 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 @@ -399174,7 +399174,7 @@ sub_80DC728: ; 80DC728 movs r2, 0x1 eors r1, r2 strh r1, [r0] -@080DC7AA: +_080DC7AA: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -399190,12 +399190,12 @@ sub_80DC728: ; 80DC728 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 @@ -399217,13 +399217,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 @@ -399270,13 +399270,13 @@ sub_80DC81C: ; 80DC81C 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 @@ -399338,7 +399338,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 @@ -399348,7 +399348,7 @@ sub_80DC8D0: ; 80DC8D0 movs r5, 0 ldrsh r0, [r2, r5] cmp r0, 0xFF - beq @080DC996 + beq _080DC996 adds r0, r3, 0x2 lsls r0, 1 adds r0, r6 @@ -399360,7 +399360,7 @@ sub_80DC8D0: ; 80DC8D0 lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - ble @080DC996 + ble _080DC996 strh r4, [r1] adds r0, r3, 0x1 lsls r1, r0, 1 @@ -399370,15 +399370,15 @@ sub_80DC8D0: ; 80DC8D0 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 .pool -@080DC940: +_080DC940: ldrh r0, [r2] subs r0, 0x1 -@080DC944: +_080DC944: strh r0, [r2] lsls r1, r3, 1 mov r5, r9 @@ -399391,10 +399391,10 @@ sub_80DC8D0: ; 80DC8D0 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 @@ -399402,7 +399402,7 @@ sub_80DC8D0: ; 80DC8D0 movs r2, 0x1 eors r1, r2 strh r1, [r0] -@080DC970: +_080DC970: adds r4, r7, 0x5 lsls r4, 4 adds r0, r4, 0 @@ -399420,12 +399420,12 @@ sub_80DC8D0: ; 80DC8D0 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 @@ -399452,15 +399452,15 @@ 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 .pool -@080DC9E0: +_080DC9E0: adds r0, r2, 0 bl sub_80DC674 -@080DC9E6: +_080DC9E6: pop {r0} bx r0 thumb_func_end sub_80DC9B4 @@ -399744,15 +399744,15 @@ 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 .pool -@080DCC70: +_080DCC70: movs r0, 0x2 bl audio_play -@080DCC76: +_080DCC76: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -399770,7 +399770,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 @@ -399785,7 +399785,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] @@ -399799,7 +399799,7 @@ sub_80DCC84: ; 80DCC84 ldr r0, =sub_80DCCD8 mov r1, r12 str r0, [r1, 0x1C] -@080DCCCC: +_080DCCCC: pop {r0} bx r0 .pool @@ -399840,26 +399840,26 @@ sub_80DCD08: ; 80DCD08 ldrb r1, [r2] adds r3, r0, 0 cmp r1, 0x1 - bne @080DCD24 + bne _080DCD24 movs r0, 0 - b @080DCD26 + b _080DCD26 .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 @@ -399871,26 +399871,26 @@ sub_80DCD48: ; 80DCD48 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 .pool -@080DCD7C: +_080DCD7C: movs r5, 0 -@080DCD7E: +_080DCD7E: adds r0, r5, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -399898,9 +399898,9 @@ sub_80DCD48: ; 80DCD48 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] @@ -399913,7 +399913,7 @@ sub_80DCD48: ; 80DCD48 movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bge @080DCDBC + bge _080DCDBC negs r0, r0 lsls r0, 16 lsrs r4, r0, 16 @@ -399921,7 +399921,7 @@ sub_80DCD48: ; 80DCD48 ldr r1, =gUnknown_085E8D40 bl CopyString adds r2, r0, 0 -@080DCDBC: +_080DCDBC: lsls r1, r4, 16 asrs r1, 16 adds r0, r2, 0 @@ -399941,9 +399941,9 @@ sub_80DCD48: ; 80DCD48 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] @@ -399956,7 +399956,7 @@ sub_80DCD48: ; 80DCD48 movs r1, 0x2 ldrsh r0, [r0, r1] cmp r0, 0 - bge @080DCE14 + bge _080DCE14 negs r0, r0 lsls r0, 16 lsrs r4, r0, 16 @@ -399964,7 +399964,7 @@ sub_80DCD48: ; 80DCD48 ldr r1, =gUnknown_085E8D40 bl CopyString adds r2, r0, 0 -@080DCE14: +_080DCE14: lsls r1, r4, 16 asrs r1, 16 adds r0, r2, 0 @@ -399984,9 +399984,9 @@ sub_80DCD48: ; 80DCD48 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} @@ -400014,7 +400014,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 @@ -400023,45 +400023,45 @@ sub_80DCE58: ; 80DCE58 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 @@ -400077,7 +400077,7 @@ sub_80DCE58: ; 80DCE58 ldr r3, =0x02039f26 adds r6, r3, 0 mov r10, r6 -@080DCEF4: +_080DCEF4: ldrb r0, [r3] lsls r2, r0, 1 mov r7, r9 @@ -400088,57 +400088,57 @@ sub_80DCE58: ; 80DCE58 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 .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] @@ -400146,10 +400146,10 @@ sub_80DCE58: ; 80DCE58 strb r5, [r0] adds r5, 0x1 cmp r5, 0x3 - ble @080DCF68 - b @080DD034 + ble _080DCF68 + b _080DD034 .pool -@080DCF80: +_080DCF80: mov r0, sp movs r1, 0xFF movs r2, 0x4 @@ -400157,7 +400157,7 @@ sub_80DCE58: ; 80DCE58 movs r5, 0 ldr r3, =0x02039f26 movs r6, 0 -@080DCF90: +_080DCF90: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x4] @@ -400167,38 +400167,38 @@ sub_80DCE58: ; 80DCE58 lsrs r2, r0, 30 mov r7, sp adds r1, r7, r2 - b @080DCFB6 + b _080DCFB6 .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] @@ -400216,14 +400216,14 @@ sub_80DCE58: ; 80DCE58 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 @@ -400231,19 +400231,19 @@ sub_80DCE58: ; 80DCE58 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 @@ -400260,7 +400260,7 @@ 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 @@ -400273,7 +400273,7 @@ sub_80DD04C: ; 80DD04C adds r5, 0x20 adds r4, 0x1 cmp r4, 0x3 - ble @080DD052 + ble _080DD052 bl sub_80DAEA4 pop {r4,r5} pop {r0} @@ -400306,9 +400306,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 @@ -400328,9 +400328,9 @@ sub_80DD080: ; 80DD080 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 @@ -400350,9 +400350,9 @@ sub_80DD080: ; 80DD080 ands r0, r3 orrs r0, r1 strb r0, [r2, 0xB] - b @080DD12C + b _080DD12C .pool -@080DD110: +_080DD110: ldr r4, =0x02039f34 ldr r0, [r4] ldr r0, [r0, 0x4] @@ -400367,7 +400367,7 @@ sub_80DD080: ; 80DD080 strb r0, [r1, 0xB] mov r8, r4 adds r7, r3, 0 -@080DD12C: +_080DD12C: mov r2, r8 ldr r4, [r2] ldr r2, [r4, 0x4] @@ -400397,7 +400397,7 @@ sub_80DD080: ; 80DD080 mov r4, r8 movs r3, 0 movs r1, 0 -@080DD166: +_080DD166: ldr r0, [r4] ldr r0, [r0, 0x4] adds r0, r1, r0 @@ -400410,7 +400410,7 @@ sub_80DD080: ; 80DD080 adds r1, 0x1C adds r2, 0x1 cmp r2, 0x3 - ble @080DD166 + ble _080DD166 ldr r5, =0x02039f34 ldr r0, [r5] ldr r1, [r0, 0x4] @@ -400421,13 +400421,13 @@ sub_80DD080: ; 80DD080 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @080DD1B4 + beq _080DD1B4 ldrh r0, [r2, 0x8] ldrh r1, [r2, 0x6] bl AreMovesContestCombo lsls r0, 24 cmp r0, 0 - bne @080DD1B4 + bne _080DD1B4 ldr r0, [r5] ldr r1, [r0, 0x4] adds r1, r4, r1 @@ -400436,7 +400436,7 @@ sub_80DD080: ; 80DD080 negs r0, r0 ands r0, r2 strb r0, [r1, 0x15] -@080DD1B4: +_080DD1B4: ldr r0, =gContestEffectFunctionTable add r0, r9 ldr r0, [r0] @@ -400451,30 +400451,30 @@ sub_80DD080: ; 80DD080 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 .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 @@ -400497,7 +400497,7 @@ sub_80DD080: ; 80DD080 bl sub_80DE1E8 lsls r0, 24 cmp r0, 0 - beq @080DD2E2 + beq _080DD2E2 ldr r0, [r5] ldr r1, [r0, 0x4] adds r1, r4, r1 @@ -400507,7 +400507,7 @@ sub_80DD080: ; 80DD080 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 @@ -400515,7 +400515,7 @@ sub_80DD080: ; 80DD080 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @080DD29C + beq _080DD29C strb r3, [r2, 0x16] ldr r0, [r5] ldr r1, [r0, 0x4] @@ -400545,9 +400545,9 @@ sub_80DD080: ; 80DD080 adds r1, r4, r1 ldrb r0, [r1, 0x15] movs r2, 0x8 - b @080DD2C8 + b _080DD2C8 .pool -@080DD29C: +_080DD29C: ldr r2, =gContestMoves ldr r5, =0x02039f34 ldr r0, [r5] @@ -400560,7 +400560,7 @@ sub_80DD080: ; 80DD080 adds r0, r2 ldrb r0, [r0, 0x2] cmp r0, 0 - beq @080DD2D8 + beq _080DD2D8 ldrb r0, [r3, 0x15] movs r1, 0x10 orrs r0, r1 @@ -400570,18 +400570,18 @@ sub_80DD080: ; 80DD080 adds r1, r4, r1 ldrb r0, [r1, 0x15] movs r2, 0x40 -@080DD2C8: +_080DD2C8: orrs r0, r2 strb r0, [r1, 0x15] - b @080DD2E2 + b _080DD2E2 .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] @@ -400593,7 +400593,7 @@ sub_80DD080: ; 80DD080 mov r8, r0 ands r0, r1 cmp r0, 0 - beq @080DD30A + beq _080DD30A ldrb r0, [r2, 0xB] lsls r0, 25 lsrs r0, 29 @@ -400602,7 +400602,7 @@ sub_80DD080: ; 80DD080 adds r1, r0 lsls r1, 1 strb r1, [r2, 0x18] -@080DD30A: +_080DD30A: ldr r0, [r5] ldr r0, [r0, 0x4] adds r2, r4, r0 @@ -400610,7 +400610,7 @@ sub_80DD080: ; 80DD080 mov r0, r8 ands r0, r1 cmp r0, 0 - beq @080DD334 + beq _080DD334 ldrb r1, [r2, 0x15] movs r0, 0x11 negs r0, r0 @@ -400624,7 +400624,7 @@ sub_80DD080: ; 80DD080 ldr r0, [r2, 0x4] adds r0, r4, r0 strh r1, [r0] -@080DD334: +_080DD334: ldr r0, [r5] ldr r0, [r0, 0x4] adds r0, r4, r0 @@ -400640,17 +400640,17 @@ sub_80DD080: ; 80DD080 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 @@ -400659,16 +400659,16 @@ sub_80DD080: ; 80DD080 ldrsb r1, [r3, r1] adds r0, r1 cmp r0, 0x4 - ble @080DD384 + ble _080DD384 movs r0, 0x3C - b @080DD38A + b _080DD38A .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 @@ -400678,21 +400678,21 @@ sub_80DD080: ; 80DD080 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] @@ -400700,7 +400700,7 @@ sub_80DD080: ; 80DD080 lsls r0, 2 adds r0, r1 strb r2, [r0, 0x1B] -@080DD3C4: +_080DD3C4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -400752,35 +400752,35 @@ 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 @@ -400827,44 +400827,44 @@ sub_80DD45C: ; 80DD45C ldrb r0, [r0, 0x1] lsls r1, r0, 29 cmp r1, 0 - bne @080DD4DC + bne _080DD4DC ldr r0, =0x02021ec4 ldr r1, =gUnknown_0827E837 bl CopyString - b @080DD52C + b _080DD52C .pool -@080DD4DC: +_080DD4DC: lsrs r0, r1, 29 cmp r0, 0x1 - bne @080DD4F4 + bne _080DD4F4 ldr r0, =0x02021ec4 ldr r1, =gUnknown_0827E83F bl CopyString - b @080DD52C + b _080DD52C .pool -@080DD4F4: +_080DD4F4: lsrs r0, r1, 29 cmp r0, 0x2 - bne @080DD50C + bne _080DD50C ldr r0, =0x02021ec4 ldr r1, =gUnknown_0827E847 bl CopyString - b @080DD52C + b _080DD52C .pool -@080DD50C: +_080DD50C: lsrs r0, r1, 29 cmp r0, 0x3 - bne @080DD524 + bne _080DD524 ldr r0, =0x02021ec4 ldr r1, =gUnknown_0827E850 bl CopyString - b @080DD52C + b _080DD52C .pool -@080DD524: +_080DD524: ldr r0, =0x02021ec4 ldr r1, =gUnknown_0827E85A bl CopyString -@080DD52C: +_080DD52C: ldr r4, =0x02021fc4 ldr r1, =gUnknown_08587E10 lsls r0, r6, 2 @@ -400925,7 +400925,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 @@ -400935,56 +400935,56 @@ sub_80DD590: ; 80DD590 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 .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 @@ -400993,45 +400993,45 @@ sub_80DD590: ; 80DD590 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] @@ -401039,14 +401039,14 @@ sub_80DD590: ; 80DD590 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 @@ -401073,7 +401073,7 @@ sub_80DD590: ; 80DD590 adds r5, 0x1C adds r4, 0x1 cmp r4, 0x3 - ble @080DD690 + ble _080DD690 add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -401094,7 +401094,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 @@ -401113,7 +401113,7 @@ sub_80DD6DC: ; 80DD6DC negs r0, r0 ands r0, r1 strb r0, [r2, 0x6] -@080DD712: +_080DD712: pop {r0} bx r0 .pool @@ -401129,27 +401129,27 @@ 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 .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 @@ -401165,9 +401165,9 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0x20 bl audio_play - b @080DD8F8 + b _080DD8F8 .pool -@080DD79C: +_080DD79C: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -401185,9 +401185,9 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0x1F bl audio_play - b @080DD8F8 + b _080DD8F8 .pool -@080DD7D0: +_080DD7D0: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -401205,9 +401205,9 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0x1F bl audio_play - b @080DD8F8 + b _080DD8F8 .pool -@080DD804: +_080DD804: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -401225,9 +401225,9 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play - b @080DD8F8 + b _080DD8F8 .pool -@080DD838: +_080DD838: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -401245,9 +401245,9 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play - b @080DD8F8 + b _080DD8F8 .pool -@080DD86C: +_080DD86C: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -401265,9 +401265,9 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play - b @080DD8F8 + b _080DD8F8 .pool -@080DD8A0: +_080DD8A0: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -401285,9 +401285,9 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0xC3 bl audio_play - b @080DD8F8 + b _080DD8F8 .pool -@080DD8D4: +_080DD8D4: ldr r0, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -401305,7 +401305,7 @@ sub_80DD720: ; 80DD720 strh r0, [r1, 0x4] movs r0, 0x2D bl audio_play -@080DD8F8: +_080DD8F8: adds r2, r4, 0 ldr r4, =0x02020630 adds r2, r5 @@ -401348,16 +401348,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, =gUnknown_08D8EC24 cmp r5, r0 - bge @080DD966 + bge _080DD966 adds r4, 0x40 -@080DD966: +_080DD966: adds r0, r1, 0 adds r0, 0x58 ldrb r1, [r0] @@ -401402,12 +401402,12 @@ sub_80DD940: ; 80DD940 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 @@ -401483,21 +401483,21 @@ 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 .pool -@080DDA94: +_080DDA94: ldrh r0, [r2, 0x10] subs r0, 0x1 -@080DDA98: +_080DDA98: strh r0, [r2, 0x10] lsls r0, r5, 2 adds r0, r5 @@ -401519,10 +401519,10 @@ c3_08130B10: ; 80DDA60 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 @@ -401534,7 +401534,7 @@ c3_08130B10: ; 80DDA60 lsls r0, 24 asrs r0, 24 cmp r0, 0x4 - bgt @080DDAFE + bgt _080DDAFE movs r3, 0xC ldrsh r0, [r4, r3] lsls r0, 4 @@ -401547,7 +401547,7 @@ c3_08130B10: ; 80DDA60 bl pal_fade_1 adds r0, r5, 0 bl remove_task -@080DDAFE: +_080DDAFE: pop {r4-r6} pop {r0} bx r0 @@ -401634,14 +401634,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] @@ -401651,7 +401651,7 @@ sub_80DDB6C: ; 80DDB6C strb r0, [r2, 0x6] adds r0, r3, 0 bl remove_task -@080DDBD4: +_080DDBD4: pop {r4,r5} pop {r0} bx r0 @@ -401676,14 +401676,14 @@ 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 .pool -@080DDC1C: +_080DDC1C: ldr r0, =task08_080CD1CC movs r1, 0xA bl AddTask @@ -401701,7 +401701,7 @@ sub_80DDBE8: ; 80DDBE8 ldrb r0, [r2, 0x6] movs r1, 0x40 orrs r0, r1 -@080DDC40: +_080DDC40: strb r0, [r2, 0x6] pop {r4,r5} pop {r0} @@ -401748,14 +401748,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] @@ -401771,7 +401771,7 @@ task08_080CD1CC: ; 80DDC4C strb r0, [r2, 0x6] adds r0, r4, 0 bl remove_task -@080DDCC4: +_080DDCC4: pop {r4,r5} pop {r0} bx r0 @@ -401823,21 +401823,21 @@ 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 .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] @@ -401845,21 +401845,21 @@ sub_80DDD20: ; 80DDD20 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 .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 @@ -401873,7 +401873,7 @@ sub_80DDD20: ; 80DDD20 strb r0, [r2, 0x6] adds r0, r5, 0 bl remove_task -@080DDD9C: +_080DDD9C: pop {r4,r5} pop {r0} bx r0 @@ -401966,22 +401966,22 @@ 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 .pool -@080DDE78: +_080DDE78: ldr r0, =0x02018000 ldr r1, =0x06002000 movs r2, 0x80 @@ -401991,7 +401991,7 @@ sub_80DDE30: ; 80DDE30 ldrh r0, [r4, 0x20] adds r0, 0x1 strh r0, [r4, 0x20] -@080DDE8C: +_080DDE8C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -402004,7 +402004,7 @@ sub_80DDE30: ; 80DDE30 movs r1, 0x20 ldrsh r0, [r0, r1] cmp r0, 0x9 - bne @080DDEBA + bne _080DDEBA ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0] @@ -402014,7 +402014,7 @@ sub_80DDE30: ; 80DDE30 strb r0, [r2, 0x6] adds r0, r5, 0 bl remove_task -@080DDEBA: +_080DDEBA: pop {r4,r5} pop {r0} bx r0 @@ -402036,12 +402036,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] @@ -402052,9 +402052,9 @@ sub_80DDED0: ; 80DDED0 adds r0, r1 lsls r0, 24 lsrs r3, r0, 24 - b @080DDF4E + b _080DDF4E .pool -@080DDF1C: +_080DDF1C: ldr r2, =0x02039f34 ldr r0, [r2] ldr r0, [r0] @@ -402065,23 +402065,23 @@ sub_80DDED0: ; 80DDED0 lsls r0, 24 lsrs r5, r0, 24 movs r3, 0 - b @080DDF4E + b _080DDF4E .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 @@ -402120,21 +402120,21 @@ 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 .pool -@080DDFB4: +_080DDFB4: ldrh r0, [r3, 0xA] subs r0, 0x1 -@080DDFB8: +_080DDFB8: strh r0, [r3, 0xA] lsls r4, r5, 2 adds r4, r5 @@ -402155,7 +402155,7 @@ sub_80DDF80: ; 80DDF80 movs r2, 0xE ldrsh r0, [r4, r2] cmp r1, r0 - bne @080DDFFC + bne _080DDFFC adds r0, r5, 0 bl remove_task ldr r0, =0x02039f34 @@ -402166,7 +402166,7 @@ sub_80DDF80: ; 80DDF80 negs r0, r0 ands r0, r1 strb r0, [r2, 0x7] -@080DDFFC: +_080DDFFC: pop {r4,r5} pop {r0} bx r0 @@ -402190,7 +402190,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] @@ -402199,10 +402199,10 @@ sub_80DE008: ; 80DE008 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 @@ -402251,9 +402251,9 @@ sub_80DE008: ; 80DE008 negs r3, r3 adds r2, r3, 0 ands r1, r2 - b @080DE0D6 + b _080DE0D6 .pool -@080DE0BC: +_080DE0BC: mov r1, r9 ldr r0, [r1] ldr r0, [r0, 0x14] @@ -402267,13 +402267,13 @@ sub_80DE008: ; 80DE008 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 @@ -402299,16 +402299,16 @@ 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, =gUnknown_08D8E9B4 adds r0, r1 - b @080DE122 + b _080DE122 .pool -@080DE120: +_080DE120: ldr r0, =gUnknown_08D8EA34 -@080DE122: +_080DE122: pop {r1} bx r1 .pool @@ -402329,7 +402329,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] @@ -402337,13 +402337,13 @@ sub_80DE12C: ; 80DE12C 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] @@ -402391,10 +402391,10 @@ sub_80DE12C: ; 80DE12C 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 @@ -402423,19 +402423,19 @@ 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 .pool -@080DE21C: +_080DE21C: movs r0, 0x1 -@080DE21E: +_080DE21E: pop {r1} bx r1 thumb_func_end sub_80DE1E8 @@ -402533,7 +402533,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 @@ -402563,7 +402563,7 @@ sub_80DE224: ; 80DE224 strb r0, [r1, 0x5] adds r5, 0x1 cmp r5, 0x3 - ble @080DE2F0 + ble _080DE2F0 add sp, 0xC pop {r3} mov r8, r3 @@ -402631,7 +402631,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 @@ -402659,7 +402659,7 @@ sub_80DE350: ; 80DE350 strb r0, [r1, 0x5] adds r5, 0x1 cmp r5, 0x3 - ble @080DE3CA + ble _080DE3CA add sp, 0x8 pop {r4-r7} pop {r0} @@ -402706,13 +402706,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 @@ -402723,7 +402723,7 @@ sub_80DE464: ; 80DE464 strh r2, [r1, 0xC] ldr r0, =sub_80DE4A8 str r0, [r1] -@080DE496: +_080DE496: pop {r0} bx r0 .pool @@ -402742,25 +402742,25 @@ 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 .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 @@ -402770,7 +402770,7 @@ sub_80DE4A8: ; 80DE4A8 strb r0, [r1] adds r2, 0x1 cmp r2, 0x3 - ble @080DE4E2 + ble _080DE4E2 bl sub_80DBF90 bl sub_80DC864 bl sub_80DB69C @@ -402784,14 +402784,14 @@ sub_80DE4A8: ; 80DE4A8 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x8] - b @080DE5B4 + b _080DE5B4 .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] @@ -402802,9 +402802,9 @@ sub_80DE4A8: ; 80DE4A8 bl sub_80DA8A4 lsls r0, 24 cmp r0, 0 - beq @080DE552 + beq _080DE552 bl sub_80DBAA0 -@080DE552: +_080DE552: ldr r4, =sub_80FCC88 adds r0, r4, 0 movs r1, 0 @@ -402817,12 +402817,12 @@ sub_80DE4A8: ; 80DE4A8 bl sub_80DBF68 movs r0, 0x2 strh r0, [r5, 0x8] - b @080DE5B4 + b _080DE5B4 .pool -@080DE584: +_080DE584: bl sub_80DBAA0 - b @080DE59A -@080DE58A: + b _080DE59A +_080DE58A: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -402830,20 +402830,20 @@ sub_80DE4A8: ; 80DE4A8 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 .pool -@080DE5A4: +_080DE5A4: bl sub_80DB884 bl sub_80DB2BC movs r0, 0 strh r0, [r5, 0x8] ldr r0, =sub_80DE5F4 str r0, [r5] -@080DE5B4: +_080DE5B4: pop {r4-r6} pop {r0} bx r0 @@ -402862,7 +402862,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 @@ -402870,7 +402870,7 @@ sub_80DE5C0: ; 80DE5C0 adds r1, r0 ldr r0, =sub_80DA4F4 str r0, [r1] -@080DE5E4: +_080DE5E4: pop {r0} bx r0 .pool @@ -402890,45 +402890,45 @@ 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 .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 str r0, [r1] - b @080DE654 + b _080DE654 .pool -@080DE650: +_080DE650: subs r0, 0x1 -@080DE652: +_080DE652: strh r0, [r1, 0x8] -@080DE654: +_080DE654: pop {r4} pop {r0} bx r0 @@ -402948,12 +402948,12 @@ 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 .pool -@080DE680: +_080DE680: movs r0, 0 strh r0, [r4, 0xC] movs r0, 0x61 @@ -402961,7 +402961,7 @@ sub_80DE65C: ; 80DE65C bl audio_play_and_stuff ldr r0, =sub_80DE5C0 str r0, [r4] -@080DE690: +_080DE690: pop {r4} pop {r0} bx r0 @@ -402979,7 +402979,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] @@ -403031,7 +403031,7 @@ sub_80DE69C: ; 80DE69C bl StartObjectRotScalAnim mov r0, r8 cmp r0, 0x2 - bne @080DE74C + bne _080DE74C ldr r0, [r5] ldr r0, [r0, 0x14] adds r0, r4, r0 @@ -403056,10 +403056,10 @@ sub_80DE69C: ; 80DE69C 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 movs r1, 0x5 bl AddTask @@ -403105,7 +403105,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 @@ -403113,11 +403113,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 @@ -403133,10 +403133,10 @@ sub_80DE794: ; 80DE794 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] @@ -403151,7 +403151,7 @@ sub_80DE794: ; 80DE794 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] @@ -403161,7 +403161,7 @@ sub_80DE794: ; 80DE794 strb r0, [r2, 0x7] adds r0, r6, 0 bl remove_task -@080DE822: +_080DE822: pop {r4-r6} pop {r0} bx r0 @@ -403176,9 +403176,9 @@ sub_80DE834: ; 80DE834 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 @@ -403191,9 +403191,9 @@ sub_80DE84C: ; 80DE84C 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 @@ -403232,46 +403232,46 @@ 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 .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, =gBaseStats lsls r1, r6, 3 subs r1, r6 @@ -403279,16 +403279,16 @@ sub_80DE864: ; 80DE864 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 .pool -@080DE920: +_080DE920: ldr r6, =0x02039f34 ldr r0, [r6] ldr r1, [r0, 0x4] @@ -403314,19 +403314,19 @@ sub_80DE864: ; 80DE864 movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x4] - b @080DE9A2 + b _080DE9A2 .pool -@080DE960: +_080DE960: ldr r1, =0x0203841a movs r0, 0xFF - b @080DE9A0 + b _080DE9A0 .pool -@080DE96C: +_080DE96C: ldr r1, =0x0203841a movs r0, 0 - b @080DE9A0 + b _080DE9A0 .pool -@080DE978: +_080DE978: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0] @@ -403334,19 +403334,19 @@ sub_80DE864: ; 80DE864 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 .pool -@080DE99C: +_080DE99C: ldr r1, =0x02038432 movs r0, 0x1 -@080DE9A0: +_080DE9A0: strb r0, [r1] -@080DE9A2: +_080DE9A2: bl sub_80DEA5C pop {r4-r7} pop {r0} @@ -403369,10 +403369,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 @@ -403484,57 +403484,57 @@ 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 .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 .pool -@080DEB60: +_080DEB60: ldr r1, =0x0202420c movs r0, 0x3 -@080DEB64: +_080DEB64: strb r0, [r1] pop {r0} bx r0 @@ -403672,31 +403672,31 @@ 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 AddTextPrinter - 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 .pool -@080DEC94: +_080DEC94: bl sav2_get_text_speed lsls r0, 24 lsrs r1, r0, 24 -@080DEC9C: +_080DEC9C: mov r0, sp movs r2, 0 bl AddTextPrinter -@080DECA4: +_080DECA4: movs r0, 0x4 bl PutWindowTilemap movs r0, 0 @@ -403816,11 +403816,11 @@ sub_80DED74: ; 80DED74 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 @@ -403828,10 +403828,10 @@ sub_80DED74: ; 80DED74 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 @@ -403861,69 +403861,69 @@ 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 .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 .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 @@ -403978,16 +403978,16 @@ sub_80DEDA8: ; 80DEDA8 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 .pool -@080DEEF4: +_080DEEF4: mov r2, r10 ldr r0, [r2] adds r0, r7 @@ -403995,11 +403995,11 @@ sub_80DEDA8: ; 80DEDA8 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 @@ -404010,9 +404010,9 @@ sub_80DEDA8: ; 80DEDA8 ldr r3, =0x00002e9a adds r0, r3 strb r1, [r0] - b @080DEF8E + b _080DEF8E .pool -@080DEF34: +_080DEF34: ldr r0, =0x03005d8c ldr r0, [r0] mov r2, r9 @@ -404022,9 +404022,9 @@ sub_80DEDA8: ; 80DEDA8 adds r0, r3 mov r1, r8 strb r1, [r0] - b @080DEF8E + b _080DEF8E .pool -@080DEF50: +_080DEF50: ldr r6, =0x02039f3c ldr r4, =0x02039e00 lsls r5, 6 @@ -404054,9 +404054,9 @@ sub_80DEDA8: ; 80DEDA8 bl CopyString mov r2, r8 strb r2, [r6, 0xA] -@080DEF8E: +_080DEF8E: movs r0, 0x1 -@080DEF90: +_080DEF90: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -404076,17 +404076,17 @@ sub_80DEFA8: ; 80DEFA8 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 @@ -404101,44 +404101,44 @@ sub_80DEFA8: ; 80DEFA8 stm r0!, {r5,r6} subs r2, 0x1 cmp r2, 0 - bgt @080DEFC8 -@080DEFE6: + bgt _080DEFC8 +_080DEFE6: movs r0, 0 - b @080DF03A + b _080DF03A .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 .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 @@ -404152,7 +404152,7 @@ sub_80DF040: ; 80DF040 mov r12, r0 ldr r4, =0x00002e90 ldr r3, =gUnknown_08587FA4 -@080DF04C: +_080DF04C: mov r1, r12 ldr r0, [r1] lsls r1, r2, 5 @@ -404168,7 +404168,7 @@ sub_80DF040: ; 80DF040 adds r3, 0x20 adds r2, 0x1 cmp r2, 0x7 - ble @080DF04C + ble _080DF04C pop {r4-r7} pop {r0} bx r0 @@ -404189,11 +404189,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 @@ -404203,7 +404203,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 @@ -404218,7 +404218,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 @@ -404231,7 +404231,7 @@ sub_80DF080: ; 80DF080 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 @@ -404239,22 +404239,22 @@ sub_80DF080: ; 80DF080 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 @@ -404262,7 +404262,7 @@ sub_80DF080: ; 80DF080 movs r0, 0x4 orrs r0, r2 strb r0, [r1, 0xC] -@080DF126: +_080DF126: ldr r3, [r6] ldr r1, [r3, 0x4] subs r0, r7, r4 @@ -404272,10 +404272,10 @@ sub_80DF080: ; 80DF080 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 @@ -404283,18 +404283,18 @@ sub_80DF080: ; 80DF080 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 @@ -404310,11 +404310,11 @@ sub_80DF080: ; 80DF080 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 @@ -404324,13 +404324,13 @@ sub_80DF080: ; 80DF080 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 @@ -404338,13 +404338,13 @@ sub_80DF080: ; 80DF080 movs r0, 0x20 orrs r0, r2 strb r0, [r1, 0xC] - b @080DF1F6 + b _080DF1F6 .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 @@ -404370,7 +404370,7 @@ sub_80DF080: ; 80DF080 adds r0, r5, r0 ldrh r0, [r0, 0x6] strh r0, [r3] -@080DF1F6: +_080DF1F6: ldr r2, [r6] ldr r1, [r2, 0x4] subs r0, r7, r4 @@ -404381,7 +404381,7 @@ sub_80DF080: ; 80DF080 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 @@ -404389,24 +404389,24 @@ sub_80DF080: ; 80DF080 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 @@ -404414,7 +404414,7 @@ sub_80DF080: ; 80DF080 movs r0, 0x20 orrs r0, r2 strb r0, [r1, 0xD] -@080DF24A: +_080DF24A: pop {r4-r7} pop {r0} bx r0 @@ -404446,24 +404446,24 @@ 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 .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 @@ -404478,10 +404478,10 @@ sub_80DF250: ; 80DF250 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 @@ -404492,7 +404492,7 @@ sub_80DF250: ; 80DF250 ldrsh r0, [r1, r6] subs r2, r0 cmp r2, 0x32 - bgt @080DF2EE + bgt _080DF2EE ldr r7, =0x02039f34 ldr r0, [r7] ldr r2, [r0, 0x1C] @@ -404501,7 +404501,7 @@ sub_80DF250: ; 80DF250 movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0xD] -@080DF2EE: +_080DF2EE: ldr r1, =0x02039f34 ldr r0, [r1] ldr r0, [r0, 0x1C] @@ -404511,12 +404511,12 @@ sub_80DF250: ; 80DF250 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 @@ -404526,28 +404526,28 @@ sub_80DF250: ; 80DF250 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] @@ -404556,7 +404556,7 @@ sub_80DF250: ; 80DF250 movs r1, 0x10 orrs r0, r1 strb r0, [r2, 0xD] -@080DF354: +_080DF354: movs r3, 0 mov r12, r3 mov r8, r3 @@ -404571,35 +404571,35 @@ sub_80DF250: ; 80DF250 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] @@ -404608,7 +404608,7 @@ sub_80DF250: ; 80DF250 movs r1, 0x40 orrs r0, r1 strb r0, [r2, 0xD] -@080DF3B4: +_080DF3B4: ldr r6, =0x02039f34 ldr r0, [r6] ldr r0, [r0, 0x1C] @@ -404618,34 +404618,34 @@ sub_80DF250: ; 80DF250 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] @@ -404657,7 +404657,7 @@ sub_80DF250: ; 80DF250 ldr r0, [r0] mov r8, r0 ldr r7, [sp, 0x30] -@080DF40E: +_080DF40E: mov r3, r8 ldr r0, [r3, 0x1C] adds r0, r7, r0 @@ -404667,37 +404667,37 @@ sub_80DF250: ; 80DF250 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] @@ -404710,26 +404710,26 @@ sub_80DF250: ; 80DF250 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 .pool -@080DF4A4: +_080DF4A4: cmp r3, r0 - bne @080DF4B6 + bne _080DF4B6 lsls r0, r6, 1 adds r0, r5, r0 ldrh r1, [r2] @@ -404737,13 +404737,13 @@ sub_80DF250: ; 80DF250 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] @@ -404784,24 +404784,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 @@ -404818,35 +404818,35 @@ sub_80DF4F8: ; 80DF4F8 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] @@ -404855,19 +404855,19 @@ sub_80DF4F8: ; 80DF4F8 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 @@ -404886,35 +404886,35 @@ sub_80DF4F8: ; 80DF4F8 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 @@ -404922,9 +404922,9 @@ sub_80DF4F8: ; 80DF4F8 ldr r0, [r0, 0x1C] ldrb r4, [r0, 0x1D] movs r3, 0x2 - b @080DF638 + b _080DF638 .pool -@080DF628: +_080DF628: mov r1, sp movs r0, 0 strb r0, [r1] @@ -404933,16 +404933,16 @@ sub_80DF4F8: ; 80DF4F8 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] @@ -404950,29 +404950,29 @@ sub_80DF4F8: ; 80DF4F8 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 .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 @@ -404992,20 +404992,20 @@ sub_80DF4F8: ; 80DF4F8 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 @@ -405022,7 +405022,7 @@ sub_80DF4F8: ; 80DF4F8 adds r0, r4, 0 adds r1, r6, 0 bl sub_80ECEB4 -@080DF6EE: +_080DF6EE: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -405046,31 +405046,31 @@ 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 .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 @@ -405087,9 +405087,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 @@ -405099,14 +405099,14 @@ sub_80DF750: ; 80DF750 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 FillWindowPixelBuffer @@ -405114,20 +405114,20 @@ sub_80DF750: ; 80DF750 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, =gUnknown_085ED1B2 bl CopyString @@ -405150,7 +405150,7 @@ sub_80DF750: ; 80DF750 movs r6, 0x7 adds r2, r7, 0x1 mov r8, r2 -@080DF7DE: +_080DF7DE: movs r1, 0x1 ands r1, r4 adds r0, r5, 0 @@ -405168,11 +405168,11 @@ sub_80DF750: ; 80DF750 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 @@ -405186,7 +405186,7 @@ sub_80DF750: ; 80DF750 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 @@ -405212,10 +405212,10 @@ sub_80DF750: ; 80DF750 lsls r0, r1, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls @080DF7AE - b @080DF920 + bls _080DF7AE + b _080DF920 .pool -@080DF874: +_080DF874: movs r7, 0 mov r2, sp adds r2, 0x6 @@ -405224,7 +405224,7 @@ sub_80DF750: ; 80DF750 mov r9, r0 movs r1, 0x7 mov r10, r1 -@080DF884: +_080DF884: add r0, sp, 0x4 ldr r1, =gUnknown_085ED1B5 bl CopyString @@ -405238,7 +405238,7 @@ sub_80DF750: ; 80DF750 movs r6, 0x7 adds r2, r7, 0x1 mov r8, r2 -@080DF8A0: +_080DF8A0: movs r1, 0x1 ands r1, r4 adds r0, r5, 0 @@ -405256,11 +405256,11 @@ sub_80DF750: ; 80DF750 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 @@ -405274,7 +405274,7 @@ sub_80DF750: ; 80DF750 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 @@ -405300,10 +405300,10 @@ sub_80DF750: ; 80DF750 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 @@ -405322,76 +405322,76 @@ sub_80DF940: ; 80DF940 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 GetStringLength 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 @@ -405413,18 +405413,18 @@ sub_80DF9E0: ; 80DF9E0 adds r4, r1, 0 bl StripExtendedControlCodes 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 @@ -405437,7 +405437,7 @@ sub_80DFA08: ; 80DFA08 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 @@ -405445,24 +405445,24 @@ sub_80DFA08: ; 80DFA08 lsrs r1, 24 adds r0, r4, 0 bl StopMusicWhileStringIsPrinted - 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 StopMusicWhileStringIsPrinted - 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] @@ -405479,13 +405479,13 @@ sub_80DFA08: ; 80DFA08 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 @@ -405503,7 +405503,7 @@ CreateShopMainMenu: ; 80DFA78 ldr r5, =0x02039f60 strb r4, [r5, 0xF] cmp r4, 0 - bne @080DFACC + bne _080DFACC ldr r0, =gUnknown_08589A38 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -405524,9 +405524,9 @@ CreateShopMainMenu: ; 80DFA78 strb r0, [r5, 0xE] str r4, [r5, 0x4] movs r5, 0x3 - b @080DFAF8 + b _080DFAF8 .pool -@080DFACC: +_080DFACC: ldr r0, =gUnknown_08589A38 ldr r1, [r0, 0xC] ldr r0, [r0, 0x8] @@ -405547,7 +405547,7 @@ CreateShopMainMenu: ; 80DFA78 strb r0, [r5, 0xE] str r4, [r5, 0x4] movs r5, 0x2 -@080DFAF8: +_080DFAF8: ldr r4, =0x02039f60 ldrb r0, [r4, 0xE] movs r1, 0 @@ -405597,8 +405597,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] @@ -405609,8 +405609,8 @@ SetShopItemsForSale: ; 80DFB58 adds r0, r1 ldrh r0, [r0] cmp r0, 0 - bne @080DFB6A -@080DFB80: + bne _080DFB6A +_080DFB80: pop {r0} bx r0 .pool @@ -405628,16 +405628,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 @@ -405645,7 +405645,7 @@ Task_ShopMenu: ; 80DFB88 ldr r1, [r0, 0x4] adds r0, r5, 0 bl _call_via_r1 -@080DFBC4: +_080DFBC4: pop {r4,r5} pop {r0} bx r0 @@ -405737,9 +405737,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 @@ -405761,7 +405761,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] @@ -405769,7 +405769,7 @@ sub_80DFCA4: ; 80DFCA4 ldrh r1, [r4, 0x12] orrs r0, r1 bl SetMainCallback2 -@080DFCD2: +_080DFCD2: pop {r4} pop {r0} bx r0 @@ -405798,23 +405798,23 @@ 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, =gUnknown_085E95C7 ldr r2, =sub_80DFD44 adds r0, r4, 0 bl DisplayItemMessageOnField - b @080DFD36 + b _080DFD36 .pool -@080DFD2C: +_080DFD2C: ldr r1, =gUnknown_085E959B ldr r2, =sub_80DFD44 adds r0, r5, 0 bl DisplayItemMessageOnField -@080DFD36: +_080DFD36: pop {r4,r5} pop {r0} bx r0 @@ -405870,11 +405870,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 @@ -405912,9 +405912,9 @@ sub_80DFD94: ; 80DFD94 bl SetVBlankCallback ldr r0, =sub_80DFD64 bl SetMainCallback2 - b @080DFEF4 + b _080DFEF4 .pool -@080DFE20: +_080DFE20: bl vblank_hblank_handler_set_zero str r4, [sp, 0x8] movs r1, 0xE0 @@ -405982,18 +405982,18 @@ sub_80DFD94: ; 80DFD94 bl FillBgTilemapBufferRect_Palette0 bl sub_80E0468 bl sub_80E0424 - b @080DFEEE + b _080DFEEE .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} @@ -406037,8 +406037,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 @@ -406055,8 +406055,8 @@ GetShopItemNames: ; 80DFF2C 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] @@ -406089,14 +406089,14 @@ GetShopItemNames: ; 80DFF2C 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 .pool -@080DFFDC: +_080DFFDC: strh r1, [r3, 0xE] -@080DFFDE: +_080DFFDE: ldr r0, =0x02039f70 ldr r0, [r0] ldr r1, =0x03006310 @@ -406121,19 +406121,19 @@ 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 .pool -@080E0020: +_080E0020: lsls r1, r4, 5 ldr r0, =gUnknown_085A5C09 adds r1, r0 adds r0, r5, 0 bl CopyString -@080E002C: +_080E002C: str r5, [r6] str r4, [r6, 0x4] pop {r4-r6} @@ -406152,14 +406152,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 @@ -406168,9 +406168,9 @@ PrintShopItemDescription: ; 80E003C adds r1, r2 ldrb r1, [r1] bl AddItemIconObjectInShop - b @080E008A + b _080E008A .pool -@080E0078: +_080E0078: ldr r0, =0x0000ffff ldr r1, =0x02039f70 ldr r1, [r1] @@ -406179,7 +406179,7 @@ PrintShopItemDescription: ; 80E003C ldrb r1, [r1] bl AddItemIconObjectInShop lsls r4, r7, 16 -@080E008A: +_080E008A: lsrs r4, 16 mov r8, r4 ldr r6, =0x02039f70 @@ -406200,27 +406200,27 @@ PrintShopItemDescription: ; 80E003C 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 .pool -@080E00D8: +_080E00D8: ldr r0, =gUnknown_085A5C08 lsls r1, r7, 5 adds r0, 0x18 adds r1, r0 ldr r4, [r1] - b @080E00EA + b _080E00EA .pool -@080E00E8: +_080E00E8: ldr r4, =gUnknown_085E93E0 -@080E00EA: +_080E00EA: movs r0, 0x2 movs r1, 0 bl FillWindowPixelBuffer @@ -406252,11 +406252,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 @@ -406274,9 +406274,9 @@ PrintShopBuyPrice: ; 80E0114 movs r2, 0 movs r3, 0x5 bl ConvertIntToDecimalString - b @080E0176 + b _080E0176 .pool -@080E0164: +_080E0164: ldr r0, =0x02021cc4 ldr r2, =gUnknown_085A5C08 lsls r1, 5 @@ -406285,7 +406285,7 @@ PrintShopBuyPrice: ; 80E0114 movs r2, 0 movs r3, 0x5 bl ConvertIntToDecimalString -@080E0176: +_080E0176: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085E969C adds r0, r4, 0 @@ -406310,7 +406310,7 @@ PrintShopBuyPrice: ; 80E0114 movs r1, 0x7 adds r3, r7, 0 bl AddTextPrinterParametrized2 -@080E01AC: +_080E01AC: add sp, 0x14 pop {r4-r7} pop {r0} @@ -406328,12 +406328,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 @@ -406350,7 +406350,7 @@ sub_80E01C8: ; 80E01C8 ldr r1, [r5] adds r1, r4 strb r0, [r1] -@080E0206: +_080E0206: add sp, 0x10 pop {r4,r5} pop {r0} @@ -406367,14 +406367,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 @@ -406423,15 +406423,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 @@ -406439,7 +406439,7 @@ AddItemIconObjectInShop: ; 80E0284 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq @080E0310 + beq _080E0310 strb r2, [r4] ldr r1, =0x02020630 lsls r0, r2, 4 @@ -406450,9 +406450,9 @@ AddItemIconObjectInShop: ; 80E0284 strh r1, [r0, 0x24] movs r1, 0x58 strh r1, [r0, 0x26] - b @080E0310 + b _080E0310 .pool -@080E02F0: +_080E02F0: lsls r0, r2, 24 lsrs r0, 24 ldr r2, =0x0000083e @@ -406466,9 +406466,9 @@ AddItemIconObjectInShop: ; 80E0284 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} @@ -406488,7 +406488,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 @@ -406504,7 +406504,7 @@ sub_80E031C: ; 80E031C bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] -@080E0356: +_080E0356: pop {r4,r5} pop {r0} bx r0 @@ -406768,12 +406768,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] @@ -406793,7 +406793,7 @@ sub_80E0584: ; 80E0584 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080E0608 + bne _080E0608 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -406805,14 +406805,14 @@ sub_80E0584: ; 80E0584 bl MapGridGetMetatileLayerTypeAt lsls r0, 24 lsrs r5, r0, 24 - b @080E060A + b _080E060A .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] @@ -406822,9 +406822,9 @@ sub_80E0584: ; 80E0584 asrs r1, r7, 16 adds r3, r5, 0 bl sub_80E0670 - b @080E0644 + b _080E0644 .pool -@080E062C: +_080E062C: asrs r0, r4, 16 mov r3, r9 ldr r2, [r3, 0x14] @@ -406836,19 +406836,19 @@ sub_80E0584: ; 80E0584 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 @@ -406872,17 +406872,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 @@ -406899,9 +406899,9 @@ sub_80E0670: ; 80E0670 ldr r0, [r6] movs r1, 0x80 lsls r1, 4 - b @080E06E2 + b _080E06E2 .pool -@080E06C0: +_080E06C0: ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0x80 @@ -406918,16 +406918,16 @@ sub_80E0670: ; 80E0670 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 .pool -@080E06F8: +_080E06F8: ldr r6, =0x02039f70 ldr r0, [r6] movs r2, 0x80 @@ -406950,7 +406950,7 @@ sub_80E0670: ; 80E0670 adds r1, r5, 0 adds r2, r4, 0 bl sub_80E0734 -@080E0728: +_080E0728: pop {r4-r7} pop {r0} bx r0 @@ -406999,7 +406999,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 @@ -407011,18 +407011,18 @@ sub_80E075C: ; 80E075C 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] @@ -407043,7 +407043,7 @@ sub_80E075C: ; 80E075C lsrs r6, r0, 24 ldr r3, [sp, 0x10] cmp r6, 0x10 - beq @080E08C2 + beq _080E08C2 mov r4, r9 ldr r1, [r4] mov r0, r8 @@ -407097,39 +407097,39 @@ sub_80E075C: ; 80E075C 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 .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 .pool -@080E0884: +_080E0884: ldr r4, =0x00002016 adds r0, r2, r4 adds r0, r5 movs r1, 0x1 - b @080E08B6 + b _080E08B6 .pool -@080E0894: +_080E0894: ldr r1, =0x00002016 adds r0, r2, r1 adds r0, r5 movs r1, 0x2 - b @080E08B6 + b _080E08B6 .pool -@080E08A4: +_080E08A4: mov r2, r9 ldr r0, [r2] mov r2, r8 @@ -407139,28 +407139,28 @@ sub_80E075C: ; 80E075C 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 @@ -407187,7 +407187,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 @@ -407199,7 +407199,7 @@ sub_80E08F0: ; 80E08F0 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 @@ -407258,7 +407258,7 @@ sub_80E08F0: ; 80E08F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080E09C0 + bne _080E09C0 lsls r2, r4, 4 adds r2, r4 lsls r2, 2 @@ -407276,7 +407276,7 @@ sub_80E08F0: ; 80E08F0 movs r1, 0x40 orrs r0, r1 strb r0, [r2] -@080E09C0: +_080E09C0: lsls r0, r6, 4 adds r0, r6 lsls r0, 2 @@ -407288,12 +407288,12 @@ sub_80E08F0: ; 80E08F0 adds r1, r5 ldrb r1, [r1] bl StartObjectImageAnim -@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 @@ -407317,16 +407317,16 @@ 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 @@ -407345,24 +407345,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 @@ -407381,26 +407381,26 @@ 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 .pool -@080E0AC0: +_080E0AC0: movs r0, 0 -@080E0AC2: +_080E0AC2: pop {r1} bx r1 thumb_func_end sub_80E0A88 @@ -407422,9 +407422,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 @@ -407439,19 +407439,19 @@ sub_80E0AC8: ; 80E0AC8 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 .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] @@ -407464,7 +407464,7 @@ sub_80E0AC8: ; 80E0AC8 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 @@ -407481,9 +407481,9 @@ sub_80E0AC8: ; 80E0AC8 lsrs r0, 24 asrs r4, r0 str r4, [r1] - b @080E0B92 + b _080E0B92 .pool -@080E0B80: +_080E0B80: ldr r1, [r7] movs r3, 0x80 lsls r3, 6 @@ -407493,7 +407493,7 @@ sub_80E0AC8: ; 80E0AC8 adds r0, r2 ldrh r0, [r0, 0x14] str r0, [r1] -@080E0B92: +_080E0B92: ldr r0, =0x03005d8c ldr r0, [r0] movs r1, 0x92 @@ -407509,16 +407509,16 @@ sub_80E0AC8: ; 80E0AC8 bl is_money_greater_than lsls r0, 24 cmp r0, 0 - bne @080E0BD0 + bne _080E0BD0 ldr r1, =gUnknown_085E9539 ldr r2, =sub_80E10A0 - b @080E0C28 + b _080E0C28 .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 @@ -407529,7 +407529,7 @@ sub_80E0AC8: ; 80E0AC8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 - bne @080E0C24 + bne _080E0C24 ldr r4, =0x02021dc4 adds r0, r5, 0 bl sub_81B6CFC @@ -407542,18 +407542,18 @@ sub_80E0AC8: ; 80E0AC8 adds r0, r4, 0 bl CopyString ldr r1, =gUnknown_085E9417 - b @080E0C26 + b _080E0C26 .pool -@080E0C24: +_080E0C24: ldr r1, =gUnknown_085E93EF -@080E0C26: +_080E0C26: ldr r2, =sub_80E0CA4 -@080E0C28: +_080E0C28: adds r0, r6, 0 bl sub_80E04E8 - b @080E0C8E + b _080E0C8E .pool -@080E0C38: +_080E0C38: ldr r0, =0x02021cc4 lsls r1, r5, 5 ldr r2, =gUnknown_085A5C09 @@ -407569,22 +407569,22 @@ sub_80E0AC8: ; 80E0AC8 bl ConvertIntToDecimalString ldrb r0, [r4, 0xF] cmp r0, 0x1 - bne @080E0C7C + bne _080E0C7C ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9468 bl ExpandStringRefs - b @080E0C84 + b _080E0C84 .pool -@080E0C7C: +_080E0C7C: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9493 bl ExpandStringRefs -@080E0C84: +_080E0C84: ldr r1, =0x02021fc4 ldr r2, =sub_80E0EAC adds r0, r6, 0 bl sub_80E04E8 -@080E0C8E: +_080E0C8E: pop {r3} mov r8, r3 pop {r4-r7} @@ -407658,18 +407658,18 @@ 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 .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 @@ -407705,7 +407705,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 @@ -407726,15 +407726,15 @@ sub_80E0D88: ; 80E0D88 str r0, [r1] adds r0, r6, 0 bl sub_80E10EC - b @080E0EA4 + b _080E0EA4 .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 @@ -407771,13 +407771,13 @@ sub_80E0D88: ; 80E0D88 ldr r2, =sub_80E0EAC adds r0, r6, 0 bl sub_80E04E8 - b @080E0EA4 + b _080E0EA4 .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 @@ -407792,7 +407792,7 @@ sub_80E0D88: ; 80E0D88 bl ClearWindowTilemap adds r0, r4, 0 bl sub_80E10A0 -@080E0EA4: +_080E0EA4: pop {r4-r7} pop {r0} bx r0 @@ -407838,54 +407838,54 @@ 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, =gUnknown_085E94C5 ldr r2, =sub_80E0F88 adds r0, r5, 0 bl sub_80E04E8 adds r0, r5, 0 bl sub_80E1204 - b @080E0F7A + b _080E0F7A .pool -@080E0F30: +_080E0F30: ldr r1, =gUnknown_085E9558 ldr r2, =sub_80E10A0 - b @080E0F60 + b _080E0F60 .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, =gUnknown_085E94E7 - b @080E0F5E + b _080E0F5E .pool -@080E0F5C: +_080E0F5C: ldr r1, =gUnknown_085E9510 -@080E0F5E: +_080E0F5E: ldr r2, =sub_80E0F88 -@080E0F60: +_080E0F60: adds r0, r5, 0 bl sub_80E04E8 - b @080E0F7A + b _080E0F7A .pool -@080E0F70: +_080E0F70: ldr r1, =gUnknown_085E957F ldr r2, =sub_80E10A0 adds r0, r7, 0 bl sub_80E04E8 -@080E0F7A: +_080E0F7A: pop {r4-r7} pop {r0} bx r0 @@ -407923,23 +407923,23 @@ 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 - b @080E0FFC + b _080E0FFC .pool -@080E0FF0: +_080E0FF0: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 adds r1, r0 ldr r0, =sub_80E1078 -@080E0FFC: +_080E0FFC: str r0, [r1] pop {r4-r6} pop {r0} @@ -407962,34 +407962,34 @@ 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, =gUnknown_085E95EA ldr r2, =sub_80E10A0 adds r0, r4, 0 bl sub_80E04E8 - b @080E1072 + b _080E1072 .pool -@080E106C: +_080E106C: adds r0, r4, 0 bl sub_80E10A0 -@080E1072: +_080E1072: pop {r4,r5} pop {r0} bx r0 @@ -408005,12 +408005,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 @@ -408142,14 +408142,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 bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@080E11D6: +_080E11D6: pop {r4} pop {r0} bx r0 @@ -408184,42 +408184,42 @@ 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 .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] @@ -408232,7 +408232,7 @@ sub_80E1204: ; 80E1204 ldrb r0, [r2] adds r0, 0x1 strb r0, [r2] -@080E127A: +_080E127A: pop {r4-r7} pop {r0} bx r0 @@ -408319,7 +408319,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] @@ -408332,14 +408332,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 @@ -408353,19 +408353,19 @@ sub_80E12E8: ; 80E12E8 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 MapGridSetMetatileIdAt - b @080E1390 + b _080E1390 .pool -@080E1380: +_080E1380: mov r1, r9 ldrh r0, [r1] mov r2, r10 @@ -408373,22 +408373,22 @@ sub_80E12E8: ; 80E12E8 adds r0, r5, 0 adds r1, r6, 0 bl MapGridSetMetatileIdAt -@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] @@ -408397,14 +408397,14 @@ sub_80E12E8: ; 80E12E8 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 @@ -408422,9 +408422,9 @@ sub_80E12E8: ; 80E12E8 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 @@ -408435,8 +408435,8 @@ sub_80E12E8: ; 80E12E8 adds r0, r5, 0 adds r1, r6, 0 bl MapGridSetMetatileIdAt - b @080E141A -@080E140A: + b _080E141A +_080E140A: mov r1, r9 ldrh r0, [r1, 0x4] mov r2, r10 @@ -408444,21 +408444,21 @@ sub_80E12E8: ; 80E12E8 adds r0, r5, 0 adds r1, r6, 0 bl MapGridSetMetatileIdAt -@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 @@ -408484,61 +408484,61 @@ 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 .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, =gUnknown_08589ABA - b @080E14C6 + b _080E14C6 .pool -@080E1498: +_080E1498: ldr r1, =gUnknown_08589AC0 - b @080E14C6 + b _080E14C6 .pool -@080E14A0: +_080E14A0: ldr r1, =gUnknown_08589AC6 - b @080E14B2 + b _080E14B2 .pool -@080E14A8: +_080E14A8: ldr r1, =gUnknown_08589ACC - b @080E14C6 + b _080E14C6 .pool -@080E14B0: +_080E14B0: ldr r1, =gUnknown_08589AD2 -@080E14B2: +_080E14B2: movs r2, 0xC0 lsls r2, 4 adds r0, r3, 0 bl sub_80E12E8 - b @080E14DE + b _080E14DE .pool -@080E14C4: +_080E14C4: ldr r1, =gUnknown_08589AD8 -@080E14C6: +_080E14C6: adds r0, r3, 0 movs r2, 0 bl sub_80E12E8 - b @080E14DE + b _080E14DE .pool -@080E14D4: +_080E14D4: ldr r1, =gUnknown_08589ADE adds r0, r3, 0 movs r2, 0 bl sub_80E12E8 -@080E14DE: +_080E14DE: ldrh r0, [r4] adds r0, 0x1 movs r1, 0x7 @@ -408546,7 +408546,7 @@ sub_80E1444: ; 80E1444 strh r0, [r4] adds r5, r0, 0 cmp r5, 0 - bne @080E1502 + bne _080E1502 bl DrawWholeMapView movs r1, 0x2 ldrsh r0, [r4, r1] @@ -408555,7 +408555,7 @@ sub_80E1444: ; 80E1444 bl __modsi3 strh r0, [r4, 0x2] strh r5, [r4, 0x6] -@080E1502: +_080E1502: pop {r4,r5} pop {r0} bx r0 @@ -408635,17 +408635,17 @@ 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 .pool -@080E15B0: +_080E15B0: movs r0, 0x1 -@080E15B2: +_080E15B2: pop {r1} bx r1 thumb_func_end sub_80E1584 @@ -408679,14 +408679,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 @@ -408699,13 +408699,13 @@ sub_80E1610: ; 80E1610 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 @@ -408720,12 +408720,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 @@ -408734,13 +408734,13 @@ sub_80E162C: ; 80E162C adds r1, r2 ldr r1, [r1] cmp r0, r1 - bne @080E1674 + bne _080E1674 movs r0, 0x1 - b @080E1676 + b _080E1676 .pool -@080E1674: +_080E1674: movs r0, 0 -@080E1676: +_080E1676: pop {r4} pop {r1} bx r1 @@ -408753,28 +408753,28 @@ GetBerryInfo: ; 80E167C 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 .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, =gBerries - 0x1c ; 1-based array -@080E16B4: +_080E16B4: adds r0, r1 pop {r4} pop {r1} @@ -408812,44 +408812,44 @@ FieldObjectInteractionWaterBerryTree: ; 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 .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 FieldObjectInteractionWaterBerryTree @@ -408861,7 +408861,7 @@ IsPlayerFacingPlantedBerryTree: ; 80E1738 bl GetFieldObjectScriptPointerForComparison ldr r1, =gUnknown_082742F9 cmp r0, r1 - bne @080E1768 + bne _080E1768 ldr r0, =0x03005df0 ldrb r0, [r0] bl FieldObjectGetBerryTreeId @@ -408870,13 +408870,13 @@ IsPlayerFacingPlantedBerryTree: ; 80E1738 bl GetStageByBerryTreeId lsls r0, 24 cmp r0, 0 - bne @080E1768 + bne _080E1768 movs r0, 0x1 - b @080E176A + b _080E176A .pool -@080E1768: +_080E1768: movs r0, 0 -@080E176A: +_080E176A: pop {r1} bx r1 thumb_func_end IsPlayerFacingPlantedBerryTree @@ -408888,15 +408888,15 @@ WaterBerryTree: ; 80E1770 bl GetFieldObjectScriptPointerForComparison ldr r1, =gUnknown_082742F9 cmp r0, r1 - bne @080E178C + bne _080E178C bl FieldObjectInteractionWaterBerryTree lsls r0, 24 lsrs r0, 24 - b @080E178E + b _080E178E .pool -@080E178C: +_080E178C: movs r0, 0 -@080E178E: +_080E178E: pop {r1} bx r1 thumb_func_end WaterBerryTree @@ -408911,7 +408911,7 @@ RemoveAllBerryTrees: ; 80E1794 ldr r0, =gUnknown_0858ABD0 ldr r3, [r0] ldr r4, [r0, 0x4] -@080E17A2: +_080E17A2: ldr r0, [r6] lsls r1, r2, 3 adds r0, r1 @@ -408920,7 +408920,7 @@ RemoveAllBerryTrees: ; 80E1794 str r4, [r0, 0x4] adds r2, 0x1 cmp r2, 0x7F - ble @080E17A2 + ble _080E17A2 pop {r4-r6} pop {r0} bx r0 @@ -408936,34 +408936,34 @@ BerryTreeGrow: ; 80E17C8 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 .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 CalcBerryYield strb r0, [r4, 0x4] -@080E1810: +_080E1810: ldrb r2, [r4, 0x1] lsls r1, r2, 25 lsrs r1, 25 @@ -408975,8 +408975,8 @@ BerryTreeGrow: ; 80E17C8 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 @@ -409001,15 +409001,15 @@ BerryTreeGrow: ; 80E17C8 ands r1, r0 strb r1, [r4, 0x5] cmp r1, 0xA - bne @080E1864 + bne _080E1864 ldr r0, =gUnknown_0858ABD0 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 @@ -409022,7 +409022,7 @@ BerryTreeTimeUpdate: ; 80E1870 push {r4-r7,lr} adds r6, r0, 0 movs r2, 0 -@080E1876: +_080E1876: ldr r1, =0x03005d8c lsls r0, r2, 3 ldr r3, =0x0000169c @@ -409032,16 +409032,16 @@ BerryTreeTimeUpdate: ; 80E1870 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 GetStageDurationByBerryType lsls r0, 16 @@ -409051,24 +409051,24 @@ BerryTreeTimeUpdate: ; 80E1870 lsls r1, 3 subs r1, r0 cmp r6, r1 - blt @080E18CC + blt _080E18CC ldr r0, =gUnknown_0858ABD0 ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [r4] str r1, [r4, 0x4] - b @080E1910 + b _080E1910 .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 GetStageDurationByBerryType @@ -409076,29 +409076,29 @@ BerryTreeTimeUpdate: ; 80E1870 adds r0, r4, 0 bl BerryTreeGrow 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 @@ -409138,21 +409138,21 @@ PlantBerryTree: ; 80E191C orrs r0, r1 strb r0, [r6, 0x1] cmp r5, 0x5 - bne @080E196E + bne _080E196E adds r0, r6, 0 bl CalcBerryYield 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 @@ -409220,16 +409220,16 @@ ItemIdToBerryType: ; 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 .pool -@080E1A08: +_080E1A08: movs r0, 0x1 -@080E1A0A: +_080E1A0A: pop {r1} bx r1 thumb_func_end ItemIdToBerryType @@ -409244,16 +409244,16 @@ BerryTypeToItemId: ; 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 .pool -@080E1A30: +_080E1A30: movs r0, 0x85 -@080E1A32: +_080E1A32: pop {r1} bx r1 thumb_func_end BerryTypeToItemId @@ -409324,25 +409324,25 @@ BerryTreeGetNumStagesWatered: ; 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 @@ -409373,10 +409373,10 @@ CalcBerryYieldInternal: ; 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 @@ -409394,16 +409394,16 @@ CalcBerryYieldInternal: ; 80E1AE4 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} @@ -409490,20 +409490,20 @@ FieldObjectInteractionGetBerryTreeData: ; 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 .pool -@080E1BE0: +_080E1BE0: ldr r4, =0x020375e0 adds r0, r5, 0 bl GetStageByBerryTreeId lsls r0, 24 lsrs r0, 24 strh r0, [r4] -@080E1BEE: +_080E1BEE: ldr r4, =0x020375e2 adds r0, r5, 0 bl GetNumStagesWateredByBerryTreeId @@ -409716,14 +409716,14 @@ ResetBerryTreeSparkleFlags: ; 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] @@ -409732,25 +409732,25 @@ ResetBerryTreeSparkleFlags: ; 80E1D6C 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 ResetBerryTreeSparkleFlag -@080E1DEC: +_080E1DEC: adds r4, 0x24 subs r6, 0x1 cmp r6, 0 - bge @080E1DB0 + bge _080E1DB0 add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -409780,7 +409780,7 @@ Multichoice: ; 80E1E08 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080E1E4C + beq _080E1E4C ldr r0, =0x020375f0 movs r1, 0xFF strh r1, [r0] @@ -409792,11 +409792,11 @@ Multichoice: ; 80E1E08 adds r3, r4, 0 bl DoMultichoice movs r0, 0x1 - b @080E1E4E + b _080E1E4E .pool -@080E1E4C: +_080E1E4C: movs r0, 0 -@080E1E4E: +_080E1E4E: add sp, 0x4 pop {r4-r7} pop {r1} @@ -409826,7 +409826,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] @@ -409837,11 +409837,11 @@ sub_80E1E58: ; 80E1E58 adds r3, r5, 0 bl DoMultichoice movs r0, 0x1 - b @080E1EAA + b _080E1EAA .pool -@080E1EA8: +_080E1EA8: movs r0, 0 -@080E1EAA: +_080E1EAA: add sp, 0x4 pop {r3} mov r8, r3 @@ -409855,14 +409855,14 @@ 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 GetStringLength @@ -409870,18 +409870,18 @@ sub_80E1EB8: ; 80E1EB8 lsls r0, 16 lsrs r5, r0, 16 adds r4, 0x1 - b @080E1EEC + b _080E1EEC .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} @@ -409920,18 +409920,18 @@ DoMultichoice: ; 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 @@ -410003,18 +410003,18 @@ sub_80E1FBC: ; 80E1FBC ldr r6, =sub_80E2058 ldr r5, =gUnknown_0858BB68 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 @@ -410028,13 +410028,13 @@ sub_80E1FBC: ; 80E1FBC mov r0, r8 strh r0, [r1, 0x10] cmp r7, 0x3 - bls @080E202C + bls _080E202C movs r0, 0x1 - b @080E202E + b _080E202E .pool -@080E202C: +_080E202C: movs r0, 0 -@080E202E: +_080E202E: strh r0, [r1, 0x12] ldr r1, =0x03005e00 lsls r0, r2, 2 @@ -410070,25 +410070,25 @@ 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 .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 @@ -410096,40 +410096,40 @@ sub_80E2058: ; 80E2058 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 .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 @@ -410145,7 +410145,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] @@ -410154,11 +410154,11 @@ yes_no_box: ; 80E2108 movs r1, 0x50 bl AddTask movs r0, 0x1 - b @080E213A + b _080E213A .pool -@080E2138: +_080E2138: movs r0, 0 -@080E213A: +_080E213A: pop {r4} pop {r1} bx r1 @@ -410170,13 +410170,13 @@ sub_80E2140: ; 80E2140 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0xFF - beq @080E2154 + beq _080E2154 movs r0, 0x1 - b @080E2156 + b _080E2156 .pool -@080E2154: +_080E2154: movs r0, 0 -@080E2156: +_080E2156: pop {r1} bx r1 thumb_func_end sub_80E2140 @@ -410195,47 +410195,47 @@ 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 .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 .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 @@ -410269,11 +410269,11 @@ sub_80E21D0: ; 80E21D0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080E2210 + bne _080E2210 movs r0, 0 - b @080E22E8 + b _080E22E8 .pool -@080E2210: +_080E2210: ldr r0, =0x020375f0 movs r1, 0xFF strh r1, [r0] @@ -410285,9 +410285,9 @@ sub_80E21D0: ; 80E21D0 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] @@ -410300,8 +410300,8 @@ sub_80E21D0: ; 80E21D0 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 @@ -410374,7 +410374,7 @@ sub_80E21D0: ; 80E21D0 movs r1, 0x3 bl CopyWindowToVram movs r0, 0x1 -@080E22E8: +_080E22E8: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -410402,31 +410402,31 @@ 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 .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 @@ -410442,17 +410442,17 @@ sp109_CreatePCMenu: ; 80E236C 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 .pool -@080E2394: +_080E2394: movs r0, 0 -@080E2396: +_080E2396: pop {r1} bx r1 thumb_func_end sp109_CreatePCMenu @@ -410467,25 +410467,25 @@ CreatePCMenu: ; 80E239C movs r5, 0 movs r4, 0 ldr r6, =gUnknown_0858BB70 -@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 FlagGet lsls r0, 24 cmp r0, 0 - beq @080E23D4 + beq _080E23D4 ldr r0, =gUnknown_085EB18B 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 @@ -410495,7 +410495,7 @@ CreatePCMenu: ; 80E239C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq @080E2448 + beq _080E2448 movs r0, 0x4 mov r8, r0 movs r0, 0 @@ -410528,9 +410528,9 @@ CreatePCMenu: ; 80E239C movs r1, 0x1 adds r3, r7, 0 bl Print - b @080E247A + b _080E247A .pool -@080E2448: +_080E2448: movs r0, 0x3 mov r8, r0 movs r0, 0 @@ -410553,13 +410553,13 @@ CreatePCMenu: ; 80E239C movs r1, 0x1 adds r3, r7, 0 bl Print -@080E247A: +_080E247A: ldr r0, =0x000008ab bl FlagGet lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - beq @080E24B0 + beq _080E24B0 ldr r2, =gUnknown_085EB176 movs r0, 0x1 str r0, [sp] @@ -410571,9 +410571,9 @@ CreatePCMenu: ; 80E239C movs r1, 0x1 adds r3, r7, 0 bl Print - b @080E24C6 + b _080E24C6 .pool -@080E24B0: +_080E24B0: ldr r2, =gUnknown_085EB169 movs r0, 0x1 str r0, [sp] @@ -410584,7 +410584,7 @@ CreatePCMenu: ; 80E239C movs r1, 0x1 adds r3, r7, 0 bl Print -@080E24C6: +_080E24C6: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EB183 adds r0, r4, 0 @@ -410649,17 +410649,17 @@ sub_80E2548: ; 80E2548 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 .pool -@080E2570: +_080E2570: movs r0, 0 -@080E2572: +_080E2572: pop {r1} bx r1 thumb_func_end sub_80E2548 @@ -410675,7 +410675,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 @@ -410684,14 +410684,14 @@ sub_80E2578: ; 80E2578 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @080E258A + bls _080E258A movs r0, 0x1 movs r1, 0 bl GetFontAttribute ldr r0, =0x020375e0 ldrh r1, [r0] cmp r1, 0 - bne @080E25D2 + bne _080E25D2 ldr r4, =0x03001124 adds r0, r5, r4 strb r1, [r0] @@ -410704,30 +410704,30 @@ sub_80E2578: ; 80E2578 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 FlagGet 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 @@ -410735,17 +410735,17 @@ sub_80E2578: ; 80E2578 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 FlagGet lsls r0, 24 cmp r0, 0 - bne @080E2630 + bne _080E2630 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x2 @@ -410755,7 +410755,7 @@ sub_80E2578: ; 80E2578 lsrs r5, r0, 24 adds r0, r4, 0 bl FlagSet -@080E2630: +_080E2630: movs r0, 0xB9 lsls r0, 1 movs r1, 0x1 @@ -410763,18 +410763,18 @@ sub_80E2578: ; 80E2578 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080E2690 + bne _080E2690 movs r0, 0x8E lsls r0, 4 bl FlagGet 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 @@ -410782,16 +410782,16 @@ sub_80E2578: ; 80E2578 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 FlagGet lsls r0, 24 cmp r0, 0 - bne @080E2690 + bne _080E2690 ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x3 @@ -410801,24 +410801,24 @@ sub_80E2578: ; 80E2578 lsrs r5, r0, 24 adds r0, r4, 0 bl FlagSet -@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 FlagGet 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 @@ -410826,16 +410826,16 @@ sub_80E2578: ; 80E2578 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 FlagGet lsls r0, 24 cmp r0, 0 - bne @080E26EC + bne _080E26EC ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x4 @@ -410845,7 +410845,7 @@ sub_80E2578: ; 80E2578 lsrs r5, r0, 24 adds r0, r4, 0 bl FlagSet -@080E26EC: +_080E26EC: movs r0, 0xBC lsls r0, 1 movs r1, 0x1 @@ -410853,17 +410853,17 @@ sub_80E2578: ; 80E2578 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080E274C + bne _080E274C ldr r0, =0x000008d6 bl FlagGet 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 @@ -410871,17 +410871,17 @@ sub_80E2578: ; 80E2578 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 FlagGet lsls r0, 24 cmp r0, 0 - bne @080E274C + bne _080E274C ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x5 @@ -410891,7 +410891,7 @@ sub_80E2578: ; 80E2578 lsrs r5, r0, 24 adds r0, r4, 0 bl FlagSet -@080E274C: +_080E274C: ldr r0, =0x03001124 adds r0, r5, r0 movs r1, 0x6 @@ -410902,44 +410902,44 @@ sub_80E2578: ; 80E2578 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne @080E276E + bne _080E276E movs r0, 0xE8 lsls r0, 1 bl FlagGet 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 .pool -@080E27A4: +_080E27A4: movs r1, 0 movs r4, 0 lsls r6, r7, 25 subs r0, r7, 0x1 mov r9, r0 ldr r5, =gUnknown_0858BB80 -@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 @@ -410964,12 +410964,12 @@ sub_80E2578: ; 80E2578 movs r4, 0 ldr r0, =gUnknown_0858BB80 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] @@ -410989,12 +410989,12 @@ sub_80E2578: ; 80E2578 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 @@ -411009,7 +411009,7 @@ sub_80E2578: ; 80E2578 adds r2, r6, 0 movs r3, 0x8 bl sub_80E1FBC -@080E2860: +_080E2860: add sp, 0xC pop {r3,r4} mov r8, r3 @@ -411026,13 +411026,13 @@ sub_80E2878: ; 80E2878 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 .pool @@ -411051,20 +411051,20 @@ 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 .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 @@ -411074,18 +411074,18 @@ task_picbox: ; 80E2898 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 .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 @@ -411109,7 +411109,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 @@ -411169,11 +411169,11 @@ sub_80E2900: ; 80E2900 movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x1 - b @080E29BA + b _080E29BA .pool -@080E29B8: +_080E29B8: movs r0, 0 -@080E29BA: +_080E29BA: pop {r3} mov r8, r3 pop {r4-r7} @@ -411189,7 +411189,7 @@ picbox_close: ; 80E29C4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @080E29F4 + beq _080E29F4 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -411199,11 +411199,11 @@ picbox_close: ; 80E29C4 adds r0, 0x1 strh r0, [r1, 0x8] ldr r0, =sub_80E29FC - b @080E29F6 + b _080E29F6 .pool -@080E29F4: +_080E29F4: movs r0, 0 -@080E29F6: +_080E29F6: pop {r1} bx r1 thumb_func_end picbox_close @@ -411216,13 +411216,13 @@ sub_80E29FC: ; 80E29FC lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @080E2A14 + beq _080E2A14 movs r0, 0 - b @080E2A16 + b _080E2A16 .pool -@080E2A14: +_080E2A14: movs r0, 0x1 -@080E2A16: +_080E2A16: pop {r1} bx r1 thumb_func_end sub_80E29FC @@ -411298,55 +411298,55 @@ sub_80E2A94: ; 80E2A94 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 .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 FillWindowPixelBuffer ldr r4, =gUnknown_0858BBAC - b @080E2B12 + b _080E2B12 .pool -@080E2AD8: +_080E2AD8: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gUnknown_0858BB9C - b @080E2B12 + b _080E2B12 .pool -@080E2AE8: +_080E2AE8: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gUnknown_0858BBBC - b @080E2B12 + b _080E2B12 .pool -@080E2AF8: +_080E2AF8: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gUnknown_0858BBCC - b @080E2B12 + b _080E2B12 .pool -@080E2B08: +_080E2B08: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, =gUnknown_0858BBEC -@080E2B12: +_080E2B12: bl GetMenuCursorPos lsls r0, 24 lsrs r0, 22 @@ -411364,9 +411364,9 @@ sub_80E2A94: ; 80E2A94 movs r1, 0x1 movs r3, 0 bl AddTextPrinterParametrized - b @080E2B70 + b _080E2B70 .pool -@080E2B40: +_080E2B40: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer @@ -411388,7 +411388,7 @@ sub_80E2A94: ; 80E2A94 movs r1, 0x1 movs r3, 0 bl AddTextPrinterParametrized -@080E2B70: +_080E2B70: add sp, 0x10 pop {r4} pop {r0} @@ -411404,17 +411404,17 @@ sp106_CreateStartMenu: ; 80E2B7C 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 .pool -@080E2BA4: +_080E2BA4: movs r0, 0 -@080E2BA6: +_080E2BA6: pop {r1} bx r1 thumb_func_end sp106_CreateStartMenu @@ -411592,9 +411592,9 @@ display_text_and_get_width: ; 80E2D2C 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 @@ -411606,15 +411606,15 @@ convert_pixel_width_to_tile_width: ; 80E2D40 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 @@ -411625,13 +411625,13 @@ sub_80E2D5C: ; 80E2D5C 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 @@ -411656,12 +411656,12 @@ do_choose_name_or_words_screen: ; 80E2D78 bl Alloc str r0, [r4] cmp r0, 0 - bne @080E2DA8 + bne _080E2DA8 ldr r0, [sp, 0x1C] bl SetMainCallback2 - b @080E2DE2 + b _080E2DE2 .pool -@080E2DA8: +_080E2DA8: ldr r1, =0x00001e2c adds r0, r1 strb r7, [r0] @@ -411685,12 +411685,12 @@ do_choose_name_or_words_screen: ; 80E2D78 ldr r2, [sp, 0x1C] str r2, [r0] cmp r7, 0 - bne @080E2DDC + bne _080E2DDC bl StartTimer1 -@080E2DDC: +_080E2DDC: ldr r0, =c2_choose_name_or_words_screen bl SetMainCallback2 -@080E2DE2: +_080E2DE2: pop {r3} mov r8, r3 pop {r4-r7} @@ -411708,51 +411708,51 @@ 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 .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 ResetAllObjectData bl ResetObjectPaletteAllocator - 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 @@ -411760,12 +411760,12 @@ c2_choose_name_or_words_screen: ; 80E2E04 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @080E2EA4 + b _080E2EA4 .pool -@080E2E9C: +_080E2E9C: bl sub_80E4CB8 bl sub_80E3194 -@080E2EA4: +_080E2EA4: pop {r0} bx r0 thumb_func_end c2_choose_name_or_words_screen @@ -411835,11 +411835,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] @@ -411858,7 +411858,7 @@ choose_name_or_words_screen_setup: ; 80E2EA8 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq @080E2F64 + beq _080E2F64 movs r7, 0xC0 lsls r7, 5 adds r0, r1, r7 @@ -411866,7 +411866,7 @@ choose_name_or_words_screen_setup: ; 80E2EA8 adds r1, r2 ldr r1, [r1] bl CopyString -@080E2F64: +_080E2F64: movs r0, 0x10 strh r0, [r4] pop {r4-r7} @@ -411882,7 +411882,7 @@ sub_80E2FA4: ; 80E2FA4 ldr r4, =0x02020630 movs r5, 0x5 negs r5, r5 -@080E2FAE: +_080E2FAE: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -411892,16 +411892,16 @@ sub_80E2FA4: ; 80E2FA4 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} @@ -411931,7 +411931,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] @@ -411941,7 +411941,7 @@ choose_name_or_words_screen_init_bgs: ; 80E2FE4 adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @080E300A + bhi _080E300A strh r6, [r2] add r2, sp, 0x8 str r2, [r1] @@ -412022,7 +412022,7 @@ choose_name_or_words_screen_init_bgs: ; 80E2FE4 bl ChangeBgY bl sub_81971D0 bl sub_8197200 -@080E30D8: +_080E30D8: lsls r0, r4, 3 ldr r1, =gUnknown_0858BE10 adds r0, r1 @@ -412037,7 +412037,7 @@ choose_name_or_words_screen_init_bgs: ; 80E2FE4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls @080E30D8 + bls _080E30D8 movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -412117,56 +412117,56 @@ 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 .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 @@ -412291,7 +412291,7 @@ sub_80E335C: ; 80E335C movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @080E3384 + bne _080E3384 movs r0, 0x1 bl sub_80E4630 movs r0, 0x1 @@ -412303,7 +412303,7 @@ sub_80E335C: ; 80E335C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@080E3384: +_080E3384: movs r0, 0 pop {r1} bx r1 @@ -412326,7 +412326,7 @@ sub_80E33A8: ; 80E33A8 bl sub_80E3F04 lsls r0, 24 cmp r0, 0 - beq @080E33CA + beq _080E33CA movs r0, 0x1 bl sub_80E4630 bl sub_80E3E28 @@ -412336,7 +412336,7 @@ sub_80E33A8: ; 80E33A8 adds r0, r1 movs r1, 0x2 strb r1, [r0] -@080E33CA: +_080E33CA: movs r0, 0 pop {r1} bx r1 @@ -412361,12 +412361,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 @@ -412374,9 +412374,9 @@ pokemon_store: ; 80E33D8 movs r1, 0x7 strb r1, [r0] movs r0, 0 - b @080E343A + b _080E343A .pool -@080E342C: +_080E342C: ldr r0, =0x02039f94 ldr r0, [r0] ldr r1, =0x00001e10 @@ -412384,7 +412384,7 @@ pokemon_store: ; 80E33D8 movs r1, 0x8 strb r1, [r0] movs r0, 0x1 -@080E343A: +_080E343A: pop {r4} pop {r1} bx r1 @@ -412426,16 +412426,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 SetRngAndSetTrainerId -@080E34A0: +_080E34A0: ldr r0, [r4] ldr r1, =0x00001e3c adds r0, r1 @@ -412450,7 +412450,7 @@ sub_80E347C: ; 80E347C ldr r0, [r4] bl Free str r5, [r4] -@080E34C6: +_080E34C6: movs r0, 0 pop {r4,r5} pop {r1} @@ -412466,7 +412466,7 @@ pokemon_transfer_to_pc_with_message: ; 80E34E4 bl sub_813B260 lsls r0, 24 cmp r0, 0 - bne @080E3534 + bne _080E3534 ldr r4, =0x02021cc4 ldr r0, =0x00004036 bl VarGet @@ -412483,9 +412483,9 @@ pokemon_transfer_to_pc_with_message: ; 80E34E4 adds r1, r2 ldr r1, [r1] bl CopyString - b @080E3574 + b _080E3574 .pool -@080E3534: +_080E3534: ldr r4, =0x02021cc4 ldr r0, =0x00004036 bl VarGet @@ -412511,16 +412511,16 @@ pokemon_transfer_to_pc_with_message: ; 80E34E4 adds r0, r4, 0 bl CopyString movs r5, 0x2 -@080E3574: +_080E3574: ldr r0, =0x000008ab bl FlagGet 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, =gUnknown_0858BDB8 lsls r0, r5, 2 @@ -412570,20 +412570,20 @@ sub_80E3604: ; 80E3604 bl IsTextPrinterActive 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 @@ -412624,7 +412624,7 @@ sub_80E3680: ; 80E3680 bl sub_80E3794 lsls r0, 24 cmp r0, 0 - beq @080E3732 + beq _080E3732 mov r4, sp adds r4, 0x2 mov r0, sp @@ -412639,9 +412639,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 @@ -412661,14 +412661,14 @@ sub_80E3680: ; 80E3680 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 .pool -@080E36F4: +_080E36F4: mov r0, sp movs r2, 0 ldrsh r4, [r0, r2] @@ -412676,15 +412676,15 @@ sub_80E3680: ; 80E3680 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] @@ -412696,7 +412696,7 @@ sub_80E3680: ; 80E3680 bl sub_80E4630 movs r0, 0 bl sub_80E3E3C -@080E3732: +_080E3732: movs r0, 0 add sp, 0x4 pop {r4-r6} @@ -412731,7 +412731,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 @@ -412741,7 +412741,7 @@ sub_80E375C: ; 80E375C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @080E376E + bne _080E376E pop {r4,r5} pop {r0} bx r0 @@ -412756,13 +412756,13 @@ sub_80E3794: ; 80E3794 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @080E37AC + beq _080E37AC movs r0, 0 - b @080E37AE + b _080E37AE .pool -@080E37AC: +_080E37AC: movs r0, 0x1 -@080E37AE: +_080E37AE: pop {r1} bx r1 thumb_func_end sub_80E3794 @@ -412832,7 +412832,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 @@ -412845,7 +412845,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} @@ -412900,7 +412900,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 @@ -412915,7 +412915,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} @@ -412979,38 +412979,38 @@ 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 .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 @@ -413030,11 +413030,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 @@ -413048,67 +413048,67 @@ 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 .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 .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 @@ -413218,11 +413218,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 StartObjectImageAnim -@080E3B48: +_080E3B48: ldrh r0, [r5, 0x36] movs r1, 0xFF ands r1, r0 @@ -413243,49 +413243,49 @@ sub_80E3B30: ; 80E3B30 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 @@ -413293,23 +413293,23 @@ sub_80E3B30: ; 80E3B30 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 @@ -413328,7 +413328,7 @@ sub_80E3B30: ; 80E3B30 adds r2, r5, 0 adds r3, r5, 0 bl sub_80B609C -@080E3C14: +_080E3C14: pop {r4-r6} pop {r0} bx r0 @@ -413348,13 +413348,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] @@ -413362,7 +413362,7 @@ sub_80E3C20: ; 80E3C20 movs r1, 0x3 ands r0, r1 strh r0, [r4, 0x30] -@080E3C52: +_080E3C52: movs r1, 0x30 ldrsh r0, [r4, r1] lsls r0, 1 @@ -413390,13 +413390,13 @@ 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 .pool -@080E3C98: +_080E3C98: movs r1, 0x30 ldrsh r0, [r4, r1] lsls r0, 1 @@ -413409,16 +413409,16 @@ sub_80E3C6C: ; 80E3C6C 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} @@ -413532,7 +413532,7 @@ sub_80E3D78: ; 80E3D78 adds r0, r4 ldrb r0, [r0] cmp r6, r0 - bge @080E3DD8 + bge _080E3DD8 bl sub_80E3274 ldr r1, =gUnknown_0858BEA3 lsls r0, 24 @@ -413541,11 +413541,11 @@ sub_80E3D78: ; 80E3D78 adds r0, r1 ldrb r0, [r0] adds r0, 0x26 - b @080E3DDA + b _080E3DDA .pool -@080E3DD8: +_080E3DD8: movs r0, 0 -@080E3DDA: +_080E3DDA: strh r0, [r5, 0x20] lsls r0, r7, 16 asrs r0, 12 @@ -413726,17 +413726,17 @@ sub_80E3F30: ; 80E3F30 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - blt @080E3F64 + blt _080E3F64 ldr r0, =gUnknown_0858BEE4 movs r2, 0 ldrsh r1, [r5, r2] adds r1, r0 ldrb r0, [r1] - b @080E3F66 + b _080E3F66 .pool -@080E3F64: +_080E3F64: movs r0, 0 -@080E3F66: +_080E3F66: add sp, 0x4 pop {r4,r5} pop {r1} @@ -413866,7 +413866,7 @@ sub_80E4084: ; 80E4084 push {r4,r5,lr} adds r4, r0, 0 ldr r5, =gUnknown_0858BEE8 -@080E408A: +_080E408A: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r0, 2 @@ -413876,7 +413876,7 @@ sub_80E4084: ; 80E4084 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @080E408A + bne _080E408A pop {r4,r5} pop {r0} bx r0 @@ -413950,7 +413950,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] @@ -413976,7 +413976,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} @@ -414007,12 +414007,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} @@ -414160,9 +414160,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 @@ -414202,8 +414202,8 @@ sub_80E4290: ; 80E4290 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r5, r0 - bcc @080E42E2 -@080E4334: + bcc _080E42E2 +_080E4334: pop {r4-r6} pop {r0} bx r0 @@ -414382,33 +414382,33 @@ 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, =gUnknown_0858BF18 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 .pool -@080E4500: +_080E4500: bl sub_80E3E28 -@080E4504: +_080E4504: movs r0, 0 -@080E4506: +_080E4506: pop {r4,r5} pop {r1} bx r1 @@ -414425,14 +414425,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 @@ -414441,7 +414441,7 @@ sub_80E450C: ; 80E450C adds r0, r1 movs r1, 0x3 strb r1, [r0] -@080E4546: +_080E4546: movs r0, 0 pop {r4} pop {r1} @@ -414460,14 +414460,14 @@ 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 @@ -414484,9 +414484,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} @@ -414504,10 +414504,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 @@ -414517,7 +414517,7 @@ sub_80E45A4: ; 80E45A4 movs r1, 0x6 strb r1, [r0] movs r0, 0x1 -@080E45D2: +_080E45D2: pop {r4} pop {r1} bx r1 @@ -414629,39 +414629,39 @@ 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 .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 @@ -414723,21 +414723,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 @@ -414754,33 +414754,33 @@ sub_80E46F0: ; 80E46F0 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] @@ -414789,9 +414789,9 @@ sub_80E46F0: ; 80E46F0 lsls r0, 1 ldr r1, [sp, 0x2C] adds r0, r1, r0 - b @080E481A + b _080E481A .pool -@080E47F0: +_080E47F0: mov r2, r8 lsls r4, r2, 16 asrs r4, 16 @@ -414799,75 +414799,75 @@ sub_80E46F0: ; 80E46F0 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 @@ -415028,14 +415028,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, =gUnknown_085E8D4B add r0, sp, 0xC bl CopyString movs r4, 0x1 -@080E49E6: +_080E49E6: ldr r0, [r5] ldr r1, =0x00001e13 adds r0, r1 @@ -415054,7 +415054,7 @@ sub_80E49BC: ; 80E49BC movs r2, 0x68 movs r3, 0x1 bl box_print -@080E4A0C: +_080E4A0C: add sp, 0x10 pop {r4,r5} pop {r0} @@ -415101,25 +415101,25 @@ 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 .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 @@ -415128,7 +415128,7 @@ sub_80E4A60: ; 80E4A60 subs r0, 0x1 lsls r0, 24 lsrs r0, 24 -@080E4AAA: +_080E4AAA: pop {r4,r5} pop {r1} bx r1 @@ -415147,27 +415147,27 @@ 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 .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 @@ -415199,15 +415199,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} @@ -415250,13 +415250,13 @@ sub_80E4B54: ; 80E4B54 ldrb r1, [r1, 0x1] subs r1, 0x1 cmp r0, r1 - bne @080E4BB0 + bne _080E4BB0 movs r0, 0x1 - b @080E4BB2 + b _080E4BB2 .pool -@080E4BB0: +_080E4BB0: movs r0, 0 -@080E4BB2: +_080E4BB2: add sp, 0x4 pop {r4} pop {r1} @@ -415295,9 +415295,9 @@ sub_80E4BE4: ; 80E4BE4 adds r0, r4 ldr r0, [r0] adds r5, r1, 0 - b @080E4C44 + b _080E4C44 .pool -@080E4C00: +_080E4C00: ldr r1, [r1] movs r0, 0xC0 lsls r0, 5 @@ -415305,9 +415305,9 @@ sub_80E4BE4: ; 80E4BE4 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] @@ -415319,9 +415319,9 @@ sub_80E4BE4: ; 80E4BE4 lsrs r2, 24 adds r1, r3, 0 bl CopyString_LimitN - b @080E4C4A + b _080E4C4A .pool -@080E4C34: +_080E4C34: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 @@ -415330,11 +415330,11 @@ sub_80E4BE4: ; 80E4BE4 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 @@ -415455,13 +415455,13 @@ sub_80E4D10: ; 80E4D10 bl FillWindowPixelBuffer movs r4, 0 cmp r4, r6 - bcs @080E4DA6 + bcs _080E4DA6 add r5, sp, 0xC mov r10, r4 ldr r0, =gUnknown_085E8218 ldrb r0, [r0] mov r8, r0 -@080E4D52: +_080E4D52: ldr r0, [r7] movs r1, 0xC0 lsls r1, 5 @@ -415477,9 +415477,9 @@ sub_80E4D10: ; 80E4D10 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 @@ -415502,8 +415502,8 @@ sub_80E4D10: ; 80E4D10 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] @@ -415549,7 +415549,7 @@ sub_80E4DE4: ; 80E4DE4 ldr r7, [r0] ldr r0, =gUnknown_0858C198 mov r8, r0 -@080E4E0E: +_080E4E0E: lsls r3, r4, 4 adds r3, 0x1 lsls r3, 24 @@ -415571,7 +415571,7 @@ sub_80E4DE4: ; 80E4DE4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @080E4E0E + bls _080E4E0E adds r0, r6, 0 bl PutWindowTilemap add sp, 0xC @@ -415595,21 +415595,21 @@ sub_80E4E5C: ; 80E4E5C bl GetGpuReg 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 .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 @@ -415794,21 +415794,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} @@ -415929,12 +415929,12 @@ is_money_greater_than: ; 80E513C 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 @@ -415952,14 +415952,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 @@ -415978,12 +415978,12 @@ subtract_money: ; 80E518C 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} @@ -416077,16 +416077,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, =gUnknown_085E969C adds r0, r2, 0 bl ExpandStringRefs @@ -416315,30 +416315,30 @@ AreMovesContestCombo: ; 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, =gComboStarterLookupTable adds r0, r4, r0 ldrb r0, [r0] - b @080E5472 + b _080E5472 .pool -@080E5470: +_080E5470: movs r0, 0 -@080E5472: +_080E5472: add sp, 0x4 pop {r4} pop {r1} @@ -416558,16 +416558,16 @@ ContestEffectFunc_080E55EC: ; 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 @@ -416576,8 +416576,8 @@ ContestEffectFunc_080E55EC: ; 80E55EC 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] @@ -416589,16 +416589,16 @@ ContestEffectFunc_080E55EC: ; 80E55EC 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] @@ -416622,11 +416622,11 @@ ContestEffectFunc_080E5664: ; 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 @@ -416634,16 +416634,16 @@ ContestEffectFunc_080E5664: ; 80E5664 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] @@ -416654,16 +416654,16 @@ ContestEffectFunc_080E5664: ; 80E5664 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] @@ -416688,12 +416688,12 @@ ContestEffectFunc_080E56E0: ; 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] @@ -416718,10 +416718,10 @@ ContestEffectFunc_080E5718: ; 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 @@ -416729,7 +416729,7 @@ ContestEffectFunc_080E5718: ; 80E5718 ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - bls @080E5798 + bls _080E5798 strb r4, [r2, 0x8] ldr r0, [r6] ldr r1, [r0, 0x8] @@ -416744,36 +416744,36 @@ ContestEffectFunc_080E5718: ; 80E5718 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] @@ -416781,14 +416781,14 @@ ContestEffectFunc_080E5718: ; 80E5718 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} @@ -416815,11 +416815,11 @@ ContestEffectFunc_080E57CC: ; 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 @@ -416828,21 +416828,21 @@ ContestEffectFunc_080E57CC: ; 80E57CC 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 @@ -416864,12 +416864,12 @@ ContestEffectFunc_080E57CC: ; 80E57CC 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] @@ -416878,14 +416878,14 @@ ContestEffectFunc_080E57CC: ; 80E57CC 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 @@ -416912,11 +416912,11 @@ ContestEffectFunc_080E588C: ; 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 @@ -416924,20 +416924,20 @@ ContestEffectFunc_080E588C: ; 80E588C 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 .pool -@080E58D8: +_080E58D8: movs r0, 0xA -@080E58DA: +_080E58DA: strh r0, [r2, 0x4] mov r1, r8 ldr r0, [r1] @@ -416950,19 +416950,19 @@ ContestEffectFunc_080E588C: ; 80E588C 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] @@ -416970,13 +416970,13 @@ ContestEffectFunc_080E588C: ; 80E588C 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 @@ -417137,9 +417137,9 @@ ContestEffectFunc_080E5A50: ; 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] @@ -417150,44 +417150,44 @@ ContestEffectFunc_080E5A50: ; 80E5A50 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 .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 @@ -417216,7 +417216,7 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 add r3, sp, 0x8 mov r10, r3 movs r6, 0 -@080E5B00: +_080E5B00: ldr r0, =0x02039f34 ldr r2, [r0] ldr r1, [r2, 0x8] @@ -417226,69 +417226,69 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 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 .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 @@ -417296,13 +417296,13 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 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 @@ -417317,11 +417317,11 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 lsls r0, r1, 2 adds r0, r1 lsls r0, 1 - b @080E5BD2 + b _080E5BD2 .pool -@080E5BD0: +_080E5BD0: movs r0, 0 -@080E5BD2: +_080E5BD2: strh r0, [r4] ldr r0, [r7] ldr r0, [r0, 0x4] @@ -417343,19 +417343,19 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 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 @@ -417374,12 +417374,12 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 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] @@ -417390,15 +417390,15 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 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] @@ -417409,7 +417409,7 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 lsls r0, 24 lsrs r0, 24 mov r9, r0 -@080E5C86: +_080E5C86: ldr r0, =0x02039f34 ldr r0, [r0] ldr r0, [r0, 0x8] @@ -417422,8 +417422,8 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 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] @@ -417432,13 +417432,13 @@ ContestEffectFunc_080E5AD4: ; 80E5AD4 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 @@ -417460,7 +417460,7 @@ ContestEffectFunc_080E5CD4: ; 80E5CD4 movs r6, 0 ldr r7, =0x02039f34 movs r5, 0 -@080E5CE4: +_080E5CE4: ldr r2, [r7] ldr r0, [r2, 0x8] ldrb r1, [r0, 0x11] @@ -417469,21 +417469,21 @@ ContestEffectFunc_080E5CD4: ; 80E5CD4 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 @@ -417508,11 +417508,11 @@ ContestEffectFunc_080E5CD4: ; 80E5CD4 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] @@ -417521,13 +417521,13 @@ ContestEffectFunc_080E5CD4: ; 80E5CD4 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} @@ -417543,7 +417543,7 @@ ContestEffectFunc_080E5D7C: ; 80E5D7C movs r4, 0 ldr r5, =0x02039f34 movs r6, 0 -@080E5D86: +_080E5D86: ldr r3, [r5] ldr r2, [r3, 0x8] ldrb r0, [r2, 0x11] @@ -417552,20 +417552,20 @@ ContestEffectFunc_080E5D7C: ; 80E5D7C 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 .pool -@080E5DB0: +_080E5DB0: movs r0, 0xA -@080E5DB2: +_080E5DB2: strh r0, [r2, 0x4] ldr r0, [r5] ldr r0, [r0, 0x8] @@ -417577,15 +417577,15 @@ ContestEffectFunc_080E5D7C: ; 80E5D7C 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] @@ -417593,13 +417593,13 @@ ContestEffectFunc_080E5D7C: ; 80E5D7C 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 @@ -417617,7 +417617,7 @@ ContestEffectFunc_080E5E04: ; 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 @@ -417640,7 +417640,7 @@ ContestEffectFunc_080E5E04: ; 80E5E04 ldrb r0, [r0, 0x11] movs r1, 0xF bl sub_80DD3D4 -@080E5E46: +_080E5E46: pop {r4} pop {r0} bx r0 @@ -417658,7 +417658,7 @@ ContestEffectFunc_080E5E5C: ; 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 @@ -417681,7 +417681,7 @@ ContestEffectFunc_080E5E5C: ; 80E5E5C ldrb r0, [r0, 0x11] movs r1, 0x10 bl sub_80DD3D4 -@080E5E9E: +_080E5E9E: pop {r4} pop {r0} bx r0 @@ -417700,25 +417700,25 @@ ContestEffectFunc_080E5EB4: ; 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] @@ -417726,16 +417726,16 @@ ContestEffectFunc_080E5EB4: ; 80E5EB4 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 .pool -@080E5F0C: +_080E5F0C: ldr r0, [r3, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -417751,7 +417751,7 @@ ContestEffectFunc_080E5EB4: ; 80E5EB4 ldrb r0, [r0, 0x11] movs r1, 0x11 bl sub_80DD3D4 -@080E5F2C: +_080E5F2C: ldr r4, =0x02039f34 ldr r1, [r4] ldr r0, [r1, 0x8] @@ -417791,46 +417791,46 @@ ContestEffectFunc_080E5F64: ; 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 .pool -@080E5FC4: +_080E5FC4: ldr r1, [r3, 0x4] lsls r0, r2, 3 subs r0, r2 @@ -417843,7 +417843,7 @@ ContestEffectFunc_080E5F64: ; 80E5F64 ldrb r0, [r0, 0x11] movs r1, 0x13 bl sub_80DD3D4 -@080E5FDE: +_080E5FDE: pop {r4-r7} pop {r0} bx r0 @@ -417860,16 +417860,16 @@ ContestEffectFunc_080E5FE4: ; 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 .pool -@080E600C: +_080E600C: ldr r0, [r3, 0x4] lsls r1, r2, 3 subs r1, r2 @@ -417878,41 +417878,41 @@ ContestEffectFunc_080E5FE4: ; 80E5FE4 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 @@ -417930,7 +417930,7 @@ ContestEffectFunc_080E6068: ; 80E6068 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x2 - bhi @080E6098 + bhi _080E6098 movs r4, 0xA ldr r0, =0x02039f34 ldr r0, [r0] @@ -417938,11 +417938,11 @@ ContestEffectFunc_080E6068: ; 80E6068 ldrb r0, [r0, 0x11] movs r1, 0x1A bl sub_80DD3D4 - b @080E60FC + b _080E60FC .pool -@080E6098: +_080E6098: cmp r0, 0x5 - bhi @080E60B4 + bhi _080E60B4 movs r4, 0x14 ldr r0, =0x02039f34 ldr r0, [r0] @@ -417950,11 +417950,11 @@ ContestEffectFunc_080E6068: ; 80E6068 ldrb r0, [r0, 0x11] movs r1, 0x1B bl sub_80DD3D4 - b @080E60FC + b _080E60FC .pool -@080E60B4: +_080E60B4: cmp r0, 0x7 - bhi @080E60D0 + bhi _080E60D0 movs r4, 0x28 ldr r0, =0x02039f34 ldr r0, [r0] @@ -417962,11 +417962,11 @@ ContestEffectFunc_080E6068: ; 80E6068 ldrb r0, [r0, 0x11] movs r1, 0x1C bl sub_80DD3D4 - b @080E60FC + b _080E60FC .pool -@080E60D0: +_080E60D0: cmp r1, 0x8 - bhi @080E60EC + bhi _080E60EC movs r4, 0x3C ldr r0, =0x02039f34 ldr r0, [r0] @@ -417974,9 +417974,9 @@ ContestEffectFunc_080E6068: ; 80E6068 ldrb r0, [r0, 0x11] movs r1, 0x1D bl sub_80DD3D4 - b @080E60FC + b _080E60FC .pool -@080E60EC: +_080E60EC: movs r4, 0x50 ldr r0, =0x02039f34 ldr r0, [r0] @@ -417984,7 +417984,7 @@ ContestEffectFunc_080E6068: ; 80E6068 ldrb r0, [r0, 0x11] movs r1, 0x1E bl sub_80DD3D4 -@080E60FC: +_080E60FC: ldr r0, =0x02039f34 ldr r1, [r0] ldr r0, [r1, 0x8] @@ -418018,18 +418018,18 @@ ContestEffectFunc_080E611C: ; 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 @@ -418037,14 +418037,14 @@ ContestEffectFunc_080E611C: ; 80E611C 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 @@ -418058,22 +418058,22 @@ ContestEffectFunc_080E611C: ; 80E611C 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 .pool -@080E61A4: +_080E61A4: mov r2, r8 ldr r6, [r2] ldr r0, [r6, 0x8] @@ -418101,7 +418101,7 @@ ContestEffectFunc_080E611C: ; 80E611C ldrb r0, [r0, 0x1] lsls r0, 29 cmp r2, r0 - bne @080E61F8 + bne _080E61F8 ldr r1, =gContestEffects ldrb r0, [r7] lsls r0, 2 @@ -418115,7 +418115,7 @@ ContestEffectFunc_080E611C: ; 80E611C ldrb r0, [r0, 0x11] movs r1, 0x1F bl sub_80DD3D4 -@080E61F8: +_080E61F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -418138,7 +418138,7 @@ ContestEffectFunc_080E620C: ; 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 @@ -418150,7 +418150,7 @@ ContestEffectFunc_080E620C: ; 80E620C ldr r0, =gContestMoves mov r12, r0 movs r7, 0 -@080E623C: +_080E623C: mov r1, r9 ldr r4, [r1] ldr r0, [r4, 0x8] @@ -418161,7 +418161,7 @@ ContestEffectFunc_080E620C: ; 80E620C adds r0, r6 ldrb r0, [r0] cmp r1, r0 - bne @080E62A4 + bne _080E62A4 mov r1, r8 lsls r0, r1, 3 mov r1, r12 @@ -418176,7 +418176,7 @@ ContestEffectFunc_080E620C: ; 80E620C ldrb r0, [r0, 0x1] lsls r0, 29 cmp r1, r0 - beq @080E62A4 + beq _080E62A4 lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -418194,14 +418194,14 @@ ContestEffectFunc_080E620C: ; 80E620C ldrb r0, [r0, 0x11] movs r1, 0x20 bl sub_80DD3D4 - b @080E62AC + b _080E62AC .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 @@ -418220,10 +418220,10 @@ ContestEffectFunc_080E62B8: ; 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] @@ -418234,7 +418234,7 @@ ContestEffectFunc_080E62B8: ; 80E62B8 adds r1, r5 ldrb r1, [r1] cmp r0, r1 - bne @080E6326 + bne _080E6326 ldr r1, [r4, 0x4] lsls r0, r2, 3 subs r0, r2 @@ -418246,7 +418246,7 @@ ContestEffectFunc_080E62B8: ; 80E62B8 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] @@ -418254,23 +418254,23 @@ ContestEffectFunc_080E62B8: ; 80E62B8 ldrb r0, [r0, 0x11] movs r1, 0x21 bl sub_80DD3D4 - b @080E6326 + b _080E6326 .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 @@ -418292,7 +418292,7 @@ ContestEffectFunc_080E6334: ; 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] @@ -418316,13 +418316,13 @@ ContestEffectFunc_080E6334: ; 80E6334 ldrb r0, [r0, 0x11] movs r1, 0x23 bl sub_80DD3D4 - b @080E6390 + b _080E6390 .pool -@080E6388: +_080E6388: adds r0, r2, 0 movs r1, 0x3A bl sub_80DD3D4 -@080E6390: +_080E6390: pop {r4} pop {r0} bx r0 @@ -418356,17 +418356,17 @@ ContestEffectFunc_080E6398: ; 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 .pool -@080E63DC: +_080E63DC: adds r0, r2, 0 movs r1, 0x3B bl sub_80DD3D4 -@080E63E4: +_080E63E4: pop {r0} bx r0 thumb_func_end ContestEffectFunc_080E6398 @@ -418381,12 +418381,12 @@ ContestEffectFunc_080E63E8: ; 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 @@ -418403,7 +418403,7 @@ ContestEffectFunc_080E63E8: ; 80E63E8 lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble @080E6400 + ble _080E6400 mov r1, r12 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -418415,22 +418415,22 @@ ContestEffectFunc_080E63E8: ; 80E63E8 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 @@ -418440,12 +418440,12 @@ ContestEffectFunc_080E63E8: ; 80E63E8 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 .pool -@080E6474: +_080E6474: lsls r0, r5, 24 movs r2, 0x80 lsls r2, 17 @@ -418453,10 +418453,10 @@ ContestEffectFunc_080E63E8: ; 80E63E8 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 @@ -418464,8 +418464,8 @@ ContestEffectFunc_080E63E8: ; 80E63E8 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] @@ -418489,7 +418489,7 @@ ContestEffectFunc_080E63E8: ; 80E63E8 strb r1, [r0, 0x10] movs r6, 0 mov r3, r12 -@080E64C6: +_080E64C6: ldr r0, [r3] lsls r1, r6, 24 asrs r1, 24 @@ -418507,7 +418507,7 @@ ContestEffectFunc_080E63E8: ; 80E63E8 lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble @080E64C6 + ble _080E64C6 mov r0, r12 ldr r1, [r0] ldr r0, [r1, 0x8] @@ -418530,7 +418530,7 @@ ContestEffectFunc_080E63E8: ; 80E63E8 ldrb r0, [r0, 0x11] movs r1, 0x25 bl sub_80DD3D4 -@080E6518: +_080E6518: add sp, 0x4 pop {r4-r7} pop {r0} @@ -418549,12 +418549,12 @@ ContestEffectFunc_080E6520: ; 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 @@ -418571,7 +418571,7 @@ ContestEffectFunc_080E6520: ; 80E6520 lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble @080E653C + ble _080E653C mov r1, r12 ldr r0, [r1] ldr r0, [r0, 0x8] @@ -418586,22 +418586,22 @@ ContestEffectFunc_080E6520: ; 80E6520 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 @@ -418611,12 +418611,12 @@ ContestEffectFunc_080E6520: ; 80E6520 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 .pool -@080E65B4: +_080E65B4: lsls r0, r5, 24 movs r2, 0x80 lsls r2, 17 @@ -418624,10 +418624,10 @@ ContestEffectFunc_080E6520: ; 80E6520 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 @@ -418635,8 +418635,8 @@ ContestEffectFunc_080E6520: ; 80E6520 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] @@ -418660,7 +418660,7 @@ ContestEffectFunc_080E6520: ; 80E6520 strb r1, [r0, 0x10] movs r6, 0 mov r3, r12 -@080E6606: +_080E6606: ldr r0, [r3] lsls r1, r6, 24 asrs r1, 24 @@ -418678,7 +418678,7 @@ ContestEffectFunc_080E6520: ; 80E6520 lsrs r6, r1, 24 asrs r1, 24 cmp r1, 0x3 - ble @080E6606 + ble _080E6606 mov r0, r12 ldr r1, [r0] ldr r0, [r1, 0x8] @@ -418701,7 +418701,7 @@ ContestEffectFunc_080E6520: ; 80E6520 ldrb r0, [r0, 0x11] movs r1, 0x26 bl sub_80DD3D4 -@080E6658: +_080E6658: add sp, 0x4 pop {r3} mov r8, r3 @@ -418724,12 +418724,12 @@ ContestEffectFunc_080E6668: ; 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 @@ -418748,10 +418748,10 @@ ContestEffectFunc_080E6668: ; 80E6668 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 @@ -418763,36 +418763,36 @@ ContestEffectFunc_080E6668: ; 80E6668 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 .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 @@ -418800,11 +418800,11 @@ ContestEffectFunc_080E6668: ; 80E6668 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 @@ -418831,7 +418831,7 @@ ContestEffectFunc_080E6668: ; 80E6668 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] @@ -418849,7 +418849,7 @@ ContestEffectFunc_080E6668: ; 80E6668 ldrb r0, [r0, 0x11] movs r1, 0x27 bl sub_80DD3D4 -@080E676C: +_080E676C: add sp, 0x8 pop {r4-r7} pop {r0} @@ -418879,12 +418879,12 @@ ContestEffectFunc_080E6778: ; 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 .pool @@ -418900,7 +418900,7 @@ ContestEffectFunc_080E67BC: ; 80E67BC movs r4, 0 ldr r5, =0x02039f34 movs r6, 0 -@080E67CC: +_080E67CC: ldr r3, [r5] ldr r2, [r3, 0x8] ldrb r0, [r2, 0x11] @@ -418909,13 +418909,13 @@ ContestEffectFunc_080E67BC: ; 80E67BC 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 @@ -418927,12 +418927,12 @@ ContestEffectFunc_080E67BC: ; 80E67BC ldr r1, [r5] ldr r1, [r1, 0x8] strh r0, [r1, 0x4] - b @080E680C + b _080E680C .pool -@080E6808: +_080E6808: movs r0, 0xA strh r0, [r2, 0x4] -@080E680C: +_080E680C: ldr r0, [r5] ldr r0, [r0, 0x8] strb r4, [r0, 0x8] @@ -418943,27 +418943,27 @@ ContestEffectFunc_080E67BC: ; 80E67BC 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] @@ -418988,48 +418988,48 @@ ContestEffectFunc_080E6868: ; 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 .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] @@ -419056,7 +419056,7 @@ ContestEffectFunc_080E68EC: ; 80E68EC movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @080E692A + bne _080E692A movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x1] @@ -419078,7 +419078,7 @@ ContestEffectFunc_080E68EC: ; 80E68EC ldrb r0, [r0, 0x11] movs r1, 0x3D bl sub_80DD3D4 -@080E692A: +_080E692A: pop {r4} pop {r0} bx r0 @@ -419100,7 +419100,7 @@ sub_80E6934: ; 80E6934 ldr r0, =gContestMoves mov r9, r0 movs r5, 0 -@080E694E: +_080E694E: ldr r3, [r6] ldr r2, [r3, 0x8] ldrb r0, [r2, 0x11] @@ -419109,7 +419109,7 @@ sub_80E6934: ; 80E6934 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] @@ -419119,13 +419119,13 @@ sub_80E6934: ; 80E6934 lsls r0, 29 lsrs r0, 29 cmp r8, r0 - bne @080E6980 + bne _080E6980 movs r0, 0x28 - b @080E6982 + b _080E6982 .pool -@080E6980: +_080E6980: movs r0, 0xA -@080E6982: +_080E6982: strh r0, [r2, 0x4] ldr r0, [r6] ldr r0, [r0, 0x8] @@ -419137,22 +419137,22 @@ sub_80E6934: ; 80E6934 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 @@ -419184,37 +419184,37 @@ 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 .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 @@ -419235,9 +419235,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] @@ -419249,7 +419249,7 @@ sub_80E6A2C: ; 80E6A2C bl sub_80E69C8 lsls r0, 24 cmp r0, 0 - beq @080E6AFE + beq _080E6AFE ldr r2, [r4] ldr r1, [r2, 0x8] ldrh r0, [r1, 0x4] @@ -419263,13 +419263,13 @@ sub_80E6A2C: ; 80E6A2C 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] @@ -419278,16 +419278,16 @@ sub_80E6A2C: ; 80E6A2C 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 .pool -@080E6AB4: +_080E6AB4: ldr r2, [r3, 0x8] ldrb r1, [r1, 0xF] ldrh r0, [r2, 0x6] @@ -419298,13 +419298,13 @@ sub_80E6A2C: ; 80E6A2C 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 @@ -419323,7 +419323,7 @@ sub_80E6A2C: ; 80E6A2C ldr r0, [r0, 0x8] ldrh r0, [r0, 0x6] strh r0, [r1] -@080E6AFE: +_080E6AFE: adds r7, 0x1 ldr r4, =0x02039f34 ldr r0, [r4] @@ -419332,25 +419332,25 @@ sub_80E6A2C: ; 80E6A2C 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 .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 @@ -419395,31 +419395,31 @@ sub_80E6B70: ; 80E6B70 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} @@ -419435,21 +419435,21 @@ sub_80E6BB4: ; 80E6BB4 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} @@ -419565,12 +419565,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 @@ -419637,12 +419637,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 @@ -419657,22 +419657,22 @@ sub_80E6E24: ; 80E6E24 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 .pool -@080E6E50: +_080E6E50: ldr r0, =0x0203a018 ldr r0, [r0] bl sub_80E6D54 - b @080E6F12 + b _080E6F12 .pool -@080E6E60: +_080E6E60: ldr r5, =0x0203a018 ldr r0, [r5] ldr r1, =0x03001134 @@ -419733,13 +419733,13 @@ sub_80E6E24: ; 80E6E24 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 @@ -419750,7 +419750,7 @@ sub_80E6E24: ; 80E6E24 ldr r2, =0x000012dc adds r0, r2 bl sub_80E8260 -@080E6F12: +_080E6F12: pop {r4,r5} pop {r0} bx r0 @@ -419765,7 +419765,7 @@ sub_80E6F60: ; 80E6F60 adds r4, r0, 0 bl sub_800A064 cmp r0, 0 - beq @080E7014 + beq _080E7014 ldr r5, =0x0203a014 ldr r0, [r5] movs r1, 0xC8 @@ -419821,9 +419821,9 @@ sub_80E6F60: ; 80E6F60 adds r0, r1 adds r1, r4, 0 bl sub_80E7F68 - b @080E70BE + b _080E70BE .pool -@080E7014: +_080E7014: ldr r5, =0x0203a014 ldr r0, [r5] movs r1, 0xC8 @@ -419897,7 +419897,7 @@ sub_80E6F60: ; 80E6F60 adds r1, r6, 0 adds r2, r4, 0 bl sub_80E89AC -@080E70BE: +_080E70BE: pop {r3} mov r8, r3 pop {r4-r6} @@ -419948,12 +419948,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 @@ -419973,24 +419973,24 @@ 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 .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 Alloc @@ -420025,9 +420025,9 @@ sub_80E715C: ; 80E715C lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1E] - b @080E730A + b _080E730A .pool -@080E7218: +_080E7218: ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] @@ -420037,7 +420037,7 @@ sub_80E715C: ; 80E715C adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - bne @080E730A + bne _080E730A movs r0, 0x2 strh r0, [r5] ldr r0, =0x00000894 @@ -420045,9 +420045,9 @@ sub_80E715C: ; 80E715C bl sub_80FB074 ldrb r0, [r5, 0x1E] bl remove_task - b @080E730A + b _080E730A .pool -@080E724C: +_080E724C: ldr r0, =sub_80E7FF8 movs r1, 0xA bl AddTask @@ -420058,9 +420058,9 @@ sub_80E715C: ; 80E715C strh r0, [r5] movs r0, 0xE0 bl audio_play - b @080E730A + b _080E730A .pool -@080E726C: +_080E726C: ldr r2, =0x03005e00 movs r0, 0x14 ldrsh r1, [r5, r0] @@ -420070,35 +420070,35 @@ sub_80E715C: ; 80E715C 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, =gUnknown_085EEA8E bl sub_80E70F4 strh r4, [r5, 0x10] - b @080E730A + b _080E730A .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] @@ -420108,7 +420108,7 @@ sub_80E715C: ; 80E715C adds r0, r2 ldrb r0, [r0, 0x4] cmp r0, 0 - bne @080E730A + bne _080E730A ldr r0, =0x0203a014 ldr r0, [r0] bl Free @@ -420119,18 +420119,18 @@ sub_80E715C: ; 80E715C ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @080E72F8 + beq _080E72F8 ldr r0, =sub_80AF2B4 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 @@ -420150,47 +420150,47 @@ 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 .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 .pool -@080E7384: +_080E7384: ldr r0, =gUnknown_085EEA7E bl sub_80E70F4 movs r0, 0xE1 @@ -420200,23 +420200,23 @@ sub_80E7324: ; 80E7324 lsls r0, 1 strh r0, [r5, 0x8] bl sub_8009FAC - b @080E7566 + b _080E7566 .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 @@ -420224,37 +420224,37 @@ sub_80E7324: ; 80E7324 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 .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] @@ -420267,46 +420267,46 @@ sub_80E7324: ; 80E7324 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 @@ -420317,9 +420317,9 @@ sub_80E7324: ; 80E7324 movs r3, 0x2 bl ConvertIntToDecimalString movs r0, 0x5 - b @080E7564 + b _080E7564 .pool -@080E7490: +_080E7490: bl sub_800ABAC lsls r0, 24 lsrs r0, 24 @@ -420334,7 +420334,7 @@ sub_80E7324: ; 80E7324 str r0, [r5] bl sub_800A064 cmp r0, 0 - beq @080E7504 + beq _080E7504 ldr r0, =0x0203a018 ldr r0, [r0] adds r1, r5, 0 @@ -420359,9 +420359,9 @@ sub_80E7324: ; 80E7324 ldr r1, =0x0300115c ldr r0, =0x00001230 str r0, [r1] - b @080E7566 + b _080E7566 .pool -@080E7504: +_080E7504: ldr r0, =0x0203a018 ldr r0, [r0] adds r1, r5, 0 @@ -420386,22 +420386,22 @@ sub_80E7324: ; 80E7324 ldr r1, =0x0300115c ldr r0, =0x00001444 str r0, [r1] - b @080E7566 + b _080E7566 .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 @@ -420421,21 +420421,21 @@ 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 .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 @@ -420448,17 +420448,17 @@ sub_80E756C: ; 80E756C ldr r0, =0x020228c4 movs r2, 0xC8 bl memcpy - b @080E75FC + b _080E75FC .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] @@ -420470,18 +420470,18 @@ sub_80E756C: ; 80E756C 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 .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 @@ -420490,10 +420490,10 @@ sub_80E756C: ; 80E756C adds r1, r2 ldrb r0, [r1, 0x4] cmp r0, 0 - bne @080E7624 + bne _080E7624 ldr r0, =sub_80E77D4 str r0, [r5] -@080E7624: +_080E7624: pop {r4,r5} pop {r0} bx r0 @@ -420529,12 +420529,12 @@ 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 .pool -@080E7678: +_080E7678: ldr r1, [sp, 0x4] mov r0, r8 asrs r1, r0 @@ -420544,7 +420544,7 @@ sub_80E7630: ; 80E7630 add r2, r8 mov r9, r2 cmp r1, 0 - beq @080E7714 + beq _080E7714 mov r0, r10 adds r0, 0x12 bl sub_80E77FC @@ -420574,18 +420574,18 @@ sub_80E7630: ; 80E7630 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 .pool -@080E76DC: +_080E76DC: adds r0, r6, 0 movs r2, 0xC8 bl memcpy -@080E76E4: +_080E76E4: mov r0, r8 bl sub_800A5EC mov r0, r9 @@ -420602,23 +420602,23 @@ sub_80E7630: ; 80E7630 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 @@ -420630,16 +420630,16 @@ sub_80E7630: ; 80E7630 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 @@ -420669,10 +420669,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 @@ -420694,11 +420694,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 .pool @@ -420768,30 +420768,30 @@ sub_80E7830: ; 80E7830 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, =gUnknown_0858CF8C 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 .pool -@080E7868: +_080E7868: movs r0, 0 bl sub_800A2A4 adds r2, r0, 0 @@ -420803,16 +420803,16 @@ sub_80E7830: ; 80E7830 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 .pool -@080E7894: +_080E7894: movs r0, 0 bl sub_800A2A4 movs r1, 0x9 @@ -420823,14 +420823,14 @@ sub_80E7830: ; 80E7830 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 @@ -420866,19 +420866,19 @@ 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 .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 @@ -420916,7 +420916,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 @@ -420931,7 +420931,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] @@ -420945,9 +420945,9 @@ sub_80E7948: ; 80E7948 strb r1, [r0] adds r0, r7, 0 bl sub_8164F70 - b @080E79FE + b _080E79FE .pool -@080E79AC: +_080E79AC: adds r5, r7, 0 muls r5, r6 mov r0, r8 @@ -420964,30 +420964,30 @@ sub_80E7948: ; 80E7948 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 StopMusicWhileStringIsPrinted -@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 @@ -421022,20 +421022,20 @@ sub_80E7A14: ; 80E7A14 bl sub_818D9AC lsls r0, 24 cmp r0, 0 - bne @080E7A60 + bne _080E7A60 movs r0, 0x40 bl Alloc adds r4, r0, 0 cmp r4, 0 - beq @080E7A8A + beq _080E7A8A ldr r1, [r6] movs r2, 0x40 bl memcpy - b @080E7A62 + b _080E7A62 .pool -@080E7A60: +_080E7A60: movs r4, 0 -@080E7A62: +_080E7A62: ldr r0, =0x03001150 ldr r0, [r0] lsls r1, r5, 2 @@ -421047,12 +421047,12 @@ sub_80E7A14: ; 80E7A14 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 @@ -421146,7 +421146,7 @@ sub_80E7B2C: ; 80E7B2C movs r2, 0 movs r1, 0 ldr r4, =0x03001160 -@080E7B36: +_080E7B36: adds r0, r3, r1 ldrb r0, [r0] adds r0, r2, r0 @@ -421154,7 +421154,7 @@ sub_80E7B2C: ; 80E7B2C lsrs r2, r0, 24 adds r1, 0x1 cmp r1, 0xFF - ble @080E7B36 + ble _080E7B36 strb r2, [r4] pop {r4} pop {r0} @@ -421209,7 +421209,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 @@ -421230,7 +421230,7 @@ sub_80E7B60: ; 80E7B60 lsrs r0, 16 mov r8, r0 cmp r0, 0x3 - bls @080E7BB0 + bls _080E7BB0 bl sub_800A064 str r0, [sp, 0x3C] movs r2, 0 @@ -421241,9 +421241,9 @@ sub_80E7B60: ; 80E7B60 mov r3, r9 muls r3, r0 str r3, [sp, 0x44] - b @080E7D04 + b _080E7D04 .pool -@080E7BF8: +_080E7BF8: ldr r1, [sp, 0x30] mov r0, r8 muls r0, r1 @@ -421262,21 +421262,21 @@ sub_80E7B60: ; 80E7B60 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 @@ -421284,32 +421284,32 @@ sub_80E7B60: ; 80E7B60 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi @080E7C54 + bhi _080E7C54 movs r4, 0x1 - b @080E7C5C + b _080E7C5C .pool -@080E7C54: +_080E7C54: adds r0, r4, 0 bl StripExtendedControlCodes 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 StripExtendedControlCodes movs r1, 0x1 - b @080E7C76 + b _080E7C76 .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 @@ -421323,31 +421323,31 @@ sub_80E7B60: ; 80E7B60 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 @@ -421355,41 +421355,41 @@ sub_80E7B60: ; 80E7B60 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 @@ -421397,9 +421397,9 @@ sub_80E7B60: ; 80E7B60 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 @@ -421407,52 +421407,52 @@ sub_80E7B60: ; 80E7B60 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 @@ -421464,30 +421464,30 @@ sub_80E7B60: ; 80E7B60 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 @@ -421495,29 +421495,29 @@ sub_80E7B60: ; 80E7B60 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 @@ -421534,18 +421534,18 @@ sub_80E7B60: ; 80E7B60 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 @@ -421554,16 +421554,16 @@ sub_80E7B60: ; 80E7B60 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 @@ -421571,8 +421571,8 @@ sub_80E7B60: ; 80E7B60 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] @@ -421582,7 +421582,7 @@ sub_80E7B60: ; 80E7B60 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 @@ -421593,7 +421593,7 @@ sub_80E7B60: ; 80E7B60 lsrs r0, 16 mov r8, r0 cmp r0, 0x3 - bls @080E7E76 + bls _080E7E76 bl sub_80E7B54 lsls r0, 24 lsrs r0, 24 @@ -421603,18 +421603,18 @@ sub_80E7B60: ; 80E7B60 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] @@ -421622,8 +421622,8 @@ sub_80E7B60: ; 80E7B60 ldr r1, [sp, 0x30] movs r3, 0 bl sub_80E7AA4 - b @080E7F1C -@080E7EC8: + b _080E7F1C +_080E7EC8: ldr r0, =gUnknown_0858CFB8 lsls r1, 1 adds r2, r1, r0 @@ -421636,9 +421636,9 @@ sub_80E7B60: ; 80E7B60 ldr r0, [sp, 0x2C] ldr r1, [sp, 0x30] bl sub_80E7AA4 - b @080E7F1C + b _080E7F1C .pool -@080E7EE8: +_080E7EE8: add r6, sp, 0x24 ldr r4, =gUnknown_0858CFBE lsls r5, r1, 2 @@ -421663,7 +421663,7 @@ sub_80E7B60: ; 80E7B60 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 @@ -421701,33 +421701,33 @@ sub_80E7F68: ; 80E7F68 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 VarSet @@ -421737,16 +421737,16 @@ sub_80E7F68: ; 80E7F68 ldrh r1, [r4] ldr r0, =0x00000113 cmp r1, r0 - bne @080E7FEC + bne _080E7FEC ldr r0, =0x000008b3 bl FlagSet - b @080E7FEC + b _080E7FEC .pool -@080E7FE4: +_080E7FE4: ldr r0, =0x00004001 movs r1, 0 bl VarSet -@080E7FEC: +_080E7FEC: pop {r4} pop {r0} bx r0 @@ -421766,114 +421766,114 @@ 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 .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 .pool -@080E80A4: +_080E80A4: movs r0, 0 bl sub_801048C lsls r0, 24 cmp r0, 0 - bne @080E810A + bne _080E810A ldr r0, =sub_8153688 movs r1, 0x5 bl AddTask - b @080E80F2 + b _080E80F2 .pool -@080E80C0: +_080E80C0: ldr r0, =sub_8153688 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 .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 @@ -421912,7 +421912,7 @@ sub_80E8110: ; 80E8110 movs r7, 0 ldr r0, =0x03005d90 mov r9, r0 -@080E8150: +_080E8150: mov r1, r9 ldr r0, [r1] adds r0, 0xB2 @@ -421932,7 +421932,7 @@ sub_80E8110: ; 80E8110 adds r0, 0x38 ldrb r0, [r0] cmp r0, 0xFF - beq @080E81B8 + beq _080E81B8 adds r5, r1, 0 adds r5, 0x34 adds r0, r5, 0 @@ -421943,11 +421943,11 @@ sub_80E8110: ; 80E8110 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 @@ -421956,45 +421956,45 @@ sub_80E8110: ; 80E8110 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 .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 @@ -422006,14 +422006,14 @@ sub_80E8110: ; 80E8110 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 .pool -@080E8224: +_080E8224: ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB2 @@ -422032,7 +422032,7 @@ sub_80E8110: ; 80E8110 adds r0, 0x44 movs r2, 0x44 bl memcpy -@080E824C: +_080E824C: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -422056,7 +422056,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 @@ -422066,7 +422066,7 @@ sub_80E8260: ; 80E8260 adds r0, 0x6 adds r6, r1, r0 adds r5, r4, 0 -@080E8286: +_080E8286: mov r2, r10 ldr r1, [r2] adds r1, 0xA @@ -422083,10 +422083,10 @@ sub_80E8260: ; 80E8260 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 @@ -422107,7 +422107,7 @@ sub_80E8260: ; 80E8260 lsls r5, 1 add r5, r8 movs r7, 0x1 -@080E82DA: +_080E82DA: movs r0, 0x2 strb r0, [r4, 0x8] mov r2, r10 @@ -422144,7 +422144,7 @@ sub_80E8260: ; 80E8260 adds r5, 0x1C subs r7, 0x1 cmp r7, 0 - bge @080E82DA + bge _080E82DA movs r6, 0 ldr r0, =0x03005d90 ldr r3, [r0] @@ -422166,7 +422166,7 @@ sub_80E8260: ; 80E8260 mov r10, r4 ldr r2, =0x00000cf4 adds r5, r3, r2 -@080E8356: +_080E8356: lsls r2, r6, 1 ldr r1, [sp] ldrh r0, [r1] @@ -422236,7 +422236,7 @@ sub_80E8260: ; 80E8260 adds r5, 0x2 adds r6, 0x1 cmp r6, 0x1 - ble @080E8356 + ble _080E8356 add sp, 0xC pop {r3-r5} mov r8, r3 @@ -422259,7 +422259,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 @@ -422267,23 +422267,23 @@ sub_80E841C: ; 80E841C 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} @@ -422315,10 +422315,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 @@ -422327,22 +422327,22 @@ sub_80E8468: ; 80E8468 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 .pool -@080E84CC: +_080E84CC: ldr r4, =0x03005d90 ldr r0, [r4] adds r1, r0, 0 @@ -422369,12 +422369,12 @@ sub_80E8468: ; 80E8468 lsls r0, r5, 27 lsrs r0, 30 adds r0, 0x1 - b @080E8550 + b _080E8550 .pool -@080E8508: +_080E8508: movs r5, 0 adds r6, r3, 0 -@080E850C: +_080E850C: movs r0, 0x1 eors r0, r5 ldr r7, =0x03005d90 @@ -422400,14 +422400,14 @@ sub_80E8468: ; 80E8468 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 @@ -422418,7 +422418,7 @@ sub_80E8468: ; 80E8468 ands r1, r5 orrs r1, r0 strb r1, [r4] -@080E8566: +_080E8566: add sp, 0x14 pop {r3} mov r8, r3 @@ -422443,32 +422443,32 @@ sub_80E8578: ; 80E8578 movs r5, 0 str r5, [sp, 0x4] ldr r4, =0x03001168 - b @080E85A0 + b _080E85A0 .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] @@ -422484,7 +422484,7 @@ sub_80E8578: ; 80E8578 str r4, [sp, 0x44] movs r5, 0 str r5, [sp, 0x48] -@080E85DC: +_080E85DC: movs r6, 0 mov r8, r6 ldr r0, =0x03005d90 @@ -422499,7 +422499,7 @@ sub_80E8578: ; 80E8578 adds r0, r4, r0 ldr r5, [sp] adds r2, r0, r5 -@080E85F8: +_080E85F8: adds r0, r2, 0 movs r6, 0x87 lsls r6, 2 @@ -422514,12 +422514,12 @@ sub_80E8578: ; 80E8578 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 @@ -422541,7 +422541,7 @@ sub_80E8578: ; 80E8578 adds r0, r2 adds r0, 0x30 mov r10, r0 -@080E864A: +_080E864A: movs r5, 0 str r5, [sp, 0xC] movs r3, 0 @@ -422556,7 +422556,7 @@ sub_80E8578: ; 80E8578 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 @@ -422570,7 +422570,7 @@ sub_80E8578: ; 80E8578 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] @@ -422582,20 +422582,20 @@ sub_80E8578: ; 80E8578 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 @@ -422608,15 +422608,15 @@ sub_80E8578: ; 80E8578 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] @@ -422627,18 +422627,18 @@ sub_80E8578: ; 80E8578 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] @@ -422654,7 +422654,7 @@ sub_80E8578: ; 80E8578 adds r2, r0, r1 movs r4, 0x2 mov r8, r4 -@080E8720: +_080E8720: movs r5, 0xD8 lsls r5, 3 adds r0, r2, r5 @@ -422673,14 +422673,14 @@ sub_80E8578: ; 80E8578 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 @@ -422691,7 +422691,7 @@ sub_80E8578: ; 80E8578 subs r1, r4 lsls r1, 2 mov r10, r1 -@080E8766: +_080E8766: movs r6, 0 str r6, [sp, 0xC] mov r0, r8 @@ -422712,7 +422712,7 @@ sub_80E8578: ; 80E8578 adds r7, r5, r0 str r6, [sp, 0x40] movs r3, 0x2 -@080E878E: +_080E878E: ldr r1, [sp, 0x20] movs r2, 0xD8 lsls r2, 3 @@ -422734,7 +422734,7 @@ sub_80E8578: ; 80E8578 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 @@ -422745,7 +422745,7 @@ sub_80E8578: ; 80E8578 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] @@ -422759,7 +422759,7 @@ sub_80E8578: ; 80E8578 ldrh r0, [r7, 0x8] ldrh r1, [r1] cmp r0, r1 - bcs @080E8808 + bcs _080E8808 adds r0, r7, 0 movs r4, 0x90 lsls r4, 1 @@ -422770,17 +422770,17 @@ sub_80E8578: ; 80E8578 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 @@ -422807,19 +422807,19 @@ sub_80E8578: ; 80E8578 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 @@ -422837,26 +422837,26 @@ sub_80E8880: ; 80E8880 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 @@ -422868,10 +422868,10 @@ sub_80E8880: ; 80E8880 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 @@ -422883,26 +422883,26 @@ sub_80E88CC: ; 80E88CC 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 @@ -422920,10 +422920,10 @@ sub_80E88CC: ; 80E88CC 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 @@ -422940,7 +422940,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 @@ -422954,7 +422954,7 @@ sub_80E8924: ; 80E8924 adds r4, r0, r1 movs r6, 0 movs r5, 0x1 -@080E8950: +_080E8950: mov r1, r10 ldr r0, [r1] adds r0, r7 @@ -422965,13 +422965,13 @@ sub_80E8924: ; 80E8924 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 @@ -422988,7 +422988,7 @@ sub_80E8924: ; 80E8924 bl sub_80E88CC adds r5, 0x1 cmp r5, 0x1 - ble @080E8972 + ble _080E8972 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -423082,7 +423082,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 @@ -423091,24 +423091,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 StopMusicWhileStringIsPrinted -@080E8A9A: +_080E8A9A: adds r4, 0x38 movs r0, 0x38 add r8, r0 @@ -423118,8 +423118,8 @@ sub_80E8A54: ; 80E8A54 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 @@ -423138,21 +423138,21 @@ 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 StripExtendedControlCodes -@080E8ADC: +_080E8ADC: adds r4, 0x1 cmp r4, 0x3 - ble @080E8AC6 + ble _080E8AC6 adds r0, r5, 0 bl sub_8164F70 pop {r4,r5} @@ -423174,7 +423174,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 @@ -423183,7 +423183,7 @@ sub_80E8AF0: ; 80E8AF0 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x6 - bls @080E8B0A + bls _080E8B0A add sp, 0x4 pop {r4} pop {r0} @@ -423196,7 +423196,7 @@ 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 @@ -423209,7 +423209,7 @@ sub_80E8B28: ; 80E8B28 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x13 - bls @080E8B2E + bls _080E8B2E pop {r4,r5} pop {r0} bx r0 @@ -423234,15 +423234,15 @@ sub_80E8B6C: ; 80E8B6C strh r1, [r0] movs r3, 0 adds r4, r0, 0 - b @080E8B86 + b _080E8B86 .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] @@ -423255,13 +423255,13 @@ sub_80E8B6C: ; 80E8B6C 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 VarSet -@080E8BB0: +_080E8BB0: pop {r4} pop {r0} bx r0 @@ -423277,16 +423277,16 @@ 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 .pool -@080E8BEC: +_080E8BEC: ldr r0, =0x020375f0 strh r1, [r0] -@080E8BF0: +_080E8BF0: pop {r0} bx r0 .pool @@ -423316,63 +423316,63 @@ sub_80E8BF8: ; 80E8BF8 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi @080E8C34 + bhi _080E8C34 movs r0, 0x1 - b @080E8C8E + b _080E8C8E .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} @@ -423414,14 +423414,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 @@ -423429,7 +423429,7 @@ sub_80E8CB0: ; 80E8CB0 ldr r5, [r1, 0xC] ldr r0, =0x000003ff mov r9, r0 -@080E8CF2: +_080E8CF2: lsls r0, r2, 16 asrs r3, r0, 16 adds r0, r6, r3 @@ -423439,22 +423439,22 @@ sub_80E8CB0: ; 80E8CB0 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 .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 @@ -423464,8 +423464,8 @@ sub_80E8CB0: ; 80E8CB0 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 @@ -423502,43 +423502,43 @@ sub_80E8D4C: ; 80E8D4C adds r7, r0, 0 mov r4, sp mov r6, r12 -@080E8D80: +_080E8D80: ldr r0, =gUnknown_0858CFCC 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 .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 @@ -423549,14 +423549,14 @@ sub_80E8D4C: ; 80E8D4C movs r2, 0 ldrsh r1, [r6, r2] bl CurrentMapDrawMetatileAt - 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 @@ -423570,21 +423570,21 @@ 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 @@ -423604,7 +423604,7 @@ sub_80E8E18: ; 80E8E18 movs r3, 0 ldr r5, =0x00001aa5 ldr r4, =0x03005d90 -@080E8E32: +_080E8E32: ldr r1, [r2] adds r1, r5 adds r1, r3 @@ -423617,7 +423617,7 @@ sub_80E8E18: ; 80E8E18 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x3 - bls @080E8E32 + bls _080E8E32 ldr r0, =0x00004054 movs r1, 0 bl VarSet @@ -423676,8 +423676,8 @@ sub_80E8EE0: ; 80E8EE0 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 @@ -423689,10 +423689,10 @@ sub_80E8EE0: ; 80E8EE0 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 @@ -423706,7 +423706,7 @@ sub_80E8EE0: ; 80E8EE0 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] @@ -423720,12 +423720,12 @@ sub_80E8EE0: ; 80E8EE0 lsls r0, 16 asrs r1, r0, 16 ldr r6, =gUnknown_0858CFCC -@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 @@ -423734,30 +423734,30 @@ sub_80E8EE0: ; 80E8EE0 asrs r0, r5, 16 asrs r1, r4, 16 bl MapGridSetMetatileIdAt - b @080E8F82 + b _080E8F82 .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 @@ -423804,23 +423804,23 @@ 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 .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 .pool -@080E900C: +_080E900C: ldr r0, =0x00004054 bl VarGet lsls r0, 16 @@ -423835,10 +423835,10 @@ sub_80E8FD0: ; 80E8FD0 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 @@ -423848,7 +423848,7 @@ sub_80E8FD0: ; 80E8FD0 bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@080E904A: +_080E904A: pop {r4} pop {r0} bx r0 @@ -423885,18 +423885,18 @@ sub_80E909C: ; 80E909C ldr r0, =0x02037318 ldrb r0, [r0, 0x17] cmp r0, 0x9 - bne @080E90C0 + bne _080E90C0 ldr r0, =0x00004097 bl VarGet lsls r0, 16 cmp r0, 0 - bne @080E90C0 + bne _080E90C0 movs r0, 0 - b @080E90C2 + b _080E90C2 .pool -@080E90C0: +_080E90C0: movs r0, 0x1 -@080E90C2: +_080E90C2: pop {r1} bx r1 thumb_func_end sub_80E909C @@ -423919,11 +423919,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 @@ -423987,7 +423987,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 @@ -424025,7 +424025,7 @@ sub_80E916C: ; 80E916C bl SetMainCallback2 adds r0, r6, 0 bl remove_task -@080E91D4: +_080E91D4: add sp, 0x4 pop {r4-r6} pop {r0} @@ -424055,16 +424055,16 @@ CurrentMapIsSecretBase: ; 80E9214 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 .pool -@080E9230: +_080E9230: movs r0, 0 -@080E9232: +_080E9232: pop {r1} bx r1 thumb_func_end CurrentMapIsSecretBase @@ -424081,7 +424081,7 @@ sub_80E9238: ; 80E9238 bl CurrentMapIsSecretBase lsls r0, 24 cmp r0, 0 - beq @080E9328 + beq _080E9328 ldr r0, =0x00004054 bl VarGet lsls r0, 16 @@ -424102,7 +424102,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] @@ -424110,14 +424110,14 @@ sub_80E9238: ; 80E9238 lsls r0, 24 lsrs r0, 24 cmp r0, 0x77 - bhi @080E92AC + bhi _080E92AC ldr r0, =gUnknown_085A5C08 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 @@ -424127,16 +424127,16 @@ sub_80E9238: ; 80E9238 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 @@ -424151,18 +424151,18 @@ sub_80E9238: ; 80E9238 adds r1, 0x7 ldr r2, =0x00000e21 bl MapGridSetMetatileIdAt - b @080E9328 + b _080E9328 .pool -@080E92F4: +_080E92F4: mov r0, r8 cmp r0, 0x1 - bne @080E9328 + bne _080E9328 ldr r0, =0x00004089 bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne @080E9328 + bne _080E9328 mov r4, sp adds r4, 0x2 movs r2, 0x88 @@ -424177,7 +424177,7 @@ sub_80E9238: ; 80E9238 adds r1, 0x7 ldr r2, =0x00000e0a bl MapGridSetMetatileIdAt -@080E9328: +_080E9328: add sp, 0x4 pop {r3} mov r8, r3 @@ -424198,7 +424198,7 @@ sub_80E933C: ; 80E933C bl CurrentMapIsSecretBase lsls r0, 24 cmp r0, 0 - bne @080E9374 + bne _080E9374 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x0000271c @@ -424209,9 +424209,9 @@ sub_80E933C: ; 80E933C str r2, [sp, 0x8] movs r3, 0xC str r3, [sp, 0x10] - b @080E939C + b _080E939C .pool -@080E9374: +_080E9374: ldr r0, =0x00004054 bl VarGet lsls r0, 16 @@ -424231,11 +424231,11 @@ sub_80E933C: ; 80E933C str r0, [sp, 0x8] movs r2, 0x10 str r2, [sp, 0x10] -@080E939C: +_080E939C: movs r6, 0 - b @080E955A + b _080E955A .pool -@080E93AC: +_080E93AC: ldr r4, [sp, 0x4] adds r0, r4, r6 ldrb r1, [r0] @@ -424243,9 +424243,9 @@ sub_80E933C: ; 80E933C 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 @@ -424255,16 +424255,16 @@ sub_80E933C: ; 80E933C 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 @@ -424272,14 +424272,14 @@ sub_80E933C: ; 80E933C 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 @@ -424289,15 +424289,15 @@ sub_80E933C: ; 80E933C 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] @@ -424322,14 +424322,14 @@ sub_80E933C: ; 80E933C 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] @@ -424392,48 +424392,48 @@ sub_80E933C: ; 80E933C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080E954C + bne _080E954C ldr r0, =0x00004054 bl VarGet 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 .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 @@ -424453,9 +424453,9 @@ sub_80E9578: ; 80E9578 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 @@ -424468,7 +424468,7 @@ sub_80E9578: ; 80E9578 lsls r0, 16 lsrs r0, 16 cmp r0, 0xD - bhi @080E95B6 + bhi _080E95B6 ldrb r0, [r1] ldr r1, =0x03005d8c ldr r2, [r1] @@ -424477,15 +424477,15 @@ sub_80E9578: ; 80E9578 bl RemoveFieldObjectByLocalIdAndMap adds r0, r4, 0 bl FlagSet -@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 @@ -424522,9 +424522,9 @@ sub_80E9608: ; 80E9608 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] @@ -424534,24 +424534,24 @@ sub_80E9608: ; 80E9608 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 .pool -@080E9650: +_080E9650: movs r1, 0x80 lsls r1, 9 adds r0, r3, r1 @@ -424559,8 +424559,8 @@ sub_80E9608: ; 80E9608 asrs r0, 16 ldrb r1, [r4, 0x3] cmp r0, r1 - blt @080E9618 -@080E9660: + blt _080E9618 +_080E9660: pop {r4-r6} pop {r0} bx r0 @@ -424586,13 +424586,13 @@ sub_80E9680: ; 80E9680 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq @080E969C + beq _080E969C movs r0, 0x1 - b @080E969E + b _080E969E .pool -@080E969C: +_080E969C: movs r0, 0 -@080E969E: +_080E969E: pop {r1} bx r1 thumb_func_end sub_80E9680 @@ -424610,34 +424610,34 @@ 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 .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 .pool -@080E96F4: +_080E96F4: movs r0, 0x7E bl copy_saved_warp2_bank_and_enter_x_to_warp1 bl warp_in @@ -424649,7 +424649,7 @@ sub_80E96A4: ; 80E96A4 bl script_env_2_disable adds r0, r5, 0 bl remove_task -@080E9714: +_080E9714: pop {r4,r5} pop {r0} bx r0 @@ -424681,15 +424681,15 @@ 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 .pool -@080E9770: +_080E9770: ldr r1, =0x020375f0 movs r0, 0 -@080E9774: +_080E9774: strh r0, [r1] pop {r0} bx r0 @@ -424820,13 +424820,13 @@ sub_80E9878: ; 80E9878 ldrb r0, [r2] lsrs r0, 6 cmp r0, 0 - bne @080E98A4 + bne _080E98A4 movs r0, 0 - b @080E98A6 + b _080E98A6 .pool -@080E98A4: +_080E98A4: movs r0, 0x1 -@080E98A6: +_080E98A6: pop {r1} bx r1 thumb_func_end sub_80E9878 @@ -424899,9 +424899,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 @@ -424919,7 +424919,7 @@ sub_80E9914: ; 80E9914 adds r7, r1, r7 str r7, [sp, 0x1C] mov r9, r6 -@080E995C: +_080E995C: movs r4, 0 lsls r5, r6, 2 lsls r3, r6, 1 @@ -424929,7 +424929,7 @@ sub_80E9914: ; 80E9914 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 @@ -424939,7 +424939,7 @@ sub_80E9914: ; 80E9914 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 @@ -424967,12 +424967,12 @@ sub_80E9914: ; 80E9914 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 @@ -424982,7 +424982,7 @@ sub_80E9914: ; 80E9914 adds r0, 0x1 str r0, [sp, 0x8] ldr r2, =0x020244ec -@080E99DA: +_080E99DA: adds r1, r4, 0 adds r1, 0xD adds r0, r5, r2 @@ -424999,7 +424999,7 @@ sub_80E9914: ; 80E9914 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 @@ -425038,14 +425038,14 @@ sub_80E9914: ; 80E9914 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 @@ -425094,9 +425094,9 @@ sub_80E9AD0: ; 80E9AD0 ldr r0, =0x02037318 ldr r4, [r0, 0x4] movs r6, 0 - b @080E9B62 + b _080E9B62 .pool -@080E9AE0: +_080E9AE0: ldr r2, [r4, 0x10] lsls r1, r6, 1 adds r0, r1, r6 @@ -425105,7 +425105,7 @@ sub_80E9AD0: ; 80E9AD0 ldrb r0, [r2, 0x5] adds r7, r1, 0 cmp r0, 0x8 - bne @080E9B5C + bne _080E9B5C ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00001a9c @@ -425113,7 +425113,7 @@ sub_80E9AD0: ; 80E9AD0 ldrb r1, [r0] ldr r0, [r2, 0x8] cmp r1, r0 - bne @080E9B5C + bne _080E9B5C ldrh r0, [r2] adds r0, 0x7 ldrh r1, [r2, 0x2] @@ -425123,22 +425123,22 @@ sub_80E9AD0: ; 80E9AD0 ldr r5, =gUnknown_0858CFCC 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 DrawWholeMapView - b @080E9B68 + b _080E9B68 .pool -@080E9B3C: +_080E9B3C: ldr r0, [r4, 0x10] adds r1, r7, r6 lsls r1, 2 @@ -425153,16 +425153,16 @@ sub_80E9AD0: ; 80E9AD0 adds r2, r4, 0 orrs r2, r3 bl MapGridSetMetatileIdAt - 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 @@ -425196,18 +425196,18 @@ 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 @@ -425215,7 +425215,7 @@ sub_80E9BA8: ; 80E9BA8 lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x13 - ble @080E9BAE + ble _080E9BAE adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -425233,27 +425233,27 @@ 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 .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 .pool -@080E9C1C: +_080E9C1C: ldr r1, =0x020375f0 movs r0, 0 -@080E9C20: +_080E9C20: strh r0, [r1] -@080E9C22: +_080E9C22: pop {r0} bx r0 .pool @@ -425332,7 +425332,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] @@ -425356,14 +425356,14 @@ sub_80E9C9C: ; 80E9C9C adds r0, r7, r0 ldr r1, =sub_80E9E90 str r1, [r0] - b @080E9D1A + b _080E9D1A .pool -@080E9D10: +_080E9D10: ldr r1, =gUnknown_085EA785 ldr r2, =task_pc_turn_off adds r0, r6, 0 bl DisplayItemMessageOnField -@080E9D1A: +_080E9D1A: pop {r3} mov r8, r3 pop {r4-r7} @@ -425388,12 +425388,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 @@ -425413,12 +425413,12 @@ game_continue: ; 80E9D2C 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 @@ -425435,14 +425435,14 @@ game_continue: ; 80E9D2C lsls r0, r2, 16 asrs r0, 16 cmp r0, 0x7 - bgt @080E9DB8 + bgt _080E9DB8 strh r2, [r7, 0x6] - b @080E9DBC + b _080E9DBC .pool -@080E9DB8: +_080E9DB8: movs r0, 0x8 strh r0, [r7, 0x6] -@080E9DBC: +_080E9DBC: ldr r2, =0x03006310 adds r1, r2, 0 ldr r0, =gUnknown_0858D07C @@ -425472,10 +425472,10 @@ sub_80E9DEC: ; 80E9DEC 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 @@ -425568,13 +425568,13 @@ 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 .pool -@080E9EC8: +_080E9EC8: movs r0, 0x5 bl audio_play ldrb r0, [r4, 0xA] @@ -425597,15 +425597,15 @@ sub_80E9E90: ; 80E9E90 bl Free adds r0, r6, 0 bl task_pc_turn_off - b @080E9F1A + b _080E9F1A .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 @@ -425683,16 +425683,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, =gUnknown_0858D048 @@ -425702,7 +425702,7 @@ sub_80E9FB0: ; 80E9FB0 ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 -@080E9FF2: +_080E9FF2: pop {r4-r6} pop {r0} bx r0 @@ -425923,15 +425923,15 @@ task_pc_turn_off: ; 80EA1D0 bl VarGet lsls r0, 16 cmp r0, 0 - bne @080EA1F4 + bne _080EA1F4 ldr r0, =gUnknown_0823B4E8 bl script_env_1_execute_new_script - b @080EA1FA + b _080EA1FA .pool -@080EA1F4: +_080EA1F4: ldr r0, =gUnknown_0823B5E9 bl script_env_1_execute_new_script -@080EA1FA: +_080EA1FA: adds r0, r4, 0 bl remove_task pop {r4} @@ -425984,61 +425984,61 @@ sub_80EA250: ; 80EA250 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0 - bne @080EA278 + bne _080EA278 ldr r0, =gUnknown_08274966 - b @080EA2DA + b _080EA2DA .pool -@080EA278: +_080EA278: cmp r0, 0x1 - bne @080EA284 + bne _080EA284 ldr r0, =gUnknown_08274D13 - b @080EA2DA + b _080EA2DA .pool -@080EA284: +_080EA284: cmp r0, 0x2 - bne @080EA290 + bne _080EA290 ldr r0, =gUnknown_08274FFE - b @080EA2DA + b _080EA2DA .pool -@080EA290: +_080EA290: cmp r0, 0x3 - bne @080EA29C + bne _080EA29C ldr r0, =gUnknown_08275367 - b @080EA2DA + b _080EA2DA .pool -@080EA29C: +_080EA29C: cmp r0, 0x4 - bne @080EA2A8 + bne _080EA2A8 ldr r0, =gUnknown_082756C7 - b @080EA2DA + b _080EA2DA .pool -@080EA2A8: +_080EA2A8: cmp r0, 0x5 - bne @080EA2B4 + bne _080EA2B4 ldr r0, =gUnknown_08274B24 - b @080EA2DA + b _080EA2DA .pool -@080EA2B4: +_080EA2B4: cmp r0, 0x6 - bne @080EA2C0 + bne _080EA2C0 ldr r0, =gUnknown_08274E75 - b @080EA2DA + b _080EA2DA .pool -@080EA2C0: +_080EA2C0: cmp r0, 0x7 - bne @080EA2CC + bne _080EA2CC ldr r0, =gUnknown_082751E1 - b @080EA2DA + b _080EA2DA .pool -@080EA2CC: +_080EA2CC: cmp r1, 0x8 - beq @080EA2D8 + beq _080EA2D8 ldr r0, =gUnknown_082758CC - b @080EA2DA + b _080EA2DA .pool -@080EA2D8: +_080EA2D8: ldr r0, =gUnknown_082754F6 -@080EA2DA: +_080EA2DA: pop {r1} bx r1 .pool @@ -426104,13 +426104,13 @@ sub_80EA354: ; 80EA354 bl FlagGet 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 @@ -426125,10 +426125,10 @@ sub_80EA354: ; 80EA354 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x13 - bls @080EA376 + bls _080EA376 ldr r0, =0x00000922 bl FlagSet -@080EA39A: +_080EA39A: ldr r4, =0x020375e0 lsls r0, r5, 24 lsrs r0, 24 @@ -426169,41 +426169,41 @@ 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 .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 VarGet 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 .pool -@080EA434: +_080EA434: ldr r0, =0x0203a01d strb r1, [r0] -@080EA438: +_080EA438: adds r0, r5, 0x4 adds r1, r5, 0x6 bl PlayerGetDestCoords - b @080EA81C + b _080EA81C .pool -@080EA448: +_080EA448: mov r4, sp adds r4, 0x2 mov r0, sp @@ -426217,15 +426217,15 @@ sub_80EA3E4: ; 80EA3E4 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] @@ -426257,100 +426257,100 @@ sub_80EA3E4: ; 80EA3E4 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 VarGet adds r1, r0, 0 movs r0, 0x20 - b @080EA7FA + b _080EA7FA .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 VarGet adds r1, r0, 0 movs r0, 0x1 - b @080EA7FA + b _080EA7FA .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 VarGet adds r1, r0, 0 movs r0, 0x4 - b @080EA7FA + b _080EA7FA .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] @@ -426359,14 +426359,14 @@ sub_80EA3E4: ; 80EA3E4 bl MapGridGetMetatileIdAt 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 VarGet @@ -426374,20 +426374,20 @@ sub_80EA3E4: ; 80EA3E4 movs r3, 0x80 lsls r3, 2 adds r0, r3, 0 - b @080EA7FA + b _080EA7FA .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 VarGet @@ -426406,20 +426406,20 @@ sub_80EA3E4: ; 80EA3E4 movs r3, 0x80 lsls r3, 6 adds r0, r3, 0 - b @080EA7FA + b _080EA7FA .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 VarGet @@ -426439,35 +426439,35 @@ sub_80EA3E4: ; 80EA3E4 lsls r3, 6 adds r0, r3, 0 eors r1, r0 - b @080EA7FC + b _080EA7FC .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 VarGet adds r1, r0, 0 movs r0, 0x80 - b @080EA7FA + b _080EA7FA .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] @@ -426485,9 +426485,9 @@ sub_80EA3E4: ; 80EA3E4 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] @@ -426498,29 +426498,29 @@ sub_80EA3E4: ; 80EA3E4 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 .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 .pool -@080EA714: +_080EA714: ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet @@ -426528,19 +426528,19 @@ sub_80EA3E4: ; 80EA3E4 movs r3, 0x80 lsls r3, 1 adds r0, r3, 0 - b @080EA7FA + b _080EA7FA .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 VarGet @@ -426553,26 +426553,26 @@ sub_80EA3E4: ; 80EA3E4 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@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 .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 VarGet @@ -426580,19 +426580,19 @@ sub_80EA3E4: ; 80EA3E4 movs r3, 0x80 lsls r3, 8 adds r0, r3, 0 - b @080EA7FA + b _080EA7FA .pool -@080EA7A8: +_080EA7A8: adds r0, r5, 0 bl MetatileBehavior_0xBB 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 VarGet @@ -426600,44 +426600,44 @@ sub_80EA3E4: ; 80EA3E4 movs r2, 0x80 lsls r2, 7 adds r0, r2, 0 - b @080EA7FA + b _080EA7FA .pool -@080EA7D8: +_080EA7D8: adds r0, r5, 0 bl MetatileBehavior_0xBC 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 VarGet 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 VarSet - b @080EA820 + b _080EA820 .pool -@080EA810: +_080EA810: ldrb r0, [r5, 0x8] bl FieldEffectActiveListContains 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} @@ -426677,19 +426677,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] @@ -426698,18 +426698,18 @@ sub_80EA828: ; 80EA828 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 @@ -426720,7 +426720,7 @@ sub_80EA828: ; 80EA828 adds r1, r2 movs r0, 0x2 strb r0, [r1] -@080EA8B8: +_080EA8B8: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -426738,23 +426738,23 @@ sub_80EA8D4: ; 80EA8D4 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 @@ -426768,11 +426768,11 @@ sub_80EA904: ; 80EA904 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 @@ -426780,26 +426780,26 @@ sub_80EA904: ; 80EA904 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 @@ -426817,24 +426817,24 @@ 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 @@ -426849,7 +426849,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 @@ -426859,20 +426859,20 @@ sub_80EA990: ; 80EA990 adds r0, r4 ldrb r0, [r0] cmp r0, r3 - bne @080EA9C0 + bne _080EA9C0 adds r0, r1, 0 - b @080EA9D0 + b _080EA9D0 .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 @@ -426885,7 +426885,7 @@ sub_80EA9D8: ; 80EA9D8 ldr r0, =0x03005d8c ldr r3, [r0] ldr r4, =0x00001a9c -@080EA9E2: +_080EA9E2: lsls r0, r2, 16 asrs r1, r0, 16 lsls r0, r1, 2 @@ -426895,20 +426895,20 @@ sub_80EA9D8: ; 80EA9D8 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - bne @080EAA04 + bne _080EAA04 lsls r0, r2, 24 lsrs r0, 24 - b @080EAA12 + b _080EAA12 .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 @@ -426920,7 +426920,7 @@ sub_80EAA18: ; 80EAA18 movs r3, 0x1 ldr r0, =0x03005d8c ldr r4, [r0] -@080EAA20: +_080EAA20: lsls r2, r3, 16 asrs r1, r2, 16 lsls r0, r1, 2 @@ -426932,24 +426932,24 @@ sub_80EAA18: ; 80EAA18 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 .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 @@ -426963,18 +426963,18 @@ sub_80EAA64: ; 80EAA64 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 @@ -426987,42 +426987,42 @@ 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 .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 @@ -427040,25 +427040,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 @@ -427068,10 +427068,10 @@ sub_80EAAF4: ; 80EAAF4 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 @@ -427081,8 +427081,8 @@ sub_80EAAF4: ; 80EAAF4 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 @@ -427098,18 +427098,18 @@ sub_80EAAF4: ; 80EAAF4 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 @@ -427127,7 +427127,7 @@ sub_80EABA4: ; 80EABA4 lsls r1, 24 lsrs r6, r1, 24 movs r4, 0x1 -@080EABAE: +_080EABAE: ldr r0, [r5] lsls r1, r4, 2 adds r1, r4 @@ -427136,17 +427136,17 @@ sub_80EABA4: ; 80EABA4 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 @@ -427158,7 +427158,7 @@ sub_80EABDC: ; 80EABDC adds r5, r0, 0 ldrb r0, [r5] cmp r0, 0 - beq @080EABF8 + beq _080EABF8 ldrb r0, [r5, 0x1] lsls r0, 27 ldr r1, =0x03005d90 @@ -427167,35 +427167,35 @@ 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 .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] @@ -427203,24 +427203,24 @@ sub_80EABDC: ; 80EABDC 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 @@ -427238,11 +427238,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 @@ -427253,17 +427253,17 @@ sub_80EAC5C: ; 80EAC5C 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 @@ -427274,18 +427274,18 @@ sub_80EAC5C: ; 80EAC5C 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 @@ -427296,21 +427296,21 @@ sub_80EAC5C: ; 80EAC5C 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 @@ -427330,7 +427330,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 @@ -427338,28 +427338,28 @@ sub_80EAD14: ; 80EAD14 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 @@ -427373,16 +427373,16 @@ sub_80EAD14: ; 80EAD14 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} @@ -427401,7 +427401,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 @@ -427409,12 +427409,12 @@ sub_80EAD94: ; 80EAD94 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 @@ -427422,40 +427422,40 @@ sub_80EAD94: ; 80EAD94 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 @@ -427468,22 +427468,22 @@ sub_80EAD94: ; 80EAD94 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 @@ -427491,7 +427491,7 @@ sub_80EAD94: ; 80EAD94 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] @@ -427499,20 +427499,20 @@ sub_80EAD94: ; 80EAD94 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 @@ -427530,13 +427530,13 @@ 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 @@ -427547,7 +427547,7 @@ 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 @@ -427570,7 +427570,7 @@ sub_80EAEB4: ; 80EAEB4 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x13 - bls @080EAEBA + bls _080EAEBA pop {r4-r6} pop {r0} bx r0 @@ -427646,18 +427646,18 @@ sub_80EAF80: ; 80EAF80 bl FlagGet 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 @@ -427669,29 +427669,29 @@ sub_80EAF80: ; 80EAF80 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 @@ -427722,9 +427722,9 @@ sub_80EAF80: ; 80EAF80 adds r0, r4, 0 adds r0, 0x6E ldrh r0, [r0] - b @080EB0D2 + b _080EB0D2 .pool -@080EB030: +_080EB030: lsls r2, r5, 1 adds r0, r6, r2 str r0, [sp] @@ -427756,9 +427756,9 @@ sub_80EAF80: ; 80EAF80 ands r1, r0 str r1, [sp, 0x1C] ldrh r0, [r4, 0x1A] - b @080EB0D2 + b _080EB0D2 .pool -@080EB074: +_080EB074: lsls r0, r5, 1 adds r0, r5 adds r0, r6, r0 @@ -427782,9 +427782,9 @@ sub_80EAF80: ; 80EAF80 ldrb r0, [r1, 0x1C] str r0, [sp, 0x1C] ldrh r0, [r1, 0x36] - b @080EB0D2 + b _080EB0D2 .pool -@080EB0A8: +_080EB0A8: str r6, [sp] ldr r1, =0x020229e8 ldrb r0, [r1] @@ -427806,16 +427806,16 @@ sub_80EAF80: ; 80EAF80 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 @@ -427827,7 +427827,7 @@ sub_80EAF80: ; 80EAF80 lsls r0, r1, 28 lsrs r0, 28 cmp r0, 0x1 - bne @080EB112 + bne _080EB112 movs r0, 0x3F ands r0, r1 movs r1, 0x40 @@ -427840,19 +427840,19 @@ sub_80EAF80: ; 80EAF80 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 @@ -427862,31 +427862,31 @@ sub_80EAF80: ; 80EAF80 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} @@ -427899,17 +427899,17 @@ 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 @@ -427934,17 +427934,17 @@ sub_80EB1AC: ; 80EB1AC bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB1FC + beq _080EB1FC ldr r0, =0x000040f0 movs r1, 0x1 bl VarSet - b @080EB204 + b _080EB204 .pool -@080EB1FC: +_080EB1FC: ldr r0, =0x000040f0 movs r1, 0 bl VarSet -@080EB204: +_080EB204: ldr r1, =0x0203a01d movs r0, 0 strb r0, [r1] @@ -427961,16 +427961,16 @@ sub_80EB218: ; 80EB218 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB272 + beq _080EB272 ldr r6, =0x0203a01d ldrb r0, [r6] cmp r0, 0x1 - bne @080EB272 + bne _080EB272 bl CurrentMapIsSecretBase lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @080EB272 + bne _080EB272 adds r0, r5, 0 movs r1, 0 bl VarSet @@ -427991,7 +427991,7 @@ sub_80EB218: ; 80EB218 adds r0, r5, 0 movs r1, 0 bl VarSet -@080EB272: +_080EB272: pop {r4-r6} pop {r0} bx r0 @@ -428005,7 +428005,7 @@ sub_80EB290: ; 80EB290 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB2BA + beq _080EB2BA ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet @@ -428018,7 +428018,7 @@ sub_80EB290: ; 80EB290 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EB2BA: +_080EB2BA: pop {r4} pop {r0} bx r0 @@ -428032,7 +428032,7 @@ sub_80EB2C8: ; 80EB2C8 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB2F2 + beq _080EB2F2 ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet @@ -428045,7 +428045,7 @@ sub_80EB2C8: ; 80EB2C8 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EB2F2: +_080EB2F2: pop {r4} pop {r0} bx r0 @@ -428059,7 +428059,7 @@ sub_80EB300: ; 80EB300 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB34C + beq _080EB34C ldr r5, =0x000040ee adds r0, r5, 0 bl VarGet @@ -428085,7 +428085,7 @@ sub_80EB300: ; 80EB300 lsrs r1, 16 adds r0, r5, 0 bl VarSet -@080EB34C: +_080EB34C: pop {r4,r5} pop {r0} bx r0 @@ -428099,7 +428099,7 @@ sub_80EB368: ; 80EB368 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB3B4 + beq _080EB3B4 ldr r5, =0x000040ee adds r0, r5, 0 bl VarGet @@ -428125,7 +428125,7 @@ sub_80EB368: ; 80EB368 lsrs r1, 16 adds r0, r5, 0 bl VarSet -@080EB3B4: +_080EB3B4: pop {r4,r5} pop {r0} bx r0 @@ -428139,7 +428139,7 @@ sub_80EB3D0: ; 80EB3D0 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB41C + beq _080EB41C ldr r5, =0x000040ee adds r0, r5, 0 bl VarGet @@ -428165,7 +428165,7 @@ sub_80EB3D0: ; 80EB3D0 lsrs r1, 16 adds r0, r5, 0 bl VarSet -@080EB41C: +_080EB41C: pop {r4,r5} pop {r0} bx r0 @@ -428179,7 +428179,7 @@ sub_80EB438: ; 80EB438 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB480 + beq _080EB480 ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet @@ -428203,7 +428203,7 @@ sub_80EB438: ; 80EB438 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EB480: +_080EB480: pop {r4} pop {r0} bx r0 @@ -428228,46 +428228,46 @@ 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 .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 VarGet lsls r0, 16 cmp r0, 0 - beq @080EB55C + beq _080EB55C ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet @@ -428280,7 +428280,7 @@ sub_80EB498: ; 80EB498 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EB55C: +_080EB55C: add sp, 0x4 pop {r4} pop {r0} @@ -428306,270 +428306,270 @@ 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 .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 VarGet lsls r0, 16 cmp r0, 0 - beq @080EB9D0 + beq _080EB9D0 ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x40 - b @080EB994 + b _080EB994 .pool -@080EB90C: +_080EB90C: ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB9D0 + beq _080EB9D0 ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x8 - b @080EB994 + b _080EB994 .pool -@080EB930: +_080EB930: ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB9D0 + beq _080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x40 - b @080EB994 + b _080EB994 .pool -@080EB954: +_080EB954: ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB9D0 + beq _080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet @@ -428577,33 +428577,33 @@ sub_80EB56C: ; 80EB56C movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 - b @080EB994 + b _080EB994 .pool -@080EB97C: +_080EB97C: ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB9D0 + beq _080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x10 -@080EB994: +_080EB994: orrs r1, r0 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl VarSet - b @080EB9D0 + b _080EB9D0 .pool -@080EB9AC: +_080EB9AC: ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EB9D0 + beq _080EB9D0 ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet @@ -428614,7 +428614,7 @@ sub_80EB56C: ; 80EB56C lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EB9D0: +_080EB9D0: add sp, 0x4 pop {r4} pop {r0} @@ -428640,77 +428640,77 @@ 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 .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 VarGet lsls r0, 16 cmp r0, 0 - beq @080EBB18 + beq _080EBB18 ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet @@ -428721,7 +428721,7 @@ sub_80EB9E0: ; 80EB9E0 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EBB18: +_080EBB18: add sp, 0x4 pop {r4} pop {r0} @@ -428747,199 +428747,199 @@ 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 .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 VarGet lsls r0, 16 cmp r0, 0 - beq @080EBE6C + beq _080EBE6C ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x8 - b @080EBE30 + b _080EBE30 .pool -@080EBE14: +_080EBE14: ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EBE6C + beq _080EBE6C ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet @@ -428947,20 +428947,20 @@ sub_80EBB28: ; 80EBB28 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 VarSet - b @080EBE6C + b _080EBE6C .pool -@080EBE48: +_080EBE48: ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080EBE6C + beq _080EBE6C ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet @@ -428971,7 +428971,7 @@ sub_80EBB28: ; 80EBB28 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EBE6C: +_080EBE6C: add sp, 0x4 pop {r4} pop {r0} @@ -428997,15 +428997,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 VarGet lsls r0, 16 cmp r0, 0 - beq @080EBECC + beq _080EBECC ldr r4, =0x000040ef adds r0, r4, 0 bl VarGet @@ -429016,7 +429016,7 @@ sub_80EBE7C: ; 80EBE7C lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080EBECC: +_080EBECC: add sp, 0x4 pop {r4} pop {r0} @@ -429031,7 +429031,7 @@ sub_80EBEE0: ; 80EBEE0 ldr r6, =0x03005d8c movs r5, 0 ldr r7, =0x000027ce -@080EBEEA: +_080EBEEA: ldr r0, [r6] lsls r1, r3, 3 adds r1, r3 @@ -429048,7 +429048,7 @@ sub_80EBEE0: ; 80EBEE0 movs r2, 0 adds r4, r3, 0x1 adds r3, r1, 0 -@080EBF0A: +_080EBF0A: ldr r0, [r6] adds r1, r2, r3 adds r0, r7 @@ -429058,11 +429058,11 @@ sub_80EBEE0: ; 80EBEE0 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} @@ -429081,15 +429081,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 @@ -429098,8 +429098,8 @@ sub_80EBF3C: ; 80EBF3C adds r0, r2 ldrb r0, [r0] cmp r0, 0 - bne @080EBF54 -@080EBF70: + bne _080EBF54 +_080EBF70: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -429109,7 +429109,7 @@ sub_80EBF3C: ; 80EBF3C lsrs r5, r0, 24 adds r7, r5, 0 ldr r6, =0x03005d8c -@080EBF86: +_080EBF86: ldr r1, [r6] lsls r0, r5, 3 adds r0, r5 @@ -429122,43 +429122,43 @@ sub_80EBF3C: ; 80EBF3C 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 .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 .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 @@ -429171,17 +429171,17 @@ sub_80EBFF4: ; 80EBFF4 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 @@ -429190,15 +429190,15 @@ sub_80EBFF4: ; 80EBFF4 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 .pool -@080EC03C: +_080EC03C: adds r0, r1, 0 -@080EC03E: +_080EC03E: pop {r1} bx r1 thumb_func_end sub_80EBFF4 @@ -429214,49 +429214,49 @@ 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 .pool -@080EC080: +_080EC080: ldr r0, =0x00000892 bl FlagGet 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 FlagReset adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x3 bl sub_80EC0CC -@080EC0BE: +_080EC0BE: pop {r4,r5} pop {r0} bx r0 @@ -429276,7 +429276,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 @@ -429284,32 +429284,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 MapGridGetMetatileBehaviorAt cmp r0, 0x86 - bne @080EC114 + bne _080EC114 adds r0, r4, 0 adds r1, r5, 0 lsrs r2, r6, 16 bl MapGridSetMetatileIdAt -@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 @@ -429370,7 +429370,7 @@ sub_80EC18C: ; 80EC18C movs r2, 0 ldr r0, =0x03005d8c ldr r3, [r0] -@080EC194: +_080EC194: lsls r0, r2, 3 adds r0, r2 lsls r0, 2 @@ -429379,25 +429379,25 @@ sub_80EC18C: ; 80EC18C 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 .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 @@ -429418,20 +429418,20 @@ 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 .pool -@080EC214: +_080EC214: ldrb r0, [r2] -@080EC216: +_080EC216: pop {r1} bx r1 thumb_func_end sub_80EC1D4 @@ -429581,10 +429581,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] @@ -429601,16 +429601,16 @@ sub_80EC31C: ; 80EC31C 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 .pool -@080EC398: +_080EC398: ldr r0, [r4] ldr r1, =0x00002bae adds r0, r1 @@ -429618,21 +429618,21 @@ sub_80EC31C: ; 80EC31C 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 .pool -@080EC3C4: +_080EC3C4: ldr r0, [r4] ldr r1, =0x00002bae adds r0, r1 @@ -429640,47 +429640,47 @@ sub_80EC31C: ; 80EC31C 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 .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] @@ -429688,10 +429688,10 @@ sub_80EC31C: ; 80EC31C adds r0, r4 ldrh r0, [r0] cmp r0, 0 - bne @080EC436 + bne _080EC436 movs r0, 0x1 bl FlagSet -@080EC436: +_080EC436: pop {r4} pop {r0} bx r0 @@ -429796,14 +429796,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 .pool @@ -429832,7 +429832,7 @@ sub_80EC548: ; 80EC548 ldrh r0, [r1] ldr r4, =0x0000ffff cmp r0, r4 - beq @080EC584 + beq _080EC584 ldr r0, =0x02021cc4 ldrh r1, [r1] bl CopyEasyChatWord @@ -429844,11 +429844,11 @@ sub_80EC548: ; 80EC548 orrs r0, r2 strh r0, [r1] movs r0, 0x1 - b @080EC586 + b _080EC586 .pool -@080EC584: +_080EC584: movs r0, 0 -@080EC586: +_080EC586: pop {r4,r5} pop {r1} bx r1 @@ -429865,34 +429865,34 @@ sub_80EC58C: ; 80EC58C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @080EC5AC + bne _080EC5AC movs r0, 0x1 - b @080EC5D2 + b _080EC5D2 .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 @@ -429905,88 +429905,88 @@ sub_80EC5D8: ; 80EC5D8 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 .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 .pool -@080EC62C: +_080EC62C: ldr r1, =0x020375e0 movs r0, 0x5 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x6 - b @080EC6AE + b _080EC6AE .pool -@080EC640: +_080EC640: ldr r1, =0x020375e0 movs r0, 0x12 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x11 - b @080EC6AE + b _080EC6AE .pool -@080EC654: +_080EC654: ldr r1, =0x020375e0 movs r0, 0x15 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x16 - b @080EC6AE + b _080EC6AE .pool -@080EC668: +_080EC668: ldr r1, =0x020375e0 movs r0, 0x8 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x9 - b @080EC6AE + b _080EC6AE .pool -@080EC67C: +_080EC67C: ldr r1, =0x020375e0 movs r0, 0x13 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x14 - b @080EC6AE + b _080EC6AE .pool -@080EC690: +_080EC690: ldr r1, =0x020375e0 movs r0, 0x17 strh r0, [r1] ldr r1, =0x020375e2 movs r0, 0x18 - b @080EC6AE + b _080EC6AE .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 .pool @@ -429999,44 +429999,44 @@ sub_80EC6BC: ; 80EC6BC 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 .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 @@ -430052,19 +430052,19 @@ sub_80EC728: ; 80EC728 ldr r5, =0x03005d10 ldrh r0, [r5, 0x28] cmp r0, 0 - bne @080EC74C + bne _080EC74C bl sub_80EC8FC - b @080EC888 + b _080EC888 .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 @@ -430074,9 +430074,9 @@ sub_80EC728: ; 80EC728 adds r1, 0x2A bl CompareString cmp r0, 0 - bne @080EC776 - b @080EC888 -@080EC776: + bne _080EC776 + b _080EC888 +_080EC776: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000027cc @@ -430089,18 +430089,18 @@ sub_80EC728: ; 80EC728 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 @@ -430110,15 +430110,15 @@ sub_80EC728: ; 80EC728 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 @@ -430138,7 +430138,7 @@ sub_80EC728: ; 80EC728 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @080EC81C + beq _080EC81C movs r4, 0x1 movs r0, 0x1 adds r3, r6, 0 @@ -430146,9 +430146,9 @@ sub_80EC728: ; 80EC728 ldr r1, =0x03005d90 mov r8, r1 adds r7, r6, 0x4 - b @080EC84E + b _080EC84E .pool -@080EC81C: +_080EC81C: movs r2, 0 ldr r0, =0x02024208 mov r12, r0 @@ -430159,7 +430159,7 @@ sub_80EC728: ; 80EC728 adds r7, r6, 0x4 adds r1, r5, 0 adds r1, 0x36 -@080EC830: +_080EC830: adds r0, r2, r1 ldrb r0, [r0] adds r0, r4, r0 @@ -430169,14 +430169,14 @@ sub_80EC728: ; 80EC728 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 @@ -430201,7 +430201,7 @@ sub_80EC728: ; 80EC728 ldrb r0, [r0] strb r0, [r6, 0x2] strb r5, [r6, 0x3] -@080EC888: +_080EC888: pop {r3} mov r8, r3 pop {r4-r7} @@ -430219,7 +430219,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 @@ -430229,7 +430229,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] @@ -430256,11 +430256,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 @@ -430270,21 +430270,21 @@ sub_80EC8FC: ; 80EC8FC 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 @@ -430297,14 +430297,14 @@ sub_80EC8FC: ; 80EC8FC 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 @@ -430339,7 +430339,7 @@ sub_80EC8FC: ; 80EC8FC ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x2] -@080EC9B4: +_080EC9B4: pop {r3} mov r8, r3 pop {r4-r7} @@ -430405,7 +430405,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 @@ -430465,7 +430465,7 @@ sub_80ECA38: ; 80ECA38 adds r0, r5 movs r1, 0x18 bl sub_80EF910 -@080ECACE: +_080ECACE: pop {r3} mov r8, r3 pop {r4-r7} @@ -430505,13 +430505,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 @@ -430533,19 +430533,19 @@ 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 .pool -@080ECBA0: +_080ECBA0: movs r0, 0x2 -@080ECBA2: +_080ECBA2: strb r0, [r4, 0x18] -@080ECBA4: +_080ECBA4: mov r0, r10 strh r0, [r4, 0x14] mov r0, r9 @@ -430571,16 +430571,16 @@ sub_80ECB00: ; 80ECB00 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 @@ -430625,18 +430625,18 @@ 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 .pool -@080ECC68: +_080ECC68: movs r1, 0 ldrsb r1, [r4, r1] lsls r0, r1, 3 @@ -430685,20 +430685,20 @@ sub_80ECC04: ; 80ECC04 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 .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 @@ -430756,20 +430756,20 @@ 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 .pool -@080ECD98: +_080ECD98: strb r0, [r4, 0x18] -@080ECD9A: +_080ECD9A: add sp, 0x20 pop {r4-r6} pop {r0} @@ -430797,14 +430797,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 @@ -430830,9 +430830,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 @@ -430858,9 +430858,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 @@ -430886,9 +430886,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 @@ -430916,7 +430916,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 @@ -430935,16 +430935,16 @@ 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 .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 @@ -430952,12 +430952,12 @@ sub_80ECEB4: ; 80ECEB4 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 @@ -430973,7 +430973,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] @@ -431038,24 +431038,24 @@ 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 .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 @@ -431083,7 +431083,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 @@ -431092,7 +431092,7 @@ sub_80ED03C: ; 80ED03C strh r6, [r5, 0x14] movs r0, 0x6 strb r0, [r5] -@080ED07A: +_080ED07A: pop {r4-r6} pop {r0} bx r0 @@ -431120,7 +431120,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 @@ -431178,7 +431178,7 @@ sub_80ED090: ; 80ED090 movs r1, 0x3 bl pokemon_getattr strb r0, [r7, 0x1F] -@080ED134: +_080ED134: pop {r3} mov r8, r3 pop {r4-r7} @@ -431239,13 +431239,13 @@ sub_80ED164: ; 80ED164 adds r0, r5 ldrb r0, [r0] cmp r0, 0 - bne @080ED1F4 + bne _080ED1F4 movs r0, 0x32 - b @080ED1F6 + b _080ED1F6 .pool -@080ED1F4: +_080ED1F4: movs r0, 0x64 -@080ED1F6: +_080ED1F6: strb r0, [r6, 0x1A] ldr r0, =0x020375e0 ldrh r0, [r0] @@ -431256,17 +431256,17 @@ sub_80ED164: ; 80ED164 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} @@ -431282,16 +431282,16 @@ sub_80ED238: ; 80ED238 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 @@ -431303,19 +431303,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 @@ -431335,7 +431335,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 @@ -431349,7 +431349,7 @@ sub_80ED238: ; 80ED238 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @080ED2B6 + bls _080ED2B6 movs r0, 0x1 bl sub_80EF038 strb r0, [r5, 0x2] @@ -431363,7 +431363,7 @@ sub_80ED238: ; 80ED238 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r5, 0x3] -@080ED2F2: +_080ED2F2: pop {r4-r7} pop {r0} bx r0 @@ -431380,7 +431380,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] @@ -431399,13 +431399,13 @@ sub_80ED320: ; 80ED320 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls @080ED400 + bls _080ED400 adds r0, r4, 0 bl GetStringLength lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bls @080ED400 + bls _080ED400 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -431470,7 +431470,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 @@ -431564,7 +431564,7 @@ sub_80ED4DC: ; 80ED4DC ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq @080ED532 + beq _080ED532 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -431596,7 +431596,7 @@ sub_80ED4DC: ; 80ED4DC strb r0, [r4, 0x16] adds r0, r4, 0 bl sub_80ECA10 -@080ED532: +_080ED532: pop {r4} pop {r0} bx r0 @@ -431762,7 +431762,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 @@ -431771,12 +431771,12 @@ 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 .pool -@080ED6F4: +_080ED6F4: bl sub_8139688 lsls r0, 24 lsrs r0, 24 @@ -431784,7 +431784,7 @@ sub_80ED610: ; 80ED610 adds r0, r6 movs r1, 0x3 bl pokemon_getattr -@080ED706: +_080ED706: strb r0, [r5, 0xE] pop {r3} mov r8, r3 @@ -431805,12 +431805,12 @@ sub_80ED718: ; 80ED718 bl FlagGet 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 @@ -431818,18 +431818,18 @@ sub_80ED718: ; 80ED718 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 @@ -431842,7 +431842,7 @@ sub_80ED718: ; 80ED718 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @080ED7E4 + beq _080ED7E4 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -431897,7 +431897,7 @@ sub_80ED718: ; 80ED718 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x18] -@080ED7E4: +_080ED7E4: pop {r4-r6} pop {r0} bx r0 @@ -431995,10 +431995,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 @@ -432008,32 +432008,32 @@ sub_80ED8B4: ; 80ED8B4 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 .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 @@ -432050,14 +432050,14 @@ sub_80ED924: ; 80ED924 adds r1, r0, r3 ldrh r0, [r1] cmp r0, r2 - bhi @080ED948 + bhi _080ED948 bl sub_80ED808 - b @080ED94C + b _080ED94C .pool -@080ED948: +_080ED948: subs r0, r2 strh r0, [r1] -@080ED94C: +_080ED94C: pop {r0} bx r0 thumb_func_end sub_80ED924 @@ -432067,28 +432067,28 @@ 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 .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 @@ -432096,13 +432096,13 @@ sub_80ED950: ; 80ED950 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 @@ -432124,14 +432124,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 @@ -432163,7 +432163,7 @@ sub_80ED9A8: ; 80ED9A8 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x6] -@080EDA18: +_080EDA18: pop {r4-r6} pop {r0} bx r0 @@ -432187,18 +432187,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 @@ -432219,7 +432219,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 @@ -432232,14 +432232,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 @@ -432278,7 +432278,7 @@ sub_80EDA80: ; 80EDA80 add r0, r8 movs r1, 0x18 bl sub_80EF910 -@080EDB1C: +_080EDB1C: pop {r3} mov r8, r3 pop {r4-r7} @@ -432305,7 +432305,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 @@ -432321,33 +432321,33 @@ sub_80EDB44: ; 80EDB44 strb r1, [r4, 0x1] ldr r6, =0x00000867 movs r5, 0 -@080EDB88: +_080EDB88: lsls r0, r6, 16 lsrs r0, 16 bl FlagGet 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 .pool -@080EDBCC: +_080EDBCC: movs r0, 0x1 bl sub_80C0844 -@080EDBD2: +_080EDBD2: strh r0, [r4, 0x2] ldr r1, =0x02037318 ldrb r0, [r1, 0x14] @@ -432360,7 +432360,7 @@ sub_80EDB44: ; 80EDB44 movs r6, 0 adds r7, r4, 0 adds r7, 0x13 -@080EDBEA: +_080EDBEA: ldr r0, =gUnknown_0858D0DE lsls r5, r6, 1 adds r0, r5, r0 @@ -432369,11 +432369,11 @@ sub_80EDB44: ; 80EDB44 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, =gUnknown_0858D0D0 adds r0, r5, r0 ldrh r0, [r0] @@ -432381,14 +432381,14 @@ sub_80EDB44: ; 80EDB44 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 @@ -432402,7 +432402,7 @@ sub_80EDB44: ; 80EDB44 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xC] -@080EDC40: +_080EDC40: pop {r4-r7} pop {r0} bx r0 @@ -432425,14 +432425,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 @@ -432462,7 +432462,7 @@ sub_80EDC60: ; 80EDC60 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x9] -@080EDCCE: +_080EDCCE: pop {r4-r7} pop {r0} bx r0 @@ -432484,14 +432484,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 @@ -432522,7 +432522,7 @@ sub_80EDCE8: ; 80EDCE8 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] -@080EDD56: +_080EDD56: pop {r4-r6} pop {r0} bx r0 @@ -432546,62 +432546,62 @@ 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 .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 .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 .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 @@ -432633,7 +432633,7 @@ sub_80EDD78: ; 80EDD78 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x8] -@080EDE54: +_080EDE54: pop {r4-r6} pop {r0} bx r0 @@ -432674,17 +432674,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 @@ -432692,66 +432692,66 @@ sub_80EDE98: ; 80EDE98 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 .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 @@ -432777,17 +432777,17 @@ sub_80EDE98: ; 80EDE98 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] @@ -432798,8 +432798,8 @@ sub_80EDE98: ; 80EDE98 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 @@ -432822,7 +432822,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 @@ -432832,12 +432832,12 @@ sub_80EDFB4: ; 80EDFB4 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 @@ -432857,53 +432857,53 @@ sub_80EDFB4: ; 80EDFB4 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 @@ -432918,18 +432918,18 @@ sub_80EDFB4: ; 80EDFB4 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] @@ -432940,8 +432940,8 @@ sub_80EDFB4: ; 80EDFB4 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 @@ -432989,7 +432989,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 @@ -433017,7 +433017,7 @@ sub_80EE104: ; 80EE104 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0xC] -@080EE168: +_080EE168: pop {r4} pop {r0} bx r0 @@ -433039,18 +433039,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 @@ -433069,7 +433069,7 @@ sub_80EE184: ; 80EE184 ldr r7, =0x03005d90 adds r2, r6, 0 adds r2, 0x36 -@080EE1DA: +_080EE1DA: adds r0, r1, r2 ldrb r0, [r0] adds r0, r5, r0 @@ -433079,16 +433079,16 @@ sub_80EE184: ; 80EE184 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 @@ -433101,78 +433101,78 @@ sub_80EE184: ; 80EE184 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 .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 .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 @@ -433194,14 +433194,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 @@ -433232,7 +433232,7 @@ sub_80EE2CC: ; 80EE2CC ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] -@080EE33A: +_080EE33A: pop {r4-r6} pop {r0} bx r0 @@ -433273,14 +433273,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 @@ -433311,26 +433311,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] @@ -433340,7 +433340,7 @@ sub_80EE35C: ; 80EE35C ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x11] -@080EE426: +_080EE426: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -433374,14 +433374,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 @@ -433407,7 +433407,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} @@ -433437,14 +433437,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 @@ -433481,23 +433481,23 @@ 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 .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} @@ -433622,90 +433622,90 @@ sub_80EE69C: ; 80EE69C 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 @@ -433725,14 +433725,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 @@ -433764,7 +433764,7 @@ sub_80EE72C: ; 80EE72C ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x8] -@080EE79C: +_080EE79C: pop {r4-r6} pop {r0} bx r0 @@ -433786,25 +433786,25 @@ 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 .pool -@080EE810: +_080EE810: movs r0, 0x1 -@080EE812: +_080EE812: pop {r4} pop {r1} bx r1 @@ -433819,7 +433819,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 @@ -433828,14 +433828,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 @@ -433843,20 +433843,20 @@ sub_80EE818: ; 80EE818 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 @@ -433869,11 +433869,11 @@ sub_80EE818: ; 80EE818 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @080EE8C0 + beq _080EE8C0 movs r0, 0x1 - b @080EE8C2 + b _080EE8C2 .pool -@080EE89C: +_080EE89C: ldr r5, =0x03005d8c ldr r0, [r5] ldr r4, =0x000027cc @@ -433884,11 +433884,11 @@ sub_80EE818: ; 80EE818 adds r0, r4 bl sub_80EF93C movs r0, 0x1 - b @080EE8C2 + b _080EE8C2 .pool -@080EE8C0: +_080EE8C0: movs r0, 0 -@080EE8C2: +_080EE8C2: pop {r4-r7} pop {r1} bx r1 @@ -433915,9 +433915,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 @@ -433940,31 +433940,31 @@ sub_80EE8C8: ; 80EE8C8 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 .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 @@ -433983,9 +433983,9 @@ sub_80EE8C8: ; 80EE8C8 movs r2, 0 bl pokemon_getattr strh r0, [r7, 0x8] - b @080EEA46 + b _080EEA46 .pool -@080EE9A8: +_080EE9A8: ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB @@ -434011,9 +434011,9 @@ sub_80EE8C8: ; 80EE8C8 movs r2, 0 bl pokemon_getattr strh r0, [r7, 0xA] - b @080EEA46 + b _080EEA46 .pool -@080EE9E8: +_080EE9E8: ldr r4, =0x020244ec adds r0, r4, 0 movs r1, 0xB @@ -434022,9 +434022,9 @@ sub_80EE8C8: ; 80EE8C8 strh r0, [r7, 0x4] adds r4, 0x64 adds r0, r4, 0 - b @080EEA3C + b _080EEA3C .pool -@080EEA00: +_080EEA00: ldr r2, =0x03005d8c mov r8, r2 ldr r6, =0x03005d90 @@ -434054,18 +434054,18 @@ sub_80EE8C8: ; 80EE8C8 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} @@ -434084,9 +434084,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 @@ -434099,7 +434099,7 @@ sub_80EEA70: ; 80EEA70 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @080EEB8C + beq _080EEB8C movs r1, 0 ldrsb r1, [r2, r1] lsls r0, r1, 3 @@ -434149,7 +434149,7 @@ sub_80EEA70: ; 80EEA70 ldrb r0, [r0] strb r0, [r5, 0x1B] cmp r0, 0x1 - beq @080EEB3A + beq _080EEB3A ldr r4, [r7] ldr r6, =0x00004054 adds r0, r6, 0 @@ -434164,12 +434164,12 @@ sub_80EEA70: ; 80EEA70 adds r4, r0 ldrb r0, [r4] cmp r0, 0x1 - bne @080EEB70 -@080EEB3A: + bne _080EEB70 +_080EEB3A: movs r0, 0x1 - b @080EEB8A + b _080EEB8A .pool -@080EEB70: +_080EEB70: adds r0, r6, 0 bl VarGet ldr r2, [r7] @@ -434182,9 +434182,9 @@ sub_80EEA70: ; 80EEA70 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} @@ -434198,15 +434198,15 @@ sub_80EEB98: ; 80EEB98 movs r5, 0 ldr r6, =gUnknown_0858D0EC adds r7, r6, 0x2 - b @080EEBAE + b _080EEBAE .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] @@ -434216,13 +434216,13 @@ sub_80EEB98: ; 80EEB98 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, =gUnknown_0858D0EC -@080EEBD2: +_080EEBD2: lsls r0, r5, 2 adds r0, r4 ldrh r0, [r0] @@ -434232,7 +434232,7 @@ sub_80EEB98: ; 80EEB98 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x6 - bls @080EEBD2 + bls _080EEBD2 pop {r4-r7} pop {r0} bx r0 @@ -434259,7 +434259,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 @@ -434290,7 +434290,7 @@ sub_80EEBF4: ; 80EEBF4 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r4, 0x5] -@080EEC60: +_080EEC60: pop {r4,r5} pop {r0} bx r0 @@ -434435,7 +434435,7 @@ sub_80EED88: ; 80EED88 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @080EEE0C + beq _080EEE0C ldr r6, =0x03005d8c ldr r0, [r6] ldr r7, =0x00002b50 @@ -434448,13 +434448,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 @@ -434466,7 +434466,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] @@ -434491,7 +434491,7 @@ sub_80EED88: ; 80EED88 adds r2, r0 movs r0, 0x1 strb r0, [r2] -@080EEE0C: +_080EEE0C: pop {r4-r7} pop {r0} bx r0 @@ -434503,26 +434503,26 @@ 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 @@ -434531,14 +434531,14 @@ sub_80EEE30: ; 80EEE30 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 @@ -434577,7 +434577,7 @@ 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 @@ -434587,11 +434587,11 @@ sub_80EEEB8: ; 80EEEB8 ldrb r0, [r0] adds r5, r2, 0x1 cmp r0, 0 - bne @080EEF12 + bne _080EEF12 lsls r0, r5, 24 - b @080EEF0C + b _080EEF0C .pool -@080EEEE0: +_080EEEE0: ldr r3, [r6] lsls r4, r2, 2 adds r0, r3, r4 @@ -434599,7 +434599,7 @@ sub_80EEEB8: ; 80EEEB8 adds r0, r7 ldrb r0, [r0] cmp r0, 0 - beq @080EEF08 + beq _080EEF08 adds r0, r3, r7 adds r1, r0, r1 adds r0, r4 @@ -434607,20 +434607,20 @@ sub_80EEEB8: ; 80EEEB8 str r0, [r1] adds r0, r2, 0 bl sub_80EEE78 - b @080EEF12 + b _080EEF12 .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 @@ -434632,35 +434632,35 @@ sub_80EEF20: ; 80EEF20 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 .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 @@ -434673,12 +434673,12 @@ sub_80EEF6C: ; 80EEF6C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - bne @080EEF84 + bne _080EEF84 ldr r1, =0x020375f0 movs r0, 0 - b @080EF01A + b _080EF01A .pool -@080EEF84: +_080EEF84: ldr r5, =0x03005d8c ldr r0, [r5] lsls r4, r2, 2 @@ -434687,7 +434687,7 @@ sub_80EEF6C: ; 80EEF6C adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0 - bne @080EEFE8 + bne _080EEFE8 ldr r2, =0x00002b51 adds r1, r2 movs r0, 0x2 @@ -434697,28 +434697,28 @@ sub_80EEF6C: ; 80EEF6C lsls r0, 24 asrs r0, 24 cmp r0, 0x13 - bgt @080EEFC8 + bgt _080EEFC8 ldr r1, =gUnknown_0858D11C ldr r0, [r5] adds r0, r4 subs r2, 0x1 - b @080EEFD0 + b _080EEFD0 .pool -@080EEFC8: +_080EEFC8: ldr r1, =gUnknown_0858D130 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 .pool -@080EEFE8: +_080EEFE8: ldrh r1, [r2] ldr r0, =0x02021cc4 movs r2, 0 @@ -434740,10 +434740,10 @@ sub_80EEF6C: ; 80EEF6C 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} @@ -434757,15 +434757,15 @@ sub_80EF038: ; 80EF038 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 @@ -434773,28 +434773,28 @@ sub_80EF038: ; 80EF038 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 .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 @@ -434806,36 +434806,36 @@ sub_80EF094: ; 80EF094 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 .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 .pool @@ -434847,29 +434847,29 @@ sub_80EF0E4: ; 80EF0E4 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 @@ -434886,7 +434886,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 @@ -434896,34 +434896,34 @@ sub_80EF120: ; 80EF120 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 .pool -@080EF164: +_080EF164: ldr r5, =0x00002b51 adds r0, r2, r5 ldrb r0, [r0] cmp r0, 0 - bne @080EF186 + bne _080EF186 ldr r0, =0x00000864 bl FlagGet 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 @@ -434932,12 +434932,12 @@ sub_80EF120: ; 80EF120 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 @@ -434956,19 +434956,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, =gUnknown_0858D144 lsls r0, 2 adds r0, r1 @@ -434976,9 +434976,9 @@ sub_80EF1BC: ; 80EF1BC ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0x14] bl CopyString - b @080EF244 + b _080EF244 .pool -@080EF1FC: +_080EF1FC: ldr r1, =gUnknown_0858D144 lsls r0, 2 adds r0, r1 @@ -434986,9 +434986,9 @@ sub_80EF1BC: ; 80EF1BC ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0x18] bl CopyString - b @080EF244 + b _080EF244 .pool -@080EF218: +_080EF218: ldr r1, =gUnknown_0858D144 lsls r0, 2 adds r0, r1 @@ -434996,9 +434996,9 @@ sub_80EF1BC: ; 80EF1BC ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0x1C] bl CopyString - b @080EF244 + b _080EF244 .pool -@080EF234: +_080EF234: ldr r1, =gUnknown_0858D144 lsls r0, 2 adds r0, r1 @@ -435006,7 +435006,7 @@ sub_80EF1BC: ; 80EF1BC ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0x20] bl CopyString -@080EF244: +_080EF244: pop {r0} bx r0 .pool @@ -435020,21 +435020,21 @@ sub_80EF250: ; 80EF250 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 .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, =gUnknown_0858D144 lsls r0, r2, 2 adds r0, r1 @@ -435042,9 +435042,9 @@ sub_80EF250: ; 80EF250 ldr r1, =gUnknown_0858BAF0 ldr r1, [r1] bl CopyString - b @080EF300 + b _080EF300 .pool -@080EF29C: +_080EF29C: ldr r1, =gUnknown_0858D144 lsls r0, r2, 2 adds r0, r1 @@ -435052,9 +435052,9 @@ sub_80EF250: ; 80EF250 ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0x4] bl CopyString - b @080EF300 + b _080EF300 .pool -@080EF2B8: +_080EF2B8: ldr r1, =gUnknown_0858D144 lsls r0, r2, 2 adds r0, r1 @@ -435062,9 +435062,9 @@ sub_80EF250: ; 80EF250 ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0x8] bl CopyString - b @080EF300 + b _080EF300 .pool -@080EF2D4: +_080EF2D4: ldr r1, =gUnknown_0858D144 lsls r0, r2, 2 adds r0, r1 @@ -435072,9 +435072,9 @@ sub_80EF250: ; 80EF250 ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0xC] bl CopyString - b @080EF300 + b _080EF300 .pool -@080EF2F0: +_080EF2F0: ldr r1, =gUnknown_0858D144 lsls r0, r2, 2 adds r0, r1 @@ -435082,7 +435082,7 @@ sub_80EF250: ; 80EF250 ldr r1, =gUnknown_0858BAF0 ldr r1, [r1, 0x10] bl CopyString -@080EF300: +_080EF300: pop {r0} bx r0 .pool @@ -435143,72 +435143,72 @@ sub_80EF370: ; 80EF370 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 .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 .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 .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 .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 .pool -@080EF404: +_080EF404: movs r0, 0x8 -@080EF406: +_080EF406: pop {r4} pop {r1} bx r1 @@ -435225,13 +435225,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 @@ -435241,24 +435241,24 @@ sub_80EF40C: ; 80EF40C 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} @@ -435287,7 +435287,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 @@ -435295,7 +435295,7 @@ sub_80EF46C: ; 80EF46C adds r1, r0, r2 ldrb r0, [r1] cmp r0, r10 - bne @080EF4E4 + bne _080EF4E4 movs r3, 0xFF adds r0, r7, 0 ands r0, r3 @@ -435303,16 +435303,16 @@ sub_80EF46C: ; 80EF46C 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 @@ -435320,18 +435320,18 @@ sub_80EF46C: ; 80EF46C ldr r0, [r5] adds r0, r4 bl sub_80EF93C -@080EF4D8: +_080EF4D8: movs r0, 0x1 - b @080EF4F0 + b _080EF4F0 .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 @@ -435345,23 +435345,23 @@ sub_80EF46C: ; 80EF46C 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] @@ -435370,17 +435370,17 @@ sub_80EF500: ; 80EF500 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 @@ -435395,7 +435395,7 @@ sub_80EF550: ; 80EF550 movs r1, 0 ldr r5, =0x03005d8c ldr r4, =0x000027cc -@080EF55C: +_080EF55C: ldr r3, [r5] lsls r0, r1, 3 adds r0, r1 @@ -435404,32 +435404,32 @@ sub_80EF550: ; 80EF550 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 .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 @@ -435445,56 +435445,56 @@ 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 .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 @@ -435507,7 +435507,7 @@ sub_80EF64C: ; 80EF64C ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne @080EF6A0 + bne _080EF6A0 ldr r4, =0x02021cc4 bl sub_8139688 lsls r0, 24 @@ -435538,7 +435538,7 @@ sub_80EF64C: ; 80EF64C adds r0, r1 movs r1, 0x6 bl sub_811F88C -@080EF6A0: +_080EF6A0: pop {r4} pop {r0} bx r0 @@ -435553,7 +435553,7 @@ sub_80EF6C4: ; 80EF6C4 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne @080EF6F0 + bne _080EF6F0 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -435567,7 +435567,7 @@ sub_80EF6C4: ; 80EF6C4 adds r0, r1 movs r1, 0x6 bl sub_811F88C -@080EF6F0: +_080EF6F0: pop {r0} bx r0 .pool @@ -435581,7 +435581,7 @@ sub_80EF704: ; 80EF704 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne @080EF774 + bne _080EF774 ldr r6, =0x02021cc4 bl sub_8139688 lsls r0, 24 @@ -435623,7 +435623,7 @@ sub_80EF704: ; 80EF704 adds r0, r1 movs r1, 0x2 bl sub_811F88C -@080EF774: +_080EF774: pop {r4-r6} pop {r0} bx r0 @@ -435656,7 +435656,7 @@ sub_80EF7B4: ; 80EF7B4 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne @080EF7E0 + bne _080EF7E0 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -435670,7 +435670,7 @@ sub_80EF7B4: ; 80EF7B4 adds r0, r1 movs r1, 0x2 bl sub_811F88C -@080EF7E0: +_080EF7E0: pop {r0} bx r0 .pool @@ -435702,7 +435702,7 @@ sub_80EF80C: ; 80EF80C ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne @080EF838 + bne _080EF838 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -435716,7 +435716,7 @@ sub_80EF80C: ; 80EF80C adds r0, r1 movs r1, 0x1 bl sub_811F88C -@080EF838: +_080EF838: pop {r0} bx r0 .pool @@ -435730,7 +435730,7 @@ sub_80EF84C: ; 80EF84C ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0 - bne @080EF878 + bne _080EF878 ldr r2, =0x03005d8c ldr r0, =0x030060bc movs r1, 0 @@ -435744,7 +435744,7 @@ sub_80EF84C: ; 80EF84C adds r0, r1 movs r1, 0x1 bl sub_811F88C -@080EF878: +_080EF878: pop {r0} bx r0 .pool @@ -435774,7 +435774,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 @@ -435786,13 +435786,13 @@ sub_80EF88C: ; 80EF88C adds r1, r6, 0 bl CompareString cmp r0, 0 - bne @080EF8EC + bne _080EF8EC movs r0, 0 - b @080EF8EE + b _080EF8EE .pool -@080EF8EC: +_080EF8EC: movs r0, 0x1 -@080EF8EE: +_080EF8EE: add sp, 0x4 pop {r4-r6} pop {r1} @@ -435827,14 +435827,14 @@ 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 @@ -435844,24 +435844,24 @@ 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} @@ -435873,22 +435873,22 @@ sub_80EF93C: ; 80EF93C 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 @@ -435896,17 +435896,17 @@ sub_80EF93C: ; 80EF93C 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} @@ -435918,19 +435918,19 @@ sub_80EF93C: ; 80EF93C 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 @@ -435979,24 +435979,24 @@ sub_80EFA24: ; 80EFA24 lsls r0, 16 lsrs r4, r0, 16 adds r6, r4, 0 - b @080EFA62 + b _080EFA62 .pool -@080EFA48: +_080EFA48: cmp r4, 0x1 - bne @080EFA54 + bne _080EFA54 ldr r4, =0x0000019b - b @080EFA5A + b _080EFA5A .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 @@ -436006,10 +436006,10 @@ sub_80EFA24: ; 80EFA24 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} @@ -436036,15 +436036,15 @@ 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 .pool -@080EFACC: +_080EFACC: ldr r1, =0x020375f0 movs r0, 0 -@080EFAD0: +_080EFAD0: strh r0, [r1] pop {r0} bx r0 @@ -436056,26 +436056,26 @@ 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 @@ -436085,7 +436085,7 @@ 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 @@ -436094,19 +436094,19 @@ sub_80EFB08: ; 80EFB08 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 @@ -436121,12 +436121,12 @@ 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 @@ -436145,23 +436145,23 @@ sub_80EFB58: ; 80EFB58 lsrs r2, r0, 24 adds r5, r4, 0x4 ldr r6, =0x0000ffff - b @080EFB7E + b _080EFB7E .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] @@ -436180,9 +436180,9 @@ sub_80EFBA4: ; 80EFBA4 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 @@ -436192,12 +436192,12 @@ sub_80EFBA4: ; 80EFBA4 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 @@ -436228,7 +436228,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] @@ -436238,9 +436238,9 @@ sub_80EFBDC: ; 80EFBDC 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 @@ -436248,30 +436248,30 @@ sub_80EFBDC: ; 80EFBDC 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 @@ -436280,17 +436280,17 @@ sub_80EFBDC: ; 80EFBDC 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 @@ -436298,30 +436298,30 @@ sub_80EFBDC: ; 80EFBDC 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 @@ -436330,18 +436330,18 @@ sub_80EFBDC: ; 80EFBDC 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 StopMusicWhileStringIsPrinted - b @080EFD30 -@080EFCD0: + b _080EFD30 +_080EFCD0: movs r0, 0xB muls r4, r0 ldr r7, =gSpeciesNames @@ -436350,25 +436350,25 @@ sub_80EFBDC: ; 80EFBDC 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 .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 @@ -436376,8 +436376,8 @@ sub_80EFBDC: ; 80EFBDC 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 @@ -436388,11 +436388,11 @@ sub_80EFBDC: ; 80EFBDC 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, =gUnknown_0858D144 mov r2, r9 lsls r1, r2, 2 @@ -436419,7 +436419,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 @@ -436427,18 +436427,18 @@ sub_80EFD54: ; 80EFD54 adds r0, r4 ldrb r0, [r0] cmp r0, r2 - bne @080EFD84 + bne _080EFD84 movs r0, 0x1 - b @080EFD90 + b _080EFD90 .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 @@ -436461,14 +436461,14 @@ sub_80EFD98: ; 80EFD98 adds r1, r4, 0 bl CompareString cmp r0, 0 - beq @080EFDD4 + beq _080EFDD4 bl sub_80ED320 movs r0, 0x1 - b @080EFDD6 + b _080EFDD6 .pool -@080EFDD4: +_080EFDD4: movs r0, 0 -@080EFDD6: +_080EFDD6: pop {r4} pop {r1} bx r1 @@ -436679,15 +436679,15 @@ 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 .pool -@080EFFD0: +_080EFFD0: ldr r1, =0x020375f0 movs r0, 0x1 -@080EFFD4: +_080EFFD4: strh r0, [r1] pop {r4} pop {r0} @@ -436702,36 +436702,36 @@ sub_80EFFE0: ; 80EFFE0 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 @@ -436762,46 +436762,46 @@ sub_80F0040: ; 80F0040 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 .pool -@080F006C: +_080F006C: movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0x2 - bne @080F0060 -@080F0074: + bne _080F0060 +_080F0074: ldr r0, =0x000008bd bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080F0092 + beq _080F0092 movs r0, 0x89 lsls r0, 4 bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080F009C -@080F0092: + beq _080F009C +_080F0092: movs r0, 0x1 - b @080F009E + b _080F009E .pool -@080F009C: +_080F009C: movs r0, 0x2 -@080F009E: +_080F009E: pop {r1} bx r1 thumb_func_end sub_80F0040 @@ -436814,55 +436814,55 @@ sub_80F00A4: ; 80F00A4 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, =gUnknown_085EAD08 bl CopyString ldr r0, =0x00004003 movs r1, 0x1 bl VarSet - b @080F0104 + b _080F0104 .pool -@080F00EC: +_080F00EC: movs r0, 0x5 ldrsb r0, [r1, r0] cmp r0, 0x2 - bne @080F0104 + bne _080F0104 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD08 bl CopyString ldr r0, =0x00004003 movs r1, 0x1 bl VarSet -@080F0104: +_080F0104: ldr r4, =0x00004003 adds r0, r4, 0 bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - beq @080F0142 + beq _080F0142 adds r0, r4, 0 bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq @080F0158 + beq _080F0158 adds r0, r4, 0 bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bls @080F016C + bls _080F016C adds r0, r4, 0 bl VarGet lsls r0, 16 @@ -436870,43 +436870,43 @@ sub_80F00A4: ; 80F00A4 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne @080F0158 -@080F0142: + bne _080F0158 +_080F0142: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD08 bl CopyString - b @080F01A8 + b _080F01A8 .pool -@080F0158: +_080F0158: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD04 bl CopyString - b @080F01A8 + b _080F01A8 .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, =gUnknown_085EAD08 bl CopyString adds r0, r4, 0 movs r1, 0x1 bl VarSet - b @080F01A8 + b _080F01A8 .pool -@080F0198: +_080F0198: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD04 bl CopyString adds r0, r4, 0 movs r1, 0x2 bl VarSet -@080F01A8: +_080F01A8: pop {r4} pop {r0} bx r0 @@ -436946,11 +436946,11 @@ sub_80F01E8: ; 80F01E8 bl Alloc 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 @@ -436967,13 +436967,13 @@ sub_80F01E8: ; 80F01E8 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 .pool -@080F0238: +_080F0238: lsls r0, r4, 3 subs r2, r0, r4 lsls r0, r2, 2 @@ -436983,48 +436983,48 @@ sub_80F01E8: ; 80F01E8 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 @@ -437038,9 +437038,9 @@ sub_80F01E8: ; 80F01E8 ldr r4, =0x00000a8c adds r3, r5, r4 bl sub_80F0358 - b @080F031E + b _080F031E .pool -@080F02C4: +_080F02C4: ldr r0, =0x03005d8c ldr r1, [r0] ldr r0, =0x000027cc @@ -437048,9 +437048,9 @@ sub_80F01E8: ; 80F01E8 movs r3, 0xE1 lsls r3, 3 adds r2, r5, r3 - b @080F02EA + b _080F02EA .pool -@080F02DC: +_080F02DC: movs r0, 0xE1 lsls r0, 2 adds r1, r5, r0 @@ -437058,14 +437058,14 @@ sub_80F01E8: ; 80F01E8 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 .pool -@080F0304: +_080F0304: movs r0, 0xE1 lsls r0, 2 adds r1, r5, r0 @@ -437078,7 +437078,7 @@ sub_80F01E8: ; 80F01E8 adds r3, r4 adds r0, r5, 0 bl sub_80F0358 -@080F031E: +_080F031E: ldr r5, =0x03005d8c ldr r0, [r5] ldr r4, =0x000027cc @@ -437092,7 +437092,7 @@ sub_80F01E8: ; 80F01E8 bl sub_80F0B64 mov r0, r8 bl Free -@080F0344: +_080F0344: pop {r3} mov r8, r3 pop {r4-r7} @@ -437124,19 +437124,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 @@ -437151,7 +437151,7 @@ sub_80F0358: ; 80F0358 negs r1, r1 adds r7, r4, 0 cmp r0, r1 - bne @080F03E0 + bne _080F03E0 ldr r1, =0x0203a02c ldrb r0, [r1] adds r0, 0x1 @@ -437161,12 +437161,12 @@ sub_80F0358: ; 80F0358 mov r2, r10 ldrb r2, [r2] cmp r0, r2 - beq @080F048C + beq _080F048C adds r6, 0x1 mov r9, r6 - b @080F0470 + b _080F0470 .pool -@080F03E0: +_080F03E0: movs r5, 0 mov r3, r10 ldrb r0, [r3] @@ -437174,10 +437174,10 @@ sub_80F0358: ; 80F0358 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 @@ -437196,7 +437196,7 @@ sub_80F0358: ; 80F0358 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @080F0446 + beq _080F0446 mov r2, r8 ldrb r1, [r2] adds r0, r4, 0 @@ -437214,8 +437214,8 @@ sub_80F0358: ; 80F0358 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 @@ -437223,13 +437223,13 @@ sub_80F0358: ; 80F0358 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] @@ -437237,17 +437237,17 @@ sub_80F0358: ; 80F0358 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 .pool -@080F048C: +_080F048C: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -437282,18 +437282,18 @@ 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 .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] @@ -437310,9 +437310,9 @@ sub_80F049C: ; 80F049C adds r1, r6, r1 adds r2, r7, 0 bl sub_80F0580 - b @080F0556 + b _080F0556 .pool -@080F050C: +_080F050C: ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] @@ -437329,9 +437329,9 @@ sub_80F049C: ; 80F049C adds r1, r6, r1 adds r2, r7, 0 bl sub_80F05E8 - b @080F0556 + b _080F0556 .pool -@080F0534: +_080F0534: ldr r0, =0x030060bc movs r1, 0 ldrsb r1, [r0, r1] @@ -437348,22 +437348,22 @@ sub_80F049C: ; 80F049C 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 .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} @@ -437386,17 +437386,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] @@ -437421,7 +437421,7 @@ sub_80F0580: ; 80F0580 stm r1!, {r2-r4} movs r0, 0x1 strb r0, [r6, 0x1] -@080F05E0: +_080F05E0: pop {r4-r6} pop {r1} bx r1 @@ -437442,15 +437442,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 @@ -437459,18 +437459,18 @@ sub_80F05E8: ; 80F05E8 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 @@ -437491,7 +437491,7 @@ sub_80F05E8: ; 80F05E8 stm r1!, {r2-r4} movs r0, 0x1 strb r0, [r6, 0x1] -@080F0660: +_080F0660: pop {r4-r6} pop {r1} bx r1 @@ -437512,17 +437512,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] @@ -437548,7 +437548,7 @@ sub_80F0668: ; 80F0668 movs r0, 0x1 strb r0, [r6, 0x1] strh r0, [r6, 0x16] -@080F06CA: +_080F06CA: pop {r4-r6} pop {r1} bx r1 @@ -437559,32 +437559,32 @@ 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 @@ -437598,7 +437598,7 @@ sub_80F0708: ; 80F0708 sub sp, 0x8 movs r0, 0 mov r9, r0 -@080F0716: +_080F0716: ldr r3, =0x03005d8c ldr r1, [r3] mov r4, r9 @@ -437611,60 +437611,60 @@ sub_80F0708: ; 80F0708 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 .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 @@ -437683,9 +437683,9 @@ sub_80F0708: ; 80F0708 adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x2] - b @080F09E6 + b _080F09E6 .pool -@080F081C: +_080F081C: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 @@ -437704,9 +437704,9 @@ sub_80F0708: ; 80F0708 adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x2] - b @080F09E6 + b _080F09E6 .pool -@080F0848: +_080F0848: ldr r0, [r3] mov r4, r9 adds r1, r7, r4 @@ -437715,9 +437715,9 @@ sub_80F0708: ; 80F0708 ldr r0, =0x000027cc adds r1, r0 ldrh r0, [r1, 0x2] - b @080F09B0 + b _080F09B0 .pool -@080F0860: +_080F0860: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -437727,9 +437727,9 @@ sub_80F0708: ; 80F0708 adds r1, r4 ldrh r0, [r1, 0x2] lsls r1, r2, 24 - b @080F09B2 + b _080F09B2 .pool -@080F0878: +_080F0878: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -437739,9 +437739,9 @@ sub_80F0708: ; 80F0708 adds r1, r4 ldrh r0, [r1, 0x6] lsls r1, r2, 24 - b @080F09B2 + b _080F09B2 .pool -@080F0890: +_080F0890: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -437760,9 +437760,9 @@ sub_80F0708: ; 80F0708 adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x1C] - b @080F09E6 + b _080F09E6 .pool -@080F08BC: +_080F08BC: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -437772,9 +437772,9 @@ sub_80F0708: ; 80F0708 adds r1, r4 ldrh r0, [r1, 0x2] lsls r1, r2, 24 - b @080F09B2 + b _080F09B2 .pool -@080F08D4: +_080F08D4: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -437793,9 +437793,9 @@ sub_80F0708: ; 80F0708 adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x14] - b @080F09E6 + b _080F09E6 .pool -@080F0900: +_080F0900: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -437805,9 +437805,9 @@ sub_80F0708: ; 80F0708 adds r1, r4 ldrh r0, [r1, 0x10] lsls r1, r2, 24 - b @080F09B2 + b _080F09B2 .pool -@080F0918: +_080F0918: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -437826,9 +437826,9 @@ sub_80F0708: ; 80F0708 adds r4, r0 adds r4, r6 ldrh r0, [r4, 0xE] - b @080F09E6 + b _080F09E6 .pool -@080F0944: +_080F0944: ldr r0, [r3] mov r2, r9 adds r1, r7, r2 @@ -437838,9 +437838,9 @@ sub_80F0708: ; 80F0708 adds r1, r4 ldrh r0, [r1, 0x4] lsls r1, r2, 24 - b @080F09B2 + b _080F09B2 .pool -@080F095C: +_080F095C: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -437849,9 +437849,9 @@ sub_80F0708: ; 80F0708 ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x8] - b @080F09D0 + b _080F09D0 .pool -@080F0974: +_080F0974: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 @@ -437870,9 +437870,9 @@ sub_80F0708: ; 80F0708 adds r4, r0 adds r4, r6 ldrh r0, [r4, 0xA] - b @080F09E6 + b _080F09E6 .pool -@080F09A0: +_080F09A0: ldr r0, [r3] mov r4, r9 adds r1, r7, r4 @@ -437881,14 +437881,14 @@ sub_80F0708: ; 80F0708 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 .pool -@080F09C0: +_080F09C0: ldr r0, [r3] mov r1, r9 adds r4, r7, r1 @@ -437897,7 +437897,7 @@ sub_80F0708: ; 80F0708 ldr r6, =0x000027cc adds r0, r6 ldrh r0, [r0, 0x6] -@080F09D0: +_080F09D0: lsls r5, r1, 24 lsrs r5, 24 adds r1, r5, 0 @@ -437908,12 +437908,12 @@ sub_80F0708: ; 80F0708 adds r4, r0 adds r4, r6 ldrh r0, [r4, 0x4] -@080F09E6: +_080F09E6: adds r1, r5, 0 bl sub_80F0B24 - b @080F0AE2 + b _080F0AE2 .pool -@080F09F4: +_080F09F4: ldr r0, [r3] mov r2, r9 adds r4, r7, r2 @@ -437943,29 +437943,29 @@ sub_80F0708: ; 80F0708 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 .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 @@ -437977,9 +437977,9 @@ sub_80F0708: ; 80F0708 ldrh r0, [r0, 0x8] lsrs r1, r6, 24 bl sub_80F0B24 - b @080F0AE2 + b _080F0AE2 .pool -@080F0AA0: +_080F0AA0: ldr r2, =0x03005d8c ldr r0, [r2] mov r1, r9 @@ -438000,23 +438000,23 @@ sub_80F0708: ; 80F0708 ldrh r0, [r4, 0xA] adds r1, r6, 0 bl sub_80F0B24 - b @080F0AE2 + b _080F0AE2 .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 @@ -438059,7 +438059,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 @@ -438069,7 +438069,7 @@ sub_80F0B24: ; 80F0B24 ldr r0, =0x000027cd adds r1, r0 strb r2, [r1] -@080F0B56: +_080F0B56: pop {r4} pop {r0} bx r0 @@ -438084,12 +438084,12 @@ sub_80F0B64: ; 80F0B64 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 @@ -438099,19 +438099,19 @@ sub_80F0B64: ; 80F0B64 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 @@ -438123,7 +438123,7 @@ 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 @@ -438136,19 +438136,19 @@ sub_80F0BB8: ; 80F0BB8 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 @@ -438163,7 +438163,7 @@ sub_80F0C04: ; 80F0C04 ldr r0, =0x03005d8c ldr r4, [r0] ldr r5, =0x000027cc -@080F0C10: +_080F0C10: lsls r0, r2, 24 asrs r1, r0, 24 lsls r0, r1, 3 @@ -438173,28 +438173,28 @@ sub_80F0C04: ; 80F0C04 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 @@ -438211,8 +438211,8 @@ sub_80F0C04: ; 80F0C04 lsrs r2, r4, 24 asrs r4, 24 cmp r4, r5 - blt @080F0C4A -@080F0C6E: + blt _080F0C4A +_080F0C6E: pop {r4,r5} pop {r0} bx r0 @@ -438233,9 +438233,9 @@ sub_80F0C7C: ; 80F0C7C bl Alloc 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 @@ -438247,21 +438247,21 @@ sub_80F0C7C: ; 80F0C7C 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 @@ -438273,32 +438273,32 @@ sub_80F0C7C: ; 80F0C7C adds r3, r5, 0 adds r3, 0xC0 bl sub_80F0D60 - b @080F0D3E + b _080F0D3E .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 .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 .pool -@080F0D28: +_080F0D28: adds r1, r5, 0 adds r1, 0x40 adds r2, r5, 0 @@ -438309,12 +438309,12 @@ sub_80F0C7C: ; 80F0C7C 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} @@ -438348,14 +438348,14 @@ 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 .pool -@080F0DA0: +_080F0DA0: lsls r4, r7, 2 mov r1, sp adds r0, r1, r4 @@ -438373,15 +438373,15 @@ sub_80F0D60: ; 80F0D60 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] @@ -438399,7 +438399,7 @@ sub_80F0D60: ; 80F0D60 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @080F0E14 + beq _080F0E14 ldrb r1, [r6] adds r0, r4, 0 bl __modsi3 @@ -438410,29 +438410,29 @@ sub_80F0D60: ; 80F0D60 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 @@ -438475,25 +438475,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 @@ -438503,7 +438503,7 @@ sub_80F0E84: ; 80F0E84 ldrh r1, [r5, 0x2] strh r1, [r0, 0x2] movs r0, 0x1 -@080F0EC6: +_080F0EC6: pop {r4-r6} pop {r1} bx r1 @@ -438518,14 +438518,14 @@ 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 @@ -438534,7 +438534,7 @@ sub_80F0ECC: ; 80F0ECC sub_80F0EEC: ; 80F0EEC push {r4,lr} movs r4, 0 -@080F0EF0: +_080F0EF0: ldr r0, =0x03005d8c ldr r0, [r0] lsls r1, r4, 2 @@ -438543,15 +438543,15 @@ sub_80F0EEC: ; 80F0EEC 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} @@ -438567,12 +438567,12 @@ sub_80F0F24: ; 80F0F24 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 @@ -438582,8 +438582,8 @@ sub_80F0F24: ; 80F0F24 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls @080F0F3C -@080F0F50: + bls _080F0F3C +_080F0F50: pop {r4,r5} pop {r0} bx r0 @@ -438599,7 +438599,7 @@ sub_80F0F64: ; 80F0F64 bl AllocZeroed adds r4, r0, 0 movs r7, 0 -@080F0F74: +_080F0F74: lsls r0, r7, 3 adds r1, r0, r7 lsls r1, 2 @@ -438608,59 +438608,59 @@ sub_80F0F64: ; 80F0F64 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 .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 @@ -438668,15 +438668,15 @@ sub_80F0F64: ; 80F0F64 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 @@ -438684,29 +438684,29 @@ sub_80F0F64: ; 80F0F64 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 @@ -438714,27 +438714,27 @@ sub_80F0F64: ; 80F0F64 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 @@ -438742,17 +438742,17 @@ sub_80F0F64: ; 80F0F64 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 @@ -438760,29 +438760,29 @@ sub_80F0F64: ; 80F0F64 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 @@ -438790,27 +438790,27 @@ sub_80F0F64: ; 80F0F64 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 @@ -438818,30 +438818,30 @@ sub_80F0F64: ; 80F0F64 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 @@ -438849,16 +438849,16 @@ sub_80F0F64: ; 80F0F64 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 @@ -438866,16 +438866,16 @@ sub_80F0F64: ; 80F0F64 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 @@ -438883,28 +438883,28 @@ sub_80F0F64: ; 80F0F64 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} @@ -438922,35 +438922,35 @@ 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 @@ -438965,30 +438965,30 @@ 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 @@ -439000,9 +439000,9 @@ sub_80F1290: ; 80F1290 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 @@ -439017,121 +439017,121 @@ 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 .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 @@ -439139,8 +439139,8 @@ sub_80F12A4: ; 80F12A4 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] @@ -439148,82 +439148,82 @@ sub_80F12A4: ; 80F12A4 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 @@ -439231,20 +439231,20 @@ sub_80F12A4: ; 80F12A4 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 @@ -439252,21 +439252,21 @@ sub_80F12A4: ; 80F12A4 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 @@ -439278,34 +439278,34 @@ sub_80F14F8: ; 80F14F8 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 @@ -439326,162 +439326,162 @@ 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 .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 @@ -439505,27 +439505,27 @@ 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 .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 @@ -439550,17 +439550,17 @@ sub_80F16EC: ; 80F16EC adds r1, 0x8 bl CompareString cmp r0, 0 - bne @080F17A4 + bne _080F17A4 ldr r1, =0x0203a030 movs r0, 0x8 - b @080F1950 + b _080F1950 .pool -@080F17A4: +_080F17A4: ldr r1, =0x0203a030 movs r0, 0x1 - b @080F1950 + b _080F1950 .pool -@080F17B0: +_080F17B0: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -439578,9 +439578,9 @@ sub_80F16EC: ; 80F16EC lsrs r1, 29 movs r0, 0x2 bl sub_80EF250 - b @080F194C + b _080F194C .pool -@080F17E8: +_080F17E8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -439590,17 +439590,17 @@ sub_80F16EC: ; 80F16EC movs r0, 0x60 ands r0, r1 cmp r0, 0 - bne @080F180C + bne _080F180C ldr r1, =0x0203a030 movs r0, 0x3 - b @080F1950 + b _080F1950 .pool -@080F180C: +_080F180C: ldr r1, =0x0203a030 movs r0, 0x4 - b @080F1950 + b _080F1950 .pool -@080F1818: +_080F1818: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -439617,9 +439617,9 @@ sub_80F16EC: ; 80F16EC bl sub_80EF340 ldr r1, =0x0203a030 movs r0, 0x5 - b @080F1950 + b _080F1950 .pool -@080F184C: +_080F184C: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -439636,9 +439636,9 @@ sub_80F16EC: ; 80F16EC bl sub_80EF340 ldr r1, =0x0203a030 movs r0, 0x5 - b @080F1950 + b _080F1950 .pool -@080F1880: +_080F1880: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -439654,17 +439654,17 @@ sub_80F16EC: ; 80F16EC bl CopyEasyChatWord ldrh r0, [r4, 0x14] cmp r0, 0 - beq @080F18B8 + beq _080F18B8 ldr r1, =0x0203a030 movs r0, 0x6 - b @080F1950 + b _080F1950 .pool -@080F18B8: +_080F18B8: ldr r1, =0x0203a030 movs r0, 0x7 - b @080F1950 + b _080F1950 .pool -@080F18C4: +_080F18C4: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -439684,9 +439684,9 @@ sub_80F16EC: ; 80F16EC bl CopyEasyChatWord ldr r1, =0x0203a030 movs r0, 0x7 - b @080F1950 + b _080F1950 .pool -@080F190C: +_080F190C: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x16 @@ -439700,9 +439700,9 @@ sub_80F16EC: ; 80F16EC adds r1, r2 bl CopyString bl sub_80F577C - b @080F1952 + b _080F1952 .pool -@080F193C: +_080F193C: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x2] movs r1, 0xB @@ -439710,12 +439710,12 @@ sub_80F16EC: ; 80F16EC ldr r2, =gSpeciesNames adds r1, r2 bl CopyString -@080F194C: +_080F194C: ldr r1, =0x0203a030 movs r0, 0x2 -@080F1950: +_080F1950: strb r0, [r1] -@080F1952: +_080F1952: ldr r0, =gUnknown_0858D204 lsls r1, r5, 2 adds r1, r0 @@ -439747,33 +439747,33 @@ 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 .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] @@ -439787,50 +439787,50 @@ sub_80F1974: ; 80F1974 bl CopyString ldrh r0, [r4, 0x16] cmp r0, 0x6 - bls @080F1A34 + bls _080F1A34 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F1BEA + b _080F1BEA .pool -@080F1A34: +_080F1A34: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F1BEA + b _080F1BEA .pool -@080F1A40: +_080F1A40: ldrb r0, [r4, 0x1A] cmp r0, 0x32 - bne @080F1A58 + bne _080F1A58 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAEB1 bl CopyString - b @080F1A60 + b _080F1A60 .pool -@080F1A58: +_080F1A58: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAEB8 bl CopyString -@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 .pool -@080F1A84: +_080F1A84: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F1BEA + b _080F1BEA .pool -@080F1A90: +_080F1A90: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -439840,13 +439840,13 @@ sub_80F1974: ; 80F1974 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 .pool -@080F1AB4: +_080F1AB4: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -439859,9 +439859,9 @@ sub_80F1974: ; 80F1974 ldr r2, =gSpeciesNames adds r1, r2 bl CopyString - b @080F1AA6 + b _080F1AA6 .pool -@080F1AE0: +_080F1AE0: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -439876,67 +439876,67 @@ sub_80F1974: ; 80F1974 bl CopyString 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 .pool -@080F1B1C: +_080F1B1C: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F1BEA + b _080F1BEA .pool -@080F1B28: +_080F1B28: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] - b @080F1B54 + b _080F1B54 .pool -@080F1B38: +_080F1B38: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC ldrb r2, [r4, 0x1E] - b @080F1B54 + b _080F1B54 .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 .pool -@080F1B68: +_080F1B68: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x18] bl CopyEasyChatWord ldrb r0, [r4, 0x1B] cmp r0, 0 - bne @080F1B88 + bne _080F1B88 ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b @080F1BEA + b _080F1BEA .pool -@080F1B88: +_080F1B88: ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] - b @080F1BEA + b _080F1BEA .pool -@080F1B94: +_080F1B94: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x18] bl CopyEasyChatWord @@ -439952,9 +439952,9 @@ sub_80F1974: ; 80F1974 ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b @080F1BEA + b _080F1BEA .pool -@080F1BCC: +_080F1BCC: ldr r0, =0x02021cc4 adds r1, r4, 0x2 ldrb r2, [r4, 0x1D] @@ -439967,7 +439967,7 @@ sub_80F1974: ; 80F1974 adds r1, r2 bl CopyString bl sub_80F577C -@080F1BEA: +_080F1BEA: ldr r0, =gUnknown_0858D240 lsls r1, r5, 2 adds r1, r0 @@ -439999,31 +439999,31 @@ 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 .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 @@ -440035,19 +440035,19 @@ sub_80F1C0C: ; 80F1C0C 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 .pool -@080F1CBC: +_080F1CBC: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F1E2C + b _080F1E2C .pool -@080F1CC8: +_080F1CC8: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -440072,39 +440072,39 @@ sub_80F1C0C: ; 80F1C0C ands r0, r1 adds r0, r2 strb r0, [r4] - b @080F1E2C + b _080F1E2C .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 .pool -@080F1D40: +_080F1D40: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F1E2C + b _080F1E2C .pool -@080F1D4C: +_080F1D4C: ldr r4, =0x02021dc4 ldrh r0, [r5, 0x8] bl itemid_get_item @@ -440116,13 +440116,13 @@ sub_80F1C0C: ; 80F1C0C 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 .pool -@080F1D7C: +_080F1D7C: ldr r4, =0x02021dc4 ldrh r0, [r5, 0xA] bl itemid_get_item @@ -440132,40 +440132,40 @@ sub_80F1C0C: ; 80F1C0C 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 .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 @@ -440179,27 +440179,27 @@ sub_80F1C0C: ; 80F1C0C bl CopyString 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 .pool -@080F1E10: +_080F1E10: ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b @080F1E2C + b _080F1E2C .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, =gUnknown_0858D1D0 lsls r1, r6, 2 adds r1, r0 @@ -440232,37 +440232,37 @@ 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 .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 @@ -440284,30 +440284,30 @@ sub_80F1E48: ; 80F1E48 bl sub_80EFBA4 adds r0, 0x1 strb r0, [r4] - b @080F20FE + b _080F20FE .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 @@ -440315,31 +440315,31 @@ sub_80F1E48: ; 80F1E48 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 .pool -@080F1F6C: +_080F1F6C: cmp r0, 0x1 - bne @080F1F7C + bne _080F1F7C ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F20FE + b _080F20FE .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 .pool -@080F1F90: +_080F1F90: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1F] @@ -440362,9 +440362,9 @@ sub_80F1E48: ; 80F1E48 ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b @080F20FE + b _080F20FE .pool -@080F1FCC: +_080F1FCC: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0xF @@ -440388,9 +440388,9 @@ sub_80F1E48: ; 80F1E48 ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b @080F20FE + b _080F20FE .pool -@080F200C: +_080F200C: movs r4, 0 str r4, [sp] str r5, [sp, 0x4] @@ -440405,8 +440405,8 @@ sub_80F1E48: ; 80F1E48 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] @@ -440432,9 +440432,9 @@ sub_80F1E48: ; 80F1E48 ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] - b @080F20FE + b _080F20FE .pool -@080F2074: +_080F2074: ldrh r0, [r5, 0x2] str r0, [sp] str r5, [sp, 0x4] @@ -440454,9 +440454,9 @@ sub_80F1E48: ; 80F1E48 ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] - b @080F20FE + b _080F20FE .pool -@080F20A4: +_080F20A4: movs r0, 0 str r0, [sp] str r5, [sp, 0x4] @@ -440478,23 +440478,23 @@ sub_80F1E48: ; 80F1E48 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 .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, =gUnknown_0858D338 lsls r1, r6, 2 adds r1, r0 @@ -440527,30 +440527,30 @@ 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 .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 @@ -440569,23 +440569,23 @@ sub_80F211C: ; 80F211C 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 .pool -@080F21E0: +_080F21E0: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F2358 + b _080F2358 .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 @@ -440597,19 +440597,19 @@ sub_80F211C: ; 80F211C 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 .pool -@080F2220: +_080F2220: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F2358 + b _080F2358 .pool -@080F222C: +_080F222C: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -440626,13 +440626,13 @@ sub_80F211C: ; 80F211C adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 - b @080F2286 + b _080F2286 .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 @@ -440645,13 +440645,13 @@ sub_80F211C: ; 80F211C ldr r2, =gSpeciesNames adds r1, r2 bl CopyString -@080F2286: +_080F2286: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F2358 + b _080F2358 .pool -@080F22A0: +_080F22A0: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -440678,9 +440678,9 @@ sub_80F211C: ; 80F211C ands r0, r1 adds r0, r2 strb r0, [r4] - b @080F2358 + b _080F2358 .pool -@080F22F4: +_080F22F4: ldr r0, =0x02021cc4 ldrh r1, [r5, 0x10] movs r4, 0xB @@ -440695,9 +440695,9 @@ sub_80F211C: ; 80F211C ldrh r1, [r5, 0x10] movs r0, 0x2 bl sub_80EF9E8 - b @080F233E + b _080F233E .pool -@080F2324: +_080F2324: ldr r0, =0x02021cc4 ldrh r1, [r5, 0x10] movs r4, 0xB @@ -440709,14 +440709,14 @@ sub_80F211C: ; 80F211C adds r1, r5, 0x4 ldrb r2, [r5, 0x3] bl sub_81DB5E8 -@080F233E: +_080F233E: ldr r0, =0x0203a030 strb r4, [r0] - b @080F2358 + b _080F2358 .pool -@080F2354: +_080F2354: bl sub_80F577C -@080F2358: +_080F2358: ldr r0, =gUnknown_0858D1A0 lsls r1, r6, 2 adds r1, r0 @@ -440747,25 +440747,25 @@ 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 .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 @@ -440781,9 +440781,9 @@ sub_80F2370: ; 80F2370 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F24C0 + b _080F24C0 .pool -@080F2408: +_080F2408: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -440802,19 +440802,19 @@ sub_80F2370: ; 80F2370 bl CopyString ldrb r0, [r4, 0x11] cmp r0, 0x1 - bne @080F2450 + bne _080F2450 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F24C0 + b _080F24C0 .pool -@080F2450: +_080F2450: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F24C0 + b _080F24C0 .pool -@080F245C: +_080F245C: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -440830,19 +440830,19 @@ sub_80F2370: ; 80F2370 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 .pool -@080F2494: +_080F2494: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F24C0 + b _080F24C0 .pool -@080F24A0: +_080F24A0: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -440851,11 +440851,11 @@ sub_80F2370: ; 80F2370 ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F24C0 + b _080F24C0 .pool -@080F24BC: +_080F24BC: bl sub_80F577C -@080F24C0: +_080F24C0: ldr r0, =gUnknown_0858D394 lsls r1, r5, 2 adds r1, r0 @@ -440887,70 +440887,70 @@ 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 .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 @@ -440966,9 +440966,9 @@ sub_80F24D8: ; 80F24D8 ldr r1, =0x0203a030 movs r0, 0x32 strb r0, [r1] - b @080F26F0 + b _080F26F0 .pool -@080F2628: +_080F2628: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -440976,23 +440976,23 @@ sub_80F24D8: ; 80F24D8 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 .pool -@080F2648: +_080F2648: ldr r1, =0x0203a030 adds r0, r2, 0x2 strb r0, [r1] - b @080F26F0 + b _080F26F0 .pool -@080F2654: +_080F2654: movs r0, 0x33 strb r0, [r6] - b @080F26F0 -@080F265A: + b _080F26F0 +_080F265A: bl GenerateRandomNumber ldrb r4, [r6] adds r4, 0x1 @@ -441002,16 +441002,16 @@ sub_80F24D8: ; 80F24D8 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 .pool -@080F2684: +_080F2684: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -441024,8 +441024,8 @@ sub_80F24D8: ; 80F24D8 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 @@ -441037,9 +441037,9 @@ sub_80F24D8: ; 80F24D8 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F26FC + b _080F26FC .pool -@080F26CC: +_080F26CC: ldr r4, =0x02021fc4 adds r1, r5, 0x4 adds r0, r4, 0 @@ -441051,15 +441051,15 @@ sub_80F24D8: ; 80F24D8 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F26FC + b _080F26FC .pool -@080F26F0: +_080F26F0: ldr r0, =gUnknown_0858D150 lsls r1, r7, 2 adds r1, r0 ldr r0, [r1] bl box_related_two__2 -@080F26FC: +_080F26FC: pop {r4-r7} pop {r0} bx r0 @@ -441086,69 +441086,69 @@ 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 .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 @@ -441159,9 +441159,9 @@ sub_80F2708: ; 80F2708 ldr r1, =0x0203a030 movs r0, 0x32 strb r0, [r1] - b @080F288C + b _080F288C .pool -@080F2844: +_080F2844: bl GenerateRandomNumber ldrb r4, [r7] adds r4, 0x1 @@ -441171,15 +441171,15 @@ sub_80F2708: ; 80F2708 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 @@ -441191,15 +441191,15 @@ sub_80F2708: ; 80F2708 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F2898 + b _080F2898 .pool -@080F288C: +_080F288C: ldr r0, =gUnknown_0858D170 lsls r1, r6, 2 adds r1, r0 ldr r0, [r1] bl box_related_two__2 -@080F2898: +_080F2898: pop {r4-r7} pop {r0} bx r0 @@ -441225,18 +441225,18 @@ 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 .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] @@ -441257,9 +441257,9 @@ sub_80F28A4: ; 80F28A4 lsrs r0, 4 adds r0, 0x1 strb r0, [r6] - b @080F297E + b _080F297E .pool -@080F2930: +_080F2930: ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] @@ -441276,9 +441276,9 @@ sub_80F28A4: ; 80F28A4 bl CopyEasyChatWord movs r0, 0x4 strb r0, [r6] - b @080F297E + b _080F297E .pool -@080F2968: +_080F2968: ldr r0, =0x02021cc4 adds r1, r4, 0x5 ldrb r2, [r4, 0xD] @@ -441287,7 +441287,7 @@ sub_80F28A4: ; 80F28A4 ldrh r1, [r4, 0x1E] bl CopyEasyChatWord bl sub_80F577C -@080F297E: +_080F297E: ldr r0, =gUnknown_0858D188 lsls r1, r5, 2 adds r1, r0 @@ -441363,51 +441363,51 @@ 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 .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 @@ -441426,35 +441426,35 @@ sub_80F2A10: ; 80F2A10 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 .pool -@080F2B2C: +_080F2B2C: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2B38: +_080F2B38: cmp r0, r1 - bls @080F2B48 + bls _080F2B48 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2B48: +_080F2B48: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2B54: +_080F2B54: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -441464,41 +441464,41 @@ sub_80F2A10: ; 80F2A10 bl CopyString 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 .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 @@ -441506,17 +441506,17 @@ sub_80F2A10: ; 80F2A10 ldr r2, =gSpeciesNames adds r1, r2 bl CopyString -@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 .pool -@080F2BC8: +_080F2BC8: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -441529,54 +441529,54 @@ sub_80F2A10: ; 80F2A10 adds r1, 0x14 ldrb r2, [r6, 0x1D] bl sub_81DB5E8 - b @080F2BB2 + b _080F2BB2 .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 .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, =gUnknown_085EB0E8 bl CopyString - b @080F2C74 + b _080F2C74 .pool -@080F2C30: +_080F2C30: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB0ED bl CopyString - b @080F2C74 + b _080F2C74 .pool -@080F2C44: +_080F2C44: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB0F4 bl CopyString - b @080F2C74 + b _080F2C74 .pool -@080F2C58: +_080F2C58: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB0F9 bl CopyString - b @080F2C74 + b _080F2C74 .pool -@080F2C6C: +_080F2C6C: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB0FF bl CopyString -@080F2C74: +_080F2C74: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -441586,110 +441586,110 @@ sub_80F2A10: ; 80F2A10 bl CopyString 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 .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 .pool -@080F2CD8: +_080F2CD8: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2CE4: +_080F2CE4: ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2CF0: +_080F2CF0: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2CFC: +_080F2CFC: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2D08: +_080F2D08: ldr r1, =0x0203a030 movs r0, 0x14 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2D14: +_080F2D14: ldr r1, =0x0203a030 movs r0, 0x15 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2D20: +_080F2D20: ldr r1, =0x0203a030 movs r0, 0x16 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2D2C: +_080F2D2C: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2D40: +_080F2D40: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2D54: +_080F2D54: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2D68: +_080F2D68: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -441699,93 +441699,93 @@ sub_80F2A10: ; 80F2A10 bl CopyString 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 .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 .pool -@080F2DB8: +_080F2DB8: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2DC4: +_080F2DC4: ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2DD0: +_080F2DD0: ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2DDC: +_080F2DDC: ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2DE8: +_080F2DE8: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2DFC: +_080F2DFC: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2E10: +_080F2E10: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2E24: +_080F2E24: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2E38: +_080F2E38: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2E4C: +_080F2E4C: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -441795,109 +441795,109 @@ sub_80F2A10: ; 80F2A10 bl CopyString 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 .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 .pool -@080F2E9C: +_080F2E9C: ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2EA8: +_080F2EA8: ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2EB4: +_080F2EB4: ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2EC0: +_080F2EC0: ldr r1, =0x0203a030 movs r0, 0x13 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2ECC: +_080F2ECC: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2EE0: +_080F2EE0: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2EF4: +_080F2EF4: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2F08: +_080F2F08: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2F1C: +_080F2F1C: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2F30: +_080F2F30: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2F44: +_080F2F44: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames - b @080F2F72 + b _080F2F72 .pool -@080F2F58: +_080F2F58: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x12] movs r1, 0xB @@ -441910,15 +441910,15 @@ sub_80F2A10: ; 80F2A10 movs r1, 0xD muls r1, r2 ldr r2, =gMoveNames -@080F2F72: +_080F2F72: adds r1, r2 bl CopyString ldr r1, =0x0203a030 movs r0, 0x17 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F2F94: +_080F2F94: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x12] movs r5, 0xB @@ -441937,84 +441937,84 @@ sub_80F2A10: ; 80F2A10 bl CopyString 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 .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 .pool -@080F3010: +_080F3010: ldr r1, =0x0203a030 movs r0, 0x1E strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F301C: +_080F301C: ldr r1, =0x0203a030 movs r0, 0x1D strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F3028: +_080F3028: ldr r1, =0x0203a030 movs r0, 0x1C strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F3034: +_080F3034: ldr r1, =0x0203a030 movs r0, 0x1B strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F3040: +_080F3040: ldr r1, =0x0203a030 movs r0, 0x1A strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F304C: +_080F304C: ldr r1, =0x0203a030 movs r0, 0x19 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F3058: +_080F3058: ldr r1, =0x0203a030 movs r0, 0x18 strb r0, [r1] - b @080F311C + b _080F311C .pool -@080F3064: +_080F3064: ldr r0, =0x02021cc4 ldrh r2, [r6, 0x2] movs r1, 0xB @@ -442022,9 +442022,9 @@ sub_80F2A10: ; 80F2A10 ldr r2, =gSpeciesNames adds r1, r2 bl CopyString - b @080F30EA + b _080F30EA .pool -@080F3080: +_080F3080: ldr r0, =0x02021cc4 adds r1, r6, 0x4 ldrb r2, [r6, 0x1E] @@ -442036,13 +442036,13 @@ sub_80F2A10: ; 80F2A10 ldr r2, =gSpeciesNames adds r1, r2 bl CopyString - b @080F30EA + b _080F30EA .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 @@ -442056,21 +442056,21 @@ sub_80F2A10: ; 80F2A10 adds r1, r2 bl CopyString ldr r0, =0x02021ec4 - b @080F30E2 + b _080F30E2 .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 .pool -@080F30FC: +_080F30FC: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x14 @@ -442084,7 +442084,7 @@ sub_80F2A10: ; 80F2A10 adds r1, r2 bl CopyString bl sub_80F577C -@080F311C: +_080F311C: ldr r0, =gUnknown_0858D27C lsls r1, r7, 2 adds r1, r0 @@ -442116,45 +442116,45 @@ 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 .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] @@ -442166,23 +442166,23 @@ sub_80F3140: ; 80F3140 bl sub_81DB5E8 ldrb r0, [r4, 0x18] cmp r0, 0 - bne @080F3200 + bne _080F3200 ldr r0, =0x02021ec4 ldr r1, =gUnknown_085ECB64 bl CopyString - b @080F3208 + b _080F3208 .pool -@080F3200: +_080F3200: ldr r0, =0x02021ec4 ldr r1, =gUnknown_085ECB6B bl CopyString -@080F3208: +_080F3208: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F3362 + b _080F3362 .pool -@080F321C: +_080F321C: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -442204,9 +442204,9 @@ sub_80F3140: ; 80F3140 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F3362 + b _080F3362 .pool -@080F3268: +_080F3268: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -442222,9 +442222,9 @@ sub_80F3140: ; 80F3140 ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F3362 + b _080F3362 .pool -@080F329C: +_080F329C: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -442235,9 +442235,9 @@ sub_80F3140: ; 80F3140 ldrb r2, [r4, 0x1A] bl sub_81DB5E8 bl sub_80F577C - b @080F3362 + b _080F3362 .pool -@080F32C0: +_080F32C0: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -442250,9 +442250,9 @@ sub_80F3140: ; 80F3140 ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F3362 + b _080F3362 .pool -@080F32EC: +_080F32EC: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -442274,9 +442274,9 @@ sub_80F3140: ; 80F3140 ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F3362 + b _080F3362 .pool -@080F3338: +_080F3338: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x19] @@ -442294,7 +442294,7 @@ sub_80F3140: ; 80F3140 adds r1, r2 bl CopyString bl sub_80F577C -@080F3362: +_080F3362: ldr r0, =gUnknown_0858D300 lsls r1, r5, 2 adds r1, r0 @@ -442325,24 +442325,24 @@ 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 .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 @@ -442350,87 +442350,87 @@ sub_80F3388: ; 80F3388 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 .pool -@080F340C: +_080F340C: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F3624 + b _080F3624 .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 .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, =gUnknown_085ECB48 bl CopyString - b @080F349C + b _080F349C .pool -@080F3458: +_080F3458: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB4E bl CopyString - b @080F349C + b _080F349C .pool -@080F346C: +_080F346C: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB52 bl CopyString - b @080F349C + b _080F349C .pool -@080F3480: +_080F3480: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB58 bl CopyString - b @080F349C + b _080F349C .pool -@080F3494: +_080F3494: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB5F bl CopyString -@080F349C: +_080F349C: ldrb r0, [r4, 0x2] cmp r0, 0x18 - bls @080F34BC + bls _080F34BC ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB2A bl CopyString - b @080F34DC + b _080F34DC .pool -@080F34BC: +_080F34BC: cmp r0, 0x16 - bls @080F34D4 + bls _080F34D4 ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB20 bl CopyString - b @080F34DC + b _080F34DC .pool -@080F34D4: +_080F34D4: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB1B bl CopyString -@080F34DC: +_080F34DC: ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0xC @@ -442439,83 +442439,83 @@ sub_80F3388: ; 80F3388 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F3624 + b _080F3624 .pool -@080F3500: +_080F3500: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x15] - b @080F3606 + b _080F3606 .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 .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, =gUnknown_085ECB48 bl CopyString - b @080F3590 + b _080F3590 .pool -@080F354C: +_080F354C: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB4E bl CopyString - b @080F3590 + b _080F3590 .pool -@080F3560: +_080F3560: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB52 bl CopyString - b @080F3590 + b _080F3590 .pool -@080F3574: +_080F3574: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB58 bl CopyString - b @080F3590 + b _080F3590 .pool -@080F3588: +_080F3588: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085ECB5F bl CopyString -@080F3590: +_080F3590: ldrb r0, [r4, 0x2] cmp r0, 0x10 - bls @080F35B0 + bls _080F35B0 ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB34 bl CopyString - b @080F35D0 + b _080F35D0 .pool -@080F35B0: +_080F35B0: cmp r0, 0xD - bls @080F35C8 + bls _080F35C8 ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB3A bl CopyString - b @080F35D0 + b _080F35D0 .pool -@080F35C8: +_080F35C8: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB3E bl CopyString -@080F35D0: +_080F35D0: ldr r0, =0x02021ec4 adds r1, r4, 0 adds r1, 0xC @@ -442524,9 +442524,9 @@ sub_80F3388: ; 80F3388 ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F3624 + b _080F3624 .pool -@080F35F4: +_080F35F4: ldr r0, =0x02021cc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x15] @@ -442535,16 +442535,16 @@ sub_80F3388: ; 80F3388 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 .pool -@080F3620: +_080F3620: bl sub_80F577C -@080F3624: +_080F3624: ldr r0, =gUnknown_0858D228 lsls r1, r5, 2 adds r1, r0 @@ -442566,27 +442566,27 @@ 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 .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] @@ -442600,23 +442600,23 @@ sub_80F363C: ; 80F363C 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 .pool -@080F36C8: +_080F36C8: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F37EA + b _080F37EA .pool -@080F36D4: +_080F36D4: movs r0, 0x2 strb r0, [r2] - b @080F37EA -@080F36DA: + b _080F37EA +_080F36DA: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bae @@ -442625,40 +442625,40 @@ sub_80F363C: ; 80F363C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @080F36FC + bne _080F36FC movs r0, 0x4 strb r0, [r2] - b @080F37EA + b _080F37EA .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] @@ -442691,13 +442691,13 @@ sub_80F363C: ; 80F363C ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b @080F37EA + b _080F37EA .pool -@080F379C: +_080F379C: movs r0, 0x8 strb r0, [r2] - b @080F37EA -@080F37A2: + b _080F37EA +_080F37A2: ldr r0, =0x02021cc4 ldr r4, =0x03005d8c ldr r1, [r4] @@ -442730,7 +442730,7 @@ sub_80F363C: ; 80F363C movs r0, 0 strb r0, [r1] bl sub_80EC4E8 -@080F37EA: +_080F37EA: ldr r0, =gUnknown_0858D66C lsls r1, r7, 2 adds r1, r0 @@ -442761,25 +442761,25 @@ 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 .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 .pool -@080F3880: +_080F3880: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -442796,9 +442796,9 @@ sub_80F3828: ; 80F3828 movs r0, 0x2 bl sub_80EF340 bl sub_80F577C - b @080F38E0 + b _080F38E0 .pool -@080F38B8: +_080F38B8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -442815,7 +442815,7 @@ sub_80F3828: ; 80F3828 movs r0, 0x2 bl sub_80EF340 bl sub_80F577C -@080F38E0: +_080F38E0: ldr r0, =gUnknown_0858D3B0 lsls r1, r5, 2 adds r1, r0 @@ -442846,18 +442846,18 @@ 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 .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 @@ -442871,9 +442871,9 @@ sub_80F3904: ; 80F3904 bl sub_80EF340 movs r0, 0x1 strb r0, [r6] - b @080F39BE + b _080F39BE .pool -@080F3974: +_080F3974: ldr r0, =0x02021cc4 ldrh r2, [r4, 0x8] movs r1, 0xB @@ -442883,9 +442883,9 @@ sub_80F3904: ; 80F3904 bl CopyString movs r0, 0x2 strb r0, [r6] - b @080F39BE + b _080F39BE .pool -@080F3994: +_080F3994: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -442903,7 +442903,7 @@ sub_80F3904: ; 80F3904 adds r1, r2 bl CopyString bl sub_80F577C -@080F39BE: +_080F39BE: ldr r0, =gUnknown_0858D3B8 lsls r1, r5, 2 adds r1, r0 @@ -442935,58 +442935,58 @@ 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 .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 .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 @@ -442999,13 +442999,13 @@ sub_80F39E4: ; 80F39E4 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 .pool -@080F3AC0: +_080F3AC0: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -443014,9 +443014,9 @@ sub_80F39E4: ; 80F39E4 ldrh r1, [r4, 0x2] movs r0, 0x1 bl sub_80EF340 - b @080F3AB0 + b _080F3AB0 .pool -@080F3ADC: +_080F3ADC: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -443025,9 +443025,9 @@ sub_80F39E4: ; 80F39E4 ldrh r1, [r4, 0x2] movs r0, 0x1 bl sub_80EF340 - b @080F3AB0 + b _080F3AB0 .pool -@080F3AF8: +_080F3AF8: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -443038,20 +443038,20 @@ sub_80F39E4: ; 80F39E4 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 .pool -@080F3B24: +_080F3B24: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F3BE8 + b _080F3BE8 .pool -@080F3B30: +_080F3B30: ldrb r1, [r4, 0x4] movs r0, 0 bl sub_80EF340 @@ -443059,49 +443059,49 @@ sub_80F39E4: ; 80F39E4 bl FlagGet 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 .pool -@080F3B58: +_080F3B58: ldr r0, =0x000008a8 bl FlagGet 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 .pool -@080F3B84: +_080F3B84: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F3BE8 + b _080F3BE8 .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 @@ -443110,30 +443110,30 @@ sub_80F39E4: ; 80F39E4 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 .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 .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, =gUnknown_0858D3C4 lsls r1, r5, 2 adds r1, r0 @@ -443164,25 +443164,25 @@ 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 .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 CopyEasyChatWord @@ -443191,19 +443191,19 @@ sub_80F3C04: ; 80F3C04 bl CopyEasyChatWord ldrb r0, [r4, 0x8] cmp r0, 0 - bne @080F3C94 + bne _080F3C94 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F3D54 + b _080F3D54 .pool -@080F3C94: +_080F3C94: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F3D54 + b _080F3D54 .pool -@080F3CA0: +_080F3CA0: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl CopyEasyChatWord @@ -443218,9 +443218,9 @@ sub_80F3C04: ; 80F3C04 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F3D54 + b _080F3D54 .pool -@080F3CD4: +_080F3CD4: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl CopyEasyChatWord @@ -443229,19 +443229,19 @@ sub_80F3C04: ; 80F3C04 bl CopyEasyChatWord ldrb r0, [r4, 0x8] cmp r0, 0 - bne @080F3D00 + bne _080F3D00 ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F3D54 + b _080F3D54 .pool -@080F3D00: +_080F3D00: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b @080F3D54 + b _080F3D54 .pool -@080F3D0C: +_080F3D0C: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl CopyEasyChatWord @@ -443256,9 +443256,9 @@ sub_80F3C04: ; 80F3C04 ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F3D54 + b _080F3D54 .pool -@080F3D40: +_080F3D40: ldr r0, =0x02021cc4 ldrh r1, [r4, 0x4] bl CopyEasyChatWord @@ -443266,7 +443266,7 @@ sub_80F3C04: ; 80F3C04 ldrh r1, [r4, 0x6] bl CopyEasyChatWord bl sub_80F577C -@080F3D54: +_080F3D54: ldr r0, =gUnknown_0858D3F0 lsls r1, r5, 2 adds r1, r0 @@ -443297,18 +443297,18 @@ 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 .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 @@ -443317,29 +443317,29 @@ sub_80F3D74: ; 80F3D74 bl CopyString 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 .pool -@080F3DF0: +_080F3DF0: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F3E5C + b _080F3E5C .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 @@ -443356,9 +443356,9 @@ sub_80F3D74: ; 80F3D74 movs r2, 0 bl GetMapName bl sub_80F577C - b @080F3E5C + b _080F3E5C .pool -@080F3E3C: +_080F3E3C: ldr r4, =0x02021cc4 ldrh r0, [r5, 0x2] bl itemid_get_item @@ -443371,7 +443371,7 @@ sub_80F3D74: ; 80F3D74 ldrb r2, [r5, 0x5] bl sub_81DB5E8 bl sub_80F577C -@080F3E5C: +_080F3E5C: ldr r0, =gUnknown_0858D40C lsls r1, r6, 2 adds r1, r0 @@ -443402,22 +443402,22 @@ 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 .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 @@ -443425,36 +443425,36 @@ sub_80F3E7C: ; 80F3E7C 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 .pool -@080F3EE8: +_080F3EE8: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB0C bl CopyString - b @080F3F04 + b _080F3F04 .pool -@080F3EFC: +_080F3EFC: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB12 bl CopyString -@080F3F04: +_080F3F04: ldrb r1, [r4, 0x2] cmp r1, 0x1 - bne @080F3F1C + bne _080F3F1C ldr r0, =0x0203a030 strb r1, [r0] - b @080F4008 + b _080F4008 .pool -@080F3F1C: +_080F3F1C: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F4008 + b _080F4008 .pool -@080F3F28: +_080F3F28: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -443462,29 +443462,29 @@ sub_80F3E7C: ; 80F3E7C 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 .pool -@080F3F44: +_080F3F44: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB0C bl CopyString - b @080F3F60 + b _080F3F60 .pool -@080F3F58: +_080F3F58: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB12 bl CopyString -@080F3F60: +_080F3F60: ldrh r1, [r4, 0x4] movs r0, 0x2 bl sub_80EF340 bl sub_80F577C - b @080F4008 + b _080F4008 .pool -@080F3F78: +_080F3F78: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -443492,31 +443492,31 @@ sub_80F3E7C: ; 80F3E7C 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 .pool -@080F3F94: +_080F3F94: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB0C bl CopyString - b @080F3FB0 + b _080F3FB0 .pool -@080F3FA8: +_080F3FA8: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB12 bl CopyString -@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 .pool -@080F3FCC: +_080F3FCC: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -443524,24 +443524,24 @@ sub_80F3E7C: ; 80F3E7C 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 .pool -@080F3FE8: +_080F3FE8: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB12 bl CopyString - b @080F4004 + b _080F4004 .pool -@080F3FFC: +_080F3FFC: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB0C bl CopyString -@080F4004: +_080F4004: bl sub_80F577C -@080F4008: +_080F4008: ldr r0, =gUnknown_0858D418 lsls r1, r5, 2 adds r1, r0 @@ -443573,42 +443573,42 @@ 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 .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 @@ -443628,9 +443628,9 @@ sub_80F4028: ; 80F4028 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F40FC: +_080F40FC: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -443651,9 +443651,9 @@ sub_80F4028: ; 80F4028 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F4140: +_080F4140: ldrh r1, [r6, 0x8] movs r0, 0 bl sub_80EF340 @@ -443666,9 +443666,9 @@ sub_80F4028: ; 80F4028 ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F4168: +_080F4168: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -443679,9 +443679,9 @@ sub_80F4028: ; 80F4028 movs r2, 0 bl GetMapName bl sub_80F577C - b @080F4344 + b _080F4344 .pool -@080F418C: +_080F418C: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -443701,9 +443701,9 @@ sub_80F4028: ; 80F4028 ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F41D0: +_080F41D0: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -443723,45 +443723,45 @@ sub_80F4028: ; 80F4028 bl CopyString 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 .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 .pool -@080F4230: +_080F4230: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F423C: +_080F423C: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F4248: +_080F4248: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F4254: +_080F4254: ldr r0, =0x02021cc4 ldrh r2, [r6, 0xC] movs r1, 0xD @@ -443775,9 +443775,9 @@ sub_80F4028: ; 80F4028 muls r1, r2 ldr r2, =gSpeciesNames adds r1, r2 - b @080F42A8 + b _080F42A8 .pool -@080F4284: +_080F4284: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -443794,14 +443794,14 @@ sub_80F4028: ; 80F4028 ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 -@080F42A8: +_080F42A8: bl CopyString ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F42C8: +_080F42C8: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -443814,9 +443814,9 @@ sub_80F4028: ; 80F4028 ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b @080F4344 + b _080F4344 .pool -@080F42F4: +_080F42F4: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -443835,16 +443835,16 @@ sub_80F4028: ; 80F4028 bl GetMapName ldr r0, =0x0203a030 strb r4, [r0] - b @080F4344 + b _080F4344 .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, =gUnknown_0858D428 lsls r1, r7, 2 adds r1, r0 @@ -443876,32 +443876,32 @@ 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 .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 @@ -443909,19 +443909,19 @@ sub_80F4360: ; 80F4360 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 .pool -@080F4408: +_080F4408: ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F4414: +_080F4414: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x4] lsls r1, 5 @@ -443930,19 +443930,19 @@ sub_80F4360: ; 80F4360 bl CopyString ldrb r0, [r5, 0x3] cmp r0, 0x1 - bne @080F443C + bne _080F443C ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F443C: +_080F443C: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F4448: +_080F4448: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x5] lsls r1, 5 @@ -443951,36 +443951,36 @@ sub_80F4360: ; 80F4360 bl CopyString 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 .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 .pool -@080F4484: +_080F4484: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F4490: +_080F4490: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F449C: +_080F449C: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x6] lsls r1, 5 @@ -443991,26 +443991,26 @@ sub_80F4360: ; 80F4360 ldrb r1, [r5, 0x7] lsls r1, 5 adds r1, r4 - b @080F44CA + b _080F44CA .pool -@080F44C0: +_080F44C0: ldr r0, =0x02021dc4 ldrb r1, [r5, 0x6] lsls r1, 5 ldr r2, =gUnknown_085A5C09 adds r1, r2 -@080F44CA: +_080F44CA: bl CopyString ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b @080F4588 + b _080F4588 .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 @@ -444018,35 +444018,35 @@ sub_80F4360: ; 80F4360 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 .pool -@080F450C: +_080F450C: cmp r1, 0x31 - bhi @080F451C + bhi _080F451C ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F451C: +_080F451C: cmp r1, 0x45 - bhi @080F452C + bhi _080F452C ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F452C: +_080F452C: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b @080F4588 + b _080F4588 .pool -@080F4538: +_080F4538: ldr r0, =0x02021cc4 adds r1, r5, 0 adds r1, 0x13 @@ -444068,11 +444068,11 @@ sub_80F4360: ; 80F4360 bl CopyString ldr r0, =0x0203a030 strb r4, [r0] - b @080F4588 + b _080F4588 .pool -@080F4584: +_080F4584: bl sub_80F577C -@080F4588: +_080F4588: ldr r0, =gUnknown_0858D45C lsls r1, r6, 2 adds r1, r0 @@ -444109,33 +444109,33 @@ sub_80F45A0: ; 80F45A0 bl sub_81DB5E8 ldrb r0, [r5, 0x4] cmp r0, 0 - bne @080F45FC + bne _080F45FC ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB72 bl CopyString - b @080F4634 + b _080F4634 .pool -@080F45FC: +_080F45FC: cmp r0, 0x1 - bne @080F4614 + bne _080F4614 ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB7A bl CopyString - b @080F4634 + b _080F4634 .pool -@080F4614: +_080F4614: cmp r0, 0x2 - bne @080F462C + bne _080F462C ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB80 bl CopyString - b @080F4634 + b _080F4634 .pool -@080F462C: +_080F462C: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECB87 bl CopyString -@080F4634: +_080F4634: ldr r4, =0x02021ec4 ldrh r0, [r5, 0x2] bl itemid_get_item @@ -444173,25 +444173,25 @@ 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 .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 @@ -444212,9 +444212,9 @@ sub_80F466C: ; 80F466C ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F4858 + b _080F4858 .pool -@080F4714: +_080F4714: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -444237,9 +444237,9 @@ sub_80F466C: ; 80F466C ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F4858 + b _080F4858 .pool -@080F4760: +_080F4760: ldr r0, =0x02021cc4 ldrh r2, [r6, 0x6] movs r1, 0xB @@ -444249,35 +444249,35 @@ sub_80F466C: ; 80F466C bl CopyString 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 .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 .pool -@080F479C: +_080F479C: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F4858 + b _080F4858 .pool -@080F47A8: +_080F47A8: ldr r0, =0x0203a030 strb r1, [r0] - b @080F4858 + b _080F4858 .pool -@080F47B4: +_080F47B4: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x8] movs r5, 0xD @@ -444294,9 +444294,9 @@ sub_80F466C: ; 80F466C ldrh r1, [r6, 0xC] muls r1, r5 adds r1, r4 - b @080F4820 + b _080F4820 .pool -@080F47EC: +_080F47EC: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x8] movs r5, 0xD @@ -444308,24 +444308,24 @@ sub_80F466C: ; 80F466C ldrh r1, [r6, 0xA] muls r1, r5 adds r1, r4 - b @080F4820 + b _080F4820 .pool -@080F4814: +_080F4814: ldr r0, =0x02021dc4 ldrh r2, [r6, 0x8] movs r1, 0xD muls r1, r2 ldr r2, =gMoveNames adds r1, r2 -@080F4820: +_080F4820: bl CopyString -@080F4824: +_080F4824: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F4858 + b _080F4858 .pool -@080F4838: +_080F4838: ldr r0, =0x02021cc4 ldrh r1, [r6, 0xE] movs r5, 0xD @@ -444339,7 +444339,7 @@ sub_80F466C: ; 80F466C adds r1, r4 bl CopyString bl sub_80F577C -@080F4858: +_080F4858: ldr r0, =gUnknown_0858D498 lsls r1, r7, 2 adds r1, r0 @@ -444370,24 +444370,24 @@ 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 .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 @@ -444402,35 +444402,35 @@ sub_80F487C: ; 80F487C bl CopyEasyChatWord ldrb r1, [r4, 0x16] cmp r1, 0x59 - bls @080F4918 + bls _080F4918 ldr r1, =0x0203a030 movs r0, 0x1 strb r0, [r1] - b @080F499A + b _080F499A .pool -@080F4918: +_080F4918: cmp r1, 0x45 - bls @080F4928 + bls _080F4928 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F499A + b _080F499A .pool -@080F4928: +_080F4928: cmp r1, 0x1D - bls @080F4938 + bls _080F4938 ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F499A + b _080F499A .pool -@080F4938: +_080F4938: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F499A + b _080F499A .pool -@080F4944: +_080F4944: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -444446,9 +444446,9 @@ sub_80F487C: ; 80F487C ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b @080F499A + b _080F499A .pool -@080F4978: +_080F4978: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0xC @@ -444462,7 +444462,7 @@ sub_80F487C: ; 80F487C ldrh r1, [r4, 0x14] bl CopyEasyChatWord bl sub_80F577C -@080F499A: +_080F499A: ldr r0, =gUnknown_0858D320 lsls r1, r5, 2 adds r1, r0 @@ -444494,30 +444494,30 @@ 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 .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 @@ -444534,92 +444534,92 @@ sub_80F49BC: ; 80F49BC 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 .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 .pool -@080F4AA8: +_080F4AA8: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4AB4: +_080F4AB4: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4AC0: +_080F4AC0: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4ACC: +_080F4ACC: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4AD8: +_080F4AD8: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4AE4: +_080F4AE4: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4AF0: +_080F4AF0: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4AFC: +_080F4AFC: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b @080F4B3A + b _080F4B3A .pool -@080F4B08: +_080F4B08: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F4B3A + b _080F4B3A .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 @@ -444632,7 +444632,7 @@ sub_80F49BC: ; 80F49BC ldrh r1, [r4, 0x6] bl CopyEasyChatWord bl sub_80F577C -@080F4B3A: +_080F4B3A: ldr r0, =gUnknown_0858D4B4 lsls r1, r5, 2 adds r1, r0 @@ -444663,34 +444663,34 @@ 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 .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 @@ -444702,27 +444702,27 @@ sub_80F4B5C: ; 80F4B5C 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 .pool -@080F4C14: +_080F4C14: cmp r1, 0x13 - bhi @080F4C24 + bhi _080F4C24 ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4C24: +_080F4C24: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4C30: +_080F4C30: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -444738,112 +444738,112 @@ sub_80F4B5C: ; 80F4B5C ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F4D84 + b _080F4D84 .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 .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 .pool -@080F4CF8: +_080F4CF8: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D04: +_080F4D04: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D10: +_080F4D10: ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D1C: +_080F4D1C: ldr r1, =0x0203a030 movs r0, 0x9 strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D28: +_080F4D28: ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D34: +_080F4D34: ldr r1, =0x0203a030 movs r0, 0xB strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D40: +_080F4D40: ldr r1, =0x0203a030 movs r0, 0xC strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D4C: +_080F4D4C: ldr r1, =0x0203a030 movs r0, 0xD strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D58: +_080F4D58: ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D64: +_080F4D64: ldr r0, =0x02021dc4 adds r1, r4, 0x4 ldrb r2, [r4, 0x10] @@ -444851,11 +444851,11 @@ sub_80F4B5C: ; 80F4B5C ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] - b @080F4D84 + b _080F4D84 .pool -@080F4D80: +_080F4D80: bl sub_80F577C -@080F4D84: +_080F4D84: ldr r0, =gUnknown_0858D4E4 lsls r1, r5, 2 adds r1, r0 @@ -444887,117 +444887,117 @@ 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 .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 .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 @@ -445009,9 +445009,9 @@ sub_80F4D9C: ; 80F4D9C ldr r1, =0x0203a030 movs r0, 0x10 strb r0, [r1] - b @080F5014 + b _080F5014 .pool -@080F4EF4: +_080F4EF4: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -445023,9 +445023,9 @@ sub_80F4D9C: ; 80F4D9C ldr r1, =0x0203a030 movs r0, 0xF strb r0, [r1] - b @080F5014 + b _080F5014 .pool -@080F4F18: +_080F4F18: ldr r0, =0x02021cc4 adds r1, r6, 0 adds r1, 0x13 @@ -445037,9 +445037,9 @@ sub_80F4D9C: ; 80F4D9C ldr r1, =0x0203a030 movs r0, 0xE strb r0, [r1] - b @080F5014 + b _080F5014 .pool -@080F4F3C: +_080F4F3C: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB @@ -445056,9 +445056,9 @@ sub_80F4D9C: ; 80F4D9C ldrh r1, [r6, 0x8] muls r1, r5 adds r1, r4 - b @080F4FEC + b _080F4FEC .pool -@080F4F74: +_080F4F74: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB @@ -445070,9 +445070,9 @@ sub_80F4D9C: ; 80F4D9C ldrh r1, [r6, 0x6] muls r1, r5 adds r1, r4 - b @080F4FEC + b _080F4FEC .pool -@080F4F9C: +_080F4F9C: ldr r0, =0x02021cc4 ldrh r1, [r6, 0x4] movs r5, 0xB @@ -445093,30 +445093,30 @@ sub_80F4D9C: ; 80F4D9C ldr r1, =0x0203a030 movs r0, 0x11 strb r0, [r1] - b @080F5014 + b _080F5014 .pool -@080F4FE0: +_080F4FE0: ldr r0, =0x02021cc4 ldrh r2, [r6, 0xA] movs r1, 0xB muls r1, r2 ldr r2, =gSpeciesNames adds r1, r2 -@080F4FEC: +_080F4FEC: bl CopyString ldr r1, =0x0203a030 movs r0, 0x12 strb r0, [r1] - b @080F5014 + b _080F5014 .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, =gUnknown_0858D524 lsls r1, r7, 2 adds r1, r0 @@ -445147,27 +445147,27 @@ 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 .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 @@ -445175,65 +445175,65 @@ sub_80F5030: ; 80F5030 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 .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 .pool -@080F50E8: +_080F50E8: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F5164 + b _080F5164 .pool -@080F50F4: +_080F50F4: ldr r1, =0x0203a030 movs r0, 0x3 strb r0, [r1] - b @080F5164 + b _080F5164 .pool -@080F5100: +_080F5100: ldr r1, =0x0203a030 movs r0, 0x4 strb r0, [r1] - b @080F5164 + b _080F5164 .pool -@080F510C: +_080F510C: ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b @080F5164 + b _080F5164 .pool -@080F5118: +_080F5118: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F5164 + b _080F5164 .pool -@080F5124: +_080F5124: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F5164 + b _080F5164 .pool -@080F5130: +_080F5130: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -445245,16 +445245,16 @@ sub_80F5030: ; 80F5030 ldr r1, =0x0203a030 movs r0, 0x8 strb r0, [r1] - b @080F5164 + b _080F5164 .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, =gUnknown_0858D570 lsls r1, r5, 2 adds r1, r0 @@ -445273,21 +445273,21 @@ sub_80F5180: ; 80F5180 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} @@ -445304,30 +445304,30 @@ sub_80F51AC: ; 80F51AC ldr r1, [r0, 0xC] movs r5, 0x1 ldr r6, =gUnknown_0858D690 -@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 .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 @@ -445358,62 +445358,62 @@ 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 .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] @@ -445428,13 +445428,13 @@ sub_80F51EC: ; 80F51EC 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 .pool -@080F5328: +_080F5328: movs r0, 0x1 strb r0, [r5, 0x12] bl GenerateRandomNumber @@ -445445,9 +445445,9 @@ sub_80F51EC: ; 80F51EC bl __modsi3 strb r0, [r4] ldrb r1, [r4] - b @080F542A + b _080F542A .pool -@080F5348: +_080F5348: ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 @@ -445458,27 +445458,27 @@ sub_80F51EC: ; 80F51EC 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 .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 .pool -@080F5384: +_080F5384: adds r0, r5, 0 movs r1, 0 - b @080F542C -@080F538A: + b _080F542C +_080F538A: bl GenerateRandomNumber ldr r7, =0x0203a031 lsls r0, 16 @@ -445490,20 +445490,20 @@ sub_80F51EC: ; 80F51EC 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 .pool -@080F53C4: +_080F53C4: ldr r0, =0x02021dc4 adds r1, r5, 0 adds r1, 0x13 @@ -445514,19 +445514,19 @@ sub_80F51EC: ; 80F51EC 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 .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 @@ -445537,30 +445537,30 @@ sub_80F51EC: ; 80F51EC 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 .pool -@080F5444: +_080F5444: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] @@ -445575,27 +445575,27 @@ sub_80F51EC: ; 80F51EC 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 .pool -@080F547C: +_080F547C: cmp r0, 0x64 - bhi @080F548C + bhi _080F548C ldr r1, =0x0203a030 movs r0, 0x5 strb r0, [r1] - b @080F552A + b _080F552A .pool -@080F548C: +_080F548C: ldr r1, =0x0203a030 movs r0, 0x6 strb r0, [r1] - b @080F552A + b _080F552A .pool -@080F5498: +_080F5498: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] @@ -445608,9 +445608,9 @@ sub_80F51EC: ; 80F51EC ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F552A + b _080F552A .pool -@080F54C4: +_080F54C4: ldr r0, =0x02021cc4 adds r1, r5, 0x4 ldrb r2, [r5, 0x1C] @@ -445621,15 +445621,15 @@ sub_80F51EC: ; 80F51EC ldrb r2, [r5, 0x1B] bl sub_81DB5E8 bl sub_80F577C - b @080F552A + b _080F552A .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 @@ -445639,26 +445639,26 @@ sub_80F51EC: ; 80F51EC ldr r1, =0x0203a030 ldrb r0, [r5, 0x12] strb r0, [r1] - b @080F552A + b _080F552A .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, =gUnknown_0858D594 mov r2, r9 lsls r1, r2, 2 @@ -445694,46 +445694,46 @@ 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 .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 @@ -445744,32 +445744,32 @@ sub_80F5548: ; 80F5548 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 .pool -@080F5608: +_080F5608: ldr r1, =0x0203a030 movs r0, 0x2 strb r0, [r1] - b @080F56BC + b _080F56BC .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 .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 @@ -445780,10 +445780,10 @@ sub_80F5548: ; 80F5548 bl sub_80EF340 ldrb r0, [r4, 0x3] cmp r0, 0 - beq @080F5662 - b @080F5674 + beq _080F5662 + b _080F5674 .pool -@080F5650: +_080F5650: ldr r0, =0x02021cc4 adds r1, r4, 0 adds r1, 0x13 @@ -445791,33 +445791,33 @@ sub_80F5548: ; 80F5548 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 .pool -@080F5674: +_080F5674: ldr r1, =0x0203a030 movs r0, 0x7 strb r0, [r1] - b @080F56BC + b _080F56BC .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 .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 @@ -445826,11 +445826,11 @@ sub_80F5548: ; 80F5548 ldr r1, =0x0203a030 movs r0, 0xA strb r0, [r1] - b @080F56BC + b _080F56BC .pool -@080F56B8: +_080F56B8: bl sub_80F577C -@080F56BC: +_080F56BC: ldr r0, =gUnknown_0858D640 lsls r1, r5, 2 adds r1, r0 @@ -445861,50 +445861,50 @@ 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 .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 .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, =gUnknown_0858D384 lsls r1, r5, 2 adds r1, r0 @@ -445962,7 +445962,7 @@ sub_80F57C4: ; 80F57C4 movs r2, 0x4 bl InitBgsFromTemplates movs r4, 0 -@080F57E0: +_080F57E0: lsls r0, r4, 24 lsrs r0, 24 ldr r1, =0x0203a034 @@ -445974,7 +445974,7 @@ sub_80F57C4: ; 80F57C4 bl SetBgTilemap adds r4, 0x1 cmp r4, 0x3 - ble @080F57E0 + ble _080F57E0 ldr r0, =gUnknown_0858D898 bl InitWindows bl DeactivateAllTextPrinters @@ -446107,7 +446107,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 @@ -446135,31 +446135,31 @@ sub_80F591C: ; 80F591C 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 .pool -@080F59F4: +_080F59F4: ldr r5, =0x000060a2 -@080F59F6: +_080F59F6: adds r4, r6, 0 adds r4, 0x13 lsls r4, 24 @@ -446182,10 +446182,10 @@ sub_80F591C: ; 80F591C bl FillBgTilemapBufferRect_Palette0 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 CopyBgTilemapBufferToVram movs r0, 0x1 @@ -446226,12 +446226,12 @@ sub_80F5A74: ; 80F5A74 ldr r0, =0x02039f25 ldrb r0, [r0] cmp r5, r0 - bne @080F5A96 + bne _080F5A96 ldr r1, =gUnknown_085ED21E adds r0, r6, 0 bl CopyString adds r6, r0, 0 -@080F5A96: +_080F5A96: adds r1, r7, 0x2 adds r0, r6, 0 bl CopyString @@ -446261,13 +446261,13 @@ sub_80F5A74: ; 80F5A74 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 CopyBgTilemapBufferToVram pop {r4} @@ -446347,17 +446347,17 @@ 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 .pool -@080F5BE4: +_080F5BE4: movs r0, 0xDF lsls r0, 1 bl song_play_for_text -@080F5BEC: +_080F5BEC: ldr r0, =sub_80F5C24 bl SetVBlankCallback add sp, 0x4 @@ -446452,9 +446452,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 @@ -446464,20 +446464,20 @@ sub_80F5CE4: ; 80F5CE4 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 .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 @@ -446485,7 +446485,7 @@ sub_80F5CE4: ; 80F5CE4 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @080F5D58 + bne _080F5D58 movs r0, 0x23 bl sav12_xor_increment ldr r1, =0x020375e2 @@ -446495,9 +446495,9 @@ sub_80F5CE4: ; 80F5CE4 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 @@ -446536,9 +446536,9 @@ sub_80F5CE4: ; 80F5CE4 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080F5E2E + b _080F5E2E .pool -@080F5DE0: +_080F5DE0: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -446546,25 +446546,25 @@ sub_80F5CE4: ; 80F5CE4 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 @@ -446575,9 +446575,9 @@ sub_80F5CE4: ; 80F5CE4 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 @@ -446585,7 +446585,7 @@ sub_80F5CE4: ; 80F5CE4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne @080F5EBA + bne _080F5EBA ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -446598,13 +446598,13 @@ sub_80F5CE4: ; 80F5CE4 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq @080F5E78 + beq _080F5E78 ldr r0, =gUnknown_085ED207 bl sub_80F707C ldr r0, =sub_80F5ED8 - b @080F5EB8 + b _080F5EB8 .pool -@080F5E78: +_080F5E78: movs r0, 0x24 bl sav12_xor_increment ldr r1, =0x02039f20 @@ -446613,10 +446613,10 @@ sub_80F5CE4: ; 80F5CE4 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 @@ -446632,9 +446632,9 @@ sub_80F5CE4: ; 80F5CE4 movs r0, 0x2 bl sub_813BADC ldr r0, =sub_80F5F74 -@080F5EB8: +_080F5EB8: str r0, [r4] -@080F5EBA: +_080F5EBA: pop {r4-r7} pop {r0} bx r0 @@ -446649,7 +446649,7 @@ sub_80F5ED8: ; 80F5ED8 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq @080F5EFC + beq _080F5EFC ldr r0, =sub_80F5F14 movs r1, 0 bl AddTask @@ -446660,7 +446660,7 @@ sub_80F5ED8: ; 80F5ED8 adds r0, r1 ldr r1, =nullsub_4 str r1, [r0] -@080F5EFC: +_080F5EFC: pop {r4} pop {r0} bx r0 @@ -446688,7 +446688,7 @@ sub_80F5F30: ; 80F5F30 bl sub_800A520 lsls r0, 24 cmp r0, 0 - beq @080F5F60 + beq _080F5F60 adds r0, r4, 0 bl remove_task ldr r2, =0x03005e00 @@ -446703,7 +446703,7 @@ sub_80F5F30: ; 80F5F30 ldr r1, =sub_80F5F74 str r1, [r0] bl sub_80F7144 -@080F5F60: +_080F5F60: pop {r4} pop {r0} bx r0 @@ -446724,7 +446724,7 @@ sub_80F5F74: ; 80F5F74 movs r2, 0x8 ldrsh r0, [r4, r2] cmp r0, 0 - bne @080F5FC4 + bne _080F5FC4 ldr r0, =sub_80F68F0 movs r1, 0x14 bl AddTask @@ -446740,38 +446740,38 @@ sub_80F5F74: ; 80F5F74 lsls r3, 3 movs r1, 0x90 movs r2, 0x78 - b @080F6016 + b _080F6016 .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 .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, =gUnknown_085ED1D0 ldr r1, =0x0203a034 ldr r1, [r1] @@ -446784,27 +446784,27 @@ sub_80F5F74: ; 80F5F74 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 .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 str r0, [r4] -@080F6048: +_080F6048: pop {r4} pop {r0} bx r0 @@ -446824,24 +446824,24 @@ 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 .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] @@ -446853,27 +446853,27 @@ sub_80F6058: ; 80F6058 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 .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 .pool -@080F60D4: +_080F60D4: movs r0, 0x88 lsls r0, 3 bl sub_80F6EF4 @@ -446882,7 +446882,7 @@ sub_80F6058: ; 80F6058 strh r0, [r4, 0xC] ldr r0, =sub_80F60F0 str r0, [r4] -@080F60E6: +_080F60E6: pop {r4,r5} pop {r0} bx r0 @@ -446900,7 +446900,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 @@ -446912,7 +446912,7 @@ sub_80F60F0: ; 80F60F0 lsls r0, 16 asrs r0, 16 cmp r0, 0x15 - bne @080F615E + bne _080F615E strh r3, [r1, 0xA] ldr r0, =gUnknown_085ED1E9 ldr r1, [r5] @@ -446925,11 +446925,11 @@ sub_80F60F0: ; 80F60F0 lsls r3, 3 movs r1, 0x90 bl sub_80F6E9C - b @080F615E + b _080F615E .pool -@080F614C: +_080F614C: cmp r3, 0x2 - bne @080F615E + bne _080F615E ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -446937,7 +446937,7 @@ sub_80F60F0: ; 80F60F0 adds r1, r0 ldr r0, =sub_80F616C str r0, [r1] -@080F615E: +_080F615E: pop {r4,r5} pop {r0} bx r0 @@ -446957,24 +446957,24 @@ 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 .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] @@ -446986,27 +446986,27 @@ sub_80F616C: ; 80F616C 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 .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 .pool -@080F61E8: +_080F61E8: movs r0, 0x88 lsls r0, 3 bl sub_80F6EF4 @@ -447014,7 +447014,7 @@ sub_80F616C: ; 80F616C strh r0, [r4, 0x8] ldr r0, =sub_80F6204 str r0, [r4] -@080F61F8: +_080F61F8: pop {r4,r5} pop {r0} bx r0 @@ -447038,32 +447038,32 @@ 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 .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 @@ -447071,9 +447071,9 @@ sub_80F6204: ; 80F6204 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @080F63F4 + b _080F63F4 .pool -@080F6274: +_080F6274: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -447084,17 +447084,17 @@ sub_80F6204: ; 80F6204 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 movs r1, 0xA bl AddTask @@ -447111,18 +447111,18 @@ sub_80F6204: ; 80F6204 strh r4, [r1, 0xA] adds r4, 0x1 cmp r4, 0x3 - ble @080F6298 - b @080F63B4 + ble _080F6298 + b _080F63B4 .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 @@ -447133,9 +447133,9 @@ sub_80F6204: ; 80F6204 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 @@ -447148,23 +447148,23 @@ sub_80F6204: ; 80F6204 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 .pool -@080F6334: +_080F6334: lsls r1, r5, 2 adds r0, r1, r5 lsls r0, 3 @@ -447176,7 +447176,7 @@ sub_80F6204: ; 80F6204 asrs r0, 16 adds r6, r1, 0 cmp r0, 0x15 - bne @080F63F4 + bne _080F63F4 movs r0, 0 strh r0, [r2, 0xA] movs r4, 0 @@ -447186,16 +447186,16 @@ sub_80F6204: ; 80F6204 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 @@ -447225,18 +447225,18 @@ sub_80F6204: ; 80F6204 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 .pool -@080F63E4: +_080F63E4: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -447245,7 +447245,7 @@ sub_80F6204: ; 80F6204 strh r1, [r0, 0x8] ldr r1, =sub_80F6404 str r1, [r0] -@080F63F4: +_080F63F4: add sp, 0x64 pop {r3} mov r8, r3 @@ -447273,24 +447273,24 @@ 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 .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] @@ -447311,16 +447311,16 @@ sub_80F6404: ; 80F6404 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] @@ -447335,7 +447335,7 @@ sub_80F6404: ; 80F6404 mov r0, r9 ldrb r0, [r0] cmp r2, r0 - bne @080F64E0 + bne _080F64E0 lsls r0, r6, 3 add r0, r12 mov r2, r8 @@ -447344,9 +447344,9 @@ sub_80F6404: ; 80F6404 adds r2, r6, 0 adds r3, r4, 0 bl DecompressMonPic_DetectFrontOrBack_2 - b @080F64F2 + b _080F64F2 .pool -@080F64E0: +_080F64E0: lsls r0, r6, 3 add r0, r12 mov r3, r8 @@ -447355,7 +447355,7 @@ sub_80F6404: ; 80F6404 adds r2, r6, 0 adds r3, r4, 0 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack -@080F64F2: +_080F64F2: adds r0, r6, 0 adds r1, r5, 0 adds r2, r4, 0 @@ -447409,9 +447409,9 @@ sub_80F6404: ; 80F6404 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080F669C + b _080F669C .pool -@080F658C: +_080F658C: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -447422,9 +447422,9 @@ sub_80F6404: ; 80F6404 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] @@ -447433,10 +447433,10 @@ sub_80F6404: ; 80F6404 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 @@ -447447,22 +447447,22 @@ sub_80F6404: ; 80F6404 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 .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 .pool -@080F65F0: +_080F65F0: lsls r0, r7, 2 adds r0, r7 lsls r0, 3 @@ -447473,7 +447473,7 @@ sub_80F6404: ; 80F6404 lsls r0, 16 asrs r0, 16 cmp r0, 0x79 - bne @080F669C + bne _080F669C movs r0, 0 strh r0, [r3, 0xA] ldr r2, =0x02020630 @@ -447491,15 +447491,15 @@ sub_80F6404: ; 80F6404 ldrh r0, [r3, 0x8] adds r0, 0x1 strh r0, [r3, 0x8] - b @080F669C + b _080F669C .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 @@ -447507,17 +447507,17 @@ sub_80F6404: ; 80F6404 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 @@ -447525,15 +447525,15 @@ sub_80F6404: ; 80F6404 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @080F669C + b _080F669C .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] @@ -447544,7 +447544,7 @@ sub_80F6404: ; 80F6404 strh r1, [r0, 0x8] ldr r1, =sub_80F66B4 str r1, [r0] -@080F669C: +_080F669C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -447566,17 +447566,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 @@ -447586,8 +447586,8 @@ sub_80F66B4: ; 80F66B4 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 @@ -447596,7 +447596,7 @@ sub_80F66B4: ; 80F66B4 strh r1, [r0, 0x1C] ldr r1, =sub_80F671C str r1, [r0] -@080F6702: +_080F6702: pop {r4-r7} pop {r0} bx r0 @@ -447613,7 +447613,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 @@ -447622,15 +447622,15 @@ sub_80F671C: ; 80F671C movs r1, 0x1C ldrsh r0, [r4, r1] cmp r0, 0 - bne @080F676E + bne _080F676E ldr r0, =gUnknown_085ED207 bl sub_80F707C bl sub_800AC34 ldr r0, =sub_80F677C str r0, [r4] - b @080F676E + b _080F676E .pool -@080F6760: +_080F6760: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -447638,7 +447638,7 @@ sub_80F671C: ; 80F671C adds r1, r0 ldr r0, =task_repel str r0, [r1] -@080F676E: +_080F676E: pop {r4} pop {r0} bx r0 @@ -447653,15 +447653,15 @@ sub_80F677C: ; 80F677C 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 @@ -447670,7 +447670,7 @@ sub_80F677C: ; 80F677C adds r1, r0 ldr r0, =task_repel str r0, [r1] -@080F67AC: +_080F67AC: pop {r4} pop {r0} bx r0 @@ -447688,14 +447688,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 @@ -447728,7 +447728,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 @@ -447737,29 +447737,29 @@ 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 .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 .pool -@080F6884: +_080F6884: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -447772,7 +447772,7 @@ sub_80F6820: ; 80F6820 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 bl sub_80F7E64 -@080F68A8: +_080F68A8: pop {r4,r5} pop {r0} bx r0 @@ -447793,19 +447793,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 @@ -447828,21 +447828,21 @@ 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 .pool -@080F6924: +_080F6924: ldrh r0, [r2, 0xA] subs r0, 0x1 -@080F6928: +_080F6928: strh r0, [r2, 0xA] lsls r0, r5, 2 adds r0, r5 @@ -447851,15 +447851,15 @@ sub_80F68F0: ; 80F68F0 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 @@ -447880,7 +447880,7 @@ sub_80F68F0: ; 80F68F0 movs r0, 0x6E movs r1, 0x1 bl pal_fade_1 -@080F6972: +_080F6972: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -447889,20 +447889,20 @@ sub_80F68F0: ; 80F68F0 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 .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 @@ -447928,9 +447928,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 @@ -447939,7 +447939,7 @@ sub_80F69B8: ; 80F69B8 adds r0, 0x80 adds r3, r0 cmp r6, 0 - beq @080F6A40 + beq _080F6A40 lsls r1, r4, 9 ldr r0, =0x06004000 adds r1, r0 @@ -447972,9 +447972,9 @@ sub_80F69B8: ; 80F69B8 str r0, [sp, 0xC] movs r2, 0x3 bl WriteSequenceToBgTilemapBuffer - b @080F6A54 + b _080F6A54 .pool -@080F6A40: +_080F6A40: mov r0, r8 lsls r1, r0, 9 ldr r2, =0x06004000 @@ -447984,7 +447984,7 @@ sub_80F69B8: ; 80F69B8 adds r0, r3, 0 movs r3, 0x1 bl RequestDma3Copy -@080F6A54: +_080F6A54: add sp, 0x10 pop {r3} mov r8, r3 @@ -448004,7 +448004,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 @@ -448016,7 +448016,7 @@ sub_80F6A64: ; 80F6A64 adds r4, 0x40 adds r5, 0x1 cmp r5, 0x3 - ble @080F6A74 + ble _080F6A74 add sp, 0x4 pop {r4-r7} pop {r0} @@ -448031,7 +448031,7 @@ sub_80F6A9C: ; 80F6A9C ldr r6, =gMonIconPaletteIndices movs r5, 0xA0 lsls r5, 16 -@080F6AA6: +_080F6AA6: ldr r1, =0x02039e00 lsls r0, r4, 6 adds r0, r1 @@ -448053,7 +448053,7 @@ sub_80F6A9C: ; 80F6A9C adds r5, r0 adds r4, 0x1 cmp r4, 0x3 - ble @080F6AA6 + ble _080F6AA6 pop {r4-r6} pop {r0} bx r0 @@ -448068,7 +448068,7 @@ sub_80F6AE8: ; 80F6AE8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @080F6B58 + beq _080F6B58 bl sub_800E0E8 movs r0, 0x8 movs r1, 0x8 @@ -448113,7 +448113,7 @@ sub_80F6AE8: ; 80F6AE8 movs r2, 0x8 orrs r0, r2 strb r0, [r1, 0x1] -@080F6B58: +_080F6B58: pop {r4} pop {r0} bx r0 @@ -448154,16 +448154,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 @@ -448212,7 +448212,7 @@ sub_80F6B78: ; 80F6B78 adds r6, r1, 0 adds r6, 0x2E movs r4, 0x2 -@080F6C34: +_080F6C34: adds r0, r6, r5 movs r7, 0 ldrsh r1, [r0, r7] @@ -448232,7 +448232,7 @@ sub_80F6B78: ; 80F6B78 adds r5, 0x2 subs r4, 0x1 cmp r4, 0 - bge @080F6C34 + bge _080F6C34 mov r7, r8 adds r7, 0x80 mov r2, r8 @@ -448249,7 +448249,7 @@ sub_80F6B78: ; 80F6B78 add r5, sp, 0xC movs r6, 0 movs r4, 0x3 -@080F6C7C: +_080F6C7C: str r6, [sp, 0x1C] ldm r5!, {r1} ldr r0, [sp, 0x2C] @@ -448257,7 +448257,7 @@ sub_80F6B78: ; 80F6B78 bl CpuSet subs r4, 0x1 cmp r4, 0 - bge @080F6C7C + bge _080F6C7C ldr r5, [sp, 0xC] ldr r6, =0x04000008 mov r0, r8 @@ -448284,16 +448284,16 @@ sub_80F6B78: ; 80F6B78 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 @@ -448333,15 +448333,15 @@ sub_80F6B78: ; 80F6B78 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 @@ -448406,18 +448406,18 @@ sub_80F6DC0: ; 80F6DC0 add r5, sp, 0x18 ldr r6, =gUnknown_0858D810 movs r4, 0x7 -@080F6DD6: +_080F6DD6: adds r0, r6, 0 bl LoadObjectPic adds r6, 0x8 subs r4, 0x1 cmp r4, 0 - bge @080F6DD6 + bge _080F6DD6 ldr r0, =gUnknown_0858D850 bl LoadTaggedObjectPalette movs r4, 0 mov r6, sp -@080F6DEE: +_080F6DEE: mov r0, sp movs r1, 0x88 lsls r1, 1 @@ -448431,7 +448431,7 @@ sub_80F6DC0: ; 80F6DC0 strh r0, [r6] adds r4, 0x1 cmp r4, 0x7 - ble @080F6DEE + ble _080F6DEE ldr r2, =0x02020630 ldrb r1, [r5] lsls r0, r1, 4 @@ -448617,15 +448617,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 @@ -448641,16 +448641,16 @@ sub_80F6F68: ; 80F6F68 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 str r0, [r3, 0x1C] -@080F6FCC: +_080F6FCC: pop {r4-r7} pop {r0} bx r0 @@ -448670,17 +448670,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 .pool @@ -448706,7 +448706,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 @@ -448722,7 +448722,7 @@ sub_80F7014: ; 80F7014 adds r2, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble @080F7038 + ble _080F7038 movs r1, 0x20 ldrsh r0, [r3, r1] movs r2, 0x24 @@ -448731,10 +448731,10 @@ sub_80F7014: ; 80F7014 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 @@ -448775,7 +448775,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 @@ -448813,7 +448813,7 @@ sub_80F707C: ; 80F707C adds r3, 0x40 adds r5, 0x1 cmp r5, 0x2 - ble @080F70BE + ble _080F70BE ldr r1, =0x02022e24 movs r0, 0xF0 strh r0, [r1] @@ -448860,7 +448860,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 @@ -448874,7 +448874,7 @@ sub_80F7144: ; 80F7144 adds r2, 0x2 subs r3, 0x1 cmp r3, 0 - bge @080F7174 + bge _080F7174 movs r0, 0 strh r0, [r7] strh r0, [r6] @@ -448904,7 +448904,7 @@ sub_80F71C8: ; 80F71C8 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - beq @080F71F8 + beq _080F71F8 ldr r1, =gUnknown_08DC6498 str r5, [sp] movs r0, 0x2 @@ -448913,63 +448913,63 @@ sub_80F71C8: ; 80F71C8 movs r3, 0x1 bl CopyToBgTilemapBufferRect movs r5, 0xA - b @080F7240 + b _080F7240 .pool -@080F71F8: +_080F71F8: ldr r0, =0x02039f2e ldrh r2, [r0] cmp r2, 0 - bne @080F720C + bne _080F720C ldr r1, =gUnknown_08DC63F8 - b @080F722E + b _080F722E .pool -@080F720C: +_080F720C: cmp r2, 0x1 - bne @080F7218 + bne _080F7218 ldr r1, =gUnknown_08DC6420 - b @080F722E + b _080F722E .pool -@080F7218: +_080F7218: cmp r2, 0x2 - bne @080F722C + bne _080F722C ldr r1, =gUnknown_08DC6448 movs r0, 0xA str r0, [sp] str r2, [sp, 0x4] movs r0, 0x2 - b @080F7236 + b _080F7236 .pool -@080F722C: +_080F722C: ldr r1, =gUnknown_08DC6470 -@080F722E: +_080F722E: movs r0, 0xA str r0, [sp] movs r0, 0x2 str r0, [sp, 0x4] -@080F7236: +_080F7236: movs r2, 0x5 movs r3, 0x1 bl CopyToBgTilemapBufferRect movs r5, 0xF -@080F7240: +_080F7240: ldr r0, =0x02039f2c ldrh r0, [r0] cmp r0, 0 - bne @080F725C + bne _080F725C movs r6, 0 ldr r1, =gUnknown_08DC64AC - b @080F7298 + b _080F7298 .pool -@080F725C: +_080F725C: cmp r0, 0x1 - bne @080F726C + bne _080F726C movs r6, 0x1 ldr r1, =gUnknown_08DC64C0 - b @080F7298 + b _080F7298 .pool -@080F726C: +_080F726C: cmp r0, 0x2 - bne @080F7290 + bne _080F7290 movs r6, 0x2 ldr r1, =gUnknown_08DC64D4 lsls r2, r5, 24 @@ -448981,14 +448981,14 @@ sub_80F71C8: ; 80F71C8 str r6, [sp, 0x4] movs r0, 0x2 bl CopyToBgTilemapBufferRect - b @080F72CC + b _080F72CC .pool -@080F7290: +_080F7290: cmp r0, 0x3 - bne @080F72B4 + bne _080F72B4 movs r6, 0x3 ldr r1, =gUnknown_08DC64E8 -@080F7298: +_080F7298: lsls r2, r5, 24 lsrs r2, 24 lsls r4, 24 @@ -448998,9 +448998,9 @@ sub_80F71C8: ; 80F71C8 movs r0, 0x2 str r0, [sp, 0x4] bl CopyToBgTilemapBufferRect - b @080F72CC + b _080F72CC .pool -@080F72B4: +_080F72B4: movs r6, 0x4 ldr r1, =gUnknown_08DC64FC lsls r2, r5, 24 @@ -449012,7 +449012,7 @@ sub_80F71C8: ; 80F71C8 movs r0, 0x2 str r0, [sp, 0x4] bl CopyToBgTilemapBufferRect -@080F72CC: +_080F72CC: adds r5, 0x5 ldr r1, =gUnknown_08DC6510 lsls r2, r5, 24 @@ -449061,24 +449061,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} @@ -449101,9 +449101,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 @@ -449112,37 +449112,37 @@ sub_80F7364: ; 80F7364 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 .pool -@080F73CC: +_080F73CC: lsls r0, r2, 24 -@080F73CE: +_080F73CE: lsrs r0, 24 lsls r0, 24 asrs r0, 24 @@ -449170,7 +449170,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 @@ -449181,11 +449181,11 @@ sub_80F73DC: ; 80F73DC strh r0, [r7, 0x1E] adds r0, r2, 0x1 strh r0, [r7, 0x1C] - b @080F74A4 + b _080F74A4 .pool -@080F741C: +_080F741C: cmp r6, 0x1 - bne @080F74A4 + bne _080F74A4 ldrh r0, [r7, 0x1E] subs r0, 0x1 strh r0, [r7, 0x1E] @@ -449194,7 +449194,7 @@ sub_80F73DC: ; 80F73DC movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne @080F74A4 + bne _080F74A4 movs r2, 0x8 ldrsh r4, [r7, r2] lsls r4, 17 @@ -449248,7 +449248,7 @@ sub_80F73DC: ; 80F73DC bl remove_task movs r0, 0x18 bl audio_play -@080F74A4: +_080F74A4: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -449270,16 +449270,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 @@ -449337,7 +449337,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] @@ -449350,27 +449350,27 @@ 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 .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 @@ -449384,20 +449384,20 @@ sub_80F75A8: ; 80F75A8 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 @@ -449414,14 +449414,14 @@ sub_80F75A8: ; 80F75A8 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, =DummyObjectCallback str r0, [r4, 0x1C] movs r0, 0 @@ -449431,7 +449431,7 @@ sub_80F75A8: ; 80F75A8 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x6] -@080F7610: +_080F7610: pop {r4} pop {r0} bx r0 @@ -449460,7 +449460,7 @@ sub_80F7620: ; 80F7620 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge @080F7664 + bge _080F7664 ldr r0, =DummyObjectCallback str r0, [r3, 0x1C] adds r2, r3, 0 @@ -449474,7 +449474,7 @@ sub_80F7620: ; 80F7620 ldr r1, [r0] movs r0, 0x2 strb r0, [r1, 0x6] -@080F7664: +_080F7664: pop {r0} bx r0 .pool @@ -449498,7 +449498,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 @@ -449507,7 +449507,7 @@ sub_80F7670: ; 80F7670 ldr r0, [r0] ldrb r0, [r0, 0x7] cmp r0, 0x27 - bhi @080F7732 + bhi _080F7732 ldr r4, =gUnknown_0858D860 bl GenerateRandomNumber lsls r0, 16 @@ -449570,16 +449570,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} @@ -449621,23 +449621,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 RemoveObjectAndFreeTiles ldr r0, [r5] @@ -449645,7 +449645,7 @@ sub_80F7768: ; 80F7768 ldrb r0, [r1, 0x7] subs r0, 0x1 strb r0, [r1, 0x7] -@080F77D6: +_080F77D6: pop {r4,r5} pop {r0} bx r0 @@ -449704,7 +449704,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] @@ -449722,7 +449722,7 @@ sub_80F7824: ; 80F7824 movs r1, 0x1 eors r0, r1 strh r0, [r4, 0x1E] -@080F786E: +_080F786E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -449744,39 +449744,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 @@ -449785,12 +449785,12 @@ sub_80F7880: ; 80F7880 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 @@ -449806,17 +449806,17 @@ sub_80F7880: ; 80F7880 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] @@ -449832,9 +449832,9 @@ sub_80F7880: ; 80F7880 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 @@ -449842,17 +449842,17 @@ sub_80F7880: ; 80F7880 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 @@ -449860,10 +449860,10 @@ sub_80F7880: ; 80F7880 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] @@ -449881,11 +449881,11 @@ sub_80F7880: ; 80F7880 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] @@ -449899,11 +449899,11 @@ sub_80F7880: ; 80F7880 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 @@ -449927,15 +449927,15 @@ sub_80F7880: ; 80F7880 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] @@ -449947,39 +449947,39 @@ sub_80F7880: ; 80F7880 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 .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 @@ -450007,21 +450007,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 @@ -450055,11 +450055,11 @@ sub_80F7A80: ; 80F7A80 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 @@ -450078,7 +450078,7 @@ sub_80F7A80: ; 80F7A80 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] -@080F7B2E: +_080F7B2E: movs r3, 0xC0 lsls r3, 18 adds r7, r3 @@ -450087,17 +450087,17 @@ sub_80F7A80: ; 80F7A80 add r9, r4 mov r0, r9 cmp r0, 0x3 - ble @080F7AAC - b @080F7C7E + ble _080F7AAC + b _080F7C7E .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] @@ -450106,13 +450106,13 @@ sub_80F7A80: ; 80F7A80 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 @@ -450149,11 +450149,11 @@ sub_80F7A80: ; 80F7A80 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 @@ -450166,22 +450166,22 @@ sub_80F7A80: ; 80F7A80 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 .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] @@ -450190,30 +450190,30 @@ sub_80F7A80: ; 80F7A80 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 .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] @@ -450225,21 +450225,21 @@ sub_80F7A80: ; 80F7A80 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 @@ -450274,7 +450274,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] @@ -450285,10 +450285,10 @@ sub_80F7CA8: ; 80F7CA8 ldrsh r0, [r0, r3] adds r5, r1, 0 cmp r0, 0 - bgt @080F7D10 - b @080F7D0E + bgt _080F7D10 + b _080F7D0E .pool -@080F7CF8: +_080F7CF8: ldr r2, =0x0203a034 ldr r0, [r2] ldr r0, [r0] @@ -450299,10 +450299,10 @@ sub_80F7CA8: ; 80F7CA8 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 @@ -450313,36 +450313,36 @@ sub_80F7CA8: ; 80F7CA8 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 .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] @@ -450354,36 +450354,36 @@ sub_80F7CA8: ; 80F7CA8 lsls r1, r0, 3 adds r4, r0, 0 cmp r3, r1 - blt @080F7D78 + blt _080F7D78 movs r0, 0x8 - b @080F7D94 + b _080F7D94 .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 .pool -@080F7DA0: +_080F7DA0: ldr r3, =0x00005057 -@080F7DA2: +_080F7DA2: adds r1, r0, r3 adds r2, 0x7 lsls r2, 24 @@ -450399,12 +450399,12 @@ sub_80F7CA8: ; 80F7CA8 bl FillBgTilemapBufferRect_Palette0 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] @@ -450413,7 +450413,7 @@ sub_80F7CA8: ; 80F7CA8 strb r0, [r1, 0x14] mov r0, r8 bl remove_task -@080F7DDC: +_080F7DDC: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -450583,7 +450583,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 @@ -450591,7 +450591,7 @@ sub_80F7F30: ; 80F7F30 bl sub_80DAB8C ldrb r0, [r4] bl sub_80DB09C -@080F7F5E: +_080F7F5E: ldr r0, =0x020375f0 strh r5, [r0] pop {r4,r5} @@ -450613,47 +450613,47 @@ 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 .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} @@ -450671,29 +450671,29 @@ 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 .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 @@ -450709,14 +450709,14 @@ sub_80F7FFC: ; 80F7FFC 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] @@ -450733,17 +450733,17 @@ sub_80F7FFC: ; 80F7FFC 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 .pool -@080F80B8: +_080F80B8: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -450759,13 +450759,13 @@ sub_80F7FFC: ; 80F7FFC 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] @@ -450782,17 +450782,17 @@ sub_80F7FFC: ; 80F7FFC 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 .pool -@080F8124: +_080F8124: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -450808,13 +450808,13 @@ sub_80F7FFC: ; 80F7FFC 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] @@ -450831,15 +450831,15 @@ sub_80F7FFC: ; 80F7FFC 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 .pool -@080F8190: +_080F8190: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -450855,9 +450855,9 @@ sub_80F7FFC: ; 80F7FFC 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] @@ -450874,15 +450874,15 @@ sub_80F7FFC: ; 80F7FFC 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 .pool -@080F81F8: +_080F81F8: mov r4, sp ldr r7, =0x02039f24 ldrb r0, [r7] @@ -450898,9 +450898,9 @@ sub_80F7FFC: ; 80F7FFC 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] @@ -450917,13 +450917,13 @@ sub_80F7FFC: ; 80F7FFC 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} @@ -450978,22 +450978,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} @@ -451023,18 +451023,18 @@ sub_80F831C: ; 80F831C 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 @@ -451050,18 +451050,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 @@ -451083,18 +451083,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 @@ -451125,12 +451125,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 bl SetMainCallback2 -@080F83FE: +_080F83FE: pop {r0} bx r0 .pool @@ -451181,12 +451181,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 bl SetMainCallback2 -@080F8476: +_080F8476: pop {r0} bx r0 .pool @@ -451263,7 +451263,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 @@ -451271,9 +451271,9 @@ sub_80F8508: ; 80F8508 ldr r2, =sub_80F8568 adds r0, r4, 0 bl set_task_function_and_args_14_15 - b @080F8556 + b _080F8556 .pool -@080F8540: +_080F8540: ldr r0, =0x02039f24 ldrb r0, [r0] bl sub_80DA8C8 @@ -451284,7 +451284,7 @@ sub_80F8508: ; 80F8508 adds r0, r1 ldr r1, =sub_81D9DE4 str r1, [r0] -@080F8556: +_080F8556: pop {r4} pop {r0} bx r0 @@ -451351,12 +451351,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 @@ -451369,51 +451369,51 @@ sub_80F85BC: ; 80F85BC 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 .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 @@ -451426,8 +451426,8 @@ sub_80F85BC: ; 80F85BC 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 @@ -451476,22 +451476,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} @@ -451507,11 +451507,11 @@ sub_80F8714: ; 80F8714 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 @@ -451519,18 +451519,18 @@ sub_80F8714: ; 80F8714 adds r1, r0 ldr r0, =sub_80F878C str r0, [r1] - b @080F877E + b _080F877E .pool -@080F8748: +_080F8748: ldr r5, =0x02039e02 movs r4, 0x3 -@080F874C: +_080F874C: adds r0, r5, 0 bl GetStringEnd_Limit7 adds r5, 0x40 subs r4, 0x1 cmp r4, 0 - bge @080F874C + bge _080F874C adds r0, r6, 0 bl remove_task ldr r0, =0x03005d8c @@ -451545,7 +451545,7 @@ sub_80F8714: ; 80F8714 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 @@ -451580,12 +451580,12 @@ sub_80F87B4: ; 80F87B4 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 .pool @@ -451626,29 +451626,29 @@ sub_80F8814: ; 80F8814 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 .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} @@ -451672,35 +451672,35 @@ sub_80F8864: ; 80F8864 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 .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 @@ -451709,16 +451709,16 @@ sub_80F8864: ; 80F8864 adds r0, r1 ldrh r1, [r0] cmp r1, 0 - bne @080F88CC + bne _080F88CC ldr r0, =0x020375e0 strh r1, [r0] - b @080F88D2 + b _080F88D2 .pool -@080F88CC: +_080F88CC: ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] -@080F88D2: +_080F88D2: pop {r0} bx r0 .pool @@ -451742,11 +451742,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 @@ -451754,15 +451754,15 @@ 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 .pool -@080F8930: +_080F8930: ldr r1, =0x020375e0 movs r0, 0 -@080F8934: +_080F8934: strh r0, [r1] pop {r0} bx r0 @@ -451778,18 +451778,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 @@ -451813,20 +451813,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 @@ -451839,17 +451839,17 @@ sub_80F8970: ; 80F8970 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 @@ -451863,11 +451863,11 @@ sub_80F8970: ; 80F8970 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 @@ -451875,13 +451875,13 @@ sub_80F8970: ; 80F8970 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 @@ -451890,19 +451890,19 @@ sub_80F8970: ; 80F8970 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 @@ -451911,27 +451911,27 @@ sub_80F8970: ; 80F8970 mov r5, r12 movs r4, 0 ldrsh r0, [r5, r4] - b @080F8A66 + b _080F8A66 .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 @@ -451949,19 +451949,19 @@ sub_80F8970: ; 80F8970 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 .pool -@080F8AB0: +_080F8AB0: ldr r1, =0x020375e4 adds r0, r7, 0x4 strh r0, [r1] -@080F8AB6: +_080F8AB6: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -452004,39 +452004,39 @@ sub_80F8AFC: ; 80F8AFC 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 .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 VarSet @@ -452055,7 +452055,7 @@ sub_80F8AFC: ; 80F8AFC adds r1, 0xD5 ldrb r1, [r1] bl VarSet -@080F8B7C: +_080F8B7C: pop {r4,r5} pop {r0} bx r0 @@ -452073,17 +452073,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, =gUnknown_0858D8EC adds r0, r5, r0 ldrb r0, [r0] @@ -452115,36 +452115,36 @@ sub_80F8B94: ; 80F8B94 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, =gFieldObjectPalette33 - b @080F8C42 + b _080F8C42 .pool -@080F8C2C: +_080F8C2C: lsrs r1, r4, 16 ldr r0, =gFieldObjectPalette34 - b @080F8C42 + b _080F8C42 .pool -@080F8C38: +_080F8C38: ldrb r0, [r1, 0x13] cmp r0, 0 - bne @080F8C50 + bne _080F8C50 lsrs r1, r4, 16 ldr r0, =gFieldObjectPalette8 -@080F8C42: +_080F8C42: movs r2, 0x20 bl gpu_pal_apply - b @080F8C5A + b _080F8C5A .pool -@080F8C50: +_080F8C50: lsrs r1, r4, 16 ldr r0, =gFieldObjectPalette17 movs r2, 0x20 bl gpu_pal_apply -@080F8C5A: +_080F8C5A: movs r0, 0x80 lsls r0, 13 adds r4, r0 @@ -452154,8 +452154,8 @@ sub_80F8B94: ; 80F8B94 ldr r0, =0x02039f30 ldrb r0, [r0] cmp r5, r0 - blt @080F8BBA -@080F8C6E: + blt _080F8BBA +_080F8C6E: pop {r4-r7} pop {r0} bx r0 @@ -452179,18 +452179,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 @@ -452198,7 +452198,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] @@ -452215,19 +452215,19 @@ 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 .pool -@080F8D18: +_080F8D18: movs r0, 0 -@080F8D1A: +_080F8D1A: add sp, 0x4 pop {r4-r6} pop {r1} @@ -452253,9 +452253,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 @@ -452292,7 +452292,7 @@ sub_80F8D28: ; 80F8D28 ldrh r0, [r4] ldrb r1, [r1] cmp r0, r1 - bne @080F8DC4 + bne _080F8DC4 lsls r0, r6, 3 ldr r1, =gMonFrontPicTable adds r0, r1 @@ -452302,9 +452302,9 @@ sub_80F8D28: ; 80F8D28 adds r2, r6, 0 adds r3, r5, 0 bl DecompressMonPic_DetectFrontOrBack_2 - b @080F8DD8 + b _080F8DD8 .pool -@080F8DC4: +_080F8DC4: lsls r0, r6, 3 ldr r1, =gMonFrontPicTable adds r0, r1 @@ -452314,7 +452314,7 @@ sub_80F8D28: ; 80F8D28 adds r2, r6, 0 adds r3, r5, 0 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack -@080F8DD8: +_080F8DD8: adds r0, r6, 0 mov r1, r8 adds r2, r5, 0 @@ -452349,12 +452349,12 @@ sub_80F8D28: ; 80F8D28 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 @@ -452363,9 +452363,9 @@ sub_80F8D28: ; 80F8D28 movs r2, 0 movs r3, 0 bl sub_806ED40 - b @080F8E6C + b _080F8E6C .pool -@080F8E58: +_080F8E58: lsls r4, r5, 4 adds r0, r4, r5 lsls r0, 2 @@ -452375,7 +452375,7 @@ sub_80F8D28: ; 80F8D28 movs r2, 0 movs r3, 0 bl sub_806ED40 -@080F8E6C: +_080F8E6C: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -452400,7 +452400,7 @@ sub_80F8D28: ; 80F8D28 negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] -@080F8E9C: +_080F8E9C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -452419,7 +452419,7 @@ sub_80F8EB8: ; 80F8EB8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @080F8EDC + beq _080F8EDC ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -452429,7 +452429,7 @@ sub_80F8EB8: ; 80F8EB8 adds r0, 0x1 strh r0, [r1, 0x8] bl sub_805F094 -@080F8EDC: +_080F8EDC: pop {r0} bx r0 .pool @@ -452449,21 +452449,21 @@ 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 .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 @@ -452474,8 +452474,8 @@ sub_80F8EE8: ; 80F8EE8 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 @@ -452492,21 +452492,21 @@ sub_80F8EE8: ; 80F8EE8 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 RemoveObjectAndFreeTiles -@080F8F78: +_080F8F78: ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b @080F8F98 + b _080F8F98 .pool -@080F8F84: +_080F8F84: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -452515,7 +452515,7 @@ sub_80F8EE8: ; 80F8EE8 bl sub_80E2A78 adds r0, r4, 0 bl remove_task -@080F8F98: +_080F8F98: pop {r4,r5} pop {r0} bx r0 @@ -452529,27 +452529,27 @@ sub_80F8FA0: ; 80F8FA0 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 .pool -@080F8FD8: +_080F8FD8: ldr r1, =0x020375f0 movs r0, 0x4 strh r0, [r1] -@080F8FDE: +_080F8FDE: pop {r4} pop {r0} bx r0 @@ -452564,7 +452564,7 @@ sub_80F8FE8: ; 80F8FE8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @080F9020 + beq _080F9020 ldr r2, =0x030060b8 ldr r1, [r2] ldr r0, =0x41c64e6d @@ -452574,14 +452574,14 @@ sub_80F8FE8: ; 80F8FE8 str r0, [r2] lsrs r0, 16 ldr r4, =0x020375f0 - b @080F902A + b _080F902A .pool -@080F9020: +_080F9020: ldr r4, =0x020375f0 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 -@080F902A: +_080F902A: ldrh r1, [r4] bl __umodsi3 strh r0, [r4] @@ -452613,16 +452613,16 @@ sub_80F905C: ; 80F905C movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @080F9074 + bne _080F9074 movs r0, 0 - b @080F907E + b _080F907E .pool -@080F9074: +_080F9074: ldr r0, =sub_80F9088 movs r1, 0x5 bl AddTask movs r0, 0x1 -@080F907E: +_080F907E: pop {r1} bx r1 .pool @@ -452641,30 +452641,30 @@ 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 .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 @@ -452678,16 +452678,16 @@ sub_80F90DC: ; 80F90DC 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 .pool @@ -452701,13 +452701,13 @@ sub_80F910C: ; 80F910C 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 .pool @@ -452721,13 +452721,13 @@ sub_80F9134: ; 80F9134 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne @080F914C + bne _080F914C movs r0, 0 - b @080F914E + b _080F914E .pool -@080F914C: +_080F914C: movs r0, 0x1 -@080F914E: +_080F914E: pop {r1} bx r1 thumb_func_end sub_80F9134 @@ -452749,13 +452749,13 @@ sub_80F9160: ; 80F9160 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @080F9178 + bne _080F9178 movs r0, 0 - b @080F917A + b _080F917A .pool -@080F9178: +_080F9178: movs r0, 0x1 -@080F917A: +_080F917A: pop {r1} bx r1 thumb_func_end sub_80F9160 @@ -452773,11 +452773,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 @@ -452802,7 +452802,7 @@ sp000_heal_pokemon: ; 80F9180 movs r1, 0x1 add r1, r8 mov r9, r1 -@080F91D4: +_080F91D4: adds r1, r5, 0 adds r1, 0xD adds r0, r4, 0 @@ -452822,7 +452822,7 @@ sp000_heal_pokemon: ; 80F9180 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @080F91D4 + bls _080F91D4 movs r0, 0 strb r0, [r6] strb r0, [r6, 0x1] @@ -452842,8 +452842,8 @@ sp000_heal_pokemon: ; 80F9180 ldr r0, =0x020244e9 ldrb r0, [r0] cmp r8, r0 - bcc @080F919E -@080F922C: + bcc _080F919E +_080F922C: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -452901,16 +452901,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} @@ -452952,19 +452952,19 @@ sub_80F92F8: ; 80F92F8 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 .pool @@ -452978,7 +452978,7 @@ sub_80F9320: ; 80F9320 movs r5, 0 movs r7, 0xCE lsls r7, 1 -@080F932C: +_080F932C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -452990,23 +452990,23 @@ sub_80F9320: ; 80F9320 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 .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 @@ -453021,14 +453021,14 @@ sub_80F9370: ; 80F9370 lsrs r0, 24 adds r4, r0, 0 cmp r4, 0x1 - bne @080F9392 + bne _080F9392 movs r0, 0xAF bl ItemIdToBerryType lsls r0, 24 lsrs r0, 24 ldr r1, =0x02021cc4 bl GetBerryNameByBerryType -@080F9392: +_080F9392: adds r0, r4, 0 pop {r4} pop {r1} @@ -453064,7 +453064,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 @@ -453074,7 +453074,7 @@ sub_80F93A0: ; 80F93A0 movs r1, 0xC add r2, sp, 0x10 bl pokemon_setattr -@080F93EE: +_080F93EE: add sp, 0x14 pop {r3} mov r8, r3 @@ -453094,13 +453094,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 @@ -453135,16 +453135,16 @@ sub_80F9460: ; 80F9460 ldr r0, =0x0203cef8 ldrb r1, [r0] cmp r1, 0 - bne @080F9478 + bne _080F9478 ldr r0, =0x020375f0 strh r1, [r0] - b @080F947E + b _080F947E .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 bl SetMainCallback2 pop {r0} @@ -453175,16 +453175,16 @@ sub_80F94B8: ; 80F94B8 ldr r0, =0x0203cef8 ldrb r1, [r0] cmp r1, 0 - bne @080F94D0 + bne _080F94D0 ldr r0, =0x020375f0 strh r1, [r0] - b @080F94D6 + b _080F94D6 .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 bl SetMainCallback2 pop {r0} @@ -453206,12 +453206,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 @@ -453219,11 +453219,11 @@ sub_80F94E8: ; 80F94E8 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] @@ -453233,7 +453233,7 @@ sub_80F94E8: ; 80F94E8 bl CpuSet mov r5, sp add r6, sp, 0x12C -@080F9538: +_080F9538: adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x64 @@ -453241,7 +453241,7 @@ sub_80F94E8: ; 80F94E8 adds r5, 0x64 adds r4, 0x64 cmp r5, r6 - ble @080F9538 + ble _080F9538 bl calc_player_party_count add sp, 0x198 pop {r4-r7} @@ -453258,17 +453258,17 @@ sub_80F9568: ; 80F9568 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 @@ -453278,26 +453278,26 @@ 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 .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 @@ -453349,12 +453349,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 @@ -453362,13 +453362,13 @@ sub_80F960C: ; 80F960C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080F964C + bne _080F964C movs r0, 0x1 - b @080F964E + b _080F964E .pool -@080F964C: +_080F964C: movs r0, 0 -@080F964E: +_080F964E: pop {r4} pop {r1} bx r1 @@ -453387,29 +453387,29 @@ 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 .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] @@ -453417,48 +453417,48 @@ sub_80F9654: ; 80F9654 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 InBattlePyramid adds r4, r0, 0 bl InBattlePike 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 .pool -@080F96F0: +_080F96F0: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b @080F9718 + b _080F9718 .pool -@080F96FC: +_080F96FC: ldrb r0, [r4, 0x2] bl sub_80F95C0 ldr r0, =gUnknown_085ECF5D @@ -453466,16 +453466,16 @@ sub_80F9654: ; 80F9654 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b @080F9722 + b _080F9722 .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 @@ -453502,12 +453502,12 @@ overworld_poison: ; 80F9744 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 @@ -453515,50 +453515,50 @@ overworld_poison: ; 80F9744 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 .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} @@ -453651,25 +453651,25 @@ sub_80F986C: ; 80F986C lsrs r2, r0, 16 movs r1, 0x1 ldr r3, =gUnknown_0858D8F0 -@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 .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 @@ -453738,13 +453738,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 @@ -453756,7 +453756,7 @@ sub_80F9910: ; 80F9910 movs r3, 0x8 bl ConvertIntToDecimalString adds r5, r0, 0 - ldr r1, @080F9980 + ldr r1, _080F9980 bl AppendString adds r5, r0, 0 adds r0, r4, 0 @@ -453771,11 +453771,11 @@ sub_80F9910: ; 80F9910 pop {r0} bx r0 .align 2, 0 -@080F9970: .4byte 0x41f00000 -@080F9974: .4byte 0x00000000 -@080F9978: .4byte 0x40396666 -@080F997C: .4byte 0x66666666 -@080F9980: .4byte gUnknown_085EED24 +_080F9970: .4byte 0x41f00000 +_080F9974: .4byte 0x00000000 +_080F9978: .4byte 0x40396666 +_080F997C: .4byte 0x66666666 +_080F9980: .4byte gUnknown_085EED24 thumb_func_end sub_80F9910 thumb_func_start sub_80F9984 @@ -453788,11 +453788,11 @@ sub_80F9984: ; 80F9984 ldr r1, =0x020375f0 ldrh r0, [r1] cmp r0, 0xFF - bne @080F99A0 + bne _080F99A0 movs r0, 0 - b @080F9A0A + b _080F9A0A .pool -@080F99A0: +_080F99A0: ldrh r1, [r1] movs r0, 0x64 muls r1, r0 @@ -453802,17 +453802,17 @@ sub_80F9984: ; 80F9984 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 .pool -@080F99CC: +_080F99CC: mov r4, sp adds r0, r5, 0 bl sub_80F97C8 @@ -453830,16 +453830,16 @@ sub_80F9984: ; 80F9984 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 .pool -@080F9A08: +_080F9A08: movs r0, 0x2 -@080F9A0A: +_080F9A0A: add sp, 0x4 pop {r4-r7} pop {r1} @@ -453869,18 +453869,18 @@ sub_80F9A14: ; 80F9A14 movs r0, 0x80 lsls r0, 8 cmp r1, r0 - bne @080F9A64 + bne _080F9A64 ldr r0, =0x02021dc4 ldr r1, =gUnknown_085ECF6B bl CopyString - b @080F9A6E + b _080F9A6E .pool -@080F9A64: +_080F9A64: ldr r0, =0x02021dc4 ldr r1, =0x03005d90 ldr r1, [r1] bl CopyString -@080F9A6E: +_080F9A6E: pop {r4,r5} pop {r0} bx r0 @@ -453995,9 +453995,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 @@ -454005,7 +454005,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 @@ -454015,12 +454015,12 @@ sub_80F9B30: ; 80F9B30 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] @@ -454028,15 +454028,15 @@ sub_80F9B30: ; 80F9B30 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 FlagSet -@080F9BAC: +_080F9BAC: add sp, 0xC pop {r3} mov r8, r3 @@ -454136,15 +454136,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 @@ -454168,20 +454168,20 @@ 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 .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] @@ -454215,8 +454215,8 @@ sub_80F9C90: ; 80F9C90 movs r0, 0x4A movs r1, 0 bl SetGpuReg - b @080F9DEE -@080F9D10: + b _080F9DEE +_080F9D10: movs r0, 0x50 bl GetGpuReg strh r0, [r4, 0x16] @@ -454229,8 +454229,8 @@ sub_80F9C90: ; 80F9C90 movs r0, 0x54 movs r1, 0x10 bl SetGpuReg - b @080F9DEE -@080F9D32: + b _080F9DEE +_080F9D32: ldrh r0, [r4, 0xE] ldrh r1, [r4, 0xA] subs r0, r1 @@ -454241,12 +454241,12 @@ sub_80F9C90: ; 80F9C90 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] @@ -454263,7 +454263,7 @@ sub_80F9C90: ; 80F9C90 bl sub_80A2A20 ldr r0, =0x02037b14 strh r5, [r0] -@080F9D76: +_080F9D76: ldrh r1, [r4, 0xE] lsls r1, 8 ldrh r0, [r4, 0x10] @@ -454274,9 +454274,9 @@ sub_80F9C90: ; 80F9C90 bl SetGpuReg movs r1, 0xE ldrsh r0, [r4, r1] - b @080F9DD8 + b _080F9DD8 .pool -@080F9D94: +_080F9D94: ldrh r0, [r4, 0x12] ldrh r1, [r4, 0xC] subs r0, r1 @@ -454286,12 +454286,12 @@ sub_80F9C90: ; 80F9C90 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 @@ -454300,7 +454300,7 @@ sub_80F9C90: ; 80F9C90 lsls r1, 6 movs r0, 0 bl ResetGpuRegBits -@080F9DC2: +_080F9DC2: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x14] @@ -454311,22 +454311,22 @@ sub_80F9C90: ; 80F9C90 bl SetGpuReg 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 SetGpuReg 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 @@ -454345,25 +454345,25 @@ 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 .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 .pool -@080F9E38: +_080F9E38: movs r1, 0 strh r1, [r4, 0xE] movs r0, 0xF0 @@ -454397,8 +454397,8 @@ sub_80F9DFC: ; 80F9DFC movs r0, 0x4A movs r1, 0 bl SetGpuReg - b @080F9F4E -@080F9E86: + b _080F9F4E +_080F9E86: ldrh r0, [r4, 0xC] ldrh r2, [r4, 0x12] adds r1, r0, r2 @@ -454409,12 +454409,12 @@ sub_80F9DFC: ; 80F9DFC 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 @@ -454425,7 +454425,7 @@ sub_80F9DFC: ; 80F9DFC movs r0, 0x54 movs r1, 0x10 bl SetGpuReg -@080F9EBC: +_080F9EBC: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x14] @@ -454437,9 +454437,9 @@ sub_80F9DFC: ; 80F9DFC 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 @@ -454450,12 +454450,12 @@ sub_80F9DFC: ; 80F9DFC 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] @@ -454466,7 +454466,7 @@ sub_80F9DFC: ; 80F9DFC ldr r1, =0x02037b14 movs r0, 0 strh r0, [r1] -@080F9F0C: +_080F9F0C: ldrh r1, [r4, 0xE] lsls r1, 8 ldrh r0, [r4, 0x10] @@ -454478,10 +454478,10 @@ sub_80F9DFC: ; 80F9DFC movs r1, 0xE ldrsh r0, [r4, r1] cmp r0, 0x78 - bne @080F9F54 - b @080F9F4E + bne _080F9F54 + b _080F9F4E .pool -@080F9F2C: +_080F9F2C: movs r1, 0x80 lsls r1, 6 movs r0, 0 @@ -454494,12 +454494,12 @@ sub_80F9DFC: ; 80F9DFC bl SetGpuReg 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 @@ -454526,76 +454526,76 @@ sub_80F9F78: ; 80F9F78 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 .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 .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 @@ -454607,12 +454607,12 @@ sub_80FA004: ; 80FA004 ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x1 - beq @080FA0AE + beq _080FA0AE bl player_get_direction_lower_nybble lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bne @080FA0AE + bne _080FA0AE ldr r4, =0x0203ab40 adds r1, r4, 0x2 adds r0, r4, 0 @@ -454629,51 +454629,51 @@ 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 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_80FA0DC - b @080FA0C0 + b _080FA0C0 .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 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_80FA1E8 - b @080FA0C0 + b _080FA0C0 .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 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_80FA34C -@080FA0C0: +_080FA0C0: str r0, [r1] movs r0, 0x1 -@080FA0C4: +_080FA0C4: pop {r4} pop {r1} bx r1 @@ -454785,21 +454785,21 @@ sub_80FA1A8: ; 80FA1A8 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 str r0, [r1, 0x1C] -@080FA1D0: +_080FA1D0: pop {r0} bx r0 .pool @@ -454876,17 +454876,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, =gUnknown_0858E618 ldr r3, =0x02020630 @@ -454913,12 +454913,12 @@ sub_80FA248: ; 80FA248 bl AddObjectToFront 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} @@ -454957,21 +454957,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 str r0, [r4, 0x1C] -@080FA32E: +_080FA32E: pop {r4} pop {r0} bx r0 @@ -455093,21 +455093,21 @@ sub_80FA418: ; 80FA418 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 str r0, [r1, 0x1C] -@080FA440: +_080FA440: pop {r0} bx r0 .pool @@ -455172,56 +455172,56 @@ 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 .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 MapGridSetMetatileIdAt movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0x2 ldrsh r1, [r4, r2] bl CurrentMapDrawMetatileAt - b @080FA56E -@080FA540: + b _080FA56E +_080FA540: movs r1, 0 ldrsh r0, [r4, r1] movs r2, 0x2 @@ -455239,12 +455239,12 @@ sub_80FA4A0: ; 80FA4A0 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 @@ -455265,7 +455265,7 @@ sub_80FA57C: ; 80FA57C bl VarGet lsls r0, 16 cmp r0, 0 - bne @080FA5B8 + bne _080FA5B8 mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -455274,9 +455274,9 @@ sub_80FA57C: ; 80FA57C movs r2, 0xE2 lsls r2, 4 bl MapGridSetMetatileIdAt - b @080FA5C8 + b _080FA5C8 .pool -@080FA5B8: +_080FA5B8: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -455284,7 +455284,7 @@ sub_80FA57C: ; 80FA57C ldrsh r1, [r4, r2] ldr r2, =0x00000e21 bl MapGridSetMetatileIdAt -@080FA5C8: +_080FA5C8: mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -455347,26 +455347,26 @@ sub_80FA62C: ; 80FA62C movs r2, 0x6 ldrsh r0, [r4, r2] cmp r0, 0x6 - bne @080FA650 + bne _080FA650 movs r0, 0 - b @080FA652 + b _080FA652 .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 @@ -455386,14 +455386,14 @@ sub_80FA62C: ; 80FA62C 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 @@ -455407,39 +455407,39 @@ sub_80FA6AC: ; 80FA6AC 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 @@ -455506,7 +455506,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 @@ -455514,12 +455514,12 @@ sub_80FA754: ; 80FA754 bl sub_80FA704 adds r0, r4, 0 bl remove_task - b @080FA78C + b _080FA78C .pool -@080FA788: +_080FA788: adds r0, r2, 0x1 strh r0, [r1, 0x8] -@080FA78C: +_080FA78C: pop {r4} pop {r0} bx r0 @@ -455538,16 +455538,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 movs r1, 0x5 bl AddTask @@ -455562,7 +455562,7 @@ sub_80FA794: ; 80FA794 strh r0, [r1, 0x8] strh r7, [r1, 0xA] strh r6, [r1, 0xC] -@080FA7DE: +_080FA7DE: pop {r4-r7} pop {r0} bx r0 @@ -455583,9 +455583,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] @@ -455593,116 +455593,116 @@ sub_80FA7EC: ; 80FA7EC 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 .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 @@ -455743,17 +455743,17 @@ 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 RemoveObjectAndFreeTiles -@080FA9CA: +_080FA9CA: pop {r4} pop {r0} bx r0 @@ -455799,7 +455799,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 @@ -455830,7 +455830,7 @@ sub_80FA9D0: ; 80FA9D0 str r0, [r2] movs r0, 0 strh r0, [r4, 0x2E] -@080FAA5E: +_080FAA5E: add sp, 0x4 pop {r4} pop {r0} @@ -455860,20 +455860,20 @@ 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 .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, =gUnknown_0858E68C ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -455893,9 +455893,9 @@ sub_80FAA7C: ; 80FAA7C adds r2, 0x20 movs r3, 0 bl AddObjectToFront - b @080FAB8C + b _080FAB8C .pool -@080FAAFC: +_080FAAFC: ldr r0, =gUnknown_0858E68C ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -455912,9 +455912,9 @@ sub_80FAA7C: ; 80FAA7C adds r1, r3 asrs r1, 16 ldrb r2, [r2] - b @080FAB4C + b _080FAB4C .pool -@080FAB2C: +_080FAB2C: ldr r0, =gUnknown_0858E68C ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -455931,12 +455931,12 @@ sub_80FAA7C: ; 80FAA7C asrs r1, 16 ldrb r2, [r2] adds r2, 0x10 -@080FAB4C: +_080FAB4C: movs r3, 0x94 bl AddObjectToFront - b @080FAB8C + b _080FAB8C .pool -@080FAB64: +_080FAB64: ldr r0, =gUnknown_0858E68C ldr r3, =0x02020630 ldr r1, =0x02037590 @@ -455956,7 +455956,7 @@ sub_80FAA7C: ; 80FAA7C adds r2, 0x10 movs r3, 0x94 bl AddObjectToFront -@080FAB8C: +_080FAB8C: movs r0, 0 add sp, 0x4 pop {r4} @@ -455978,22 +455978,22 @@ door_restore_tilemap: ; 80FABA4 bl MapGridGetMetatileIdAt 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 MapGridSetMetatileIdAt - b @080FABEA + b _080FABEA .pool -@080FABDC: +_080FABDC: ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] subs r1, 0x1 movs r2, 0xA1 lsls r2, 2 bl MapGridSetMetatileIdAt -@080FABEA: +_080FABEA: ldr r4, =0x02038c08 ldr r0, [r4, 0x14] ldr r1, [r4, 0x18] @@ -456024,11 +456024,11 @@ sub_80FAC24: ; 80FAC24 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] @@ -456041,7 +456041,7 @@ sub_80FAC24: ; 80FAC24 strh r0, [r5, 0x2E] ldr r0, =sub_80FAC68 str r0, [r5, 0x1C] -@080FAC54: +_080FAC54: pop {r4,r5} pop {r0} bx r0 @@ -456076,26 +456076,26 @@ 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 .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 @@ -456111,15 +456111,15 @@ sub_80FAC78: ; 80FAC78 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080FADCE + beq _080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x10 - b @080FAD8A + b _080FAD8A .pool -@080FAD14: +_080FAD14: ldr r0, =0x02021cc4 movs r1, 0x32 movs r2, 0 @@ -456135,43 +456135,43 @@ sub_80FAC78: ; 80FAC78 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080FADCE + beq _080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x20 - b @080FAD8A + b _080FAD8A .pool -@080FAD60: +_080FAD60: ldr r1, =0x020375f0 movs r0, 0x1 - b @080FAD70 + b _080FAD70 .pool -@080FAD6C: +_080FAD6C: ldr r1, =0x020375f0 movs r0, 0x2 -@080FAD70: +_080FAD70: strh r0, [r1] ldr r0, =0x00004054 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080FADCE + beq _080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet adds r1, r0, 0 movs r0, 0x80 -@080FAD8A: +_080FAD8A: orrs r1, r0 lsls r1, 16 lsrs r1, 16 adds r0, r4, 0 bl VarSet - b @080FADCE + b _080FADCE .pool -@080FADA4: +_080FADA4: ldr r1, =0x020375f0 movs r0, 0x3 strh r0, [r1] @@ -456179,7 +456179,7 @@ sub_80FAC78: ; 80FAC78 bl VarGet lsls r0, 16 cmp r0, 0 - beq @080FADCE + beq _080FADCE ldr r4, =0x000040ee adds r0, r4, 0 bl VarGet @@ -456190,7 +456190,7 @@ sub_80FAC78: ; 80FAC78 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@080FADCE: +_080FADCE: add sp, 0x4 pop {r4} pop {r0} @@ -456209,32 +456209,32 @@ sub_80FADE4: ; 80FADE4 bl CurrentMapIsSecretBase 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 .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 @@ -456254,43 +456254,43 @@ 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 .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 @@ -456298,7 +456298,7 @@ task50_overworld_posion_effect: ; 80FAE38 lsrs r1, 16 movs r0, 0x4C bl SetGpuReg -@080FAEA2: +_080FAEA2: pop {r0} bx r0 thumb_func_end task50_overworld_posion_effect @@ -456359,13 +456359,13 @@ sub_80FAEF0: ; 80FAEF0 bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @080FAF1C + beq _080FAF1C adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080FAF4E -@080FAF1C: + beq _080FAF4E +_080FAF1C: bl player_get_direction_lower_nybble lsls r0, 24 lsrs r0, 24 @@ -456386,7 +456386,7 @@ sub_80FAEF0: ; 80FAEF0 adds r0, r1 ldr r1, =sub_80FAF64 str r1, [r0] -@080FAF4E: +_080FAF4E: pop {r4,r5} pop {r0} bx r0 @@ -456409,7 +456409,7 @@ sub_80FAF64: ; 80FAF64 bl FieldObjectClearAnimIfSpecialAnimFinished lsls r0, 24 cmp r0, 0 - beq @080FAFC8 + beq _080FAFC8 ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -456421,7 +456421,7 @@ sub_80FAF64: ; 80FAF64 lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bgt @080FAFC4 + bgt _080FAFC4 bl player_get_direction_lower_nybble lsls r0, 24 lsrs r0, 24 @@ -456431,12 +456431,12 @@ sub_80FAF64: ; 80FAF64 lsrs r1, 24 adds r0, r5, 0 bl FieldObjectSetSpecialAnim - b @080FAFC8 + b _080FAFC8 .pool -@080FAFC4: +_080FAFC4: ldr r0, =sub_80FAFD4 str r0, [r2] -@080FAFC8: +_080FAFC8: pop {r4,r5} pop {r0} bx r0 @@ -456485,7 +456485,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 @@ -456511,11 +456511,11 @@ sub_80FB00C: ; 80FB00C adds r0, 0x2 strh r0, [r4, 0x22] adds r0, r5, 0 - b @080FB06E + b _080FB06E .pool -@080FB06C: +_080FB06C: movs r0, 0x40 -@080FB06E: +_080FB06E: pop {r4,r5} pop {r1} bx r1 @@ -456528,24 +456528,24 @@ sub_80FB074: ; 80FB074 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, =gUnknown_0858E880 cmp r1, r0 - bne @080FB098 + bne _080FB098 adds r0, r4, 0 bl FreeObjectPalette adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@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 @@ -456559,21 +456559,21 @@ sub_80FB0B0: ; 80FB0B0 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 @@ -456586,13 +456586,13 @@ sub_80FB0DC: ; 80FB0DC 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 @@ -456659,9 +456659,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 @@ -456697,21 +456697,21 @@ 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 .pool -@080FB1F0: +_080FB1F0: ldr r2, =gUnknown_0858E898 movs r1, 0x2 ldrsh r0, [r7, r1] @@ -456720,13 +456720,13 @@ sub_80FB1AC: ; 80FB1AC 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 str r1, [r0] -@080FB20C: +_080FB20C: movs r4, 0x2 ldrsh r0, [r7, r4] adds r0, r2 @@ -456797,7 +456797,7 @@ sub_80FB1AC: ; 80FB1AC str r0, [sp] movs r0, 0x3 bl sub_808E82C -@080FB2A8: +_080FB2A8: add sp, 0x4 pop {r4-r7} pop {r0} @@ -456825,21 +456825,21 @@ 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 .pool -@080FB304: +_080FB304: ldr r1, =gUnknown_0858E898 movs r3, 0x2 ldrsh r0, [r2, r3] @@ -456878,7 +456878,7 @@ sub_80FB2C0: ; 80FB2C0 movs r0, 0x3 adds r3, r4, 0 bl sub_808E82C -@080FB358: +_080FB358: add sp, 0x4 pop {r3} mov r8, r3 @@ -456901,33 +456901,33 @@ 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 .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 SetCameraPanningCallback movs r0, 0 @@ -456942,23 +456942,23 @@ sub_80FB36C: ; 80FB36C strh r0, [r4] movs r0, 0x31 bl audio_play - b @080FB4D8 + b _080FB4D8 .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] @@ -456969,12 +456969,12 @@ sub_80FB36C: ; 80FB36C 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 @@ -456988,9 +456988,9 @@ sub_80FB36C: ; 80FB36C strh r0, [r4] movs r0, 0x32 bl audio_play - b @080FB4D8 + b _080FB4D8 .pool -@080FB450: +_080FB450: ldr r2, =0x03005e00 movs r0, 0x6 ldrsh r1, [r4, r0] @@ -457000,36 +457000,36 @@ sub_80FB36C: ; 80FB36C adds r0, r2 ldrb r5, [r0, 0x4] cmp r5, 0 - bne @080FB4D8 + bne _080FB4D8 bl InstallCameraPanAheadCallback strh r5, [r4, 0x2] movs r0, 0x4 strh r0, [r4] - b @080FB4D8 + b _080FB4D8 .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 @@ -457051,7 +457051,7 @@ sub_80FB36C: ; 80FB36C adds r0, r5, 0 bl remove_task bl script_env_2_disable -@080FB4D8: +_080FB4D8: pop {r4,r5} pop {r0} bx r0 @@ -457099,7 +457099,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] @@ -457125,7 +457125,7 @@ sub_80FB540: ; 80FB540 movs r0, 0x3 adds r3, r5, 0 bl sub_808E82C -@080FB58A: +_080FB58A: add sp, 0x4 pop {r4-r6} pop {r0} @@ -457149,7 +457149,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 @@ -457165,10 +457165,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} @@ -457194,95 +457194,95 @@ 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 .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 .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 .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, =gUnknown_0858E8AB - b @080FB6B2 + b _080FB6B2 .pool -@080FB6AC: +_080FB6AC: ldrb r1, [r6, 0x1] ldrb r2, [r6] ldr r3, =gUnknown_0858E8AD -@080FB6B2: +_080FB6B2: movs r0, 0xFF bl exec_movement movs r0, 0x1 strh r0, [r4] - b @080FB6E2 + b _080FB6E2 .pool -@080FB6C4: +_080FB6C4: ldr r0, =0x00004001 bl FlagReset movs r0, 0x80 @@ -457293,7 +457293,7 @@ sub_80FB5E8: ; 80FB5E8 bl sp13E_warp_to_last_warp adds r0, r5, 0 bl remove_task -@080FB6E2: +_080FB6E2: pop {r4-r7} pop {r0} bx r0 @@ -457330,7 +457330,7 @@ sub_80FB6EC: ; 80FB6EC lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne @080FB74C + bne _080FB74C movs r0, 0x4 bl FieldObjectDirectionToImageAnimId adds r1, r0, 0 @@ -457338,9 +457338,9 @@ sub_80FB6EC: ; 80FB6EC lsrs r1, 24 adds r0, r4, 0 bl StartObjectImageAnim - b @080FB75E + b _080FB75E .pool -@080FB74C: +_080FB74C: movs r0, 0x3 bl FieldObjectDirectionToImageAnimId adds r1, r0, 0 @@ -457348,7 +457348,7 @@ sub_80FB6EC: ; 80FB6EC lsrs r1, 24 adds r0, r4, 0 bl StartObjectImageAnim -@080FB75E: +_080FB75E: add sp, 0x4 pop {r4} pop {r0} @@ -457416,20 +457416,20 @@ GetCurrentMapRotatingGatePuzzleType: ; 80FB7E8 movs r0, 0x86 lsls r0, 1 cmp r1, r0 - bne @080FB800 + bne _080FB800 movs r0, 0x1 - b @080FB812 + b _080FB812 .pool -@080FB800: +_080FB800: ldr r0, =0x0000081d cmp r1, r0 - beq @080FB810 + beq _080FB810 movs r0, 0 - b @080FB812 + b _080FB812 .pool -@080FB810: +_080FB810: movs r0, 0x2 -@080FB812: +_080FB812: pop {r1} bx r1 thumb_func_end GetCurrentMapRotatingGatePuzzleType @@ -457445,9 +457445,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 @@ -457457,8 +457457,8 @@ sub_80FB818: ; 80FB818 adds r3, 0x1 ldrb r0, [r4] cmp r3, r0 - blt @080FB830 -@080FB844: + blt _080FB830 +_080FB844: pop {r4-r6} pop {r0} bx r0 @@ -457511,24 +457511,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} @@ -457541,38 +457541,38 @@ sub_80FB8CC: ; 80FB8CC push {lr} bl GetCurrentMapRotatingGatePuzzleType 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, =gUnknown_0858E8B0 str r0, [r1] ldr r1, =0x0203a048 movs r0, 0x8 - b @080FB902 + b _080FB902 .pool -@080FB8F8: +_080FB8F8: ldr r1, =0x0203a044 ldr r0, =gUnknown_0858E8F0 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 .pool @@ -457614,12 +457614,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 @@ -457633,26 +457633,26 @@ sub_80FB928: ; 80FB928 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 @@ -457662,15 +457662,15 @@ sub_80FB928: ; 80FB928 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 @@ -457701,18 +457701,18 @@ 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, =gUnknown_08591FE0 - b @080FBA38 + b _080FBA38 .pool -@080FBA34: +_080FBA34: mov r1, sp ldr r0, =gUnknown_08591FC8 -@080FBA38: +_080FBA38: ldm r0!, {r2,r3,r5} stm r1!, {r2,r3,r5} ldm r0!, {r2,r3,r5} @@ -457732,7 +457732,7 @@ sub_80FB9FC: ; 80FB9FC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq @080FBAD4 + beq _080FBAD4 ldrh r0, [r4] adds r0, 0x7 ldrh r1, [r4, 0x2] @@ -457781,11 +457781,11 @@ sub_80FB9FC: ; 80FB9FC adds r0, r4, 0 bl StartObjectRotScalAnim adds r0, r5, 0 - b @080FBAD6 + b _080FBAD6 .pool -@080FBAD4: +_080FBAD4: movs r0, 0x40 -@080FBAD6: +_080FBAD6: add sp, 0x18 pop {r3} mov r8, r3 @@ -457808,7 +457808,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 @@ -457816,21 +457816,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 StartObjectRotScalAnim - b @080FBB58 -@080FBB2A: + b _080FBB58 +_080FBB2A: cmp r5, 0x2 - bne @080FBB58 + bne _080FBB58 adds r0, r7, 0 adds r0, 0x8 lsls r0, 24 @@ -457839,18 +457839,18 @@ sub_80FBAE4: ; 80FBAE4 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 StartObjectRotScalAnim -@080FBB58: +_080FBB58: movs r0, 0 strh r0, [r6, 0x30] pop {r4-r7} @@ -457904,37 +457904,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 @@ -457979,9 +457979,9 @@ sub_80FBC10: ; 80FBC10 lsls r1, 16 lsrs r7, r1, 16 movs r6, 0 - b @080FBCB6 + b _080FBCB6 .pool -@080FBC48: +_080FBC48: ldr r0, =0x0203a044 ldr r0, [r0] lsls r1, r6, 3 @@ -457998,29 +457998,29 @@ sub_80FBC10: ; 80FBC10 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] @@ -458035,13 +458035,13 @@ sub_80FBC10: ; 80FBC10 bl RemoveObjectAndFreeTiles 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 @@ -458063,21 +458063,21 @@ sub_80FBCDC: ; 80FBCDC lsls r0, 24 lsrs r4, r0, 24 cmp r1, 0x1 - bne @080FBCFC + bne _080FBCFC ldr r0, =gUnknown_08592058 mov r10, r0 - b @080FBD08 + b _080FBD08 .pool -@080FBCFC: +_080FBCFC: cmp r1, 0x2 - beq @080FBD04 -@080FBD00: + beq _080FBD04 +_080FBD00: movs r0, 0 - b @080FBD98 -@080FBD04: + b _080FBD98 +_080FBD04: ldr r1, =gUnknown_08592038 mov r10, r1 -@080FBD08: +_080FBD08: adds r0, r4, 0 bl sub_80FB854 lsls r0, 24 @@ -458101,7 +458101,7 @@ sub_80FBCDC: ; 80FBCDC lsls r0, 16 asrs r0, 16 mov r8, r0 -@080FBD38: +_080FBD38: movs r6, 0 ldr r2, [sp] adds r7, r2, r3 @@ -458111,12 +458111,12 @@ sub_80FBCDC: ; 80FBCDC adds r0, r1 ldr r2, =gUnknown_08592078 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 @@ -458126,7 +458126,7 @@ sub_80FBCDC: ; 80FBCDC lsrs r1, r0, 24 ldrb r0, [r4] cmp r0, 0 - beq @080FBD88 + beq _080FBD88 lsls r1, 2 add r1, r10 movs r0, 0 @@ -458142,17 +458142,17 @@ sub_80FBCDC: ; 80FBCDC 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 @@ -458182,9 +458182,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 @@ -458216,7 +458216,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 @@ -458226,7 +458226,7 @@ sub_80FBE08: ; 80FBE08 adds r0, r3, 0 bl sub_80FB854 strh r0, [r4, 0x32] -@080FBE2C: +_080FBE2C: pop {r4} pop {r0} bx r0 @@ -458244,30 +458244,30 @@ sub_80FBE3C: ; 80FBE3C lsls r2, 16 lsrs r2, 16 cmp r0, 0x2 - bne @080FBE58 + bne _080FBE58 ldr r3, =gUnknown_08591FF8 - b @080FBE7A + b _080FBE7A .pool -@080FBE58: +_080FBE58: cmp r0, 0x1 - bne @080FBE64 + bne _080FBE64 ldr r3, =gUnknown_08592008 - b @080FBE7A + b _080FBE7A .pool -@080FBE64: +_080FBE64: cmp r0, 0x3 - bne @080FBE70 + bne _080FBE70 ldr r3, =gUnknown_08592018 - b @080FBE7A + b _080FBE7A .pool -@080FBE70: +_080FBE70: cmp r3, 0x4 - beq @080FBE78 + beq _080FBE78 movs r0, 0xFF - b @080FBE88 -@080FBE78: + b _080FBE88 +_080FBE78: ldr r3, =gUnknown_08592028 -@080FBE7A: +_080FBE7A: lsls r0, r2, 16 lsls r1, 16 asrs r1, 16 @@ -458275,7 +458275,7 @@ sub_80FBE3C: ; 80FBE3C adds r0, r1 adds r0, r3, r0 ldrb r0, [r0] -@080FBE88: +_080FBE88: pop {r1} bx r1 .pool @@ -458286,10 +458286,10 @@ sub_80FBE90: ; 80FBE90 push {lr} bl GetCurrentMapRotatingGatePuzzleType cmp r0, 0 - beq @080FBEA2 + beq _080FBEA2 bl sub_80FB8CC bl sub_80FB818 -@080FBEA2: +_080FBEA2: pop {r0} bx r0 thumb_func_end sub_80FBE90 @@ -458304,14 +458304,14 @@ RotatingGatePuzzleCameraUpdate: ; 80FBEA8 lsrs r5, r1, 16 bl GetCurrentMapRotatingGatePuzzleType 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 @@ -458322,13 +458322,13 @@ sub_80FBED0: ; 80FBED0 push {lr} bl GetCurrentMapRotatingGatePuzzleType cmp r0, 0 - beq @080FBEEA + beq _080FBEEA bl LoadRotatingGatePics bl sub_80FB8CC movs r0, 0 movs r1, 0 bl sub_80FB928 -@080FBEEA: +_080FBEEA: pop {r0} bx r0 thumb_func_end sub_80FBED0 @@ -458349,25 +458349,25 @@ CheckForRotatingGatePuzzleCollision: ; 80FBEF0 mov r8, r2 bl GetCurrentMapRotatingGatePuzzleType 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 @@ -458382,10 +458382,10 @@ CheckForRotatingGatePuzzleCollision: ; 80FBEF0 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 @@ -458393,10 +458393,10 @@ CheckForRotatingGatePuzzleCollision: ; 80FBEF0 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 @@ -458410,7 +458410,7 @@ CheckForRotatingGatePuzzleCollision: ; 80FBEF0 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @080FBFB8 + beq _080FBFB8 lsrs r5, r0, 4 movs r1, 0xF ands r1, r0 @@ -458419,24 +458419,24 @@ CheckForRotatingGatePuzzleCollision: ; 80FBEF0 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 .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 @@ -458462,20 +458462,20 @@ sub_80FBFD4: ; 80FBFD4 mov r8, r2 bl GetCurrentMapRotatingGatePuzzleType 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 @@ -458490,10 +458490,10 @@ sub_80FBFD4: ; 80FBFD4 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 @@ -458501,10 +458501,10 @@ sub_80FBFD4: ; 80FBFD4 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 @@ -458518,7 +458518,7 @@ sub_80FBFD4: ; 80FBFD4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @080FC080 + beq _080FC080 lsrs r5, r0, 4 movs r1, 0xF ands r1, r0 @@ -458527,21 +458527,21 @@ sub_80FBFD4: ; 80FBFD4 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 @@ -458634,7 +458634,7 @@ safari_step: ; 80FC14C push {lr} bl GetSafariZoneFlag cmp r0, 0 - beq @080FC168 + beq _080FC168 bl sub_80FC480 ldr r1, =0x0203a04e ldrh r0, [r1] @@ -458642,16 +458642,16 @@ 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 .pool -@080FC170: +_080FC170: ldr r0, =gUnknown_082A4B8A bl script_env_1_execute_new_script movs r0, 0x1 -@080FC178: +_080FC178: pop {r1} bx r1 .pool @@ -458679,24 +458679,24 @@ 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 bl SetMainCallback2 - b @080FC21C + b _080FC21C .pool -@080FC1D8: +_080FC1D8: ldrb r0, [r2] cmp r0, 0x8 - bne @080FC208 + bne _080FC208 ldr r0, =gUnknown_082A4B4C bl script_env_2_execute_new_script bl warp_in @@ -458705,17 +458705,17 @@ sub_80FC190: ; 80FC190 str r0, [r1] ldr r0, =c2_load_new_map bl SetMainCallback2 - b @080FC21C + b _080FC21C .pool -@080FC208: +_080FC208: cmp r0, 0x7 - bne @080FC21C + bne _080FC21C ldr r0, =gUnknown_082A4B9B 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 bl SetMainCallback2 -@080FC21C: +_080FC21C: pop {r0} bx r0 .pool @@ -458758,7 +458758,7 @@ sub_80FC258: ; 80FC258 adds r1, r4, 0 bl GetXYCoordsOneStepInFrontOfPlayer movs r5, 0 -@080FC26A: +_080FC26A: ldr r0, =0x03005d8c ldr r2, [r0] ldr r1, =0x0203a054 @@ -458769,20 +458769,20 @@ sub_80FC258: ; 80FC258 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, =gUnknown_085B262C @@ -458792,19 +458792,19 @@ sub_80FC258: ; 80FC258 ldr r1, [r0] ldr r0, =0x02021cc4 bl CopyString - b @080FC2D6 + b _080FC2D6 .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} @@ -458828,7 +458828,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 @@ -458837,7 +458837,7 @@ sub_80FC2E8: ; 80FC2E8 movs r0, 0x4 ldrsb r0, [r3, r0] cmp r1, r0 - bne @080FC364 + bne _080FC364 ldrh r0, [r4] ldrh r1, [r3] subs r0, r1 @@ -458850,39 +458850,39 @@ sub_80FC2E8: ; 80FC2E8 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 .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} @@ -458898,16 +458898,16 @@ sub_80FC388: ; 80FC388 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 .pool -@080FC3B0: +_080FC3B0: movs r0, 0 -@080FC3B2: +_080FC3B2: pop {r1} bx r1 thumb_func_end sub_80FC388 @@ -458920,16 +458920,16 @@ sub_80FC3B8: ; 80FC3B8 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 .pool -@080FC3E0: +_080FC3E0: movs r0, 0 -@080FC3E2: +_080FC3E2: pop {r1} bx r1 thumb_func_end sub_80FC3B8 @@ -458952,21 +458952,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 GetXYCoordsOneStepInFrontOfPlayer @@ -458992,15 +458992,15 @@ sub_80FC3E8: ; 80FC3E8 strh r0, [r4] ldrh r0, [r6] strh r0, [r4, 0x2] - b @080FC472 + b _080FC472 .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 @@ -459015,25 +459015,25 @@ 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 @@ -459048,7 +459048,7 @@ sub_80FC4B4: ; 80FC4B4 ldrh r1, [r3] ldr r0, =0x0000ffff cmp r1, r0 - beq @080FC4EC + beq _080FC4EC ldr r0, =0x02021dc4 ldr r2, =0x0203a054 lsls r1, 4 @@ -459058,11 +459058,11 @@ sub_80FC4B4: ; 80FC4B4 movs r3, 0x3 bl ConvertIntToDecimalString movs r0, 0x1 - b @080FC4EE + b _080FC4EE .pool -@080FC4EC: +_080FC4EC: movs r0, 0 -@080FC4EE: +_080FC4EE: pop {r1} bx r1 thumb_func_end sub_80FC4B4 @@ -459086,13 +459086,13 @@ sub_80FC4F4: ; 80FC4F4 bl link_0800A448 lsls r0, 24 cmp r0, 0 - bne @080FC528 + bne _080FC528 movs r0, 0 - b @080FC52A + b _080FC52A .pool -@080FC528: +_080FC528: movs r0, 0x1 -@080FC52A: +_080FC52A: pop {r4,r5} pop {r1} bx r1 @@ -459110,14 +459110,14 @@ 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 @@ -459132,13 +459132,13 @@ 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 @@ -459154,7 +459154,7 @@ sub_80FC580: ; 80FC580 ldr r6, =sub_80FC5C0 ldr r4, =0x020223c4 movs r3, 0xFF -@080FC590: +_080FC590: lsls r0, r1, 8 adds r0, r4 strh r3, [r0] @@ -459162,7 +459162,7 @@ sub_80FC580: ; 80FC580 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bls @080FC590 + bls _080FC590 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -459199,7 +459199,7 @@ sub_80FC5DC: ; 80FC5DC ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - beq @080FC650 + beq _080FC650 bl link_get_multiplayer_id ldr r1, =0x02039f25 strb r0, [r1] @@ -459212,47 +459212,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 @@ -459268,35 +459268,35 @@ 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 .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 @@ -459317,35 +459317,35 @@ 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 .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] @@ -459356,9 +459356,9 @@ sub_80FC6BC: ; 80FC6BC bl memcpy movs r0, 0xA strh r0, [r4, 0x8] - b @080FC7F4 + b _080FC7F4 .pool -@080FC738: +_080FC738: ldr r0, =0x020228c4 ldr r1, =0x02039f25 ldrb r1, [r1] @@ -459367,21 +459367,21 @@ sub_80FC6BC: ; 80FC6BC adds r1, r2 movs r2, 0x40 bl memcpy - b @080FC7D6 + b _080FC7D6 .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 @@ -459399,8 +459399,8 @@ sub_80FC6BC: ; 80FC6BC 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 @@ -459409,9 +459409,9 @@ sub_80FC6BC: ; 80FC6BC ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080FC7F4 + b _080FC7F4 .pool -@080FC7C0: +_080FC7C0: ldrh r0, [r4, 0x1E] adds r0, 0x1 strh r0, [r4, 0x1E] @@ -459419,14 +459419,14 @@ sub_80FC6BC: ; 80FC6BC 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 @@ -459438,7 +459438,7 @@ sub_80FC6BC: ; 80FC6BC 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} @@ -459460,37 +459460,37 @@ 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 .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 .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 @@ -459500,11 +459500,11 @@ sub_80FC804: ; 80FC804 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 @@ -459528,7 +459528,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 @@ -459537,54 +459537,54 @@ 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 .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 .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 @@ -459592,8 +459592,8 @@ sub_80FC894: ; 80FC894 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 @@ -459601,22 +459601,22 @@ sub_80FC894: ; 80FC894 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080FC986 + b _080FC986 .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 @@ -459628,7 +459628,7 @@ sub_80FC894: ; 80FC894 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 @@ -459651,37 +459651,37 @@ 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 .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 .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 @@ -459705,20 +459705,20 @@ 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 .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 @@ -459732,31 +459732,31 @@ sub_80FC9F8: ; 80FC9F8 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 .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] @@ -459768,8 +459768,8 @@ sub_80FC9F8: ; 80FC9F8 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 @@ -459777,7 +459777,7 @@ sub_80FC9F8: ; 80FC9F8 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@080FCAB2: +_080FCAB2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -459801,47 +459801,47 @@ 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 .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 .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] @@ -459849,9 +459849,9 @@ sub_80FCACC: ; 80FCACC ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 - b @080FCC50 + b _080FCC50 .pool -@080FCB6C: +_080FCB6C: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -459862,29 +459862,29 @@ sub_80FCACC: ; 80FCACC 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 .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] @@ -459892,22 +459892,22 @@ sub_80FCACC: ; 80FCACC ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 - b @080FCC50 + b _080FCC50 .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 .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] @@ -459915,19 +459915,19 @@ sub_80FCACC: ; 80FCACC ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x8 - b @080FCC50 + b _080FCC50 .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 @@ -459936,13 +459936,13 @@ sub_80FCACC: ; 80FCACC ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080FCC82 + b _080FCC82 .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] @@ -459950,7 +459950,7 @@ sub_80FCACC: ; 80FCACC ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x4 -@080FCC50: +_080FCC50: bl memcpy ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -459960,14 +459960,14 @@ sub_80FCACC: ; 80FCACC ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @080FCC82 + b _080FCC82 .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 @@ -459987,49 +459987,49 @@ 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 .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 .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] @@ -460039,9 +460039,9 @@ sub_80FCC88: ; 80FCC88 ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x70 - b @080FCE10 + b _080FCE10 .pool -@080FCD30: +_080FCD30: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -460052,31 +460052,31 @@ sub_80FCC88: ; 80FCC88 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 .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] @@ -460086,40 +460086,40 @@ sub_80FCC88: ; 80FCC88 ldr r2, =0x020223c4 adds r1, r2 movs r2, 0x14 - b @080FCE10 + b _080FCE10 .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 .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 .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 @@ -460128,22 +460128,22 @@ sub_80FCC88: ; 80FCC88 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @080FCE42 + b _080FCE42 .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 @@ -460153,14 +460153,14 @@ sub_80FCC88: ; 80FCC88 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @080FCE42 + b _080FCE42 .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 @@ -460183,7 +460183,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 @@ -460192,43 +460192,43 @@ 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 .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 .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 @@ -460238,36 +460238,36 @@ sub_80FCE48: ; 80FCE48 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 .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 @@ -460279,7 +460279,7 @@ sub_80FCE48: ; 80FCE48 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 @@ -460302,40 +460302,40 @@ 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 .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 .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] @@ -460344,11 +460344,11 @@ sub_80FCF40: ; 80FCF40 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 @@ -460368,40 +460368,40 @@ 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 .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 .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] @@ -460410,11 +460410,11 @@ sub_80FCFD0: ; 80FCFD0 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 @@ -460430,26 +460430,26 @@ SetUpItemUseCallback: ; 80FD060 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 .pool -@080FD084: +_080FD084: ldrh r0, [r1] bl itemid_get_type -@080FD08A: +_080FD08A: subs r0, 0x1 lsls r0, 24 lsrs r4, r0, 24 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FD0B8 + bne _080FD0B8 ldr r0, =0x0203ce54 ldr r2, [r0] ldr r1, =gUnknown_085920D8 @@ -460459,9 +460459,9 @@ SetUpItemUseCallback: ; 80FD060 str r0, [r2] adds r0, r5, 0 bl sub_81AB8F8 - b @080FD0CC + b _080FD0CC .pool -@080FD0B8: +_080FD0B8: ldr r0, =0x0203cf2c ldr r2, [r0] ldr r1, =gUnknown_085920D8 @@ -460471,7 +460471,7 @@ SetUpItemUseCallback: ; 80FD060 str r0, [r2] adds r0, r5, 0 bl sub_81C5B14 -@080FD0CC: +_080FD0CC: pop {r4,r5} pop {r0} bx r0 @@ -460492,20 +460492,20 @@ SetUpItemUseOnFieldCallback: ; 80FD0DC movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0x1 - beq @080FD110 + beq _080FD110 ldr r1, =0x03005dac ldr r0, =MapPostLoadHook_UseItem str r0, [r1] adds r0, r2, 0 bl SetUpItemUseCallback - b @080FD11A + b _080FD11A .pool -@080FD110: +_080FD110: ldr r0, =0x0203a0f4 ldr r1, [r0] adds r0, r2, 0 bl _call_via_r1 -@080FD11A: +_080FD11A: pop {r0} bx r0 .pool @@ -460534,12 +460534,12 @@ Task_CallItemUseOnFieldCallback: ; 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 @@ -460560,31 +460560,31 @@ DisplayCannotUseItemMessage: ; 80FD164 adds r0, r6, 0 bl ExpandStringRefs cmp r4, 0 - bne @080FD1B4 + bne _080FD1B4 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FD1A0 + bne _080FD1A0 ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 adds r2, r6, 0 bl DisplayItemMessage - b @080FD1BE + b _080FD1BE .pool -@080FD1A0: +_080FD1A0: ldr r1, =gUnknown_085E8F31 ldr r2, =sub_81C6714 adds r0, r5, 0 bl DisplayItemMessageInBattlePyramid - b @080FD1BE + b _080FD1BE .pool -@080FD1B4: +_080FD1B4: ldr r2, =CleanUpAfterFailingToUseRegisteredKeyItemOnField adds r0, r5, 0 adds r1, r6, 0 bl DisplayItemMessageOnField -@080FD1BE: +_080FD1BE: pop {r4-r6} pop {r0} bx r0 @@ -460650,22 +460650,22 @@ CheckIfItemIsTMHMOrEvolutionStone: ; 80FD21C bl itemid_get_overworld_function ldr r1, =ItemUseOutOfBattle_TMHM cmp r0, r1 - bne @080FD238 + bne _080FD238 movs r0, 0x1 - b @080FD24E + b _080FD24E .pool -@080FD238: +_080FD238: adds r0, r4, 0 bl itemid_get_overworld_function ldr r1, =ItemUseOutOfBattle_EvolutionStone cmp r0, r1 - beq @080FD24C + beq _080FD24C movs r0, 0 - b @080FD24E + b _080FD24E .pool -@080FD24C: +_080FD24C: movs r0, 0x2 -@080FD24E: +_080FD24E: pop {r4} pop {r1} bx r1 @@ -460735,57 +460735,57 @@ ItemUseOutOfBattle_Bike: ; 80FD298 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080FD30E + beq _080FD30E adds r0, r4, 0 bl MetatileBehavior_IsVerticalRail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080FD30E + beq _080FD30E adds r0, r4, 0 bl MetatileBehavior_IsHorizontalRail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080FD30E + beq _080FD30E adds r0, r4, 0 bl MetatileBehavior_IsIsolatedVerticalRail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @080FD30E + beq _080FD30E adds r0, r4, 0 bl MetatileBehavior_IsIsolatedHorizontalRail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FD320 -@080FD30E: + bne _080FD320 +_080FD30E: ldrb r1, [r6, 0x6] adds r0, r5, 0 bl DisplayCannotDismountBikeMessage - b @080FD350 + b _080FD350 .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, =ItemUseOnFieldCB_Bike str r0, [r1] adds r0, r5, 0 bl SetUpItemUseOnFieldCallback - b @080FD350 + b _080FD350 .pool -@080FD348: +_080FD348: ldrb r1, [r6, 0x6] adds r0, r5, 0 bl DisplayDadsAdviceCannotUseItemMessage -@080FD350: +_080FD350: add sp, 0x4 pop {r4-r6} pop {r0} @@ -460802,15 +460802,15 @@ ItemUseOnFieldCB_Bike: ; 80FD358 bl itemid_get_x28 lsls r0, 24 cmp r0, 0 - bne @080FD378 + bne _080FD378 movs r0, 0x2 bl GetOnOffBike - b @080FD37E + b _080FD37E .pool -@080FD378: +_080FD378: movs r0, 0x4 bl GetOnOffBike -@080FD37E: +_080FD37E: bl sub_80984F4 bl script_env_2_disable adds r0, r4, 0 @@ -460844,30 +460844,30 @@ CanFish: ; 80FD394 bl MetatileBehavior_IsWaterfall lsls r0, 24 cmp r0, 0 - bne @080FD41C + bne _080FD41C movs r0, 0x10 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - bne @080FD41C + bne _080FD41C movs r0, 0x8 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - bne @080FD3EC + bne _080FD3EC bl IsPlayerFacingSurfableFishableWater 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 MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, 24 cmp r0, 0 - beq @080FD40C + beq _080FD40C mov r0, sp movs r1, 0 ldrsh r0, [r0, r1] @@ -460876,18 +460876,18 @@ CanFish: ; 80FD394 bl MapGridIsImpassableAt 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} @@ -460901,15 +460901,15 @@ ItemUseOutOfBattle_Rod: ; 80FD428 lsrs r4, r0, 24 bl CanFish cmp r0, 0x1 - bne @080FD44C + bne _080FD44C ldr r1, =0x0203a0f4 ldr r0, =ItemUseOnFieldCB_Rod str r0, [r1] adds r0, r4, 0 bl SetUpItemUseOnFieldCallback - b @080FD45E + b _080FD45E .pool -@080FD44C: +_080FD44C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -460918,7 +460918,7 @@ ItemUseOutOfBattle_Rod: ; 80FD428 ldrb r1, [r1, 0xE] adds r0, r4, 0 bl DisplayDadsAdviceCannotUseItemMessage -@080FD45E: +_080FD45E: pop {r4} pop {r0} bx r0 @@ -460976,7 +460976,7 @@ ItemUseOnFieldCB_Itemfinder: ; 80FD4B8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FD4EC + bne _080FD4EC ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -460984,14 +460984,14 @@ ItemUseOnFieldCB_Itemfinder: ; 80FD4B8 adds r1, r0 ldr r0, =sub_80FD504 str r0, [r1] - b @080FD4F6 + b _080FD4F6 .pool -@080FD4EC: +_080FD4EC: ldr r1, =gUnknown_085E9002 ldr r2, =sub_80FD5CC adds r0, r4, 0 bl DisplayItemMessageOnField -@080FD4F6: +_080FD4F6: pop {r4} pop {r0} bx r0 @@ -461014,11 +461014,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 @@ -461027,7 +461027,7 @@ sub_80FD504: ; 80FD504 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq @080FD564 + beq _080FD564 ldr r1, =gUnknown_085920E4 subs r0, 0x1 adds r0, r1 @@ -461038,9 +461038,9 @@ sub_80FD504: ; 80FD504 adds r0, r7, r0 ldr r1, =sub_80FDA94 str r1, [r0] - b @080FD5C2 + b _080FD5C2 .pool -@080FD564: +_080FD564: bl player_get_direction_lower_nybble lsls r0, 24 lsrs r2, r0, 24 @@ -461048,20 +461048,20 @@ sub_80FD504: ; 80FD504 adds r3, r6, 0 ldr r7, =gUnknown_085920E4 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 @@ -461071,21 +461071,21 @@ sub_80FD504: ; 80FD504 movs r0, 0 strh r0, [r4, 0x6] strh r0, [r4, 0x4] - b @080FD5C2 + b _080FD5C2 .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} @@ -461138,10 +461138,10 @@ ItemfinderCheckForHiddenItems: ; 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] @@ -461152,7 +461152,7 @@ ItemfinderCheckForHiddenItems: ; 80FD5F0 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 @@ -461163,7 +461163,7 @@ ItemfinderCheckForHiddenItems: ; 80FD5F0 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @080FD694 + bne _080FD694 ldr r1, [r5, 0x10] adds r1, r4, r1 ldrh r2, [r1] @@ -461185,16 +461185,16 @@ ItemfinderCheckForHiddenItems: ; 80FD5F0 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 @@ -461202,8 +461202,8 @@ ItemfinderCheckForHiddenItems: ; 80FD5F0 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 @@ -461214,13 +461214,13 @@ ItemfinderCheckForHiddenItems: ; 80FD5F0 movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0x1 - beq @080FD6C4 + beq _080FD6C4 movs r0, 0 - b @080FD6C6 + b _080FD6C6 .pool -@080FD6C4: +_080FD6C4: movs r0, 0x1 -@080FD6C6: +_080FD6C6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -461241,22 +461241,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 @@ -461267,17 +461267,17 @@ sub_80FD6D4: ; 80FD6D4 bl FlagGet 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 @@ -461293,19 +461293,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 @@ -461315,8 +461315,8 @@ sub_80FD730: ; 80FD730 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 @@ -461325,36 +461325,36 @@ sub_80FD730: ; 80FD730 ldr r0, =0x02037318 ldr r0, [r0] ldr r0, [r0, 0x4] - b @080FD79E + b _080FD79E .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 .pool -@080FD7AC: +_080FD7AC: movs r0, 0 - b @080FD7C2 -@080FD7B0: + b _080FD7C2 +_080FD7B0: ldr r0, [r3, 0x4] lsls r1, 16 asrs r1, 16 @@ -461363,7 +461363,7 @@ sub_80FD730: ; 80FD730 bl sub_80FD6D4 lsls r0, 24 lsrs r0, 24 -@080FD7C2: +_080FD7C2: pop {r4-r6} pop {r1} bx r1 @@ -461408,8 +461408,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 @@ -461423,32 +461423,32 @@ sub_80FD7C8: ; 80FD7C8 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 @@ -461458,14 +461458,14 @@ sub_80FD7C8: ; 80FD7C8 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 @@ -461477,7 +461477,7 @@ sub_80FD7C8: ; 80FD7C8 asrs r2, 16 ldr r0, [sp, 0x4] bl sub_80FD8E0 -@080FD89E: +_080FD89E: movs r1, 0x80 lsls r1, 9 adds r0, r7, r1 @@ -461489,8 +461489,8 @@ sub_80FD7C8: ; 80FD7C8 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 @@ -461501,8 +461501,8 @@ sub_80FD7C8: ; 80FD7C8 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 @@ -461535,62 +461535,62 @@ 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 .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 @@ -461603,27 +461603,27 @@ sub_80FD8E0: ; 80FD8E0 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 @@ -461640,67 +461640,67 @@ sub_80FD9B0: ; 80FD9B0 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 @@ -461778,12 +461778,12 @@ sub_80FDA94: ; 80FDA94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FDACA + bne _080FDACA ldr r1, =gUnknown_085E8F93 ldr r2, =sub_80FD5CC adds r0, r4, 0 bl DisplayItemMessageOnField -@080FDACA: +_080FDACA: pop {r4} pop {r0} bx r0 @@ -461817,12 +461817,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, =gUnknown_085920E4 movs r2, 0xA ldrsh r0, [r4, r2] @@ -461842,12 +461842,12 @@ sub_80FDADC: ; 80FDADC lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @080FDB50 + bne _080FDB50 ldr r1, =gUnknown_085E8FDB ldr r2, =sub_80FD5CC adds r0, r5, 0 bl DisplayItemMessageOnField -@080FDB50: +_080FDB50: pop {r4,r5} pop {r0} bx r0 @@ -461863,7 +461863,7 @@ ItemUseOutOfBattle_PokeblockCase: ; 80FDB6C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FDB98 + bne _080FDB98 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -461872,9 +461872,9 @@ ItemUseOutOfBattle_PokeblockCase: ; 80FDB6C ldrb r1, [r1, 0xE] adds r0, r4, 0 bl DisplayDadsAdviceCannotUseItemMessage - b @080FDBDA + b _080FDBDA .pool -@080FDB98: +_080FDB98: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -461883,16 +461883,16 @@ ItemUseOutOfBattle_PokeblockCase: ; 80FDB6C movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 - beq @080FDBC8 + beq _080FDBC8 ldr r0, =0x0203ce54 ldr r1, [r0] ldr r0, =sub_80FDBEC str r0, [r1] adds r0, r4, 0 bl sub_81AB8F8 - b @080FDBDA + b _080FDBDA .pool -@080FDBC8: +_080FDBC8: ldr r0, =0x03005dac ldr r1, =sub_80AF6D4 str r1, [r0] @@ -461901,7 +461901,7 @@ ItemUseOutOfBattle_PokeblockCase: ; 80FDB6C bl fade_screen ldr r0, =sub_80FDC00 str r0, [r5] -@080FDBDA: +_080FDBDA: pop {r4,r5} pop {r0} bx r0 @@ -461929,14 +461929,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 movs r0, 0 bl sub_81357FC adds r0, r4, 0 bl remove_task -@080FDC24: +_080FDC24: pop {r4} pop {r0} bx r0 @@ -461969,20 +461969,20 @@ ItemUseOutOfBattle_CoinCase: ; 80FDC34 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne @080FDC90 + bne _080FDC90 ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl DisplayItemMessage - b @080FDC9A + b _080FDC9A .pool -@080FDC90: +_080FDC90: ldr r2, =CleanUpAfterFailingToUseRegisteredKeyItemOnField adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField -@080FDC9A: +_080FDC9A: pop {r4,r5} pop {r0} bx r0 @@ -462013,20 +462013,20 @@ ItemUseOutOfBattle_PowderJar: ; 80FDCA4 movs r1, 0xE ldrsh r0, [r0, r1] cmp r0, 0 - bne @080FDCFC + bne _080FDCFC ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 adds r2, r4, 0 bl DisplayItemMessage - b @080FDD06 + b _080FDD06 .pool -@080FDCFC: +_080FDCFC: ldr r2, =CleanUpAfterFailingToUseRegisteredKeyItemOnField adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField -@080FDD06: +_080FDD06: pop {r4,r5} pop {r0} bx r0 @@ -462042,7 +462042,7 @@ sub_80FDD10: ; 80FDD10 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FDD58 + bne _080FDD58 ldr r1, =0x0203a0f4 ldr r0, =sub_80FDD74 str r0, [r1] @@ -462055,16 +462055,16 @@ sub_80FDD10: ; 80FDD10 str r0, [r1] adds r0, r4, 0 bl sub_81AB8F8 - b @080FDD68 + b _080FDD68 .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 @@ -462102,26 +462102,26 @@ ItemUseOutOfBattle_WailmerPail: ; 80FDDA4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FDDC8 + bne _080FDDC8 ldr r1, =0x0203a0f4 ldr r0, =sub_80FDE7C - b @080FDDD8 + b _080FDDD8 .pool -@080FDDC8: +_080FDDC8: bl WaterBerryTree lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FDDEC + bne _080FDDEC ldr r1, =0x0203a0f4 ldr r0, =sub_80FDE08 -@080FDDD8: +_080FDDD8: str r0, [r1] adds r0, r4, 0 bl SetUpItemUseOnFieldCallback - b @080FDDFE + b _080FDDFE .pool -@080FDDEC: +_080FDDEC: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -462130,7 +462130,7 @@ ItemUseOutOfBattle_WailmerPail: ; 80FDDA4 ldrb r1, [r1, 0xE] adds r0, r5, 0 bl DisplayDadsAdviceCannotUseItemMessage -@080FDDFE: +_080FDDFE: pop {r4,r5} pop {r0} bx r0 @@ -462174,7 +462174,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 @@ -462182,14 +462182,14 @@ 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 .pool -@080FDE70: +_080FDE70: movs r0, 0x1 -@080FDE72: +_080FDE72: add sp, 0x4 pop {r4} pop {r1} @@ -462307,21 +462307,21 @@ ItemUseOutOfBattle_TMHM: ; 80FDF48 movs r0, 0xA9 lsls r0, 1 cmp r1, r0 - bls @080FDF74 + bls _080FDF74 ldr r2, =gUnknown_085E9047 ldr r3, =sub_80FDF90 adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FDF80 + b _080FDF80 .pool -@080FDF74: +_080FDF74: ldr r2, =gUnknown_085E9037 ldr r3, =sub_80FDF90 adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage -@080FDF80: +_080FDF80: pop {r4} pop {r0} bx r0 @@ -462359,7 +462359,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] @@ -462381,7 +462381,7 @@ task08_0809AD8C: ; 80FDFBC movs r1, 0x1 adds r2, r4, 0 bl DisplayItemMessage -@080FE000: +_080FE000: pop {r4,r5} pop {r0} bx r0 @@ -462431,7 +462431,7 @@ sub_80FE058: ; 80FE058 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE0AC + bne _080FE0AC ldrh r0, [r4] bl itemid_get_pocket_number lsls r0, 24 @@ -462442,12 +462442,12 @@ sub_80FE058: ; 80FE058 lsls r0, 24 lsrs r0, 24 bl sub_81ABA88 - b @080FE0B4 + b _080FE0B4 .pool -@080FE0AC: +_080FE0AC: bl sub_81C5924 bl sub_81C59BC -@080FE0B4: +_080FE0B4: pop {r4} pop {r0} bx r0 @@ -462463,7 +462463,7 @@ ItemUseOutOfBattle_Repel: ; 80FE0BC bl VarGet lsls r0, 16 cmp r0, 0 - bne @080FE0EC + bne _080FE0EC ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -462471,26 +462471,26 @@ ItemUseOutOfBattle_Repel: ; 80FE0BC adds r1, r0 ldr r0, =sub_80FE124 str r0, [r1] - b @080FE116 + b _080FE116 .pool -@080FE0EC: +_080FE0EC: bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE10C + bne _080FE10C ldr r2, =gUnknown_085E9092 ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FE116 + b _080FE116 .pool -@080FE10C: +_080FE10C: ldr r1, =gUnknown_085E9092 ldr r2, =sub_81C6714 adds r0, r5, 0 bl DisplayItemMessageInBattlePyramid -@080FE116: +_080FE116: pop {r4,r5} pop {r0} bx r0 @@ -462513,7 +462513,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 @@ -462523,7 +462523,7 @@ sub_80FE124: ; 80FE124 adds r0, r4, r0 ldr r1, =sub_80FE164 str r1, [r0] -@080FE156: +_080FE156: pop {r4,r5} pop {r0} bx r0 @@ -462539,7 +462539,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] @@ -462553,20 +462553,20 @@ sub_80FE164: ; 80FE164 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE1B8 + bne _080FE1B8 ldr r2, =0x02021fc4 ldr r3, =sub_81ABBBC adds r0, r5, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FE1C2 + b _080FE1C2 .pool -@080FE1B8: +_080FE1B8: ldr r1, =0x02021fc4 ldr r2, =sub_81C6714 adds r0, r6, 0 bl DisplayItemMessageInBattlePyramid -@080FE1C2: +_080FE1C2: pop {r4-r6} pop {r0} bx r0 @@ -462590,26 +462590,26 @@ sub_80FE1D0: ; 80FE1D0 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble @080FE226 + ble _080FE226 movs r0, 0x75 bl audio_play bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE21C + bne _080FE21C ldr r2, =0x02021fc4 ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FE226 + b _080FE226 .pool -@080FE21C: +_080FE21C: ldr r1, =0x02021fc4 ldr r2, =sub_81C6714 adds r0, r5, 0 bl DisplayItemMessageInBattlePyramid -@080FE226: +_080FE226: pop {r4,r5} pop {r0} bx r0 @@ -462627,7 +462627,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: ; 80FE234 bl itemid_get_name ldrh r0, [r4] cmp r0, 0x2B - bne @080FE278 + bne _080FE278 ldr r0, =0x000008ad bl FlagSet ldr r0, =0x000008ae @@ -462635,9 +462635,9 @@ ItemUseOutOfBattle_BlackWhiteFlute: ; 80FE234 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E90C6 bl ExpandStringRefs - b @080FE28C + b _080FE28C .pool -@080FE278: +_080FE278: ldr r0, =0x000008ae bl FlagSet ldr r0, =0x000008ad @@ -462645,7 +462645,7 @@ ItemUseOutOfBattle_BlackWhiteFlute: ; 80FE234 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E90F4 bl ExpandStringRefs -@080FE28C: +_080FE28C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -462709,13 +462709,13 @@ sub_80FE314: ; 80FE314 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @080FE32C + bne _080FE32C movs r0, 0 - b @080FE32E + b _080FE32E .pool -@080FE32C: +_080FE32C: movs r0, 0x1 -@080FE32E: +_080FE32E: pop {r1} bx r1 thumb_func_end sub_80FE314 @@ -462729,15 +462729,15 @@ ItemUseOutOfBattle_EscapeRope: ; 80FE334 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FE35C + bne _080FE35C ldr r1, =0x0203a0f4 ldr r0, =re_escape_rope str r0, [r1] adds r0, r4, 0 bl SetUpItemUseOnFieldCallback - b @080FE36E + b _080FE36E .pool -@080FE35C: +_080FE35C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -462746,7 +462746,7 @@ ItemUseOutOfBattle_EscapeRope: ; 80FE334 ldrb r1, [r1, 0xE] adds r0, r4, 0 bl DisplayDadsAdviceCannotUseItemMessage -@080FE36E: +_080FE36E: pop {r4} pop {r0} bx r0 @@ -462776,7 +462776,7 @@ ItemUseInBattle_PokeBall: ; 80FE394 bl sub_806B8B0 lsls r0, 24 cmp r0, 0 - bne @080FE3D0 + bne _080FE3D0 ldr r0, =0x0203ce7c ldrh r0, [r0] movs r1, 0x1 @@ -462784,33 +462784,33 @@ ItemUseInBattle_PokeBall: ; 80FE394 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE3C8 + bne _080FE3C8 adds r0, r4, 0 bl sub_81AB8F8 - b @080FE3FA + b _080FE3FA .pool -@080FE3C8: +_080FE3C8: adds r0, r4, 0 bl sub_81C5B14 - b @080FE3FA -@080FE3D0: + b _080FE3FA +_080FE3D0: bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE3F0 + bne _080FE3F0 ldr r2, =gUnknown_085E9125 ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FE3FA + b _080FE3FA .pool -@080FE3F0: +_080FE3F0: ldr r1, =gUnknown_085E9125 ldr r2, =sub_81C6714 adds r0, r5, 0 bl DisplayItemMessageInBattlePyramid -@080FE3FA: +_080FE3FA: pop {r4,r5} pop {r0} bx r0 @@ -462828,19 +462828,19 @@ sub_80FE408: ; 80FE408 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq @080FE43A + beq _080FE43A bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE434 + bne _080FE434 adds r0, r4, 0 bl sub_81AB8F8 - b @080FE43A + b _080FE43A .pool -@080FE434: +_080FE434: adds r0, r5, 0 bl sub_81C5B14 -@080FE43A: +_080FE43A: pop {r4,r5} pop {r0} bx r0 @@ -462863,7 +462863,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 @@ -462873,7 +462873,7 @@ sub_80FE440: ; 80FE440 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE49C + bne _080FE49C ldrh r0, [r4] bl sub_806CF78 adds r2, r0, 0 @@ -462881,16 +462881,16 @@ sub_80FE440: ; 80FE440 adds r0, r5, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FE4AC + b _080FE4AC .pool -@080FE49C: +_080FE49C: ldrh r0, [r4] bl sub_806CF78 adds r1, r0, 0 ldr r2, =sub_80FE408 adds r0, r6, 0 bl DisplayItemMessageInBattlePyramid -@080FE4AC: +_080FE4AC: pop {r4-r6} pop {r0} bx r0 @@ -462921,26 +462921,26 @@ ItemUseInBattle_StatIncrease: ; 80FE4B8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq @080FE52C + beq _080FE52C bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE518 + bne _080FE518 ldr r2, =gUnknown_085E96F6 ldr r3, =sub_81ABBBC adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FE53C + b _080FE53C .pool -@080FE518: +_080FE518: ldr r1, =gUnknown_085E96F6 ldr r2, =sub_81C6714 adds r0, r4, 0 bl DisplayItemMessageInBattlePyramid - b @080FE53C + b _080FE53C .pool -@080FE52C: +_080FE52C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -462949,7 +462949,7 @@ ItemUseInBattle_StatIncrease: ; 80FE4B8 ldr r0, =sub_80FE440 str r0, [r1] strh r2, [r1, 0x18] -@080FE53C: +_080FE53C: pop {r4} pop {r0} bx r0 @@ -462964,23 +462964,23 @@ sub_80FE54C: ; 80FE54C bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE574 + bne _080FE574 ldr r0, =0x0203ce54 ldr r1, [r0] ldr r0, =sub_81B89F0 str r0, [r1] adds r0, r4, 0 bl sub_81AB8F8 - b @080FE582 + b _080FE582 .pool -@080FE574: +_080FE574: ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =sub_81B89F0 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 -@080FE582: +_080FE582: pop {r4} pop {r0} bx r0 @@ -463039,27 +463039,27 @@ ItemUseInBattle_Escape: ; 80FE5E4 movs r1, 0x8 ands r0, r1 cmp r0, 0 - bne @080FE634 + bne _080FE634 bl sub_80FE058 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @080FE620 + bne _080FE620 ldr r2, =0x02021fc4 ldr r3, =sub_81AB8F8 adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @080FE646 + b _080FE646 .pool -@080FE620: +_080FE620: ldr r1, =0x02021fc4 ldr r2, =sub_81C5B14 adds r0, r4, 0 bl DisplayItemMessageInBattlePyramid - b @080FE646 + b _080FE646 .pool -@080FE634: +_080FE634: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -463068,7 +463068,7 @@ ItemUseInBattle_Escape: ; 80FE5E4 ldrb r1, [r1, 0xE] adds r0, r4, 0 bl DisplayDadsAdviceCannotUseItemMessage -@080FE646: +_080FE646: pop {r4} pop {r0} bx r0 @@ -463087,39 +463087,39 @@ ItemUseOutOfBattle_EnigmaBerry: ; 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 .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 @@ -463129,9 +463129,9 @@ ItemUseOutOfBattle_EnigmaBerry: ; 80FE650 strh r0, [r1, 0x10] adds r0, r4, 0 bl ItemUseOutOfBattle_Medicine - b @080FE770 + b _080FE770 .pool -@080FE6EC: +_080FE6EC: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -463141,9 +463141,9 @@ ItemUseOutOfBattle_EnigmaBerry: ; 80FE650 strh r0, [r1, 0x10] adds r0, r4, 0 bl ItemUseOutOfBattle_SacredAsh - b @080FE770 + b _080FE770 .pool -@080FE708: +_080FE708: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -463153,9 +463153,9 @@ ItemUseOutOfBattle_EnigmaBerry: ; 80FE650 strh r0, [r1, 0x10] adds r0, r4, 0 bl ItemUseOutOfBattle_RareCandy - b @080FE770 + b _080FE770 .pool -@080FE724: +_080FE724: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -463165,9 +463165,9 @@ ItemUseOutOfBattle_EnigmaBerry: ; 80FE650 strh r0, [r1, 0x10] adds r0, r4, 0 bl ItemUseOutOfBattle_PPUp - b @080FE770 + b _080FE770 .pool -@080FE740: +_080FE740: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -463177,9 +463177,9 @@ ItemUseOutOfBattle_EnigmaBerry: ; 80FE650 strh r0, [r1, 0x10] adds r0, r4, 0 bl ItemUseOutOfBattle_PPRecovery - b @080FE770 + b _080FE770 .pool -@080FE75C: +_080FE75C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -463189,7 +463189,7 @@ ItemUseOutOfBattle_EnigmaBerry: ; 80FE650 strh r0, [r1, 0x10] adds r0, r4, 0 bl ItemUseOutOfBattle_CannotUse -@080FE770: +_080FE770: pop {r4} pop {r0} bx r0 @@ -463207,53 +463207,53 @@ ItemUseInBattle_EnigmaBerry: ; 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 .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 ItemUseInBattle_StatIncrease - b @080FE81A -@080FE804: + b _080FE81A +_080FE804: adds r0, r4, 0 bl ItemUseInBattle_Medicine - b @080FE81A -@080FE80C: + b _080FE81A +_080FE80C: adds r0, r4, 0 bl ItemUseInBattle_PPRecovery - b @080FE81A -@080FE814: + b _080FE81A +_080FE814: adds r0, r4, 0 bl ItemUseOutOfBattle_CannotUse -@080FE81A: +_080FE81A: pop {r4} pop {r0} bx r0 @@ -463298,14 +463298,14 @@ 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 .pool -@080FE87C: +_080FE87C: ldrh r0, [r5, 0x8] -@080FE87E: +_080FE87E: strh r0, [r4, 0x34] ldr r0, =0x0203841e ldrh r0, [r0, 0xA] @@ -463326,7 +463326,7 @@ sub_80FE898: ; 80FE898 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] @@ -463348,11 +463348,11 @@ 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 @@ -463474,27 +463474,27 @@ sub_80FE9E4: ; 80FE9E4 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq @080FE9FA + beq _080FE9FA adds r0, r4, 0 bl RemoveObjectAndFreeTiles - 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 .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] @@ -463517,7 +463517,7 @@ sub_80FE9E4: ; 80FE9E4 movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] -@080FEA4E: +_080FEA4E: pop {r4} pop {r0} bx r0 @@ -463544,7 +463544,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] @@ -463569,14 +463569,14 @@ sub_80FEA58: ; 80FEA58 movs r1, 0 movs r2, 0 bl AddObjectAndAnimateForOneFrame -@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 @@ -463624,10 +463624,10 @@ sub_80FEB28: ; 80FEB28 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 @@ -463662,15 +463662,15 @@ 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 .pool -@080FEB90: +_080FEB90: ldrh r0, [r5, 0x20] adds r0, 0x14 -@080FEB94: +_080FEB94: strh r0, [r5, 0x20] bl GenerateRandomNumber2 lsls r0, 16 @@ -463723,11 +463723,11 @@ sub_80FEBFC: ; 80FEBFC 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 @@ -463738,13 +463738,13 @@ sub_80FEBFC: ; 80FEBFC 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] @@ -463753,7 +463753,7 @@ sub_80FEBFC: ; 80FEBFC movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] -@080FEC42: +_080FEC42: pop {r4} pop {r0} bx r0 @@ -463770,12 +463770,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] @@ -463815,7 +463815,7 @@ sub_80FECB8: ; 80FECB8 bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @080FECE2 + beq _080FECE2 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -463829,7 +463829,7 @@ sub_80FECB8: ; 80FECB8 ldr r1, =sub_80FECF0 adds r0, r4, 0 bl oamt_set_x3A_32 -@080FECE2: +_080FECE2: pop {r4} pop {r0} bx r0 @@ -463876,7 +463876,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 @@ -463884,7 +463884,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] @@ -463925,7 +463925,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 @@ -463937,9 +463937,9 @@ sub_80FED74: ; 80FED74 negs r0, r0 ands r0, r2 orrs r0, r1 - b @080FEDEC + b _080FEDEC .pool -@080FEDC8: +_080FEDC8: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -463947,9 +463947,9 @@ sub_80FED74: ; 80FED74 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 @@ -463958,7 +463958,7 @@ sub_80FED74: ; 80FED74 negs r0, r0 ands r0, r1 orrs r0, r2 -@080FEDEC: +_080FEDEC: strb r0, [r4, 0x5] ldrh r0, [r4, 0x30] adds r0, 0x2 @@ -463973,10 +463973,10 @@ sub_80FED74: ; 80FED74 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 @@ -463991,38 +463991,38 @@ sub_80FEE1C: ; 80FEE1C 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 .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 @@ -464072,7 +464072,7 @@ sub_80FEECC: ; 80FEECC bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @080FEF38 + bne _080FEF38 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x20 @@ -464093,19 +464093,19 @@ 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 .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] @@ -464114,12 +464114,12 @@ sub_80FEECC: ; 80FEECC movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x38] - b @080FEF3E + b _080FEF3E .pool -@080FEF38: +_080FEF38: adds r0, r4, 0 bl move_anim_8072740 -@080FEF3E: +_080FEF3E: pop {r4} pop {r0} bx r0 @@ -464169,7 +464169,7 @@ sub_80FEF98: ; 80FEF98 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @080FEFF0 + bne _080FEFF0 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x8 @@ -464183,14 +464183,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 @@ -464201,17 +464201,17 @@ sub_80FEF98: ; 80FEF98 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 @@ -464257,27 +464257,27 @@ sub_80FF044: ; 80FF044 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 str r0, [r1, 0x1C] - b @080FF08C + b _080FF08C .pool -@080FF078: +_080FF078: subs r0, 0x1 strh r0, [r1, 0x32] ldrh r0, [r1, 0x2E] @@ -464288,7 +464288,7 @@ sub_80FF044: ; 80FF044 ldrh r2, [r1, 0x22] adds r0, r2 strh r0, [r1, 0x22] -@080FF08C: +_080FF08C: pop {r0} bx r0 thumb_func_end sub_80FF044 @@ -464302,20 +464302,20 @@ 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 .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 @@ -464328,18 +464328,18 @@ sub_80FF090: ; 80FF090 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 @@ -464356,19 +464356,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 @@ -464385,9 +464385,9 @@ sub_80FF0F4: ; 80FF0F4 lsrs r0, 24 ldrh r6, [r6, 0x6] adds r0, r6 - b @080FF174 + b _080FF174 .pool -@080FF154: +_080FF154: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -464403,7 +464403,7 @@ sub_80FF0F4: ; 80FF0F4 ldrh r0, [r6, 0x6] ldrh r1, [r5, 0x36] adds r0, r1 -@080FF174: +_080FF174: strh r0, [r5, 0x36] ldr r0, =0x0203841e ldrh r0, [r0, 0xA] @@ -464420,13 +464420,13 @@ sub_80FF0F4: ; 80FF0F4 lsls r4, 24 lsls r0, 24 cmp r4, r0 - bne @080FF1AC + bne _080FF1AC movs r0, 0x1 - b @080FF1AE + b _080FF1AE .pool -@080FF1AC: +_080FF1AC: movs r0, 0 -@080FF1AE: +_080FF1AE: strh r0, [r5, 0x2E] ldr r0, =sub_80FF1C0 str r0, [r5, 0x1C] @@ -464452,25 +464452,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] @@ -464490,9 +464490,9 @@ sub_80FF1C0: ; 80FF1C0 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 @@ -464502,26 +464502,26 @@ sub_80FF1C0: ; 80FF1C0 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 @@ -464535,7 +464535,7 @@ sub_80FF268: ; 80FF268 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @080FF28A + bne _080FF28A ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -464544,7 +464544,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] @@ -464575,20 +464575,20 @@ sub_80FF2BC: ; 80FF2BC 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 @@ -464598,10 +464598,10 @@ sub_80FF2BC: ; 80FF2BC 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 @@ -464620,23 +464620,23 @@ sub_80FF2BC: ; 80FF2BC 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 .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 @@ -464651,10 +464651,10 @@ sub_80FF2BC: ; 80FF2BC 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 @@ -464697,7 +464697,7 @@ sub_80FF3B0: ; 80FF3B0 ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne @080FF3DA + bne _080FF3DA adds r2, r4, 0 adds r2, 0x2C ldrb r1, [r2] @@ -464711,7 +464711,7 @@ sub_80FF3B0: ; 80FF3B0 strh r0, [r4, 0x2E] ldr r0, =sub_80FF3EC str r0, [r4, 0x1C] -@080FF3DA: +_080FF3DA: pop {r4} pop {r0} bx r0 @@ -464727,14 +464727,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 @@ -464742,37 +464742,37 @@ sub_80FF3EC: ; 80FF3EC 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 StartObjectRotScalAnim - b @080FF452 -@080FF44C: + b _080FF452 +_080FF44C: adds r0, r4, 0 bl move_anim_8072740 -@080FF452: +_080FF452: pop {r4} pop {r0} bx r0 @@ -464803,12 +464803,12 @@ 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 .pool -@080FF498: +_080FF498: adds r0, r1, 0 movs r1, 0x1 bl sub_80A7270 @@ -464871,7 +464871,7 @@ sub_80FF458: ; 80FF458 strh r0, [r6, 0x1E] ldr r0, =sub_80FF53C str r0, [r6] -@080FF51C: +_080FF51C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -464915,11 +464915,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] @@ -464937,11 +464937,11 @@ sub_80FF53C: ; 80FF53C lsls r0, 16 asrs r0, 16 cmp r0, 0 - bne @080FF5B4 + bne _080FF5B4 strh r0, [r4, 0x8] ldr r0, =sub_80FF5CC str r0, [r4] -@080FF5B4: +_080FF5B4: pop {r4-r6} pop {r0} bx r0 @@ -464957,7 +464957,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 @@ -464967,7 +464967,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 @@ -465011,9 +465011,9 @@ sub_80FF5CC: ; 80FF5CC ldrh r0, [r7, 0x8] adds r0, 0x1 strh r0, [r7, 0x8] - b @080FF68E + b _080FF68E .pool -@080FF660: +_080FF660: ldr r1, =0x03005e00 lsls r2, r3, 2 adds r0, r2, r3 @@ -465023,8 +465023,8 @@ sub_80FF5CC: ; 80FF5CC 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 @@ -465034,10 +465034,10 @@ sub_80FF5CC: ; 80FF5CC 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 @@ -465051,23 +465051,23 @@ sub_80FF698: ; 80FF698 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 @@ -465094,9 +465094,9 @@ sub_80FF698: ; 80FF698 ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b @080FF756 + b _080FF756 .pool -@080FF704: +_080FF704: adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -465110,7 +465110,7 @@ sub_80FF698: ; 80FF698 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @080FF756 + beq _080FF756 adds r0, r5, 0 movs r1, 0x1 bl sub_80082B8 @@ -465134,7 +465134,7 @@ sub_80FF698: ; 80FF698 ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 -@080FF756: +_080FF756: pop {r4-r6} pop {r0} bx r0 @@ -465148,7 +465148,7 @@ sub_80FF768: ; 80FF768 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne @080FF7D4 + bne _080FF7D4 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -465186,7 +465186,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 @@ -465194,7 +465194,7 @@ sub_80FF768: ; 80FF768 adds r0, r2 adds r1, r0 strh r1, [r5, 0x22] -@080FF7D4: +_080FF7D4: ldr r0, =sub_80FF8DC str r0, [r5, 0x1C] pop {r4,r5} @@ -465323,7 +465323,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 @@ -465344,16 +465344,16 @@ 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 @@ -465365,7 +465365,7 @@ sub_80FF934: ; 80FF934 movs r1, 0x2E ldrsh r0, [r6, r1] cmp r0, 0 - bne @080FF974 + bne _080FF974 ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0x2 @@ -465390,7 +465390,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] @@ -465413,10 +465413,10 @@ sub_80FF934: ; 80FF934 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 @@ -465474,16 +465474,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 @@ -465514,7 +465514,7 @@ sub_80FF9E0: ; 80FF9E0 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 @@ -465522,10 +465522,10 @@ sub_80FF9E0: ; 80FF9E0 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 @@ -465542,21 +465542,21 @@ sub_80FFA84: ; 80FFA84 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0xA - bne @080FFA98 + bne _080FFA98 adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim -@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 @@ -465579,12 +465579,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 @@ -465602,12 +465602,12 @@ sub_80FFAB4: ; 80FFAB4 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 str r0, [r4, 0x1C] -@080FFB0E: +_080FFB0E: pop {r4,r5} pop {r0} bx r0 @@ -465637,7 +465637,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 @@ -465646,9 +465646,9 @@ sub_80FFB18: ; 80FFB18 movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x1 - b @080FFB7A + b _080FFB7A .pool -@080FFB68: +_080FFB68: strh r6, [r5, 0x3A] adds r0, r2, 0 adds r0, 0xA @@ -465657,7 +465657,7 @@ sub_80FFB18: ; 80FFB18 movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x3 -@080FFB7A: +_080FFB7A: strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] @@ -465686,12 +465686,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 @@ -465709,12 +465709,12 @@ sub_80FFB90: ; 80FFB90 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 @@ -465735,7 +465735,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 @@ -465748,9 +465748,9 @@ sub_80FFBF4: ; 80FFBF4 movs r0, 0x3C strh r0, [r5, 0x36] ldr r0, =sub_80FFAB4 - b @080FFC62 + b _080FFC62 .pool -@080FFC38: +_080FFC38: movs r0, 0xFF strh r0, [r5, 0x3A] adds r0, r6, 0 @@ -465759,10 +465759,10 @@ sub_80FFBF4: ; 80FFBF4 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 @@ -465771,7 +465771,7 @@ sub_80FFBF4: ; 80FFBF4 movs r0, 0x3C strh r0, [r5, 0x36] ldr r0, =sub_80FFB90 -@080FFC62: +_080FFC62: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -465786,14 +465786,14 @@ sub_80FFC70: ; 80FFC70 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] @@ -465806,10 +465806,10 @@ sub_80FFC70: ; 80FFC70 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 @@ -465839,7 +465839,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 @@ -465848,9 +465848,9 @@ sub_80FFCB4: ; 80FFCB4 movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x1 - b @080FFD16 + b _080FFD16 .pool -@080FFD04: +_080FFD04: strh r6, [r5, 0x3A] adds r0, r2, 0 adds r0, 0xA @@ -465859,7 +465859,7 @@ sub_80FFCB4: ; 80FFCB4 movs r1, 0x3C bl sub_80FF9B8 movs r0, 0x3 -@080FFD16: +_080FFD16: strh r0, [r5, 0x34] movs r0, 0x3C strh r0, [r5, 0x36] @@ -465888,12 +465888,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 @@ -465909,7 +465909,7 @@ sub_80FFD2C: ; 80FFD2C strh r0, [r4, 0x26] lsls r0, 16 cmp r0, 0 - bne @080FFD8A + bne _080FFD8A movs r0, 0x3F bl sub_80A5178 adds r1, r0, 0 @@ -465917,12 +465917,12 @@ sub_80FFD2C: ; 80FFD2C 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 @@ -465935,7 +465935,7 @@ sub_80FFD2C: ; 80FFD2C asrs r1, 24 movs r0, 0x7D bl audio_play_and_stuff -@080FFDB2: +_080FFDB2: pop {r4,r5} pop {r0} bx r0 @@ -465949,20 +465949,20 @@ sub_80FFDBC: ; 80FFDBC 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 .pool -@080FFDE4: +_080FFDE4: ldr r0, =0x0203841e movs r1, 0x2 ldrsh r3, [r0, r1] @@ -465971,17 +465971,17 @@ sub_80FFDBC: ; 80FFDBC 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] @@ -466004,19 +466004,19 @@ sub_80FFDBC: ; 80FFDBC 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 .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 @@ -466029,23 +466029,23 @@ sub_80FFE58: ; 80FFE58 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 StartObjectRotScalAnim - b @080FFEBA -@080FFE82: + b _080FFEBA +_080FFE82: movs r1, 0x36 ldrsh r0, [r4, r1] movs r1, 0xA @@ -466056,25 +466056,25 @@ sub_80FFE58: ; 80FFE58 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 str r0, [r4, 0x1C] -@080FFEBA: +_080FFEBA: pop {r4,r5} pop {r0} bx r0 @@ -466099,27 +466099,27 @@ 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 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 .pool -@080FFF10: +_080FFF10: adds r0, r2, 0x1 strh r0, [r4, 0x32] movs r0, 0x2E @@ -466143,24 +466143,24 @@ sub_80FFEC4: ; 80FFEC4 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 @@ -466171,7 +466171,7 @@ sub_80FFEC4: ; 80FFEC4 movs r1, 0x14 bl sine strh r0, [r4, 0x26] -@080FFF76: +_080FFF76: pop {r4-r6} pop {r0} bx r0 @@ -466184,10 +466184,10 @@ sub_80FFF7C: ; 80FFF7C 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 @@ -466260,9 +466260,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] @@ -466286,10 +466286,10 @@ sub_80FFFC0: ; 80FFFC0 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] @@ -466400,34 +466400,34 @@ 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 .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 @@ -466435,28 +466435,28 @@ sub_8100128: ; 8100128 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 @@ -466464,28 +466464,28 @@ sub_8100128: ; 8100128 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 @@ -466493,14 +466493,14 @@ sub_8100128: ; 8100128 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 @@ -466537,8 +466537,8 @@ sub_8100128: ; 8100128 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 @@ -466546,14 +466546,14 @@ sub_8100128: ; 8100128 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 @@ -466609,8 +466609,8 @@ sub_8100128: ; 8100128 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 @@ -466668,8 +466668,8 @@ sub_8100128: ; 8100128 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 @@ -466677,14 +466677,14 @@ sub_8100128: ; 8100128 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 @@ -466722,8 +466722,8 @@ sub_8100128: ; 8100128 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 @@ -466779,8 +466779,8 @@ sub_8100128: ; 8100128 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 @@ -466788,12 +466788,12 @@ sub_8100128: ; 8100128 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 @@ -466831,8 +466831,8 @@ sub_8100128: ; 8100128 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 @@ -466840,34 +466840,34 @@ sub_8100128: ; 8100128 bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @081004FC + beq _081004FC adds r0, r4, 0 bl RemoveObjectAndFreeTiles 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 @@ -466882,11 +466882,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} @@ -466906,7 +466906,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 @@ -466933,7 +466933,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 @@ -466968,7 +466968,7 @@ sub_8100524: ; 8100524 adds r5, r0 ldr r0, =sub_81005D4 str r0, [r5] -@081005BA: +_081005BA: pop {r3} mov r8, r3 pop {r4-r7} @@ -466987,7 +466987,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 @@ -467009,7 +467009,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] @@ -467027,7 +467027,7 @@ sub_81005D4: ; 81005D4 strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@08100636: +_08100636: pop {r4} pop {r0} bx r0 @@ -467042,28 +467042,28 @@ sub_8100640: ; 8100640 movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 - bne @0810065C + bne _0810065C ldr r0, =0x02038436 - b @0810065E + b _0810065E .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 .pool -@08100688: +_08100688: movs r0, 0x1 strh r0, [r4, 0x36] ldr r1, =0x0203841e @@ -467072,7 +467072,7 @@ sub_8100640: ; 8100640 strh r0, [r4, 0x32] movs r0, 0x80 lsls r0, 1 -@08100698: +_08100698: strh r0, [r4, 0x20] adds r7, r1, 0 adds r5, r7, 0 @@ -467085,27 +467085,27 @@ sub_8100640: ; 8100640 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 .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 @@ -467113,7 +467113,7 @@ sub_8100640: ; 8100640 lsrs r0, 24 ldrh r5, [r5] adds r0, r5 -@081006E4: +_081006E4: strh r0, [r4, 0x22] adds r0, r6, 0 bl sub_80A8328 @@ -467126,8 +467126,8 @@ sub_8100640: ; 8100640 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 @@ -467139,7 +467139,7 @@ sub_8100640: ; 8100640 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 @@ -467154,7 +467154,7 @@ sub_8100640: ; 8100640 ands r1, r2 orrs r1, r0 strb r1, [r4, 0x5] -@08100738: +_08100738: ldr r0, =sub_810074C str r0, [r4, 0x1C] pop {r4-r7} @@ -467197,17 +467197,17 @@ 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 .pool -@081007A4: +_081007A4: movs r1, 0x24 ldrsh r0, [r4, r1] movs r2, 0x20 @@ -467216,11 +467216,11 @@ sub_810074C: ; 810074C 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 @@ -467239,12 +467239,12 @@ 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 .pool -@081007E8: +_081007E8: ldr r0, =0x0000274f bl IndexOfObjectPaletteTag lsls r0, 24 @@ -467263,16 +467263,16 @@ sub_81007C4: ; 81007C4 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b @08100876 + b _08100876 .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] @@ -467299,7 +467299,7 @@ sub_81007C4: ; 81007C4 lsls r0, 16 asrs r0, 16 cmp r0, 0x11 - bne @08100876 + bne _08100876 strh r7, [r5, 0x1C] ldrh r0, [r5, 0x1E] adds r0, 0x1 @@ -467307,19 +467307,19 @@ sub_81007C4: ; 81007C4 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 @@ -467335,22 +467335,22 @@ 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 .pool -@081008B4: +_081008B4: movs r3, 0 ldrsh r0, [r1, r3] cmp r0, 0 - bne @081008C4 + bne _081008C4 ldr r4, =0x02038436 - b @081008C6 + b _081008C6 .pool -@081008C4: +_081008C4: ldr r4, =0x02038437 -@081008C6: +_081008C6: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -467368,7 +467368,7 @@ sub_8100898: ; 8100898 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] @@ -467377,9 +467377,9 @@ sub_8100898: ; 8100898 strh r0, [r6, 0x22] strh r5, [r6, 0x38] strh r2, [r6, 0x3A] - b @08100918 + b _08100918 .pool -@08100908: +_08100908: strh r5, [r6, 0x20] strh r2, [r6, 0x22] ldrh r0, [r7, 0x4] @@ -467388,7 +467388,7 @@ sub_8100898: ; 8100898 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] @@ -467429,12 +467429,12 @@ sub_8100898: ; 8100898 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] @@ -467444,7 +467444,7 @@ sub_8100898: ; 8100898 bl sub_80A73E0 ldr r0, =sub_81009A0 str r0, [r6, 0x1C] -@0810098E: +_0810098E: add sp, 0x4 pop {r4-r7} pop {r0} @@ -467460,7 +467460,7 @@ sub_81009A0: ; 81009A0 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 @@ -467477,11 +467477,11 @@ 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 @@ -467496,10 +467496,10 @@ 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 @@ -467513,23 +467513,23 @@ 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 .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] @@ -467553,11 +467553,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 StartObjectImageAnim -@08100A6A: +_08100A6A: ldr r0, =sub_81009DC str r0, [r5, 0x1C] ldr r4, =0x0203841e @@ -467631,11 +467631,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 str r0, [r5, 0x1C] ldr r0, =0x0203841e @@ -467643,14 +467643,14 @@ sub_8100AE0: ; 8100AE0 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 .pool -@08100B3C: +_08100B3C: ldrh r0, [r5, 0x20] ldrh r1, [r3] subs r0, r1 @@ -467661,7 +467661,7 @@ sub_8100AE0: ; 8100AE0 movs r1, 0x1 orrs r0, r1 strb r0, [r2] -@08100B50: +_08100B50: ldrh r0, [r3, 0x2] ldrh r2, [r5, 0x22] adds r0, r2 @@ -467682,10 +467682,10 @@ sub_8100AE0: ; 8100AE0 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 @@ -467702,14 +467702,14 @@ 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 .pool -@08100BA8: +_08100BA8: ldr r5, =0x02038437 ldrb r0, [r5] movs r4, 0x2 @@ -467721,9 +467721,9 @@ sub_8100B88: ; 8100B88 ldrb r0, [r5] eors r4, r0 adds r0, r4, 0 - b @08100C34 + b _08100C34 .pool -@08100BC8: +_08100BC8: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0 @@ -467743,7 +467743,7 @@ sub_8100B88: ; 8100B88 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 @@ -467762,9 +467762,9 @@ sub_8100B88: ; 8100B88 lsrs r0, 24 adds r0, r4 lsrs r4, r0, 1 - b @08100C3E + b _08100C3E .pool -@08100C24: +_08100C24: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -467772,12 +467772,12 @@ sub_8100B88: ; 8100B88 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 @@ -467785,11 +467785,11 @@ sub_8100B88: ; 8100B88 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 str r0, [r6, 0x1C] ldr r0, =0x0203841e @@ -467797,14 +467797,14 @@ sub_8100B88: ; 8100B88 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 .pool -@08100C7C: +_08100C7C: ldrh r0, [r6, 0x20] ldrh r1, [r3] subs r0, r1 @@ -467815,7 +467815,7 @@ sub_8100B88: ; 8100B88 movs r1, 0x1 orrs r0, r1 strb r0, [r2] -@08100C90: +_08100C90: ldrh r0, [r3, 0x2] ldrh r2, [r6, 0x22] adds r0, r2 @@ -467836,10 +467836,10 @@ sub_8100B88: ; 8100B88 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} @@ -467863,14 +467863,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 @@ -467889,7 +467889,7 @@ sub_8100CCC: ; 8100CCC lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - bne @08100D28 + bne _08100D28 ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -467897,7 +467897,7 @@ sub_8100CCC: ; 8100CCC strh r0, [r4, 0x2E] ldr r0, =sub_80A64B0 str r0, [r4, 0x1C] -@08100D28: +_08100D28: pop {r4} pop {r0} bx r0 @@ -467912,12 +467912,12 @@ sub_8100D38: ; 8100D38 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] @@ -467948,9 +467948,9 @@ sub_8100D38: ; 8100D38 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - b @08100DCA + b _08100DCA .pool -@08100D94: +_08100D94: adds r1, r5, 0 adds r1, 0x3E ldrb r0, [r1] @@ -467978,22 +467978,22 @@ sub_8100D38: ; 8100D38 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 .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 @@ -468011,7 +468011,7 @@ sub_8100D38: ; 8100D38 bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl move_anim_8072740 -@08100E10: +_08100E10: pop {r4,r5} pop {r0} bx r0 @@ -468030,17 +468030,17 @@ 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 .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] @@ -468082,16 +468082,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] @@ -468115,10 +468115,10 @@ sub_8100E80: ; 8100E80 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 @@ -468131,12 +468131,12 @@ sub_8100EF0: ; 8100EF0 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 @@ -468159,12 +468159,12 @@ sub_8100EF0: ; 8100EF0 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 @@ -468179,9 +468179,9 @@ sub_8100EF0: ; 8100EF0 ands r1, r2 orrs r1, r0 strb r1, [r5, 0x5] - b @08100F84 + b _08100F84 .pool -@08100F6C: +_08100F6C: ldrb r0, [r6] bl sub_80A8328 movs r1, 0x3 @@ -468193,7 +468193,7 @@ sub_8100EF0: ; 8100EF0 ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] -@08100F84: +_08100F84: ldr r0, =0x0203841e ldrh r0, [r0, 0x4] strh r0, [r5, 0x2E] @@ -468245,7 +468245,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 @@ -468258,7 +468258,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 @@ -468271,30 +468271,30 @@ sub_8100FD4: ; 8100FD4 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 @@ -468307,24 +468307,24 @@ sub_8100FD4: ; 8100FD4 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@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 .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] @@ -468341,7 +468341,7 @@ sub_8100FD4: ; 8100FD4 movs r1, 0x3C ldrsh r0, [r4, r1] cmp r0, 0x10 - bne @081010C2 + bne _081010C2 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -468350,7 +468350,7 @@ sub_8100FD4: ; 8100FD4 strb r0, [r2] ldr r0, =sub_80A67F4 str r0, [r4, 0x1C] -@081010C2: +_081010C2: pop {r4-r6} pop {r0} bx r0 @@ -468412,31 +468412,31 @@ sub_8101138: ; 8101138 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 .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] @@ -468445,24 +468445,24 @@ sub_8101138: ; 8101138 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] @@ -468474,28 +468474,28 @@ sub_8101138: ; 8101138 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 StartObjectRotScalAnim - b @08101272 -@081011E8: + b _08101272 +_081011E8: adds r0, r4, 0 movs r1, 0x10 movs r2, 0x4 @@ -468506,41 +468506,41 @@ sub_8101138: ; 8101138 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] @@ -468552,27 +468552,27 @@ sub_8101138: ; 8101138 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 SetGpuReg @@ -468581,7 +468581,7 @@ sub_8101138: ; 8101138 bl SetGpuReg adds r0, r4, 0 bl move_anim_8072740 -@08101290: +_08101290: pop {r4} pop {r0} bx r0 @@ -468594,11 +468594,11 @@ sub_8101298: ; 8101298 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 @@ -468606,19 +468606,19 @@ sub_8101298: ; 8101298 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 @@ -468631,21 +468631,21 @@ sub_8101298: ; 8101298 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 @@ -468659,10 +468659,10 @@ sub_810130C: ; 810130C 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 @@ -468696,25 +468696,25 @@ sub_810135C: ; 810135C movs r1, 0x4 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08101378 + bne _08101378 ldr r0, =0x02038436 - b @0810137A + b _0810137A .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 @@ -468731,14 +468731,14 @@ sub_810135C: ; 810135C ldrh r1, [r5, 0x22] adds r0, r1 strh r0, [r5, 0x22] - b @08101414 + b _08101414 .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 @@ -468747,9 +468747,9 @@ sub_810135C: ; 810135C strh r0, [r5, 0x20] adds r0, r6, 0 movs r1, 0x1 - b @081013FA + b _081013FA .pool -@081013E8: +_081013E8: adds r0, r6, 0 movs r1, 0x2 bl sub_80A5C6C @@ -468758,7 +468758,7 @@ sub_810135C: ; 810135C strh r0, [r5, 0x20] adds r0, r6, 0 movs r1, 0x3 -@081013FA: +_081013FA: bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 @@ -468770,7 +468770,7 @@ sub_810135C: ; 810135C ldrsh r1, [r0, r2] adds r0, r5, 0 bl sub_80A6864 -@08101414: +_08101414: ldr r1, =0x0203841e ldrh r0, [r1, 0xA] strh r0, [r5, 0x2E] @@ -468799,7 +468799,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] @@ -468809,9 +468809,9 @@ sub_8101440: ; 8101440 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - b @0810148E + b _0810148E .pool -@08101474: +_08101474: ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -468824,7 +468824,7 @@ sub_8101440: ; 8101440 adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim -@0810148E: +_0810148E: ldr r0, =sub_81014A0 str r0, [r4, 0x1C] pop {r4} @@ -468843,7 +468843,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 @@ -468861,17 +468861,17 @@ 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 @@ -468887,7 +468887,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] @@ -468899,9 +468899,9 @@ sub_81014F4: ; 81014F4 strh r0, [r4, 0x22] movs r0, 0x1 strh r0, [r4, 0x34] - b @0810154A + b _0810154A .pool -@0810152C: +_0810152C: ldr r2, =0x0203841e ldrh r0, [r4, 0x20] ldrh r1, [r2] @@ -468916,7 +468916,7 @@ sub_81014F4: ; 81014F4 adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim -@0810154A: +_0810154A: ldr r0, =sub_8101560 str r0, [r4, 0x1C] pop {r4} @@ -468955,10 +468955,10 @@ 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 @@ -468993,20 +468993,20 @@ 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 str r0, [r5, 0x1C] ldr r1, =sub_81015D4 adds r0, r5, 0 bl oamt_set_x3A_32 - b @0810166A + b _0810166A .pool -@08101604: +_08101604: ldrh r3, [r5, 0x24] ldrh r0, [r5, 0x20] adds r3, r0 @@ -469055,7 +469055,7 @@ sub_81015D4: ; 81015D4 asrs r1, 24 movs r0, 0xD2 bl audio_play_and_stuff -@0810166A: +_0810166A: ldrh r0, [r5, 0x38] movs r1, 0x1 eors r0, r1 @@ -469074,7 +469074,7 @@ sub_8101684: ; 8101684 lsls r0, 16 asrs r0, 24 cmp r0, 0x4 - bne @081016AC + bne _081016AC movs r0, 0xA strh r0, [r2, 0x2E] ldr r0, =sub_80A64B0 @@ -469082,12 +469082,12 @@ sub_8101684: ; 8101684 ldr r1, =sub_81016B8 adds r0, r2, 0 bl oamt_set_x3A_32 - b @081016B0 + b _081016B0 .pool -@081016AC: +_081016AC: ldr r0, =sub_81015D4 str r0, [r2, 0x1C] -@081016B0: +_081016B0: pop {r0} bx r0 .pool @@ -469099,7 +469099,7 @@ sub_81016B8: ; 81016B8 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] @@ -469109,40 +469109,40 @@ sub_81016B8: ; 81016B8 ldr r1, =sub_8101774 adds r0, r5, 0 bl oamt_set_x3A_32 - b @08101760 + b _08101760 .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 .pool -@08101700: +_08101700: ldr r7, =0x0000fff8 - b @08101716 + b _08101716 .pool -@08101708: +_08101708: movs r7, 0x8 ldr r6, =0x0000fff8 - b @08101718 + b _08101718 .pool -@08101714: +_08101714: movs r7, 0x8 -@08101716: +_08101716: movs r6, 0x8 -@08101718: +_08101718: ldrh r0, [r5, 0x24] ldrh r1, [r5, 0x20] adds r0, r1 @@ -469176,7 +469176,7 @@ sub_81016B8: ; 81016B8 ldr r1, =sub_8101820 adds r0, r5, 0 bl oamt_set_x3A_32 -@08101760: +_08101760: pop {r4-r7} pop {r0} bx r0 @@ -469191,27 +469191,27 @@ sub_8101774: ; 8101774 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 @@ -469230,7 +469230,7 @@ sub_8101774: ; 8101774 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] @@ -469252,14 +469252,14 @@ sub_8101774: ; 8101774 asrs r1, 24 movs r0, 0xC0 bl audio_play_and_stuff - b @08101814 + b _08101814 .pool -@0810180C: +_0810180C: cmp r0, 0 - bne @08101814 + bne _08101814 ldr r0, =sub_8101820 str r0, [r4, 0x1C] -@08101814: +_08101814: add sp, 0xC pop {r4} pop {r0} @@ -469275,13 +469275,13 @@ sub_8101820: ; 8101820 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 str r0, [r2, 0x1C] -@08101838: +_08101838: pop {r0} bx r0 .pool @@ -469297,7 +469297,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] @@ -469314,17 +469314,17 @@ 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 @@ -469340,18 +469340,18 @@ 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 .pool -@081018BC: +_081018BC: cmp r0, 0x2 - bne @081018D8 + bne _081018D8 ldrh r0, [r3, 0x20] subs r0, 0x18 strh r0, [r3, 0x20] @@ -469363,10 +469363,10 @@ sub_8101898: ; 8101898 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] @@ -469378,8 +469378,8 @@ sub_8101898: ; 8101898 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] @@ -469391,10 +469391,10 @@ sub_8101898: ; 8101898 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 @@ -469432,32 +469432,32 @@ 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 .pool -@0810196C: +_0810196C: cmp r0, 0x2 - beq @08101984 - b @0810198C -@08101972: + beq _08101984 + b _0810198C +_08101972: ldr r0, =sub_8101998 - b @0810198E + b _0810198E .pool -@0810197C: +_0810197C: ldr r0, =sub_8101A74 - b @0810198E + b _0810198E .pool -@08101984: +_08101984: ldr r0, =sub_8101AC4 - b @0810198E + b _0810198E .pool -@0810198C: +_0810198C: ldr r0, =sub_8101B84 -@0810198E: +_0810198E: str r0, [r3, 0x1C] pop {r0} bx r0 @@ -469478,9 +469478,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] @@ -469507,7 +469507,7 @@ sub_81019E8: ; 81019E8 movs r0, 0x2E ldrsh r6, [r5, r0] cmp r6, 0 - bne @08101A24 + bne _08101A24 ldr r1, =0x020241e4 ldr r4, =0x02038436 ldrb r0, [r4] @@ -469524,14 +469524,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 @@ -469554,12 +469554,12 @@ sub_81019E8: ; 81019E8 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @08101A5E + ble _08101A5E movs r0, 0 strh r0, [r5, 0x2E] ldr r0, =sub_8101B84 str r0, [r5, 0x1C] -@08101A5E: +_08101A5E: pop {r4-r6} pop {r0} bx r0 @@ -469578,11 +469578,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] @@ -469612,12 +469612,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 str r0, [r1, 0x1C] -@08101ADE: +_08101ADE: pop {r0} bx r0 .pool @@ -469630,7 +469630,7 @@ sub_8101AE8: ; 8101AE8 movs r1, 0x2E ldrsh r0, [r5, r1] cmp r0, 0 - bne @08101B38 + bne _08101B38 ldr r1, =0x020241e4 ldr r4, =0x02038436 ldrb r0, [r4] @@ -469646,23 +469646,23 @@ 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 .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 @@ -469685,14 +469685,14 @@ sub_8101AE8: ; 8101AE8 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 str r0, [r5, 0x1C] -@08101B78: +_08101B78: pop {r4,r5} pop {r0} bx r0 @@ -469724,17 +469724,17 @@ sub_8101BA0: ; 8101BA0 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 @@ -469750,11 +469750,11 @@ sub_8101BA0: ; 8101BA0 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] @@ -469765,7 +469765,7 @@ sub_8101BA0: ; 8101BA0 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@08101BFA: +_08101BFA: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x38] adds r0, r1 @@ -469788,7 +469788,7 @@ sub_8101BA0: ; 8101BA0 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @08101C8E + ble _08101C8E movs r0, 0 strh r0, [r4, 0x30] movs r2, 0x36 @@ -469798,9 +469798,9 @@ sub_8101BA0: ; 8101BA0 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b @08101C8E + b _08101C8E .pool -@08101C4C: +_08101C4C: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x38] adds r0, r1 @@ -469823,14 +469823,14 @@ sub_8101BA0: ; 8101BA0 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 @@ -469863,14 +469863,14 @@ 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 .pool -@08101CE8: +_08101CE8: strh r1, [r5, 0xC] movs r0, 0x8 strh r0, [r5, 0xE] @@ -469878,14 +469878,14 @@ sub_8101C94: ; 8101C94 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 - b @08101D20 + b _08101D20 .pool -@08101D04: +_08101D04: movs r0, 0x8 strh r0, [r5, 0xE] movs r0, 0xC0 @@ -469894,16 +469894,16 @@ sub_8101C94: ; 8101C94 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 -@08101D20: +_08101D20: str r0, [r5] -@08101D22: +_08101D22: pop {r4-r6} pop {r0} bx r0 @@ -469923,32 +469923,32 @@ 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 .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] @@ -469956,21 +469956,21 @@ sub_8101D2C: ; 8101D2C 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 @@ -469983,8 +469983,8 @@ sub_8101D2C: ; 8101D2C 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 @@ -470002,33 +470002,33 @@ sub_8101D2C: ; 8101D2C 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 .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] @@ -470039,9 +470039,9 @@ sub_8101D2C: ; 8101D2C ldrh r1, [r4, 0x12] ldrh r2, [r4, 0x10] adds r1, r2 - b @08101E48 + b _08101E48 .pool -@08101E34: +_08101E34: ldr r2, =0x02020630 movs r3, 0x8 ldrsh r1, [r4, r3] @@ -470052,13 +470052,13 @@ sub_8101D2C: ; 8101D2C 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 .pool -@08101E54: +_08101E54: ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -470070,18 +470070,18 @@ sub_8101D2C: ; 8101D2C strh r1, [r0, 0x24] movs r0, 0xC strh r0, [r4, 0xE] - b @08101EA8 + b _08101EA8 .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 @@ -470099,25 +470099,25 @@ sub_8101D2C: ; 8101D2C 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 .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 @@ -470127,16 +470127,16 @@ sub_8101D2C: ; 8101D2C 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 .pool -@08101EE0: +_08101EE0: adds r0, r2, 0 bl move_anim_task_del -@08101EE6: +_08101EE6: pop {r4} pop {r0} bx r0 @@ -470155,7 +470155,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 @@ -470171,14 +470171,14 @@ sub_8101EEC: ; 8101EEC ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] - b @08101F38 + b _08101F38 .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 @@ -470192,13 +470192,13 @@ sub_8101F40: ; 8101F40 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne @08101F5C + bne _08101F5C ldr r4, =0x02038436 - b @08101F5E + b _08101F5E .pool -@08101F5C: +_08101F5C: ldr r4, =0x02038437 -@08101F5E: +_08101F5E: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -470305,7 +470305,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 @@ -470317,7 +470317,7 @@ sub_8102044: ; 8102044 bl oamt_set_x3A_32 ldr r0, =sub_80A653C str r0, [r4, 0x1C] -@0810206E: +_0810206E: pop {r4} pop {r0} bx r0 @@ -470345,7 +470345,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 @@ -470369,10 +470369,10 @@ 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 @@ -470385,13 +470385,13 @@ sub_81020D8: ; 81020D8 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne @081020F4 + bne _081020F4 ldr r4, =0x02038436 - b @081020F6 + b _081020F6 .pool -@081020F4: +_081020F4: ldr r4, =0x02038437 -@081020F6: +_081020F6: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -470433,13 +470433,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 @@ -470450,10 +470450,10 @@ sub_810213C: ; 810213C 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 @@ -470508,7 +470508,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] @@ -470525,20 +470525,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] @@ -470547,33 +470547,33 @@ sub_81021CC: ; 81021CC 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 @@ -470586,7 +470586,7 @@ sub_8102268: ; 8102268 movs r1, 0x2E ldrsh r0, [r6, r1] cmp r0, 0 - bne @081022B2 + bne _081022B2 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -470608,23 +470608,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 @@ -470644,26 +470644,26 @@ 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 .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] @@ -470680,12 +470680,12 @@ sub_81022D4: ; 81022D4 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 @@ -470722,11 +470722,11 @@ sub_810237C: ; 810237C 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] @@ -470754,7 +470754,7 @@ sub_810237C: ; 810237C ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 -@081023CC: +_081023CC: pop {r4,r5} pop {r0} bx r0 @@ -470777,7 +470777,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] @@ -470794,10 +470794,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 @@ -470813,45 +470813,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} @@ -470866,8 +470866,8 @@ sub_81024A8: ; 81024A8 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] @@ -470875,11 +470875,11 @@ sub_81024A8: ; 81024A8 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} @@ -470895,17 +470895,17 @@ sub_81024E0: ; 81024E0 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 @@ -470932,10 +470932,10 @@ sub_8102528: ; 8102528 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 @@ -470981,27 +470981,27 @@ 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 @@ -471123,32 +471123,32 @@ 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 .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 @@ -471156,7 +471156,7 @@ sub_81026A8: ; 81026A8 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bgt @0810273C + bgt _0810273C ldrh r0, [r4, 0x16] ldrh r1, [r4, 0x10] adds r0, r1 @@ -471186,18 +471186,18 @@ sub_81026A8: ; 81026A8 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 @@ -471207,10 +471207,10 @@ sub_81026A8: ; 81026A8 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 @@ -471220,8 +471220,8 @@ sub_81026A8: ; 81026A8 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 @@ -471229,16 +471229,16 @@ sub_81026A8: ; 81026A8 lsls r0, r1, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls @0810274C - b @08102832 + bls _0810274C + b _08102832 .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 @@ -471248,7 +471248,7 @@ sub_81026A8: ; 81026A8 mov r8, r7 ldr r6, =gUnknown_08592EEC movs r5, 0x1 -@081027B2: +_081027B2: lsls r0, r2, 4 adds r0, r2 lsls r1, r0, 2 @@ -471256,30 +471256,30 @@ sub_81026A8: ; 81026A8 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 .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 @@ -471291,22 +471291,22 @@ sub_81026A8: ; 81026A8 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@08102814: +_08102814: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @08102832 + b _08102832 .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 @@ -471324,17 +471324,17 @@ sub_8102844: ; 8102844 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] @@ -471362,7 +471362,7 @@ sub_8102844: ; 8102844 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @081028D4 + beq _081028D4 ldrb r1, [r5, 0x3] movs r0, 0x3F negs r0, r0 @@ -471381,15 +471381,15 @@ sub_8102844: ; 8102844 movs r0, 0x30 ldrsh r1, [r5, r0] ldr r0, =0xffffec00 - b @081028FA + b _081028FA .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] @@ -471402,7 +471402,7 @@ sub_8102844: ; 8102844 ldrsh r1, [r5, r0] movs r0, 0xA0 lsls r0, 5 -@081028FA: +_081028FA: bl __divsi3 strh r0, [r5, 0x34] lsls r4, 7 @@ -471412,9 +471412,9 @@ sub_8102844: ; 8102844 ldr r0, =0xfffff600 bl __divsi3 strh r0, [r5, 0x38] - b @08102958 + b _08102958 .pool -@0810291C: +_0810291C: ldrh r0, [r5, 0x20] adds r0, 0x28 strh r0, [r5, 0x20] @@ -471443,7 +471443,7 @@ sub_8102844: ; 8102844 movs r1, 0x30 orrs r0, r1 strb r0, [r5, 0x3] -@08102958: +_08102958: ldr r0, =sub_810296C str r0, [r5, 0x1C] pop {r4-r6} @@ -471476,19 +471476,19 @@ 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 @@ -471537,7 +471537,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 @@ -471550,7 +471550,7 @@ sub_81029B4: ; 81029B4 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xF - bls @08102A0C + bls _08102A0C adds r0, r3, 0 movs r1, 0x10 movs r2, 0xB @@ -471563,9 +471563,9 @@ sub_81029B4: ; 81029B4 movs r1, 0x1C adds r1, r7 mov r9, r1 - b @08102A88 + b _08102A88 .pool -@08102A54: +_08102A54: lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -471592,16 +471592,16 @@ sub_81029B4: ; 81029B4 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 str r0, [r6] ldr r0, =0x02038436 @@ -471610,19 +471610,19 @@ sub_81029B4: ; 81029B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08102AC8 + bne _08102AC8 movs r1, 0x80 lsls r1, 2 movs r0, 0 bl ResetGpuRegBits - b @08102AD2 + b _08102AD2 .pool -@08102AC8: +_08102AC8: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl ResetGpuRegBits -@08102AD2: +_08102AD2: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -471644,31 +471644,31 @@ 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 SetGpuRegBits - b @08102B26 + b _08102B26 .pool -@08102B1C: +_08102B1C: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl SetGpuRegBits -@08102B26: +_08102B26: ldr r0, =0x00002771 bl FreeObjectPaletteByTag adds r0, r4, 0 bl move_anim_task_del -@08102B32: +_08102B32: pop {r4} pop {r0} bx r0 @@ -471685,17 +471685,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] @@ -471708,9 +471708,9 @@ sub_8102B3C: ; 8102B3C strh r1, [r0, 0xE] adds r0, r5, 0 bl obj_delete_but_dont_free_vram - b @08102BC2 + b _08102BC2 .pool -@08102B80: +_08102B80: ldr r4, =gUnknown_08329F40 movs r1, 0x2E ldrsh r0, [r5, r1] @@ -471741,7 +471741,7 @@ sub_8102B3C: ; 8102B3C ldrsh r1, [r5, r2] bl sine strh r0, [r5, 0x24] -@08102BC2: +_08102BC2: pop {r4,r5} pop {r0} bx r0 @@ -471777,7 +471777,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 @@ -471785,7 +471785,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 @@ -471797,12 +471797,12 @@ sub_8102BE8: ; 8102BE8 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls @08102C14 -@08102C2C: + bls _08102C14 +_08102C2C: movs r4, 0x1 ldr r0, =gUnknown_08593020 mov r8, r0 -@08102C32: +_08102C32: lsls r0, r4, 1 adds r0, r4 lsls r5, r0, 2 @@ -471815,7 +471815,7 @@ sub_8102BE8: ; 8102BE8 adds r4, 0x1 mov r12, r4 cmp r3, 0xFF - beq @08102C7A + beq _08102C7A lsls r0, r3, 20 movs r1, 0x80 lsls r1, 17 @@ -471825,7 +471825,7 @@ sub_8102BE8: ; 8102BE8 ldr r7, =0x02037b14 ldr r6, =gUnknown_08593020 adds r4, r5, 0 -@08102C60: +_08102C60: adds r1, r3, r2 lsls r1, 1 adds r1, r7 @@ -471838,13 +471838,13 @@ sub_8102BE8: ; 8102BE8 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} @@ -471863,7 +471863,7 @@ sub_8102CA0: ; 8102CA0 lsrs r5, r0, 24 movs r4, 0x1 ldr r6, =gUnknown_08593020 -@08102CAA: +_08102CAA: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -471874,7 +471874,7 @@ sub_8102CA0: ; 8102CA0 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} @@ -471905,14 +471905,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] @@ -471922,12 +471922,12 @@ sub_8102CD4: ; 8102CD4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @08102D34 + beq _08102D34 movs r6, 0x30 movs r3, 0x28 - b @08102D4E + b _08102D4E .pool -@08102D34: +_08102D34: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -471939,7 +471939,7 @@ sub_8102CD4: ; 8102CD4 bl sub_80A5C6C lsls r0, 24 lsrs r3, r0, 24 -@08102D4E: +_08102D4E: ldrh r0, [r5, 0x20] lsls r1, r0, 4 strh r1, [r5, 0x36] @@ -471983,11 +471983,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 @@ -471995,9 +471995,9 @@ sub_8102D8C: ; 8102D8C 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 @@ -472029,9 +472029,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 @@ -472061,31 +472061,31 @@ sub_8102DE4: ; 8102DE4 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 @@ -472093,9 +472093,9 @@ sub_8102DE4: ; 8102DE4 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @08102E7E + ble _08102E7E strh r5, [r4, 0x30] -@08102E7E: +_08102E7E: ldr r2, =gUnknown_08593020 movs r3, 0x30 ldrsh r1, [r4, r3] @@ -472108,14 +472108,14 @@ sub_8102DE4: ; 8102DE4 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 @@ -472132,13 +472132,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 @@ -472209,11 +472209,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 @@ -472232,20 +472232,20 @@ 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 @@ -472259,7 +472259,7 @@ sub_8102FB8: ; 8102FB8 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0x1 - bne @08102FDC + bne _08102FDC ldrb r0, [r5, 0x3] movs r1, 0x3F negs r1, r1 @@ -472268,11 +472268,11 @@ sub_8102FB8: ; 8102FB8 orrs r1, r0 strb r1, [r5, 0x3] movs r6, 0x10 - b @08102FDE + b _08102FDE .pool -@08102FDC: +_08102FDC: ldr r6, =0x0000fff0 -@08102FDE: +_08102FDE: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -472325,21 +472325,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] @@ -472371,7 +472371,7 @@ sub_81030B0: ; 81030B0 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @08103100 + bne _08103100 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x8 @@ -472382,11 +472382,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 @@ -472403,11 +472403,11 @@ sub_81030B0: ; 81030B0 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 @@ -472423,18 +472423,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 @@ -472448,9 +472448,9 @@ sub_810310C: ; 810310C 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] @@ -472467,13 +472467,13 @@ sub_8103164: ; 8103164 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08103180 + bne _08103180 ldr r0, =0x02038436 - b @08103182 + b _08103182 .pool -@08103180: +_08103180: ldr r0, =0x02038437 -@08103182: +_08103182: ldrb r4, [r0] adds r0, r4, 0 adds r1, r5, 0 @@ -472512,7 +472512,7 @@ sub_81031D0: ; 81031D0 strh r0, [r4, 0x2E] lsls r0, 16 cmp r0, 0 - bne @081031F8 + bne _081031F8 ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -472523,7 +472523,7 @@ sub_81031D0: ; 81031D0 bl StartObjectImageAnim ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] -@081031F8: +_081031F8: pop {r4} pop {r0} bx r0 @@ -472538,13 +472538,13 @@ sub_8103208: ; 8103208 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08103224 + bne _08103224 ldr r0, =0x02038436 - b @08103226 + b _08103226 .pool -@08103224: +_08103224: ldr r0, =0x02038437 -@08103226: +_08103226: ldrb r0, [r0] adds r1, r4, 0 bl sub_810310C @@ -472571,7 +472571,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 StartObjectRotScalAnim @@ -472580,7 +472580,7 @@ sub_8103250: ; 8103250 bl oamt_set_x3A_32 ldr r0, =sub_80A67BC str r0, [r4, 0x1C] -@08103276: +_08103276: pop {r4} pop {r0} bx r0 @@ -472595,13 +472595,13 @@ sub_8103284: ; 8103284 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @081032A0 + bne _081032A0 ldr r0, =0x02038436 - b @081032A2 + b _081032A2 .pool -@081032A0: +_081032A0: ldr r0, =0x02038437 -@081032A2: +_081032A2: ldrb r5, [r0] adds r0, r5, 0 movs r1, 0 @@ -472617,10 +472617,10 @@ sub_8103284: ; 8103284 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] @@ -472653,10 +472653,10 @@ sub_8103300: ; 8103300 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - ble @08103316 + ble _08103316 ldr r0, =sub_8103320 str r0, [r1, 0x1C] -@08103316: +_08103316: pop {r0} bx r0 .pool @@ -472672,42 +472672,42 @@ 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 str r0, [r2, 0x1C] - b @08103388 + b _08103388 .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, =gUnknown_08329F40 movs r3, 0x30 ldrsh r0, [r2, r3] @@ -472719,7 +472719,7 @@ sub_8103320: ; 8103320 asrs r1, r0, 1 adds r0, r1 strh r0, [r2, 0x24] -@08103388: +_08103388: pop {r0} bx r0 .pool @@ -472733,13 +472733,13 @@ sub_8103390: ; 8103390 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @081033AC + bne _081033AC ldr r0, =0x02038436 - b @081033AE + b _081033AE .pool -@081033AC: +_081033AC: ldr r0, =0x02038437 -@081033AE: +_081033AE: ldrb r4, [r0] adds r0, r4, 0 adds r1, r5, 0 @@ -472748,19 +472748,19 @@ sub_8103390: ; 8103390 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne @081033D4 + bne _081033D4 adds r0, r5, 0 movs r1, 0 bl StartObjectImageAnim movs r0, 0x2 - b @081033DE + b _081033DE .pool -@081033D4: +_081033D4: adds r0, r5, 0 movs r1, 0x1 bl StartObjectImageAnim movs r0, 0x3 -@081033DE: +_081033DE: strh r0, [r5, 0x2E] ldr r0, =sub_81033F0 str r0, [r5, 0x1C] @@ -472780,7 +472780,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] @@ -472793,7 +472793,7 @@ sub_81033F0: ; 81033F0 bl oamt_set_x3A_32 ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] -@0810341E: +_0810341E: pop {r4} pop {r0} bx r0 @@ -472810,10 +472810,10 @@ 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 @@ -472861,13 +472861,13 @@ sub_8103498: ; 8103498 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @081034B4 + bne _081034B4 ldr r0, =0x02038436 - b @081034B6 + b _081034B6 .pool -@081034B4: +_081034B4: ldr r0, =0x02038437 -@081034B6: +_081034B6: ldrb r0, [r0] adds r1, r4, 0 bl sub_810310C @@ -472889,17 +472889,17 @@ sub_81034D8: ; 81034D8 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] @@ -472909,9 +472909,9 @@ sub_81034D8: ; 81034D8 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] @@ -472920,23 +472920,23 @@ sub_81034D8: ; 81034D8 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 @@ -472963,7 +472963,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 @@ -472973,7 +472973,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] @@ -473009,22 +473009,22 @@ 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 .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 @@ -473099,14 +473099,14 @@ sub_8103680: ; 8103680 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 @@ -473150,7 +473150,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 @@ -473161,9 +473161,9 @@ sub_81036DC: ; 81036DC lsls r0, 16 lsrs r3, r0, 16 adds r6, r2, 0 - b @08103726 + b _08103726 .pool -@08103718: +_08103718: ldr r2, =0x03005e00 lsls r1, r5, 2 adds r0, r1, r5 @@ -473171,7 +473171,7 @@ sub_81036DC: ; 81036DC adds r0, r2 ldrh r3, [r0, 0x8] adds r6, r1, 0 -@08103726: +_08103726: movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -473184,7 +473184,7 @@ sub_81036DC: ; 81036DC 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] @@ -473195,21 +473195,21 @@ sub_81036DC: ; 81036DC adds r0, r1 ldrh r1, [r0, 0x26] adds r1, 0x1 - b @0810378A + b _0810378A .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] @@ -473220,7 +473220,7 @@ sub_81036DC: ; 81036DC adds r0, r1 ldrh r1, [r0, 0x26] subs r1, 0x1 -@0810378A: +_0810378A: strh r1, [r0, 0x26] adds r0, r4, 0 bl sub_80A73A0 @@ -473233,26 +473233,26 @@ sub_81036DC: ; 81036DC 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 .pool -@081037CC: +_081037CC: adds r0, r2, 0x1 -@081037CE: +_081037CE: strh r0, [r1, 0xA] -@081037D0: +_081037D0: pop {r4-r6} pop {r0} bx r0 @@ -473268,23 +473268,23 @@ 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 .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 @@ -473294,7 +473294,7 @@ sub_81037D8: ; 81037D8 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] @@ -473305,24 +473305,24 @@ sub_81037D8: ; 81037D8 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 .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 str r0, [r4, 0x1C] ldr r1, =move_anim_8072740 @@ -473380,20 +473380,20 @@ 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 .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 @@ -473404,7 +473404,7 @@ sub_81038C8: ; 81038C8 ldrh r0, [r1, 0x6] negs r0, r0 strh r0, [r1, 0x6] -@0810390E: +_0810390E: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC @@ -473452,12 +473452,12 @@ sub_81038C8: ; 81038C8 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] @@ -473493,7 +473493,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] @@ -473506,7 +473506,7 @@ sub_81039CC: ; 81039CC strh r1, [r0, 0xA] adds r0, r3, 0 bl RemoveObjectAndFreeTiles -@081039F6: +_081039F6: pop {r0} bx r0 .pool @@ -473528,7 +473528,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 @@ -473536,9 +473536,9 @@ sub_8103A00: ; 8103A00 ldrh r0, [r2, 0x36] ldrh r3, [r2, 0x3A] adds r0, r3 - b @08103A42 + b _08103A42 .pool -@08103A34: +_08103A34: ldrh r0, [r2, 0x38] ldrh r1, [r2, 0x34] subs r0, r1 @@ -473546,7 +473546,7 @@ sub_8103A00: ; 8103A00 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] @@ -473560,41 +473560,41 @@ sub_8103A00: ; 8103A00 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 str r0, [r2, 0x1C] -@08103A98: +_08103A98: pop {r4} pop {r0} bx r0 @@ -473631,37 +473631,37 @@ 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 .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] @@ -473688,12 +473688,12 @@ sub_8103AA4: ; 8103AA4 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] @@ -473703,12 +473703,12 @@ sub_8103AA4: ; 8103AA4 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 @@ -473754,7 +473754,7 @@ sub_8103AA4: ; 8103AA4 strh r0, [r7, 0x36] ldr r0, =sub_8103A00 str r0, [r7, 0x1C] -@08103BD4: +_08103BD4: pop {r3} mov r8, r3 pop {r4-r7} @@ -473776,10 +473776,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 .pool @@ -473800,7 +473800,7 @@ sub_8103C0C: ; 8103C0C strh r1, [r5, 0x8] lsls r0, 16 cmp r0, 0 - bgt @08103CE0 + bgt _08103CE0 ldr r0, =gUnknown_085933B0 movs r2, 0x1A ldrsh r1, [r5, r2] @@ -473823,12 +473823,12 @@ 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 .pool -@08103C6C: +_08103C6C: ldrb r2, [r6, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -473839,8 +473839,8 @@ sub_8103C0C: ; 8103C0C 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 @@ -473848,7 +473848,7 @@ sub_8103C0C: ; 8103C0C movs r0, 0x10 orrs r1, r0 strb r1, [r6, 0x3] -@08103C90: +_08103C90: ldr r3, =0x03005e00 lsls r2, r7, 2 adds r2, r7 @@ -473884,10 +473884,10 @@ sub_8103C0C: ; 8103C0C movs r3, 0xA ldrsh r0, [r4, r3] cmp r0, 0x2 - ble @08103CE0 + ble _08103CE0 ldr r0, =sub_8103BE4 str r0, [r4] -@08103CE0: +_08103CE0: pop {r4-r7} pop {r0} bx r0 @@ -473917,7 +473917,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 @@ -473934,19 +473934,19 @@ 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 .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] @@ -473958,7 +473958,7 @@ sub_8103CF0: ; 8103CF0 lsls r2, r7, 2 mov r8, r2 cmp r0, 0 - bne @08103DB6 + bne _08103DB6 ldr r1, =0x03005e00 adds r0, r2, r7 lsls r0, 3 @@ -473975,18 +473975,18 @@ sub_8103CF0: ; 8103CF0 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 .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 @@ -474012,7 +474012,7 @@ sub_8103CF0: ; 8103CF0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @08103E20 + beq _08103E20 ldr r4, =0x02038437 ldrb r1, [r4] movs r0, 0x2 @@ -474020,15 +474020,15 @@ sub_8103CF0: ; 8103CF0 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 .pool -@08103E20: +_08103E20: mov r5, sp ldr r4, =0x02038437 ldrb r0, [r4] @@ -474044,7 +474044,7 @@ sub_8103CF0: ; 8103CF0 lsrs r0, 24 mov r1, r10 strh r0, [r1] -@08103E42: +_08103E42: mov r4, sp ldr r0, =0x03005e00 mov r2, r8 @@ -474071,13 +474071,13 @@ sub_8103CF0: ; 8103CF0 ldrsh r0, [r0, r3] adds r1, r6, 0 cmp r0, r1 - blt @08103E88 + blt _08103E88 subs r0, r2, r1 - b @08103E8A + b _08103E8A .pool -@08103E88: +_08103E88: subs r0, r1, r2 -@08103E8A: +_08103E8A: lsls r0, 16 lsrs r0, 16 lsls r4, r0, 16 @@ -474114,7 +474114,7 @@ sub_8103CF0: ; 8103CF0 ldrsh r0, [r2, r3] mov r4, r9 cmp r0, r4 - blt @08103F08 + blt _08103F08 subs r4, r1, r4 lsls r4, 16 asrs r4, 16 @@ -474130,9 +474130,9 @@ sub_8103CF0: ; 8103CF0 negs r1, r1 ands r1, r0 strh r1, [r6, 0x18] - b @08103F28 + b _08103F28 .pool -@08103F08: +_08103F08: subs r4, r1 lsls r4, 16 asrs r4, 16 @@ -474147,7 +474147,7 @@ sub_8103CF0: ; 8103CF0 movs r1, 0x1 orrs r0, r1 strh r0, [r6, 0x18] -@08103F28: +_08103F28: ldr r1, =0x03005e00 mov r3, r8 adds r0, r3, r7 @@ -474160,14 +474160,14 @@ sub_8103CF0: ; 8103CF0 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 @@ -474178,13 +474178,13 @@ sub_8103CF0: ; 8103CF0 ldrh r4, [r4, 0x8] adds r1, r4 adds r0, r1 - b @08103FB0 + b _08103FB0 .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 @@ -474195,9 +474195,9 @@ sub_8103CF0: ; 8103CF0 ldrh r4, [r4, 0x8] adds r1, r4 adds r0, r1 - b @08103FB0 + b _08103FB0 .pool -@08103FA0: +_08103FA0: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A82E4 @@ -474205,7 +474205,7 @@ sub_8103CF0: ; 8103CF0 lsrs r0, 24 ldrh r1, [r4, 0x8] subs r0, r1 -@08103FB0: +_08103FB0: strh r0, [r5, 0xC] ldr r0, =0x03005e00 mov r2, r8 @@ -474215,10 +474215,10 @@ sub_8103CF0: ; 8103CF0 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 str r0, [r1] add sp, 0x4 @@ -474265,7 +474265,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] @@ -474285,14 +474285,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 @@ -474304,10 +474304,10 @@ sub_8104018: ; 8104018 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 @@ -474342,11 +474342,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] @@ -474421,11 +474421,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 @@ -474438,7 +474438,7 @@ sub_8104154: ; 8104154 lsls r0, 16 asrs r0, 16 cmp r0, 0x7E - ble @081041B8 + ble _081041B8 movs r0, 0 strh r0, [r4, 0x30] movs r1, 0x32 @@ -474453,10 +474453,10 @@ sub_8104154: ; 8104154 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 @@ -474527,12 +474527,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 @@ -474577,10 +474577,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 @@ -474593,7 +474593,7 @@ sub_81042A0: ; 81042A0 lsls r0, 16 asrs r0, 16 cmp r0, 0x7E - ble @081042FE + ble _081042FE movs r0, 0 strh r0, [r4, 0x30] movs r1, 0x32 @@ -474608,10 +474608,10 @@ sub_81042A0: ; 81042A0 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 @@ -474628,11 +474628,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] @@ -474673,7 +474673,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 @@ -474681,7 +474681,7 @@ sub_8104364: ; 8104364 adds r0, r5, 0 movs r1, 0x1 bl StartObjectImageAnim -@08104390: +_08104390: lsls r0, r7, 16 asrs r0, 16 ldrh r1, [r5, 0x20] @@ -474731,10 +474731,10 @@ 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 @@ -474757,7 +474757,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 @@ -474766,7 +474766,7 @@ sub_8104414: ; 8104414 lsrs r1, 24 adds r0, r5, 0 bl StartObjectImageAnim -@08104448: +_08104448: mov r0, r8 lsls r1, r0, 16 asrs r1, 16 @@ -474822,14 +474822,14 @@ sub_81044BC: ; 81044BC 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 SeekObjectImageAnim @@ -474865,7 +474865,7 @@ sub_81044BC: ; 81044BC strh r2, [r4, 0x34] ldr r0, =sub_8104530 str r0, [r4, 0x1C] -@08104520: +_08104520: pop {r4} pop {r0} bx r0 @@ -474879,14 +474879,14 @@ sub_8104530: ; 8104530 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 @@ -474898,7 +474898,7 @@ sub_8104530: ; 8104530 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] @@ -474919,7 +474919,7 @@ sub_8104530: ; 8104530 bl StartObjectImageAnim ldr r0, =sub_8104594 str r0, [r4, 0x1C] -@0810458A: +_0810458A: pop {r4} pop {r0} bx r0 @@ -474933,10 +474933,10 @@ sub_8104594: ; 8104594 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 @@ -475004,7 +475004,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 @@ -475024,7 +475024,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 @@ -475084,37 +475084,37 @@ 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 .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] @@ -475132,24 +475132,24 @@ sub_81046CC: ; 81046CC 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 @@ -475163,21 +475163,21 @@ sub_81046CC: ; 81046CC 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] @@ -475195,16 +475195,16 @@ sub_81046CC: ; 81046CC 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 @@ -475218,7 +475218,7 @@ sub_81046CC: ; 81046CC strh r1, [r0, 0x26] adds r0, r5, 0 bl move_anim_task_del -@081047F6: +_081047F6: pop {r4,r5} pop {r0} bx r0 @@ -475243,21 +475243,21 @@ 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 .pool -@08104844: +_08104844: ldr r5, =0x02020630 lsls r3, r4, 4 adds r3, r4 @@ -475331,7 +475331,7 @@ sub_8104800: ; 8104800 lsrs r3, 30 adds r0, r4, 0 bl CalcVecFromObjectCenterToObjectUpperLeft -@081048DA: +_081048DA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -475350,7 +475350,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] @@ -475372,7 +475372,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 @@ -475393,12 +475393,12 @@ 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 .pool -@08104964: +_08104964: ldrb r0, [r5] bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -475416,7 +475416,7 @@ sub_8104938: ; 8104938 bl sub_80A7CFC ldr r0, =sub_8104998 str r0, [r4] -@0810498A: +_0810498A: pop {r4,r5} pop {r0} bx r0 @@ -475436,20 +475436,20 @@ 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 .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] @@ -475471,11 +475471,11 @@ sub_8104998: ; 8104998 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble @08104AA8 + ble _08104AA8 strh r5, [r4, 0xE] - b @08104A5C + b _08104A5C .pool -@08104A00: +_08104A00: adds r0, r4, 0 bl sub_80A7D34 ldr r2, =0x02020630 @@ -475495,16 +475495,16 @@ sub_8104998: ; 8104998 lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble @08104AA8 + ble _08104AA8 movs r0, 0 strh r0, [r4, 0xE] - b @08104A5C + b _08104A5C .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] @@ -475518,26 +475518,26 @@ sub_8104998: ; 8104998 ldrh r0, [r4, 0x10] subs r0, 0x2 strh r0, [r4, 0x10] - b @08104AA8 + b _08104AA8 .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] @@ -475548,15 +475548,15 @@ sub_8104998: ; 8104998 strh r5, [r0, 0x26] adds r0, r6, 0 bl move_anim_task_del - b @08104AA8 + b _08104AA8 .pool -@08104A9C: +_08104A9C: ldrb r1, [r4, 0x8] ldr r2, =gUnknown_085935E8 adds r0, r4, 0 bl sub_80A7CFC strh r5, [r4, 0xA] -@08104AA8: +_08104AA8: pop {r4-r6} pop {r0} bx r0 @@ -475602,10 +475602,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 @@ -475621,7 +475621,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 StartObjectImageAnim @@ -475633,9 +475633,9 @@ sub_8104B1C: ; 8104B1C adds r0, 0x20 strh r0, [r4, 0x20] movs r0, 0x40 - b @08104B6A + b _08104B6A .pool -@08104B50: +_08104B50: adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim @@ -475647,7 +475647,7 @@ sub_8104B1C: ; 8104B1C subs r0, 0x20 strh r0, [r4, 0x20] ldr r0, =0x0000ffc0 -@08104B6A: +_08104B6A: strh r0, [r4, 0x30] ldr r0, =0x02038436 ldrb r0, [r0] @@ -475681,26 +475681,26 @@ sub_8104BAC: ; 8104BAC movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08104BC8 + bne _08104BC8 ldr r0, =0x02038436 - b @08104BCA + b _08104BCA .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 @@ -475721,10 +475721,10 @@ sub_8104BAC: ; 8104BAC 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 adds r0, r6, 0 bl oamt_set_x3A_32 @@ -475778,10 +475778,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 @@ -475836,12 +475836,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 str r0, [r4] pop {r4} @@ -475866,7 +475866,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] @@ -475875,7 +475875,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] @@ -475886,9 +475886,9 @@ sub_8104D28: ; 8104D28 ldrh r1, [r3, 0x1A] ldrh r2, [r0, 0x22] adds r1, r2 - b @08104D8C + b _08104D8C .pool -@08104D78: +_08104D78: ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] @@ -475899,24 +475899,24 @@ sub_8104D28: ; 8104D28 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 .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] @@ -475933,14 +475933,14 @@ sub_8104D28: ; 8104D28 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 .pool -@08104DDC: +_08104DDC: ldr r2, =0x02020630 movs r5, 0x8 ldrsh r1, [r3, r5] @@ -475957,14 +475957,14 @@ sub_8104D28: ; 8104D28 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 .pool -@08104E0C: +_08104E0C: ldr r2, =0x02020630 movs r0, 0x8 ldrsh r1, [r3, r0] @@ -475982,24 +475982,24 @@ sub_8104D28: ; 8104D28 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 .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 @@ -476010,10 +476010,10 @@ sub_8104D28: ; 8104D28 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 @@ -476052,19 +476052,19 @@ 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 .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 @@ -476072,15 +476072,15 @@ sub_8104E74: ; 8104E74 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] @@ -476090,15 +476090,15 @@ sub_8104E74: ; 8104E74 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 @@ -476133,31 +476133,31 @@ 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 .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] @@ -476170,26 +476170,26 @@ sub_8104F54: ; 8104F54 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 @@ -476204,7 +476204,7 @@ sub_8104F54: ; 8104F54 adds r0, r2 ldrh r1, [r3, 0x14] strh r1, [r0] -@08104FF0: +_08104FF0: ldrh r0, [r3, 0xE] adds r0, 0x1 strh r0, [r3, 0xE] @@ -476213,13 +476213,13 @@ sub_8104F54: ; 8104F54 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 @@ -476276,24 +476276,24 @@ sub_8105078: ; 8105078 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 @@ -476308,14 +476308,14 @@ sub_8105078: ; 8105078 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] @@ -476323,22 +476323,22 @@ sub_8105078: ; 8105078 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] @@ -476352,13 +476352,13 @@ sub_8105078: ; 8105078 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 @@ -476366,25 +476366,25 @@ sub_8105078: ; 8105078 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] @@ -476393,22 +476393,22 @@ sub_8105078: ; 8105078 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 @@ -476424,14 +476424,14 @@ sub_8105078: ; 8105078 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] @@ -476441,7 +476441,7 @@ sub_8105078: ; 8105078 strb r0, [r2] adds r0, r4, 0 bl move_anim_8072740 -@081051BC: +_081051BC: pop {r4} pop {r0} bx r0 @@ -476464,13 +476464,13 @@ 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 .pool -@081051F0: +_081051F0: ldr r0, =0x02038437 -@081051F2: +_081051F2: ldrb r5, [r0] ldrb r1, [r1, 0x6] movs r0, 0x1 @@ -476479,29 +476479,29 @@ sub_81051C4: ; 81051C4 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 .pool -@08105230: +_08105230: adds r0, r5, 0 movs r1, 0x2 -@08105234: +_08105234: bl sub_80A5C6C lsls r0, 24 lsrs r4, r0, 24 @@ -476509,7 +476509,7 @@ sub_81051C4: ; 81051C4 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq @08105260 + beq _08105260 ldr r2, =0x0203841e mov r0, sp ldrh r1, [r0] @@ -476518,15 +476518,15 @@ sub_81051C4: ; 81051C4 subs r1, r0 subs r0, r1 strh r0, [r2] - b @0810526A + b _0810526A .pool -@08105260: +_08105260: ldr r1, =0x0203841e mov r0, sp ldrh r0, [r0] subs r0, r4 strh r0, [r1] -@0810526A: +_0810526A: ldr r1, =sub_80A77C8 str r1, [r6, 0x1C] adds r0, r6, 0 @@ -476545,12 +476545,12 @@ sub_8105284: ; 8105284 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 @@ -476575,41 +476575,41 @@ 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 .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 .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 @@ -476628,19 +476628,19 @@ sub_81052A4: ; 81052A4 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 .pool -@0810535C: +_0810535C: ldr r2, =0x02020630 ldr r0, =0x020241e4 add r0, r8 - b @081053EA + b _081053EA .pool -@0810536C: +_0810536C: adds r0, r7, 0 mov r1, r10 bl sub_80A5C6C @@ -476655,7 +476655,7 @@ sub_81052A4: ; 81052A4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @081053E4 + bne _081053E4 movs r0, 0x2 adds r4, r7, 0 eors r4, r0 @@ -476663,7 +476663,7 @@ sub_81052A4: ; 81052A4 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 @@ -476683,31 +476683,31 @@ sub_81052A4: ; 81052A4 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 .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] @@ -476724,23 +476724,23 @@ sub_81052A4: ; 81052A4 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 .pool -@0810544C: +_0810544C: mov r4, sp mov r0, r8 mov r1, r10 @@ -476755,12 +476755,12 @@ sub_81052A4: ; 81052A4 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 @@ -476769,9 +476769,9 @@ sub_81052A4: ; 81052A4 adds r0, r2 strh r0, [r3] adds r2, r1, 0 - b @0810549E + b _0810549E .pool -@08105490: +_08105490: mov r3, sp mov r0, sp ldr r2, =0x0203841e @@ -476779,7 +476779,7 @@ sub_81052A4: ; 81052A4 ldrh r1, [r2, 0x6] subs r0, r1 strh r0, [r3] -@0810549E: +_0810549E: ldrh r1, [r2, 0x8] mov r3, sp ldrh r3, [r3, 0x2] @@ -476822,7 +476822,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 @@ -476832,7 +476832,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 StartObjectRotScalAnim @@ -476858,9 +476858,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] @@ -476899,9 +476899,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] @@ -476911,7 +476911,7 @@ sub_810557C: ; 810557C 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] @@ -476927,7 +476927,7 @@ sub_810557C: ; 810557C bl StartObjectRotScalAnim ldr r0, =sub_81055F4 str r0, [r4, 0x1C] -@081055E0: +_081055E0: pop {r4,r5} pop {r0} bx r0 @@ -476944,13 +476944,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 StartObjectRotScalAnim ldr r0, =sub_810561C str r0, [r4, 0x1C] -@08105612: +_08105612: pop {r4} pop {r0} bx r0 @@ -476966,7 +476966,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 StartObjectRotScalAnim @@ -476975,7 +476975,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 @@ -476988,9 +476988,9 @@ sub_810561C: ; 810561C orrs r0, r1 strh r0, [r4, 0x4] ldr r0, =sub_8105694 - b @08105680 + b _08105680 .pool -@08105668: +_08105668: ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 @@ -477003,9 +477003,9 @@ sub_810561C: ; 810561C orrs r0, r1 strh r0, [r4, 0x4] ldr r0, =sub_810571C -@08105680: +_08105680: str r0, [r4, 0x1C] -@08105682: +_08105682: pop {r4} pop {r0} bx r0 @@ -477025,7 +477025,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 @@ -477039,7 +477039,7 @@ sub_8105694: ; 8105694 bl SetGpuReg ldr r0, =sub_81056D4 str r0, [r4, 0x1C] -@081056CA: +_081056CA: pop {r4} pop {r0} bx r0 @@ -477059,7 +477059,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] @@ -477074,10 +477074,10 @@ sub_81056D4: ; 81056D4 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @08105712 + bne _08105712 ldr r0, =sub_810571C str r0, [r4, 0x1C] -@08105712: +_08105712: pop {r4} pop {r0} bx r0 @@ -477092,7 +477092,7 @@ sub_810571C: ; 810571C ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne @08105754 + bne _08105754 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -477102,15 +477102,15 @@ sub_810571C: ; 810571C movs r1, 0x3C ldrsh r0, [r3, r1] cmp r0, 0 - bne @08105750 + bne _08105750 ldr r0, =sub_810575C - b @08105752 + b _08105752 .pool -@08105750: +_08105750: ldr r0, =move_anim_8072740 -@08105752: +_08105752: str r0, [r3, 0x1C] -@08105754: +_08105754: pop {r0} bx r0 .pool @@ -477175,7 +477175,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] @@ -477197,7 +477197,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 @@ -477226,17 +477226,17 @@ 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 .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 @@ -477264,20 +477264,20 @@ 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 .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] @@ -477292,16 +477292,16 @@ sub_8105878: ; 8105878 strh r4, [r3, 0xA] strh r4, [r3, 0xC] strh r4, [r3, 0xE] - b @0810595A + b _0810595A .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] @@ -477310,7 +477310,7 @@ sub_8105878: ; 8105878 ands r0, r4 lsls r0, 16 cmp r0, 0 - beq @08105904 + beq _08105904 ldr r2, =0x02020630 movs r4, 0x26 ldrsh r1, [r3, r4] @@ -477320,9 +477320,9 @@ sub_8105878: ; 8105878 adds r0, r2 ldrh r1, [r0, 0x24] adds r1, 0x6 - b @08105916 + b _08105916 .pool -@08105904: +_08105904: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -477332,7 +477332,7 @@ sub_8105878: ; 8105878 adds r0, r2 ldrh r1, [r0, 0x24] subs r1, 0x6 -@08105916: +_08105916: strh r1, [r0, 0x24] ldrh r0, [r3, 0xE] adds r0, 0x1 @@ -477340,12 +477340,12 @@ sub_8105878: ; 8105878 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 @@ -477355,24 +477355,24 @@ sub_8105878: ; 8105878 ldrh r0, [r1, 0x24] subs r0, 0x6 strh r0, [r1, 0x24] - b @0810595A + b _0810595A .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] @@ -477393,10 +477393,10 @@ sub_8105878: ; 8105878 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 @@ -477450,7 +477450,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] @@ -477459,7 +477459,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 @@ -477467,7 +477467,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] @@ -477480,9 +477480,9 @@ sub_81059E0: ; 81059E0 movs r1, 0x5 negs r1, r1 ands r1, r2 - b @08105A52 + b _08105A52 .pool -@08105A3C: +_08105A3C: ldr r3, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -477494,7 +477494,7 @@ sub_81059E0: ; 81059E0 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -@08105A52: +_08105A52: strb r1, [r0] ldrh r0, [r4, 0xE] adds r0, 0x1 @@ -477505,7 +477505,7 @@ sub_81059E0: ; 81059E0 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] @@ -477514,13 +477514,13 @@ sub_81059E0: ; 81059E0 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 .pool -@08105A88: +_08105A88: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -477535,7 +477535,7 @@ sub_81059E0: ; 81059E0 strb r1, [r0] adds r0, r5, 0 bl move_anim_task_del -@08105AA6: +_08105AA6: pop {r4-r6} pop {r0} bx r0 @@ -477597,25 +477597,25 @@ 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 .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 @@ -477628,20 +477628,20 @@ sub_8105B08: ; 8105B08 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] @@ -477650,29 +477650,29 @@ sub_8105B08: ; 8105B08 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, =gUnknown_085938DC movs r3, 0x24 @@ -477684,7 +477684,7 @@ sub_8105B08: ; 8105B08 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq @08105C42 + beq _08105C42 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -477720,7 +477720,7 @@ sub_8105B08: ; 8105B08 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @08105C42 + ble _08105C42 strh r5, [r4, 0xC] ldrh r0, [r4, 0xE] adds r0, 0x1 @@ -477728,20 +477728,20 @@ sub_8105B08: ; 8105B08 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 .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 @@ -477779,7 +477779,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 @@ -477797,7 +477797,7 @@ sub_8105C48: ; 8105C48 strh r0, [r1] adds r0, r3, 0 bl RemoveObjectAndFreeTiles -@08105CAA: +_08105CAA: pop {r4} pop {r0} bx r0 @@ -477817,7 +477817,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 @@ -477827,7 +477827,7 @@ sub_8105CB4: ; 8105CB4 strb r0, [r1] adds r4, 0x1 cmp r4, 0x2 - ble @08105CCC + ble _08105CCC movs r0, 0x80 lsls r0, 6 bl AllocZeroed @@ -477841,7 +477841,7 @@ sub_8105CB4: ; 8105CB4 ldr r0, =gUnknown_08C22610 bl LZDecompressWram movs r4, 0 -@08105D00: +_08105D00: ldr r5, =0x020244d4 ldr r0, [r5] movs r1, 0xBE @@ -477862,7 +477862,7 @@ sub_8105CB4: ; 8105CB4 bl gpu_pal_apply adds r4, 0x1 cmp r4, 0x2 - ble @08105D00 + ble _08105D00 ldr r0, [r5] movs r4, 0xBE lsls r4, 1 @@ -477889,13 +477889,13 @@ sub_8105D60: ; 8105D60 lsrs r6, r0, 24 ldr r5, =gUnknown_08593950 movs r4, 0x2 -@08105D6A: +_08105D6A: ldrh r0, [r5] bl FreeObjectPaletteByTag 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} @@ -477960,12 +477960,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] @@ -478010,11 +478010,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 @@ -478034,10 +478034,10 @@ sub_8105E60: ; 8105E60 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 @@ -478052,9 +478052,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] @@ -478115,20 +478115,20 @@ 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 str r0, [r3] - b @08105F78 + b _08105F78 .pool -@08105F70: +_08105F70: ldr r1, =0x02022e24 lsls r0, r4, 8 orrs r2, r0 strh r2, [r1] -@08105F78: +_08105F78: pop {r4} pop {r0} bx r0 @@ -478154,7 +478154,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 @@ -478171,11 +478171,11 @@ sub_8105F84: ; 8105F84 ldr r2, =0x00007fff movs r1, 0x10 bl sub_80A2A20 - b @0810600C + b _0810600C .pool -@08105FD8: +_08105FD8: cmp r0, 0x4 - ble @0810600C + ble _0810600C ldr r0, =0x02022e24 strh r4, [r0] ldr r0, =0x02022e26 @@ -478195,7 +478195,7 @@ sub_8105F84: ; 8105F84 bl SetGpuReg adds r0, r5, 0 bl move_anim_task_del -@0810600C: +_0810600C: add sp, 0xC pop {r4,r5} pop {r0} @@ -478224,7 +478224,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 @@ -478240,9 +478240,9 @@ sub_8106020: ; 8106020 adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x24] - b @081060A4 + b _081060A4 .pool -@0810607C: +_0810607C: ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -478256,12 +478256,12 @@ sub_8106020: ; 8106020 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 @@ -478289,7 +478289,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 @@ -478305,9 +478305,9 @@ sub_81060B0: ; 81060B0 adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x24] - b @08106134 + b _08106134 .pool -@0810610C: +_0810610C: ldr r1, =0x02020630 lsls r0, r4, 4 adds r0, r4 @@ -478321,12 +478321,12 @@ sub_81060B0: ; 81060B0 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 @@ -478375,7 +478375,7 @@ sub_810618C: ; 810618C bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @081061B6 + bne _081061B6 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0xE @@ -478388,11 +478388,11 @@ 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 @@ -478406,7 +478406,7 @@ sub_81061C4: ; 81061C4 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @081061E8 + bne _081061E8 ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x30] @@ -478414,9 +478414,9 @@ sub_81061C4: ; 81061C4 strh r0, [r4, 0x32] adds r0, r2, 0x1 strh r0, [r4, 0x2E] - b @08106244 + b _08106244 .pool -@081061E8: +_081061E8: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] adds r0, r2 @@ -478436,7 +478436,7 @@ sub_81061C4: ; 81061C4 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 @@ -478455,14 +478455,14 @@ sub_81061C4: ; 81061C4 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 @@ -478517,7 +478517,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 @@ -478537,10 +478537,10 @@ 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 @@ -478570,12 +478570,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] @@ -478634,23 +478634,23 @@ 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 .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 @@ -478662,7 +478662,7 @@ sub_81063A8: ; 81063A8 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @081064F0 + bne _081064F0 strh r5, [r4, 0x1C] ldrh r1, [r4, 0x1E] adds r1, 0x1 @@ -478678,13 +478678,13 @@ sub_81063A8: ; 81063A8 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 @@ -478695,14 +478695,14 @@ sub_81063A8: ; 81063A8 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 @@ -478713,7 +478713,7 @@ sub_81063A8: ; 81063A8 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @081064F0 + bne _081064F0 movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -478730,13 +478730,13 @@ sub_81063A8: ; 81063A8 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 @@ -478750,18 +478750,18 @@ sub_81063A8: ; 81063A8 ldrh r1, [r0, 0x20] adds r1, 0x1 strh r1, [r0, 0x20] - b @081064F0 + b _081064F0 .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 SetGpuReg @@ -478774,7 +478774,7 @@ sub_81063A8: ; 81063A8 bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -@081064F0: +_081064F0: add sp, 0x10 pop {r4,r5} pop {r0} @@ -478805,12 +478805,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] @@ -478827,31 +478827,31 @@ sub_81064F8: ; 81064F8 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @08106578 + beq _08106578 ldr r1, =gUnknown_08D93960 - b @0810658A + b _0810658A .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, =gUnknown_08D93598 -@0810658A: +_0810658A: mov r0, sp movs r2, 0 bl sub_80A6D60 - b @081065A6 + b _081065A6 .pool -@0810659C: +_0810659C: ldr r1, =gUnknown_08D9377C mov r0, sp movs r2, 0 bl sub_80A6D60 -@081065A6: +_081065A6: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =gUnknown_08C249F8 @@ -478893,23 +478893,23 @@ 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 .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 @@ -478921,7 +478921,7 @@ sub_81065EC: ; 81065EC lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne @08106730 + bne _08106730 strh r5, [r4, 0x1C] ldrh r1, [r4, 0x1E] adds r1, 0x1 @@ -478937,13 +478937,13 @@ sub_81065EC: ; 81065EC 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 @@ -478954,14 +478954,14 @@ sub_81065EC: ; 81065EC 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 @@ -478972,7 +478972,7 @@ sub_81065EC: ; 81065EC lsls r0, 16 asrs r0, 16 cmp r0, 0x2 - bne @08106730 + bne _08106730 movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -478989,13 +478989,13 @@ sub_81065EC: ; 81065EC 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 @@ -479010,16 +479010,16 @@ sub_81065EC: ; 81065EC 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 SetGpuReg @@ -479032,7 +479032,7 @@ sub_81065EC: ; 81065EC bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -@08106730: +_08106730: add sp, 0x10 pop {r4,r5} pop {r0} @@ -479092,14 +479092,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] @@ -479125,9 +479125,9 @@ sub_810679C: ; 810679C 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] @@ -479146,12 +479146,12 @@ sub_810679C: ; 810679C 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 .pool -@08106828: +_08106828: movs r3, 0x80 lsls r3, 3 adds r0, r3, 0 @@ -479172,19 +479172,19 @@ sub_810679C: ; 810679C 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 @@ -479248,22 +479248,22 @@ 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 @@ -479288,10 +479288,10 @@ 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 @@ -479343,10 +479343,10 @@ 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 @@ -479372,7 +479372,7 @@ sub_81069D0: ; 81069D0 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @081069EE + bne _081069EE ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] @@ -479382,7 +479382,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] @@ -479402,7 +479402,7 @@ sub_81069D0: ; 81069D0 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x4F - bgt @08106A32 + bgt _08106A32 adds r0, r5, 0 movs r1, 0x50 bl cosine @@ -479415,11 +479415,11 @@ sub_81069D0: ; 81069D0 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] @@ -479431,12 +479431,12 @@ sub_81069D0: ; 81069D0 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 @@ -479469,7 +479469,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 @@ -479487,14 +479487,14 @@ 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 @@ -479508,7 +479508,7 @@ sub_8106AD0: ; 8106AD0 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @08106AF4 + bne _08106AF4 ldr r1, =0x0203841e ldrh r0, [r1] strh r0, [r4, 0x30] @@ -479516,9 +479516,9 @@ sub_8106AD0: ; 8106AD0 strh r0, [r4, 0x32] adds r0, r2, 0x1 strh r0, [r4, 0x2E] - b @08106B48 + b _08106B48 .pool -@08106AF4: +_08106AF4: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] adds r0, r2 @@ -479540,7 +479540,7 @@ sub_8106AD0: ; 8106AD0 ands r0, r1 strh r0, [r4, 0x34] cmp r0, 0x46 - ble @08106B48 + ble _08106B48 ldr r0, =sub_8106A64 str r0, [r4, 0x1C] ldrh r0, [r4, 0x24] @@ -479558,7 +479558,7 @@ sub_8106AD0: ; 8106AD0 movs r1, 0xB4 bl __umodsi3 strh r0, [r4, 0x34] -@08106B48: +_08106B48: pop {r4,r5} pop {r0} bx r0 @@ -479572,7 +479572,7 @@ sub_8106B54: ; 8106B54 movs r1, 0x34 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08106B8E + bne _08106B8E ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -479594,7 +479594,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 @@ -479604,27 +479604,27 @@ sub_8106B54: ; 8106B54 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 @@ -479636,9 +479636,9 @@ sub_8106B54: ; 8106B54 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 @@ -479648,26 +479648,26 @@ sub_8106B54: ; 8106B54 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] @@ -479675,7 +479675,7 @@ sub_8106B54: ; 8106B54 lsls r0, 16 lsrs r0, 16 cmp r0, 0x46 - bls @08106C5C + bls _08106C5C movs r0, 0x2E ldrsh r1, [r4, r0] lsrs r0, r1, 31 @@ -479694,9 +479694,9 @@ sub_8106B54: ; 8106B54 ands r0, r2 orrs r0, r1 strb r0, [r3] - b @08106C6A + b _08106C6A .pool -@08106C5C: +_08106C5C: adds r2, r4, 0 adds r2, 0x3E ldrb r1, [r2] @@ -479704,14 +479704,14 @@ sub_8106B54: ; 8106B54 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 @@ -479724,7 +479724,7 @@ sub_8106C80: ; 8106C80 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @08106CB4 + bne _08106CB4 ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -479740,19 +479740,19 @@ sub_8106C80: ; 8106C80 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b @08106CC8 + b _08106CC8 .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 @@ -479766,22 +479766,22 @@ sub_8106CD0: ; 8106CD0 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 .pool -@08106CEC: +_08106CEC: movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0 - bne @08106CFC + bne _08106CFC ldr r4, =0x02038436 - b @08106CFE + b _08106CFE .pool -@08106CFC: +_08106CFC: ldr r4, =0x02038437 -@08106CFE: +_08106CFE: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -479799,15 +479799,15 @@ sub_8106CD0: ; 8106CD0 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 .pool -@08106D34: +_08106D34: ldrh r0, [r5, 0x20] subs r0, 0x20 -@08106D38: +_08106D38: strh r0, [r5, 0x20] ldrh r0, [r2, 0x4] strh r0, [r5, 0x2E] @@ -479819,7 +479819,7 @@ sub_8106CD0: ; 8106CD0 bl StartObjectImageAnim ldr r0, =sub_8106D5C str r0, [r5, 0x1C] -@08106D50: +_08106D50: pop {r4,r5} pop {r0} bx r0 @@ -479835,23 +479835,23 @@ 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 StartObjectImageAnim - 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 @@ -479897,10 +479897,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 @@ -479915,26 +479915,26 @@ sub_8106E00: ; 8106E00 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08106E1C + bne _08106E1C ldr r0, =0x02038436 - b @08106E1E + b _08106E1E .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 @@ -479963,18 +479963,18 @@ sub_8106E00: ; 8106E00 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] @@ -480023,10 +480023,10 @@ 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 @@ -480038,7 +480038,7 @@ sub_8106F00: ; 8106F00 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @08106F22 + bne _08106F22 ldr r0, =0x0203841e ldrh r1, [r0] movs r0, 0x78 @@ -480050,7 +480050,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] @@ -480059,23 +480059,23 @@ sub_8106F00: ; 8106F00 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 @@ -480089,7 +480089,7 @@ sub_8106F60: ; 8106F60 movs r1, 0x2E ldrsh r0, [r6, r1] cmp r0, 0 - bne @08106F8E + bne _08106F8E movs r5, 0x78 strh r5, [r6, 0x20] ldr r4, =0x0203841e @@ -480106,7 +480106,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 @@ -480151,7 +480151,7 @@ sub_8106F60: ; 8106F60 movs r2, 0x38 ldrsh r0, [r6, r2] cmp r1, r0 - ble @0810700A + ble _0810700A ldr r0, =sub_8107018 str r0, [r6, 0x1C] strh r5, [r6, 0x2E] @@ -480164,7 +480164,7 @@ sub_8106F60: ; 8106F60 adds r0, r6, 0 movs r1, 0x1 bl StartObjectRotScalAnim -@0810700A: +_0810700A: pop {r4-r6} pop {r0} bx r0 @@ -480181,12 +480181,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 str r0, [r1, 0x1C] -@08107032: +_08107032: pop {r0} bx r0 .pool @@ -480206,20 +480206,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 @@ -480240,14 +480240,14 @@ sub_810703C: ; 810703C 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 @@ -480262,7 +480262,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 @@ -480270,7 +480270,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 @@ -480284,9 +480284,9 @@ sub_81070AC: ; 81070AC adds r0, r5, 0 movs r1, 0x1 bl StartObjectRotScalAnim - b @08107118 + b _08107118 .pool -@081070F8: +_081070F8: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -480301,7 +480301,7 @@ sub_81070AC: ; 81070AC lsrs r0, 24 adds r0, 0x28 strh r0, [r5, 0x22] -@08107118: +_08107118: movs r0, 0xD strh r0, [r5, 0x2E] ldrh r0, [r5, 0x20] @@ -480368,7 +480368,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] @@ -480376,7 +480376,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] @@ -480386,7 +480386,7 @@ sub_8107188: ; 8107188 ldrsh r1, [r5, r2] bl __modsi3 cmp r0, 0x1 - bne @081071F8 + bne _081071F8 bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 @@ -480407,16 +480407,16 @@ sub_8107188: ; 8107188 adds r1, r4, 0 movs r3, 0x4 bl AddObjectToFront -@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 @@ -480441,24 +480441,24 @@ 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 RemoveObjectAndFreeTiles -@0810725A: +_0810725A: pop {r0} bx r0 thumb_func_end sub_8107228 @@ -480472,7 +480472,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 @@ -480481,9 +480481,9 @@ sub_8107260: ; 8107260 ldr r4, =0x0203841e ldrh r1, [r4] subs r0, r1 - b @081072A2 + b _081072A2 .pool -@08107290: +_08107290: ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -480492,7 +480492,7 @@ sub_8107260: ; 8107260 lsrs r0, 24 ldrh r1, [r4] adds r0, r1 -@081072A2: +_081072A2: strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x3 @@ -480513,12 +480513,12 @@ sub_8107260: ; 8107260 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] @@ -480635,16 +480635,16 @@ sub_8107380: ; 8107380 lsls r4, 24 lsrs r4, 24 cmp r4, 0 - beq @081073EC + beq _081073EC strh r4, [r7, 0x36] - b @081073F6 + b _081073F6 .pool -@081073EC: +_081073EC: ldr r0, =sub_8107408 str r0, [r5, 0x1C] adds r0, r7, 0 bl RemoveObjectAndFreeTiles -@081073F6: +_081073F6: add sp, 0x4 pop {r3} mov r8, r3 @@ -480698,20 +480698,20 @@ 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 .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] @@ -480761,7 +480761,7 @@ sub_81074E4: ; 81074E4 ldrh r1, [r0, 0xE] ldr r0, =0x0000ffff cmp r1, r0 - bne @08107506 + bne _08107506 adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim @@ -480771,15 +480771,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 @@ -480832,7 +480832,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] @@ -480847,19 +480847,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 @@ -480872,10 +480872,10 @@ sub_810756C: ; 810756C 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 @@ -480922,19 +480922,19 @@ 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 .pool -@0810765C: +_0810765C: lsls r0, r1, 8 strh r0, [r5, 0x3A] -@08107660: +_08107660: ldr r1, =sub_8107674 str r1, [r5, 0x1C] adds r0, r5, 0 @@ -480952,10 +480952,10 @@ sub_8107674: ; 8107674 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 @@ -480972,19 +480972,19 @@ sub_8107674: ; 8107674 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 @@ -481031,10 +481031,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 .pool @@ -481066,25 +481066,25 @@ 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 .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] @@ -481105,10 +481105,10 @@ 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 @@ -481127,7 +481127,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] @@ -481137,19 +481137,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] @@ -481158,15 +481158,15 @@ sub_81077C0: ; 81077C0 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 @@ -481174,11 +481174,11 @@ sub_81077C0: ; 81077C0 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 @@ -481244,17 +481244,17 @@ sub_81078D0: ; 81078D0 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 .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] @@ -481295,10 +481295,10 @@ 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 @@ -481335,7 +481335,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 @@ -481346,26 +481346,26 @@ 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, =gUnknown_08D95E00 bl sub_80A6D48 - b @081079EA + b _081079EA .pool -@081079D0: +_081079D0: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =gUnknown_08D960D0 bl sub_80A6D48 - b @081079EA + b _081079EA .pool -@081079E0: +_081079E0: ldr r1, =gUnknown_08D963A4 mov r0, sp movs r2, 0x1 bl sub_80A6D60 -@081079EA: +_081079EA: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =gUnknown_08D94AB8 @@ -481376,23 +481376,23 @@ sub_8107954: ; 8107954 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08107A24 + bne _08107A24 ldr r0, =gUnknown_08D95DD8 mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - b @08107A32 + b _08107A32 .pool -@08107A24: +_08107A24: ldr r0, =gUnknown_08D8FB9C mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette -@08107A32: +_08107A32: ldr r0, =sub_8107D58 ldr r4, =0x03005e00 mov r2, r10 @@ -481427,7 +481427,7 @@ sub_8107954: ; 8107954 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - beq @08107AB4 + beq _08107AB4 ldr r1, =0x0000ffb0 adds r0, r1, 0 ldr r2, =0x02022e18 @@ -481442,16 +481442,16 @@ sub_8107954: ; 8107954 strh r0, [r6, 0xA] mov r0, r9 strh r0, [r7, 0xE] - b @08107B0E + b _08107B0E .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 @@ -481466,9 +481466,9 @@ sub_8107954: ; 8107954 ldr r0, =0x0000ffff strh r0, [r6, 0xA] strh r1, [r7, 0xE] - b @08107B0E + b _08107B0E .pool -@08107AF8: +_08107AF8: ldr r0, =0x02022e18 strh r4, [r0] ldr r1, =0x0000ffd0 @@ -481480,7 +481480,7 @@ sub_8107954: ; 8107954 movs r0, 0x1 strh r0, [r6, 0xA] strh r4, [r7, 0xE] -@08107B0E: +_08107B0E: ldr r0, =0x02022e18 ldrh r1, [r0] movs r0, 0x14 @@ -481498,16 +481498,16 @@ sub_8107954: ; 8107954 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 .pool -@08107B54: +_08107B54: movs r0, 0 strh r0, [r1, 0x10] -@08107B58: +_08107B58: strh r0, [r1, 0x12] ldr r1, =0x03005e00 mov r2, r10 @@ -481562,7 +481562,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] @@ -481575,7 +481575,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 @@ -481591,7 +481591,7 @@ sub_8107B84: ; 8107B84 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - bne @08107BDE + bne _08107BDE mov r0, sp ldrb r0, [r0, 0x8] lsls r0, 4 @@ -481605,7 +481605,7 @@ sub_8107B84: ; 8107B84 lsls r0, 3 adds r0, r1 strh r2, [r0, 0x12] -@08107C18: +_08107C18: ldr r1, =0x03005e00 lsls r2, r5, 2 adds r0, r2, r5 @@ -481619,7 +481619,7 @@ sub_8107B84: ; 8107B84 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] @@ -481628,7 +481628,7 @@ sub_8107B84: ; 8107B84 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 @@ -481643,11 +481643,11 @@ sub_8107B84: ; 8107B84 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] @@ -481662,7 +481662,7 @@ sub_8107B84: ; 8107B84 lsls r0, 8 orrs r2, r0 strh r2, [r1, 0xA] -@08107C86: +_08107C86: adds r0, r6, r5 lsls r0, 3 adds r2, r0, r4 @@ -481676,11 +481676,11 @@ sub_8107B84: ; 8107B84 movs r3, 0x1F ands r3, r0 cmp r3, 0 - bne @08107CA8 + bne _08107CA8 strh r3, [r2, 0x8] ldr r0, =sub_8107CC4 str r0, [r2] -@08107CA8: +_08107CA8: add sp, 0x10 pop {r4-r7} pop {r0} @@ -481707,7 +481707,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 @@ -481715,18 +481715,18 @@ sub_8107CC4: ; 8107CC4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @08107D4A + b _08107D4A .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 @@ -481747,7 +481747,7 @@ sub_8107CC4: ; 8107CC4 strh r1, [r0, 0x26] adds r0, r5, 0 bl move_anim_task_del -@08107D4A: +_08107D4A: pop {r3} mov r8, r3 pop {r4-r7} @@ -481770,35 +481770,35 @@ 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 .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 @@ -481817,21 +481817,21 @@ sub_8107D58: ; 8107D58 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 @@ -481848,19 +481848,19 @@ sub_8107D58: ; 8107D58 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 @@ -481877,12 +481877,12 @@ sub_8107D58: ; 8107D58 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 @@ -481894,9 +481894,9 @@ sub_8107D58: ; 8107D58 ldrh r1, [r4, 0xA] strh r1, [r0] ldrh r0, [r4, 0xA] - b @08107E7A + b _08107E7A .pool -@08107E64: +_08107E64: lsls r0, r3, 16 asrs r0, 15 mov r1, r12 @@ -481908,7 +481908,7 @@ sub_8107D58: ; 8107D58 ldrh r1, [r4, 0xC] strh r1, [r0] ldrh r0, [r4, 0xC] -@08107E7A: +_08107E7A: strh r0, [r2] ldr r0, =0x04000052 str r0, [sp] @@ -481927,42 +481927,42 @@ sub_8107D58: ; 8107D58 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @08108022 + b _08108022 .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 @@ -481981,18 +481981,18 @@ sub_8107D58: ; 8107D58 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] @@ -482009,16 +482009,16 @@ sub_8107D58: ; 8107D58 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] @@ -482033,18 +482033,18 @@ sub_8107D58: ; 8107D58 lsls r1, r3, 16 asrs r0, r1, 16 cmp r0, 0x9F - ble @08107F4E - b @08108022 + ble _08107F4E + b _08108022 .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 @@ -482063,18 +482063,18 @@ sub_8107D58: ; 8107D58 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] @@ -482091,16 +482091,16 @@ sub_8107D58: ; 8107D58 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] @@ -482115,18 +482115,18 @@ sub_8107D58: ; 8107D58 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} @@ -482164,11 +482164,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 @@ -482194,15 +482194,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 @@ -482214,10 +482214,10 @@ sub_8108098: ; 8108098 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 @@ -482278,26 +482278,26 @@ 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 .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 @@ -482316,14 +482316,14 @@ sub_8108140: ; 8108140 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] @@ -482332,7 +482332,7 @@ sub_8108140: ; 8108140 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @08108200 + beq _08108200 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -482351,9 +482351,9 @@ sub_8108140: ; 8108140 ldrh r1, [r0, 0x22] adds r1, 0x1 strh r1, [r0, 0x22] - b @08108212 + b _08108212 .pool -@08108200: +_08108200: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -482363,15 +482363,15 @@ sub_8108140: ; 8108140 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 @@ -482385,18 +482385,18 @@ sub_8108140: ; 8108140 adds r0, r2 strh r5, [r0, 0x24] strh r5, [r4, 0xE] - b @0810835C + b _0810835C .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 @@ -482414,32 +482414,32 @@ sub_8108140: ; 8108140 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] @@ -482448,7 +482448,7 @@ sub_8108140: ; 8108140 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @081082D8 + beq _081082D8 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -482458,9 +482458,9 @@ sub_8108140: ; 8108140 adds r0, r2 ldrh r1, [r0, 0x26] adds r1, 0x2 - b @081082EA + b _081082EA .pool -@081082D8: +_081082D8: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -482470,12 +482470,12 @@ sub_8108140: ; 8108140 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 @@ -482493,9 +482493,9 @@ sub_8108140: ; 8108140 movs r0, 0 strh r0, [r4, 0xE] strh r0, [r4, 0x10] - b @0810835E + b _0810835E .pool -@08108320: +_08108320: ldr r6, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -482511,7 +482511,7 @@ sub_8108140: ; 8108140 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @0810837A + bne _0810837A ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 @@ -482524,22 +482524,22 @@ sub_8108140: ; 8108140 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 .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} @@ -482554,7 +482554,7 @@ sub_8108384: ; 8108384 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne @081083B8 + bne _081083B8 ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -482563,12 +482563,12 @@ sub_8108384: ; 8108384 movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @081083C8 + b _081083C8 .pool -@081083B4: +_081083B4: adds r0, r2, 0 - b @081083FA -@081083B8: + b _081083FA +_081083B8: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -482577,7 +482577,7 @@ sub_8108384: ; 8108384 movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -@081083C8: +_081083C8: adds r5, r1, r0 adds r0, r5, 0 movs r1, 0x3A @@ -482591,18 +482591,18 @@ sub_8108384: ; 8108384 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 @@ -482646,9 +482646,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 @@ -482662,7 +482662,7 @@ sub_8108408: ; 8108408 str r1, [sp, 0x10] asrs r0, 16 mov r8, r0 -@08108472: +_08108472: ldr r0, =gUnknown_08595268 mov r1, r10 mov r2, r9 @@ -482672,7 +482672,7 @@ sub_8108408: ; 8108408 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 @@ -482705,14 +482705,14 @@ sub_8108408: ; 8108408 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 @@ -482731,7 +482731,7 @@ sub_8108408: ; 8108408 str r1, [sp, 0x4] asrs r0, 16 cmp r0, 0x13 - ble @08108472 + ble _08108472 add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -482750,11 +482750,11 @@ sub_810851C: ; 810851C 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 @@ -482780,7 +482780,7 @@ sub_810851C: ; 810851C ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@08108564: +_08108564: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x32] adds r0, r1 @@ -482800,15 +482800,15 @@ sub_810851C: ; 810851C 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] @@ -482826,7 +482826,7 @@ sub_810851C: ; 810851C strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@081085BE: +_081085BE: pop {r4} pop {r0} bx r0 @@ -482852,17 +482852,17 @@ 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 .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] @@ -482898,31 +482898,31 @@ 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 .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 @@ -482938,7 +482938,7 @@ sub_810862C: ; 810862C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @081086B4 + beq _081086B4 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -482950,7 +482950,7 @@ sub_810862C: ; 810862C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@081086B4: +_081086B4: movs r0, 0x3 strh r0, [r5] adds r0, r6, 0 @@ -482959,7 +482959,7 @@ sub_810862C: ; 810862C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @081086E0 + beq _081086E0 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -482971,29 +482971,29 @@ sub_810862C: ; 810862C 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 .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} @@ -483029,7 +483029,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 @@ -483047,7 +483047,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] @@ -483081,7 +483081,7 @@ sub_81087C0: ; 81087C0 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] @@ -483090,7 +483090,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] @@ -483111,7 +483111,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 @@ -483146,10 +483146,10 @@ sub_81087C0: ; 81087C0 adds r0, r4 ldr r1, =sub_810886C str r1, [r0] -@08108850: +_08108850: adds r0, r5, 0 bl RemoveObjectAndFreeTiles -@08108856: +_08108856: pop {r4,r5} pop {r0} bx r0 @@ -483166,7 +483166,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 @@ -483188,7 +483188,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] @@ -483210,7 +483210,7 @@ sub_810886C: ; 810886C bl rotscale_free_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@081088D8: +_081088D8: pop {r4} pop {r0} bx r0 @@ -483248,19 +483248,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 @@ -483298,33 +483298,33 @@ 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 .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] @@ -483333,11 +483333,11 @@ sub_8108978: ; 8108978 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 @@ -483354,24 +483354,24 @@ sub_8108978: ; 8108978 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 @@ -483386,9 +483386,9 @@ sub_8108978: ; 8108978 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 @@ -483404,14 +483404,14 @@ sub_8108978: ; 8108978 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 @@ -483426,24 +483426,24 @@ sub_8108978: ; 8108978 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 @@ -483459,7 +483459,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, =gUnknown_08595268 @@ -483472,7 +483472,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 @@ -483494,7 +483494,7 @@ sub_8108AC0: ; 8108AC0 ldrh r0, [r6, 0x18] adds r0, 0x1 strh r0, [r6, 0x18] -@08108B1A: +_08108B1A: pop {r4-r6} pop {r0} bx r0 @@ -483508,7 +483508,7 @@ sub_8108B2C: ; 8108B2C bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @08108B86 + beq _08108B86 ldrh r0, [r6, 0x24] ldrh r1, [r6, 0x20] adds r0, r1 @@ -483543,7 +483543,7 @@ sub_8108B2C: ; 8108B2C bl sub_80A68D4 ldr r0, =sub_8108B94 str r0, [r6, 0x1C] -@08108B86: +_08108B86: pop {r4-r6} pop {r0} bx r0 @@ -483557,10 +483557,10 @@ sub_8108B94: ; 8108B94 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 @@ -483568,7 +483568,7 @@ sub_8108B94: ; 8108B94 ldr r1, [r2] ldr r0, =sub_8108978 cmp r1, r0 - bne @08108BC6 + bne _08108BC6 movs r0, 0x1 strh r0, [r2, 0x1C] ldrh r0, [r2, 0x18] @@ -483576,13 +483576,13 @@ sub_8108B94: ; 8108B94 strh r0, [r2, 0x18] adds r0, r5, 0 bl RemoveObjectAndFreeTiles -@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 @@ -483640,10 +483640,10 @@ 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 @@ -483672,12 +483672,12 @@ 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 RemoveObjectAndFreeTiles -@08108C8C: +_08108C8C: pop {r4} pop {r0} bx r0 @@ -483751,23 +483751,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] @@ -483845,7 +483845,7 @@ sub_8108D54: ; 8108D54 adds r1, r0 lsls r1, 16 mov r10, r1 -@08108DE2: +_08108DE2: ldr r0, =gUnknown_08595310 mov r2, r8 asrs r1, r2, 16 @@ -483872,22 +483872,22 @@ sub_8108D54: ; 8108D54 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 .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 @@ -483900,7 +483900,7 @@ sub_8108D54: ; 8108D54 subs r1, r0 lsls r1, 16 mov r10, r1 -@08108E58: +_08108E58: ldr r0, =gUnknown_08595310 mov r2, r8 asrs r1, r2, 16 @@ -483927,22 +483927,22 @@ sub_8108D54: ; 8108D54 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 .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 @@ -484022,7 +484022,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] @@ -484036,9 +484036,9 @@ sub_8108F4C: ; 8108F4C negs r0, r0 strh r0, [r4, 0x32] adds r1, r2, 0 - b @08108F9E + b _08108F9E .pool -@08108F88: +_08108F88: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -484050,7 +484050,7 @@ sub_8108F4C: ; 8108F4C 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] @@ -484074,7 +484074,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] @@ -484087,9 +484087,9 @@ sub_8108FBC: ; 8108FBC ldrh r0, [r2, 0x8] strh r0, [r4, 0x32] adds r1, r2, 0 - b @08109008 + b _08109008 .pool -@08108FF0: +_08108FF0: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r4, 0x20] @@ -484102,7 +484102,7 @@ sub_8108FBC: ; 8108FBC 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] @@ -484129,7 +484129,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 @@ -484138,16 +484138,16 @@ 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 @@ -484162,15 +484162,15 @@ 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 .pool -@08109090: +_08109090: ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r4, 0x20] @@ -484180,7 +484180,7 @@ sub_8109064: ; 8109064 adds r2, 0x43 movs r1, 0x8 strb r1, [r2] -@081090A2: +_081090A2: adds r2, r0, 0 ldrh r0, [r2, 0x2] ldrh r1, [r4, 0x22] @@ -484213,17 +484213,17 @@ sub_81090D8: ; 81090D8 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] @@ -484257,27 +484257,27 @@ sub_81090D8: ; 81090D8 lsls r0, r1, 16 asrs r0, 16 cmp r0, 0xFF - ble @0810914C + ble _0810914C ldr r2, =0xffffff00 - b @08109154 + b _08109154 .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 @@ -484318,27 +484318,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 str r1, [r6, 0x1C] adds r0, r6, 0 @@ -484394,7 +484394,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] @@ -484418,7 +484418,7 @@ sub_8109244: ; 8109244 bl obj_translate_based_on_private_1_2_3_4 ldr r0, =sub_810929C str r0, [r5, 0x1C] -@0810928E: +_0810928E: pop {r4,r5} pop {r0} bx r0 @@ -484432,7 +484432,7 @@ sub_810929C: ; 810929C bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq @081092E4 + beq _081092E4 movs r4, 0 strh r4, [r6, 0x2E] ldr r5, =0x02038437 @@ -484454,9 +484454,9 @@ sub_810929C: ; 810929C str r1, [r6, 0x1C] adds r0, r6, 0 bl _call_via_r1 - b @0810930E + b _0810930E .pool -@081092E4: +_081092E4: movs r1, 0x3C ldrsh r0, [r6, r1] movs r1, 0x1C @@ -484476,7 +484476,7 @@ sub_810929C: ; 810929C movs r1, 0xFF ands r0, r1 strh r0, [r6, 0x3C] -@0810930E: +_0810930E: pop {r4-r6} pop {r0} bx r0 @@ -484493,10 +484493,10 @@ 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 @@ -484640,10 +484640,10 @@ 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 @@ -484712,25 +484712,25 @@ 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 .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 @@ -484749,14 +484749,14 @@ sub_81094D0: ; 81094D0 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] @@ -484765,7 +484765,7 @@ sub_81094D0: ; 81094D0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @08109578 + beq _08109578 ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -484774,9 +484774,9 @@ sub_81094D0: ; 81094D0 lsls r0, 2 adds r0, r2 movs r1, 0x3 - b @08109588 + b _08109588 .pool -@08109578: +_08109578: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -484785,20 +484785,20 @@ sub_81094D0: ; 81094D0 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 @@ -484811,15 +484811,15 @@ sub_81094D0: ; 81094D0 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 @@ -484835,22 +484835,22 @@ sub_81094D0: ; 81094D0 strh r5, [r4, 0xA] strh r5, [r4, 0xC] strh r5, [r4, 0xE] - b @08109790 + b _08109790 .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 @@ -484866,8 +484866,8 @@ sub_81094D0: ; 81094D0 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 @@ -484883,33 +484883,33 @@ sub_81094D0: ; 81094D0 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] @@ -484918,7 +484918,7 @@ sub_81094D0: ; 81094D0 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @081096AC + beq _081096AC ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -484928,9 +484928,9 @@ sub_81094D0: ; 81094D0 adds r0, r2 ldrh r1, [r0, 0x26] adds r1, 0x3 - b @081096BE + b _081096BE .pool -@081096AC: +_081096AC: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -484940,20 +484940,20 @@ sub_81094D0: ; 81094D0 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 @@ -484968,9 +484968,9 @@ sub_81094D0: ; 81094D0 adds r0, r4, 0 movs r3, 0xF0 bl sub_80A805C - b @0810971A + b _0810971A .pool -@081096FC: +_081096FC: ldrh r1, [r4, 0x26] lsls r1, 24 lsrs r1, 24 @@ -484985,12 +484985,12 @@ sub_81094D0: ; 81094D0 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] @@ -485001,18 +485001,18 @@ sub_81094D0: ; 81094D0 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 .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] @@ -485023,13 +485023,13 @@ sub_81094D0: ; 81094D0 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] @@ -485044,20 +485044,20 @@ sub_81094D0: ; 81094D0 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 .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} @@ -485096,21 +485096,21 @@ 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 .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 @@ -485126,7 +485126,7 @@ sub_81097B4: ; 81097B4 mov r3, r8 lsls r3, 1 mov r10, r3 -@08109834: +_08109834: ldr r0, =gUnknown_085955B4 ldr r2, [sp, 0x8] asrs r1, r2, 16 @@ -485137,7 +485137,7 @@ sub_81097B4: ; 81097B4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq @081098B6 + beq _081098B6 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -485161,9 +485161,9 @@ sub_81097B4: ; 81097B4 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 @@ -485191,12 +485191,12 @@ sub_81097B4: ; 81097B4 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 @@ -485219,7 +485219,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] @@ -485237,7 +485237,7 @@ sub_81098EC: ; 81098EC strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@08109926: +_08109926: pop {r4} pop {r0} bx r0 @@ -485268,17 +485268,17 @@ 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 .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 @@ -485315,7 +485315,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] @@ -485328,7 +485328,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 @@ -485348,22 +485348,22 @@ sub_81099A0: ; 81099A0 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 @@ -485413,30 +485413,30 @@ sub_8109A64: ; 8109A64 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] @@ -485446,20 +485446,20 @@ sub_8109A64: ; 8109A64 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] @@ -485468,25 +485468,25 @@ sub_8109A64: ; 8109A64 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @08109ADC + beq _08109ADC ldr r0, =0x0000fffd - b @08109ADE + b _08109ADE .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 @@ -485499,17 +485499,17 @@ sub_8109AFC: ; 8109AFC 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 @@ -485524,13 +485524,13 @@ sub_8109AFC: ; 8109AFC bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - beq @08109B48 + beq _08109B48 movs r0, 0x4 - b @08109B4A + b _08109B4A .pool -@08109B48: +_08109B48: ldr r0, =0x0000fffc -@08109B4A: +_08109B4A: strh r0, [r5, 0x36] ldr r0, =0x02038437 ldrb r0, [r0] @@ -485544,9 +485544,9 @@ sub_8109AFC: ; 8109AFC ands r0, r2 orrs r0, r1 strb r0, [r5, 0x5] - b @08109BC6 + b _08109BC6 .pool -@08109B70: +_08109B70: ldrh r0, [r5, 0x30] adds r0, 0xC0 strh r0, [r5, 0x30] @@ -485555,18 +485555,18 @@ sub_8109AFC: ; 8109AFC 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 .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] @@ -485585,15 +485585,15 @@ sub_8109AFC: ; 8109AFC 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 @@ -485613,7 +485613,7 @@ sub_8109AFC: ; 8109AFC 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] @@ -485646,7 +485646,7 @@ sub_8109AFC: ; 8109AFC bl sub_80A6FD4 ldr r0, =sub_8109C4C str r0, [r5, 0x1C] -@08109C3E: +_08109C3E: pop {r4,r5} pop {r0} bx r0 @@ -485660,7 +485660,7 @@ sub_8109C4C: ; 8109C4C bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @08109CA4 + bne _08109CA4 movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0x10 @@ -485677,28 +485677,28 @@ 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 .pool -@08109CA4: +_08109CA4: adds r0, r4, 0 bl move_anim_8072740 -@08109CAA: +_08109CAA: pop {r4} pop {r0} bx r0 @@ -485712,13 +485712,13 @@ sub_8109CB0: ; 8109CB0 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 @@ -485749,13 +485749,13 @@ sub_8109CB0: ; 8109CB0 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 @@ -485768,9 +485768,9 @@ sub_8109CB0: ; 8109CB0 ands r0, r2 orrs r0, r1 strb r0, [r4, 0x5] - b @08109D80 + b _08109D80 .pool -@08109D3C: +_08109D3C: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -485786,33 +485786,33 @@ sub_8109CB0: ; 8109CB0 ands r1, r2 orrs r1, r0 strb r1, [r4, 0x5] - b @08109D80 + b _08109D80 .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] @@ -485826,14 +485826,14 @@ sub_8109CB0: ; 8109CB0 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 @@ -485857,9 +485857,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] @@ -485901,24 +485901,24 @@ 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 .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 @@ -485931,7 +485931,7 @@ sub_8109E2C: ; 8109E2C lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble @08109E94 + ble _08109E94 strh r3, [r2, 0xA] ldrh r0, [r2, 0xC] adds r0, 0x1 @@ -485939,24 +485939,24 @@ sub_8109E2C: ; 8109E2C 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 @@ -485980,29 +485980,29 @@ sub_8109E2C: ; 8109E2C 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 .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] @@ -486011,24 +486011,24 @@ sub_8109E2C: ; 8109E2C 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 @@ -486052,20 +486052,20 @@ sub_8109E2C: ; 8109E2C 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 .pool -@08109F7C: +_08109F7C: movs r7, 0x20 ldrsh r1, [r2, r7] lsls r1, 1 @@ -486078,7 +486078,7 @@ sub_8109E2C: ; 8109E2C lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble @08109FB0 + ble _08109FB0 movs r0, 0 strh r0, [r2, 0xA] ldrh r0, [r2, 0xC] @@ -486087,23 +486087,23 @@ sub_8109E2C: ; 8109E2C 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 @@ -486127,33 +486127,33 @@ sub_8109E2C: ; 8109E2C 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 .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 @@ -486174,11 +486174,11 @@ sub_8109E2C: ; 8109E2C 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 @@ -486231,7 +486231,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] @@ -486240,7 +486240,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] @@ -486252,17 +486252,17 @@ sub_810A094: ; 810A094 movs r5, 0x10 ldrsh r0, [r2, r5] cmp r0, 0 - bne @0810A100 + bne _0810A100 ldr r4, =gUnknown_08595684 movs r1, 0x8 ldrsh r0, [r2, r1] - b @0810A106 + b _0810A106 .pool -@0810A100: +_0810A100: ldr r4, =gUnknown_08595694 movs r3, 0x8 ldrsh r0, [r2, r3] -@0810A106: +_0810A106: movs r1, 0xA bl __modsi3 lsls r0, 16 @@ -486277,7 +486277,7 @@ sub_810A094: ; 810A094 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 @@ -486291,14 +486291,14 @@ sub_810A094: ; 810A094 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 .pool -@0810A154: +_0810A154: ldr r3, =0x02020630 lsls r4, r6, 4 adds r2, r4, r6 @@ -486312,7 +486312,7 @@ sub_810A094: ; 810A094 strh r0, [r2, 0x24] adds r2, r3, 0 adds r3, r4, 0 -@0810A16E: +_0810A16E: mov r1, r12 adds r0, r1, r7 lsls r0, 3 @@ -486322,7 +486322,7 @@ sub_810A094: ; 810A094 movs r5, 0xA ldrsh r0, [r0, r5] cmp r1, r0 - bne @0810A194 + bne _0810A194 adds r0, r3, r6 lsls r0, 2 adds r0, r2 @@ -486331,7 +486331,7 @@ sub_810A094: ; 810A094 strh r1, [r0, 0x26] adds r0, r7, 0 bl move_anim_task_del -@0810A194: +_0810A194: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -486351,22 +486351,22 @@ 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 .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 @@ -486388,10 +486388,10 @@ 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 @@ -486405,21 +486405,21 @@ 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 .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 str r0, [r4, 0x1C] pop {r4} @@ -486437,10 +486437,10 @@ 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 @@ -486467,7 +486467,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] @@ -486477,9 +486477,9 @@ sub_810A274: ; 810A274 ldrh r1, [r2, 0x2] subs r0, r1 strh r0, [r5, 0x22] - b @0810A2D8 + b _0810A2D8 .pool -@0810A2C4: +_0810A2C4: ldr r0, =0x0203841e ldrh r1, [r0] ldrh r2, [r5, 0x20] @@ -486490,7 +486490,7 @@ sub_810A274: ; 810A274 adds r1, r2 strh r1, [r5, 0x22] adds r2, r0, 0 -@0810A2D8: +_0810A2D8: movs r0, 0 strh r0, [r5, 0x2E] ldrh r0, [r2, 0x4] @@ -486518,24 +486518,24 @@ sub_810A308: ; 810A308 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 .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 .pool -@0810A338: +_0810A338: ldr r4, =0x02038436 ldrb r0, [r4] movs r6, 0x2 @@ -486543,16 +486543,16 @@ sub_810A308: ; 810A308 bl b_side_obj__get_some_boolean lsls r0, 24 cmp r0, 0 - bne @0810A354 + bne _0810A354 ldrb r4, [r4] - b @0810A384 + b _0810A384 .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 @@ -486560,22 +486560,22 @@ sub_810A308: ; 810A308 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 .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 @@ -486584,9 +486584,9 @@ sub_810A308: ; 810A308 strh r0, [r5, 0x20] adds r0, r4, 0 movs r1, 0x1 - b @0810A3BE + b _0810A3BE .pool -@0810A3AC: +_0810A3AC: adds r0, r4, 0 movs r1, 0x2 bl sub_80A5C6C @@ -486595,7 +486595,7 @@ sub_810A308: ; 810A308 strh r0, [r5, 0x20] adds r0, r4, 0 movs r1, 0x3 -@0810A3BE: +_0810A3BE: bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 @@ -486629,7 +486629,7 @@ sub_810A308: ; 810A308 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0810A422 + beq _0810A422 adds r0, r4, 0 bl sub_80A8328 lsls r0, 24 @@ -486644,7 +486644,7 @@ sub_810A308: ; 810A308 ands r1, r2 orrs r1, r0 strb r1, [r5, 0x5] -@0810A422: +_0810A422: ldrb r2, [r5, 0x3] lsls r2, 26 lsrs r2, 27 @@ -486742,7 +486742,7 @@ sub_810A4F4: ; 810A4F4 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @0810A55E + bne _0810A55E movs r1, 0x3C ldrsh r0, [r4, r1] movs r2, 0x38 @@ -486771,7 +486771,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] @@ -486785,11 +486785,11 @@ 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 @@ -486807,7 +486807,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 @@ -486825,16 +486825,16 @@ 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 @@ -486846,19 +486846,19 @@ sub_810A5BC: ; 810A5BC 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 @@ -486903,29 +486903,29 @@ sub_810A628: ; 810A628 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @0810A64C + beq _0810A64C ldr r0, =0x02038437 - b @0810A64E + b _0810A64E .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 @@ -487005,7 +487005,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] @@ -487019,16 +487019,16 @@ 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 @@ -487058,26 +487058,26 @@ 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 .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] @@ -487157,21 +487157,21 @@ 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 .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 @@ -487181,27 +487181,27 @@ sub_810A834: ; 810A834 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 .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, =gUnknown_08595828 lsls r1, r4, 16 asrs r1, 16 @@ -487209,9 +487209,9 @@ sub_810A834: ; 810A834 asrs r2, 16 mov r4, r12 lsls r3, r4, 16 - b @0810A952 + b _0810A952 .pool -@0810A8E4: +_0810A8E4: mov r0, r12 lsls r3, r0, 17 mov r1, r8 @@ -487224,9 +487224,9 @@ sub_810A834: ; 810A834 asrs r1, 16 lsls r2, r6, 16 asrs r2, 16 - b @0810A952 + b _0810A952 .pool -@0810A904: +_0810A904: mov r3, r12 lsls r0, r3, 16 asrs r0, 16 @@ -487237,8 +487237,8 @@ sub_810A834: ; 810A834 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 @@ -487252,22 +487252,22 @@ sub_810A834: ; 810A834 asrs r1, 16 lsls r2, r6, 16 asrs r2, 16 - b @0810A952 + b _0810A952 .pool -@0810A93C: +_0810A93C: mov r1, r12 lsls r0, r1, 16 asrs r0, 16 lsls r3, r0, 2 adds r3, r0 -@0810A946: +_0810A946: ldr r0, =gUnknown_08595828 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 @@ -487279,15 +487279,15 @@ sub_810A834: ; 810A834 adds r0, r7, 0x1 lsls r0, 24 lsrs r7, r0, 24 - b @0810A978 + b _0810A978 .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 @@ -487311,7 +487311,7 @@ sub_810A834: ; 810A834 adds r3, r4 ldr r1, [r3] bl _call_via_r1 -@0810A9AC: +_0810A9AC: ldr r0, =0x03005e00 mov r1, r10 add r1, r9 @@ -487320,7 +487320,7 @@ sub_810A834: ; 810A834 ldrh r0, [r1, 0x1C] adds r0, 0x1 strh r0, [r1, 0x1C] -@0810A9BC: +_0810A9BC: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -487339,7 +487339,7 @@ sub_810A9DC: ; 810A9DC 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 @@ -487350,8 +487350,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 @@ -487362,17 +487362,17 @@ sub_810A9DC: ; 810A9DC 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 RemoveObjectAndFreeTiles -@0810AA26: +_0810AA26: pop {r0} bx r0 thumb_func_end sub_810A9DC @@ -487443,7 +487443,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 @@ -487461,17 +487461,17 @@ 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 @@ -487490,13 +487490,13 @@ sub_810AAFC: ; 810AAFC movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0810AB28 + bne _0810AB28 ldr r4, =0x02038436 - b @0810AB2A + b _0810AB2A .pool -@0810AB28: +_0810AB28: ldr r4, =0x02038437 -@0810AB2A: +_0810AB2A: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -487544,7 +487544,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 @@ -487554,7 +487554,7 @@ sub_810AB78: ; 810AB78 movs r2, 0x22 ldrsh r1, [r5, r2] cmp r0, r1 - ble @0810AC86 + ble _0810AC86 strh r7, [r5, 0x20] ldr r0, =gUnknown_085958A8 movs r3, 0x24 @@ -487566,7 +487566,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 @@ -487619,9 +487619,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] @@ -487630,32 +487630,32 @@ sub_810AB78: ; 810AB78 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 .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 @@ -487668,7 +487668,7 @@ sub_810AC8C: ; 810AC8C bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq @0810ACB4 + beq _0810ACB4 ldr r2, =0x03005e00 movs r0, 0x38 ldrsh r1, [r4, r0] @@ -487681,7 +487681,7 @@ sub_810AC8C: ; 810AC8C strh r1, [r0, 0x16] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0810ACB4: +_0810ACB4: pop {r4} pop {r0} bx r0 @@ -487710,13 +487710,13 @@ sub_810ACD8: ; 810ACD8 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0810ACF4 + bne _0810ACF4 ldr r4, =0x02038436 - b @0810ACF6 + b _0810ACF6 .pool -@0810ACF4: +_0810ACF4: ldr r4, =0x02038437 -@0810ACF6: +_0810ACF6: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -487748,13 +487748,13 @@ sub_810AD30: ; 810AD30 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0810AD4C + bne _0810AD4C ldr r4, =0x02038436 - b @0810AD4E + b _0810AD4E .pool -@0810AD4C: +_0810AD4C: ldr r4, =0x02038437 -@0810AD4E: +_0810AD4E: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -487814,12 +487814,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 str r0, [r5, 0x1C] pop {r4,r5} @@ -487835,23 +487835,23 @@ sub_810ADF8: ; 810ADF8 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 @@ -487872,10 +487872,10 @@ sub_810ADF8: ; 810ADF8 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 @@ -487895,22 +487895,22 @@ 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 .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 @@ -487928,17 +487928,17 @@ sub_810AE5C: ; 810AE5C 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 .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 @@ -487949,16 +487949,16 @@ sub_810AE5C: ; 810AE5C adds r0, r2 ldrh r1, [r5, 0x24] strh r1, [r0, 0x24] - b @0810AF92 + b _0810AF92 .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 @@ -487984,7 +487984,7 @@ sub_810AE5C: ; 810AE5C 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] @@ -487995,16 +487995,16 @@ sub_810AE5C: ; 810AE5C lsls r0, 2 adds r0, r4 strh r2, [r0, 0x24] - b @0810AFC0 + b _0810AFC0 .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 @@ -488032,14 +488032,14 @@ sub_810AE5C: ; 810AE5C 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 .pool -@0810AFA0: +_0810AFA0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r5, r0] @@ -488055,7 +488055,7 @@ sub_810AE5C: ; 810AE5C strb r1, [r0] adds r0, r3, 0 bl move_anim_task_del -@0810AFC0: +_0810AFC0: pop {r4-r6} pop {r0} bx r0 @@ -488075,22 +488075,22 @@ 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 .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 @@ -488099,9 +488099,9 @@ sub_810AFCC: ; 810AFCC 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 @@ -488109,21 +488109,21 @@ sub_810AFCC: ; 810AFCC 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 .pool -@0810B048: +_0810B048: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -488141,8 +488141,8 @@ sub_810AFCC: ; 810AFCC 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 @@ -488166,19 +488166,19 @@ sub_810AFCC: ; 810AFCC lsls r1, 5 subs r0, r1 strh r0, [r5, 0x10] - b @0810B0E6 + b _0810B0E6 .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 @@ -488187,9 +488187,9 @@ sub_810AFCC: ; 810AFCC movs r0, 0x50 subs r0, r1 strh r0, [r5, 0x12] - b @0810B0E6 + b _0810B0E6 .pool -@0810B0D0: +_0810B0D0: movs r0, 0 ldrsh r1, [r3, r0] lsls r0, r1, 2 @@ -488201,32 +488201,32 @@ sub_810AFCC: ; 810AFCC 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 .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 @@ -488234,26 +488234,26 @@ sub_810AFCC: ; 810AFCC 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 @@ -488275,7 +488275,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 @@ -488287,24 +488287,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 @@ -488314,31 +488314,31 @@ sub_810B154: ; 810B154 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 .pool -@0810B1E8: +_0810B1E8: movs r0, 0 -@0810B1EA: +_0810B1EA: pop {r4,r5} pop {r1} bx r1 @@ -488354,7 +488354,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] @@ -488376,7 +488376,7 @@ sub_810B1F0: ; 810B1F0 bl rotscale_free_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0810B230: +_0810B230: pop {r4} pop {r0} bx r0 @@ -488390,11 +488390,11 @@ sub_810B23C: ; 810B23C 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 @@ -488414,19 +488414,19 @@ sub_810B23C: ; 810B23C ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b @0810B294 + b _0810B294 .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 @@ -488445,23 +488445,23 @@ 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 .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 @@ -488520,15 +488520,15 @@ sub_810B29C: ; 810B29C strh r0, [r5, 0x26] ldrh r0, [r5, 0x8] adds r0, 0x1 - b @0810B426 + b _0810B426 .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 @@ -488536,34 +488536,34 @@ sub_810B29C: ; 810B29C 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 @@ -488571,22 +488571,22 @@ sub_810B29C: ; 810B29C 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 @@ -488595,37 +488595,37 @@ sub_810B29C: ; 810B29C 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 .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 @@ -488647,7 +488647,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 @@ -488671,32 +488671,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 @@ -488705,28 +488705,28 @@ sub_810B430: ; 810B430 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] @@ -488735,16 +488735,16 @@ sub_810B430: ; 810B430 adds r0, r1 strh r0, [r4, 0x14] movs r0, 0x1 - b @0810B514 + b _0810B514 .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 @@ -488760,7 +488760,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] @@ -488778,7 +488778,7 @@ sub_810B51C: ; 810B51C strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0810B552: +_0810B552: pop {r4} pop {r0} bx r0 @@ -488798,18 +488798,18 @@ 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 .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 @@ -488820,18 +488820,18 @@ sub_810B55C: ; 810B55C 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 @@ -488845,16 +488845,16 @@ sub_810B55C: ; 810B55C lsrs r0, 24 subs r0, 0x2 strh r0, [r5, 0x20] - b @0810B5F8 + b _0810B5F8 .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 @@ -488862,20 +488862,20 @@ sub_810B55C: ; 810B55C 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 @@ -488899,7 +488899,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 @@ -488916,23 +488916,23 @@ 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 .pool -@0810B67C: +_0810B67C: movs r0, 0x1 -@0810B67E: +_0810B67E: pop {r4,r5} pop {r1} bx r1 @@ -488947,7 +488947,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] @@ -488965,7 +488965,7 @@ sub_810B684: ; 810B684 strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0810B6B8: +_0810B6B8: pop {r4} pop {r0} bx r0 @@ -489043,16 +489043,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 @@ -489072,14 +489072,14 @@ sub_810B6C4: ; 810B6C4 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] @@ -489097,14 +489097,14 @@ sub_810B6C4: ; 810B6C4 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 .pool -@0810B7E0: +_0810B7E0: lsls r1, r3, 16 asrs r1, 16 adds r1, r7 @@ -489119,15 +489119,15 @@ sub_810B6C4: ; 810B6C4 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 @@ -489166,7 +489166,7 @@ sub_810B848: ; 810B848 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 @@ -489202,11 +489202,11 @@ 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 @@ -489259,21 +489259,21 @@ 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 .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 @@ -489305,13 +489305,13 @@ sub_810B974: ; 810B974 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 .pool -@0810B990: +_0810B990: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -489325,11 +489325,11 @@ sub_810B974: ; 810B974 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 @@ -489338,7 +489338,7 @@ sub_810B974: ; 810B974 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -@0810B9C6: +_0810B9C6: ldr r1, =sub_810B9E8 adds r0, r4, 0 bl oamt_set_x3A_32 @@ -489375,10 +489375,10 @@ 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 @@ -489400,7 +489400,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 @@ -489416,9 +489416,9 @@ sub_810BA24: ; 810BA24 ldrh r6, [r6, 0x6] adds r0, r6 strh r0, [r5, 0x36] - b @0810BA86 + b _0810BA86 .pool -@0810BA74: +_0810BA74: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -489427,40 +489427,40 @@ sub_810BA24: ; 810BA24 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 .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] @@ -489470,7 +489470,7 @@ sub_810BA24: ; 810BA24 ldrh r0, [r5, 0x32] eors r0, r1 strh r0, [r5, 0x32] -@0810BAE2: +_0810BAE2: movs r0, 0x1 strh r0, [r5, 0x2E] adds r0, r5, 0 @@ -489484,19 +489484,19 @@ sub_810BA24: ; 810BA24 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 @@ -489513,14 +489513,14 @@ sub_810BA24: ; 810BA24 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 @@ -489554,9 +489554,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 @@ -489589,13 +489589,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 @@ -489619,9 +489619,9 @@ sub_810BBC8: ; 810BBC8 ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] - b @0810BC42 + b _0810BC42 .pool -@0810BC24: +_0810BC24: ldrh r0, [r4, 0x24] ldrh r2, [r4, 0x20] adds r0, r2 @@ -489637,7 +489637,7 @@ sub_810BBC8: ; 810BBC8 strh r1, [r4, 0x34] ldr r0, =sub_810BC4C str r0, [r4, 0x1C] -@0810BC42: +_0810BC42: pop {r4} pop {r0} bx r0 @@ -489661,7 +489661,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 @@ -489670,15 +489670,15 @@ 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 @@ -489701,7 +489701,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 @@ -489715,9 +489715,9 @@ sub_810BC94: ; 810BC94 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - b @0810BCF2 + b _0810BCF2 .pool -@0810BCE0: +_0810BCE0: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -489726,28 +489726,28 @@ sub_810BC94: ; 810BC94 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 .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 @@ -489759,14 +489759,14 @@ sub_810BC94: ; 810BC94 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 @@ -489774,7 +489774,7 @@ sub_810BC94: ; 810BC94 ldrh r0, [r5, 0x32] eors r0, r1 strh r0, [r5, 0x32] -@0810BD5A: +_0810BD5A: movs r0, 0x1 strh r0, [r5, 0x2E] adds r0, r5, 0 @@ -489788,19 +489788,19 @@ sub_810BC94: ; 810BC94 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 @@ -489817,14 +489817,14 @@ sub_810BC94: ; 810BC94 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] @@ -489845,10 +489845,10 @@ sub_810BDD8: ; 810BDD8 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 @@ -489866,7 +489866,7 @@ sub_810BDD8: ; 810BDD8 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0x1 - bne @0810BE42 + bne _0810BE42 movs r2, 0x20 ldrsh r0, [r4, r2] movs r2, 0x24 @@ -489876,22 +489876,22 @@ sub_810BDD8: ; 810BDD8 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 @@ -489904,18 +489904,18 @@ sub_810BE48: ; 810BE48 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 .pool -@0810BE6C: +_0810BE6C: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -489929,11 +489929,11 @@ sub_810BE48: ; 810BE48 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 @@ -489942,23 +489942,23 @@ sub_810BE48: ; 810BE48 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 .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 @@ -489972,17 +489972,17 @@ sub_810BED0: ; 810BED0 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 .pool -@0810BEF4: +_0810BEF4: ldr r4, =0x02038436 ldrb r0, [r4] adds r2, r5, 0 @@ -489995,37 +489995,37 @@ sub_810BED0: ; 810BED0 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 .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 .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 @@ -490038,55 +490038,55 @@ sub_810BED0: ; 810BED0 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 .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 .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] @@ -490119,7 +490119,7 @@ sub_810C008: ; 810C008 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @0810C092 + bne _0810C092 movs r1, 0x38 ldrsh r0, [r4, r1] movs r2, 0x3A @@ -490141,7 +490141,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 @@ -490155,8 +490155,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 @@ -490173,17 +490173,17 @@ sub_810C008: ; 810C008 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 @@ -490213,12 +490213,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] @@ -490285,23 +490285,23 @@ 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 .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 @@ -490313,9 +490313,9 @@ sub_810C164: ; 810C164 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 @@ -490337,14 +490337,14 @@ sub_810C164: ; 810C164 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 .pool -@0810C214: +_0810C214: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -490355,14 +490355,14 @@ sub_810C164: ; 810C164 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 @@ -490373,7 +490373,7 @@ sub_810C164: ; 810C164 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @0810C2DA + bne _0810C2DA movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -490390,13 +490390,13 @@ sub_810C164: ; 810C164 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 @@ -490411,16 +490411,16 @@ sub_810C164: ; 810C164 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] @@ -490438,7 +490438,7 @@ sub_810C164: ; 810C164 bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -@0810C2DA: +_0810C2DA: add sp, 0x10 pop {r4,r5} pop {r0} @@ -490495,12 +490495,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] @@ -490567,23 +490567,23 @@ 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 .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 @@ -490608,15 +490608,15 @@ sub_810C3F0: ; 810C3F0 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 .pool -@0810C484: +_0810C484: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -490627,14 +490627,14 @@ sub_810C3F0: ; 810C3F0 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 @@ -490645,7 +490645,7 @@ sub_810C3F0: ; 810C3F0 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @0810C54A + bne _0810C54A movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -490662,13 +490662,13 @@ sub_810C3F0: ; 810C3F0 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 @@ -490683,16 +490683,16 @@ sub_810C3F0: ; 810C3F0 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] @@ -490710,7 +490710,7 @@ sub_810C3F0: ; 810C3F0 bl lcd_bg_operations adds r0, r4, 0 bl move_anim_task_del -@0810C54A: +_0810C54A: add sp, 0x10 pop {r4,r5} pop {r0} @@ -490740,11 +490740,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 @@ -490753,7 +490753,7 @@ sub_810C560: ; 810C560 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] @@ -490766,7 +490766,7 @@ sub_810C560: ; 810C560 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @0810C5F0 + beq _0810C5F0 mov r1, r8 ldrb r0, [r1] adds r0, r3 @@ -490774,7 +490774,7 @@ sub_810C560: ; 810C560 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 @@ -490790,10 +490790,10 @@ sub_810C560: ; 810C560 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 @@ -490811,7 +490811,7 @@ sub_810C560: ; 810C560 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 @@ -490831,9 +490831,9 @@ sub_810C560: ; 810C560 strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x3 - b @0810C684 + b _0810C684 .pool -@0810C65C: +_0810C65C: ldrh r0, [r6, 0x2] ldrh r1, [r5, 0x20] adds r0, r1 @@ -490853,7 +490853,7 @@ sub_810C560: ; 810C560 strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x1 -@0810C684: +_0810C684: bl sub_80A5C6C lsls r0, 24 lsrs r0, 24 @@ -490870,14 +490870,14 @@ sub_810C560: ; 810C560 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 @@ -490899,19 +490899,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, =gUnknown_08329F40 @@ -490928,23 +490928,23 @@ sub_810C6D4: ; 810C6D4 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 .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 @@ -490969,7 +490969,7 @@ sub_810C6D4: ; 810C6D4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @0810C78C + bne _0810C78C ldr r1, =0x02024076 ldrb r0, [r6] adds r0, r1 @@ -490977,14 +490977,14 @@ sub_810C6D4: ; 810C6D4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0810C78C + beq _0810C78C movs r0, 0xCC strh r0, [r4, 0x38] - b @0810C78E + b _0810C78E .pool -@0810C78C: +_0810C78C: strh r5, [r4, 0x38] -@0810C78E: +_0810C78E: movs r0, 0 strh r0, [r4, 0x26] ldr r1, =gUnknown_08329F40 @@ -491003,9 +491003,9 @@ sub_810C6D4: ; 810C6D4 strh r0, [r4, 0x38] adds r0, r4, 0 bl obj_translate_based_on_private_1_2_3_4 - b @0810C90C + b _0810C90C .pool -@0810C7BC: +_0810C7BC: adds r0, r4, 0 bl sub_80A6F3C ldr r1, =gUnknown_08329F40 @@ -491036,7 +491036,7 @@ sub_810C6D4: ; 810C6D4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @0810C83A + bne _0810C83A ldrh r1, [r4, 0x38] adds r0, r1, 0 subs r0, 0x40 @@ -491044,18 +491044,18 @@ sub_810C6D4: ; 810C6D4 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 .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 @@ -491066,34 +491066,34 @@ sub_810C6D4: ; 810C6D4 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 @@ -491113,7 +491113,7 @@ sub_810C6D4: ; 810C6D4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @0810C8B4 + bne _0810C8B4 ldr r1, =0x02024076 ldr r0, =0x02038437 ldrb r0, [r0] @@ -491122,14 +491122,14 @@ sub_810C6D4: ; 810C6D4 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0810C8B4 + beq _0810C8B4 movs r0, 0x80 lsls r0, 1 - b @0810C8B6 + b _0810C8B6 .pool -@0810C8B4: +_0810C8B4: ldr r0, =0x0000fff0 -@0810C8B6: +_0810C8B6: strh r0, [r4, 0x32] ldrh r0, [r4, 0x3C] adds r0, 0x1 @@ -491139,21 +491139,21 @@ sub_810C6D4: ; 810C6D4 strh r1, [r4, 0x24] adds r0, r4, 0 bl sub_80A6FD4 - b @0810C90C + b _0810C90C .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 @@ -491163,14 +491163,14 @@ sub_810C6D4: ; 810C6D4 negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -@0810C8FE: +_0810C8FE: adds r0, r4, 0 bl RemoveObjectAndFreeTiles ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -@0810C90C: +_0810C90C: pop {r4-r6} pop {r0} bx r0 @@ -491205,85 +491205,85 @@ 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 .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 @@ -491317,7 +491317,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 @@ -491328,7 +491328,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 @@ -491343,12 +491343,12 @@ 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 .pool -@0810CA60: +_0810CA60: adds r0, r5, 0 movs r1, 0x1 bl sub_80A861C @@ -491371,8 +491371,8 @@ sub_810C9E4: ; 810C9E4 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 @@ -491395,11 +491395,11 @@ sub_810C9E4: ; 810C9E4 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 @@ -491409,7 +491409,7 @@ sub_810C9E4: ; 810C9E4 asrs r0, 22 lsls r0, 16 lsrs r6, r0, 16 -@0810CAE2: +_0810CAE2: lsls r0, r6, 16 asrs r0, 16 adds r0, 0x8 @@ -491429,7 +491429,7 @@ sub_810C9E4: ; 810C9E4 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq @0810CB44 + beq _0810CB44 lsls r4, r5, 4 adds r4, r5 lsls r4, 2 @@ -491451,11 +491451,11 @@ sub_810C9E4: ; 810C9E4 mov r1, r10 strh r1, [r4, 0x3C] movs r0, 0x1 - b @0810CB46 + b _0810CB46 .pool -@0810CB44: +_0810CB44: movs r0, 0 -@0810CB46: +_0810CB46: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -491482,22 +491482,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, =gUnknown_08595B68 movs r2, 0x34 ldrsh r1, [r4, r2] @@ -491511,7 +491511,7 @@ sub_810CB58: ; 810CB58 lsrs r0, 24 strh r0, [r4, 0x2E] cmp r0, 0x40 - beq @0810CBE6 + beq _0810CBE6 ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -491539,16 +491539,16 @@ sub_810CB58: ; 810CB58 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 RemoveObjectAndFreeTiles - b @0810CC32 + b _0810CC32 .pool -@0810CC04: +_0810CC04: ldr r3, =0x03005e00 movs r2, 0x3C ldrsh r1, [r4, r2] @@ -491570,7 +491570,7 @@ sub_810CB58: ; 810CB58 bl rotscale_free_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0810CC32: +_0810CC32: pop {r4} pop {r0} bx r0 @@ -491587,7 +491587,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] @@ -491609,7 +491609,7 @@ sub_810CC3C: ; 810CC3C bl rotscale_free_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0810CC7C: +_0810CC7C: pop {r4} pop {r0} bx r0 @@ -491631,9 +491631,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 StartObjectRotScalAnim adds r0, r5, 0 @@ -491647,11 +491647,11 @@ unc_080B06FC: ; 810CC88 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 @@ -491688,7 +491688,7 @@ sub_810CD1C: ; 810CD1C bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @0810CD3E + beq _0810CD3E adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim @@ -491697,7 +491697,7 @@ sub_810CD1C: ; 810CD1C ldr r1, =move_anim_8072740 adds r0, r4, 0 bl oamt_set_x3A_32 -@0810CD3E: +_0810CD3E: pop {r4} pop {r0} bx r0 @@ -491734,11 +491734,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 @@ -491764,15 +491764,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 @@ -491784,10 +491784,10 @@ sub_810CDB0: ; 810CDB0 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 @@ -491851,20 +491851,20 @@ sub_810CE68: ; 810CE68 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 @@ -491886,7 +491886,7 @@ sub_810CEB4: ; 810CEB4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @0810CED0 + beq _0810CED0 ldr r0, =0x0203841e ldrh r1, [r0, 0x2] negs r1, r1 @@ -491894,7 +491894,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} @@ -491913,17 +491913,17 @@ 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 .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] @@ -491950,27 +491950,27 @@ sub_810CF30: ; 810CF30 ldrsh r1, [r0, r2] mov r9, r0 cmp r1, 0 - bne @0810CF54 + bne _0810CF54 ldr r0, =0x02038436 - b @0810CF56 + b _0810CF56 .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 StartObjectImageAnim @@ -492001,9 +492001,9 @@ sub_810CF30: ; 810CF30 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 @@ -492028,32 +492028,32 @@ sub_810CF30: ; 810CF30 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] @@ -492083,7 +492083,7 @@ sub_810CF30: ; 810CF30 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 @@ -492102,7 +492102,7 @@ sub_810CF30: ; 810CF30 adds r0, r4 ldr r1, =DummyObjectCallback str r1, [r0] -@0810D08C: +_0810D08C: ldr r0, =sub_810D0B8 str r0, [r5, 0x1C] pop {r3,r4} @@ -492122,11 +492122,11 @@ sub_810D0B8: ; 810D0B8 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 @@ -492144,15 +492144,15 @@ sub_810D0B8: ; 810D0B8 lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeTiles -@0810D0F4: +_0810D0F4: adds r0, r5, 0 bl move_anim_8072740 - b @0810D104 + b _0810D104 .pool -@0810D100: +_0810D100: subs r0, r1, 0x1 strh r0, [r5, 0x2E] -@0810D104: +_0810D104: pop {r4,r5} pop {r0} bx r0 @@ -492170,13 +492170,13 @@ 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 .pool -@0810D130: +_0810D130: ldrh r0, [r4, 0x20] adds r0, 0x14 strh r0, [r4, 0x32] @@ -492186,7 +492186,7 @@ sub_810D10C: ; 810D10C movs r1, 0x1 orrs r0, r1 strb r0, [r2] -@0810D142: +_0810D142: ldrh r0, [r4, 0x22] subs r0, 0x14 strh r0, [r4, 0x36] @@ -492212,7 +492212,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 @@ -492234,7 +492234,7 @@ sub_810D164: ; 810D164 ldr r1, =move_anim_8072740 adds r0, r5, 0 bl oamt_set_x3A_32 -@0810D1A4: +_0810D1A4: pop {r4-r6} pop {r0} bx r0 @@ -492252,19 +492252,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 @@ -492273,12 +492273,12 @@ sub_810D1B4: ; 810D1B4 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 @@ -492313,7 +492313,7 @@ sub_810D240: ; 810D240 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - bne @0810D26C + bne _0810D26C ldrh r0, [r4, 0x3C] lsls r0, 16 asrs r0, 24 @@ -492327,11 +492327,11 @@ 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 @@ -492414,7 +492414,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 @@ -492435,7 +492435,7 @@ sub_810D308: ; 810D308 ldr r1, =sub_810D360 adds r0, r5, 0 bl oamt_set_x3A_32 -@0810D34C: +_0810D34C: pop {r4,r5} pop {r0} bx r0 @@ -492463,7 +492463,7 @@ sub_810D37C: ; 810D37C movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @0810D3A8 + bne _0810D3A8 adds r0, r4, 0 movs r1, 0x1 bl sub_80A6980 @@ -492475,9 +492475,9 @@ sub_810D37C: ; 810D37C ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b @0810D404 + b _0810D404 .pool -@0810D3A8: +_0810D3A8: ldrh r0, [r4, 0x30] ldrh r2, [r4, 0x36] adds r0, r2 @@ -492497,7 +492497,7 @@ sub_810D37C: ; 810D37C 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 @@ -492516,14 +492516,14 @@ sub_810D37C: ; 810D37C 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 @@ -492537,13 +492537,13 @@ sub_810D40C: ; 810D40C movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0810D428 + bne _0810D428 ldr r4, =0x02038436 - b @0810D42A + b _0810D42A .pool -@0810D428: +_0810D428: ldr r4, =0x02038437 -@0810D42A: +_0810D42A: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -492587,37 +492587,37 @@ sub_810D47C: ; 810D47C 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] @@ -492626,23 +492626,23 @@ sub_810D47C: ; 810D47C 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 .pool @@ -492656,7 +492656,7 @@ sub_810D4F4: ; 810D4F4 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne @0810D520 + bne _0810D520 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -492665,9 +492665,9 @@ sub_810D4F4: ; 810D4F4 lsrs r0, 24 ldrh r2, [r6, 0x4] adds r0, r2 - b @0810D532 + b _0810D532 .pool -@0810D520: +_0810D520: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -492676,7 +492676,7 @@ sub_810D4F4: ; 810D4F4 lsrs r0, 24 ldrh r1, [r6, 0x4] adds r0, r1 -@0810D532: +_0810D532: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 @@ -492707,49 +492707,49 @@ sub_810D4F4: ; 810D4F4 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 .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 .pool -@0810D5A0: +_0810D5A0: movs r0, 0x3 strh r0, [r5, 0x3A] ldr r0, =0x0000fffd strh r0, [r5, 0x3C] - b @0810D5CE + b _0810D5CE .pool -@0810D5B0: +_0810D5B0: ldr r0, =0x0000fffd strh r0, [r5, 0x3A] movs r0, 0x3 strh r0, [r5, 0x3C] - b @0810D5CE + b _0810D5CE .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 str r0, [r5, 0x1C] -@0810D5D2: +_0810D5D2: pop {r4-r6} pop {r0} bx r0 @@ -492774,10 +492774,10 @@ 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 @@ -492790,7 +492790,7 @@ sub_810D608: ; 810D608 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0810D664 + bne _0810D664 ldr r4, =0x0202420b ldrb r0, [r4] movs r1, 0x2 @@ -492817,9 +492817,9 @@ sub_810D608: ; 810D608 orrs r0, r1 strb r0, [r5, 0x5] ldr r0, =0x02038437 - b @0810D680 + b _0810D680 .pool -@0810D664: +_0810D664: ldr r0, =0x02038437 ldrb r0, [r0] bl sub_80A8328 @@ -492833,7 +492833,7 @@ sub_810D608: ; 810D608 orrs r0, r1 strb r0, [r5, 0x5] ldr r0, =0x02038436 -@0810D680: +_0810D680: ldrb r0, [r0] strh r0, [r5, 0x3C] movs r0, 0 @@ -492860,7 +492860,7 @@ sub_810D6A8: ; 810D6A8 lsls r0, 16 asrs r0, 16 cmp r0, 0xB4 - bne @0810D704 + bne _0810D704 movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -492893,7 +492893,7 @@ sub_810D6A8: ; 810D6A8 bl oamt_set_x3A_32 ldr r0, =sub_80A6F98 str r0, [r4, 0x1C] -@0810D704: +_0810D704: pop {r4} pop {r0} bx r0 @@ -492950,7 +492950,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 @@ -492973,16 +492973,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 @@ -493022,7 +493022,7 @@ sub_810D770: ; 810D770 strh r0, [r7, 0x34] ldr r0, =sub_810D830 str r0, [r7, 0x1C] -@0810D818: +_0810D818: pop {r3} mov r8, r3 pop {r4-r7} @@ -493054,18 +493054,18 @@ 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 @@ -493078,7 +493078,7 @@ sub_810D874: ; 810D874 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0810D8B8 + bne _0810D8B8 ldr r4, =0x0202420b ldrb r0, [r4] movs r1, 0x2 @@ -493095,13 +493095,13 @@ sub_810D874: ; 810D874 ldr r0, =0x02038437 ldrb r4, [r0] ldr r0, =0x02038436 - b @0810D8BE + b _0810D8BE .pool -@0810D8B8: +_0810D8B8: ldr r0, =0x02038436 ldrb r4, [r0] ldr r0, =0x02038437 -@0810D8BE: +_0810D8BE: ldrb r0, [r0] bl sub_80A8328 movs r1, 0x3 @@ -493116,7 +493116,7 @@ sub_810D874: ; 810D874 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @0810D8F8 + beq _0810D8F8 ldrb r2, [r5, 0x3] lsls r1, r2, 26 lsrs r1, 27 @@ -493124,14 +493124,14 @@ sub_810D874: ; 810D874 orrs r1, r0 lsls r1, 1 subs r0, 0x47 - b @0810D912 + b _0810D912 .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 @@ -493139,11 +493139,11 @@ sub_810D874: ; 810D874 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] @@ -493184,10 +493184,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] @@ -493228,22 +493228,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 @@ -493269,36 +493269,36 @@ sub_810DA10: ; 810DA10 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 .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 StartObjectImageAnim - 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 StartObjectImageAnim -@0810DA5E: +_0810DA5E: ldr r0, =sub_80A67D8 str r0, [r4, 0x1C] ldr r1, =move_anim_8072740 @@ -493319,7 +493319,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 @@ -493336,10 +493336,10 @@ 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 @@ -493358,19 +493358,19 @@ 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 .pool -@0810DAF4: +_0810DAF4: ldrh r0, [r4, 0x18] subs r0, 0x1 strh r0, [r4, 0x18] @@ -493379,20 +493379,20 @@ sub_810DABC: ; 810DABC 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 @@ -493404,7 +493404,7 @@ sub_810DABC: ; 810DABC 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 @@ -493413,9 +493413,9 @@ sub_810DABC: ; 810DABC adds r0, r2 strh r0, [r1] adds r7, r1, 0 - b @0810DB60 + b _0810DB60 .pool -@0810DB50: +_0810DB50: ldr r2, =0x02022e20 ldrh r1, [r4, 0x1A] lsls r1, 16 @@ -493424,7 +493424,7 @@ sub_810DABC: ; 810DABC subs r0, r1 strh r0, [r2] adds r7, r2, 0 -@0810DB60: +_0810DB60: ldr r3, =0x02022e22 ldrh r2, [r4, 0x1C] lsls r0, r2, 16 @@ -493444,14 +493444,14 @@ sub_810DABC: ; 810DABC 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 @@ -493466,11 +493466,11 @@ sub_810DBAC: ; 810DBAC movs r1, 0x6 ldrsh r0, [r4, r1] cmp r0, 0 - bne @0810DBC2 + bne _0810DBC2 adds r0, r5, 0 movs r1, 0x2 bl StartObjectImageAnim -@0810DBC2: +_0810DBC2: adds r0, r5, 0 movs r1, 0x1 bl sub_80A69CC @@ -493508,10 +493508,10 @@ sub_810DC10: ; 810DC10 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 @@ -493526,11 +493526,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 StartObjectImageAnim -@0810DC44: +_0810DC44: adds r0, r4, 0 movs r1, 0x1 bl sub_80A69CC @@ -493547,11 +493547,11 @@ sub_810DC2C: ; 810DC2C 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 @@ -493583,10 +493583,10 @@ sub_810DCB4: ; 810DCB4 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 @@ -493647,10 +493647,10 @@ 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 @@ -493673,12 +493673,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] @@ -493714,13 +493714,13 @@ sub_810DDC4: ; 810DDC4 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 .pool -@0810DDE0: +_0810DDE0: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r4, 0 @@ -493734,11 +493734,11 @@ sub_810DDC4: ; 810DDC4 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 @@ -493747,7 +493747,7 @@ sub_810DDC4: ; 810DDC4 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -@0810DE16: +_0810DE16: ldr r0, =sub_810DE2C str r0, [r4, 0x1C] pop {r4,r5} @@ -493783,10 +493783,10 @@ 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 @@ -493838,10 +493838,10 @@ 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 @@ -493894,7 +493894,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] @@ -493912,20 +493912,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 @@ -493935,10 +493935,10 @@ sub_810DF18: ; 810DF18 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 @@ -493956,12 +493956,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] @@ -494006,10 +494006,10 @@ sub_810E028: ; 810E028 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 @@ -494024,7 +494024,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 @@ -494038,11 +494038,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 @@ -494050,7 +494050,7 @@ sub_810E044: ; 810E044 ldrh r1, [r0, 0x6] negs r1, r1 strh r1, [r0, 0x6] -@0810E088: +_0810E088: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -494075,7 +494075,7 @@ sub_810E044: ; 810E044 movs r3, 0xC ldrsh r0, [r2, r3] cmp r0, 0 - bne @0810E0EC + bne _0810E0EC ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -494089,9 +494089,9 @@ sub_810E044: ; 810E044 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - b @0810E0FE + b _0810E0FE .pool -@0810E0EC: +_0810E0EC: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -494100,7 +494100,7 @@ sub_810E044: ; 810E044 adds r3, 0x36 movs r1, 0x1 bl sub_80A8924 -@0810E0FE: +_0810E0FE: ldr r4, =0x0203841e ldrh r0, [r4, 0x4] ldrh r1, [r5, 0x32] @@ -494165,11 +494165,11 @@ sub_810E184: ; 810E184 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 @@ -494179,7 +494179,7 @@ sub_810E184: ; 810E184 ldrh r1, [r2, 0x26] subs r1, r0 strh r1, [r2, 0x26] -@0810E1AA: +_0810E1AA: movs r3, 0x22 ldrsh r0, [r2, r3] movs r3, 0x26 @@ -494188,10 +494188,10 @@ sub_810E184: ; 810E184 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 @@ -494205,7 +494205,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] @@ -494214,13 +494214,13 @@ sub_810E1C8: ; 810E1C8 adds r0, r5, 0 movs r1, 0x1 bl StartObjectRotScalAnim - b @0810E1FE + b _0810E1FE .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] @@ -494262,7 +494262,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 @@ -494272,7 +494272,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 @@ -494282,15 +494282,15 @@ sub_810E24C: ; 810E24C 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 @@ -494308,7 +494308,7 @@ sub_810E24C: ; 810E24C strb r0, [r1] adds r0, r4, 0 bl move_anim_8072740 -@0810E2BC: +_0810E2BC: pop {r4} pop {r0} bx r0 @@ -494324,14 +494324,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 @@ -494341,14 +494341,14 @@ sub_810E2C8: ; 810E2C8 negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -@0810E2FA: +_0810E2FA: adds r0, r4, 0 bl RemoveObjectAndFreeTiles ldr r1, =0x020383fe ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -@0810E308: +_0810E308: pop {r4} pop {r0} bx r0 @@ -494369,24 +494369,24 @@ sub_810E314: ; 810E314 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq @0810E33C + beq _0810E33C ldr r0, =0x02038436 - b @0810E33E + b _0810E33E .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 @@ -494436,11 +494436,11 @@ sub_810E314: ; 810E314 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 @@ -494455,9 +494455,9 @@ sub_810E314: ; 810E314 ands r1, r2 orrs r1, r0 strb r1, [r7, 0x5] - b @0810E408 + b _0810E408 .pool -@0810E3F0: +_0810E3F0: adds r0, r6, 0 bl sub_80A8328 movs r1, 0x3 @@ -494469,7 +494469,7 @@ sub_810E314: ; 810E314 ands r0, r2 orrs r0, r1 strb r0, [r7, 0x5] -@0810E408: +_0810E408: ldrb r1, [r5, 0xE] movs r4, 0x2 negs r4, r4 @@ -494482,7 +494482,7 @@ sub_810E314: ; 810E314 lsls r1, 8 ands r0, r1 cmp r0, 0 - bne @0810E4AA + bne _0810E4AA adds r3, r7, 0 adds r3, 0x3F ldrb r2, [r3] @@ -494502,8 +494502,8 @@ sub_810E314: ; 810E314 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 @@ -494525,7 +494525,7 @@ sub_810E314: ; 810E314 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @0810E4AA + beq _0810E4AA adds r3, r7, 0 adds r3, 0x3F ldrb r2, [r3] @@ -494547,12 +494547,12 @@ sub_810E314: ; 810E314 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 @@ -494625,60 +494625,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 @@ -494692,12 +494692,12 @@ sub_810E520: ; 810E520 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] @@ -494728,16 +494728,16 @@ sub_810E520: ; 810E520 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 @@ -494750,8 +494750,8 @@ sub_810E520: ; 810E520 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 @@ -494764,26 +494764,26 @@ sub_810E520: ; 810E520 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 @@ -494793,7 +494793,7 @@ sub_810E520: ; 810E520 ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -@0810E672: +_0810E672: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -494801,35 +494801,35 @@ sub_810E520: ; 810E520 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] @@ -494860,16 +494860,16 @@ sub_810E520: ; 810E520 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 @@ -494882,8 +494882,8 @@ sub_810E520: ; 810E520 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 @@ -494896,26 +494896,26 @@ sub_810E520: ; 810E520 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 @@ -494925,7 +494925,7 @@ sub_810E520: ; 810E520 ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -@0810E766: +_0810E766: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -494933,35 +494933,35 @@ sub_810E520: ; 810E520 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] @@ -494992,16 +494992,16 @@ sub_810E520: ; 810E520 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 @@ -495014,8 +495014,8 @@ sub_810E520: ; 810E520 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 @@ -495028,26 +495028,26 @@ sub_810E520: ; 810E520 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 @@ -495057,7 +495057,7 @@ sub_810E520: ; 810E520 ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -@0810E85A: +_0810E85A: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -495065,25 +495065,25 @@ sub_810E520: ; 810E520 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 @@ -495097,12 +495097,12 @@ sub_810E520: ; 810E520 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] @@ -495133,16 +495133,16 @@ sub_810E520: ; 810E520 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 @@ -495155,8 +495155,8 @@ sub_810E520: ; 810E520 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 @@ -495169,26 +495169,26 @@ sub_810E520: ; 810E520 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 @@ -495198,7 +495198,7 @@ sub_810E520: ; 810E520 ands r1, r2 orrs r1, r0 strb r1, [r4, 0xE] -@0810E962: +_0810E962: ldrb r1, [r4] movs r0, 0x9 negs r0, r0 @@ -495206,15 +495206,15 @@ sub_810E520: ; 810E520 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 @@ -495272,7 +495272,7 @@ sub_810E520: ; 810E520 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @0810EA0C + beq _0810EA0C ldrh r0, [r4, 0x4] subs r1, 0x1 ands r1, r0 @@ -495281,9 +495281,9 @@ sub_810E520: ; 810E520 movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x2] - b @0810EA1C + b _0810EA1C .pool -@0810EA0C: +_0810EA0C: ldrh r0, [r4, 0x4] ldr r1, =0x00007fff ands r1, r0 @@ -495292,7 +495292,7 @@ sub_810E520: ; 810E520 movs r0, 0xFF ands r1, r0 strh r1, [r4, 0x2] -@0810EA1C: +_0810EA1C: movs r0, 0x22 ldrsh r1, [r5, r0] movs r2, 0x26 @@ -495301,12 +495301,12 @@ sub_810E520: ; 810E520 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 str r0, [r5, 0x1C] -@0810EA36: +_0810EA36: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -495361,44 +495361,44 @@ sub_810EAA0: ; 810EAA0 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 .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 @@ -495444,12 +495444,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 StartObjectImageAnim -@0810EB6A: +_0810EB6A: ldrh r0, [r4, 0x3C] subs r0, 0x1 strh r0, [r4, 0x3C] @@ -495458,10 +495458,10 @@ sub_810EB40: ; 810EB40 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 @@ -495484,7 +495484,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 @@ -495525,17 +495525,17 @@ sub_810EB88: ; 810EB88 adds r1, r4, 0 movs r3, 0x3 bl AddObjectAndAnimateForOneFrame -@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} @@ -495551,11 +495551,11 @@ sub_810EC34: ; 810EC34 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 @@ -495576,19 +495576,19 @@ sub_810EC34: ; 810EC34 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b @0810EC8C + b _0810EC8C .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 @@ -495601,17 +495601,17 @@ sub_810EC94: ; 810EC94 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 @@ -495622,21 +495622,21 @@ sub_810EC94: ; 810EC94 negs r0, r0 subs r0, 0x20 strh r0, [r4, 0x26] - b @0810ECD8 + b _0810ECD8 .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] @@ -495648,7 +495648,7 @@ sub_810EC94: ; 810EC94 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 @@ -495666,7 +495666,7 @@ sub_810EC94: ; 810EC94 strb r0, [r1] adds r0, r4, 0 bl move_anim_8072740 -@0810ED1E: +_0810ED1E: pop {r4} pop {r0} bx r0 @@ -495714,11 +495714,11 @@ sub_810ED70: ; 810ED70 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 @@ -495727,7 +495727,7 @@ sub_810ED70: ; 810ED70 movs r1, 0x20 negs r1, r1 cmp r0, r1 - ble @0810EDAA + ble _0810EDAA ldrh r0, [r2, 0x30] ldrh r1, [r2, 0x32] adds r0, r1 @@ -495737,8 +495737,8 @@ sub_810ED70: ; 810ED70 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] @@ -495751,10 +495751,10 @@ sub_810ED70: ; 810ED70 lsls r0, 16 asrs r0, 16 cmp r0, 0x14 - ble @0810EDC8 + ble _0810EDC8 ldr r0, =sub_810EDD0 str r0, [r2, 0x1C] -@0810EDC8: +_0810EDC8: pop {r0} bx r0 .pool @@ -495778,7 +495778,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] @@ -495786,14 +495786,14 @@ 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 @@ -495806,22 +495806,22 @@ sub_810EE14: ; 810EE14 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 .pool -@0810EE40: +_0810EE40: ldr r4, =0x02038437 -@0810EE42: +_0810EE42: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -495847,20 +495847,20 @@ sub_810EE14: ; 810EE14 ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b @0810EEEC + b _0810EEEC .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 @@ -495886,9 +495886,9 @@ sub_810EE14: ; 810EE14 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 @@ -495898,12 +495898,12 @@ sub_810EE14: ; 810EE14 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} @@ -495924,41 +495924,41 @@ 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 .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 @@ -495966,17 +495966,17 @@ sub_810EEF8: ; 810EEF8 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 .pool -@0810EF74: +_0810EF74: ldr r4, =0x02038437 -@0810EF76: +_0810EF76: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -496005,20 +496005,20 @@ sub_810EFA8: ; 810EFA8 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 @@ -496032,20 +496032,20 @@ sub_810EFA8: ; 810EFA8 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 @@ -496070,18 +496070,18 @@ sub_810F018: ; 810F018 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 @@ -496104,20 +496104,20 @@ sub_810F018: ; 810F018 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 @@ -496233,18 +496233,18 @@ 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 @@ -496258,7 +496258,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 @@ -496272,9 +496272,9 @@ sub_810F184: ; 810F184 ldrb r0, [r1] movs r2, 0x4 orrs r0, r2 - b @0810F1DA + b _0810F1DA .pool -@0810F1BC: +_0810F1BC: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -496289,7 +496289,7 @@ sub_810F184: ; 810F184 movs r0, 0x5 negs r0, r0 ands r0, r2 -@0810F1DA: +_0810F1DA: strb r0, [r1] adds r0, r4, 0 bl move_anim_task_del @@ -496314,11 +496314,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 @@ -496332,8 +496332,8 @@ sub_810F1EC: ; 810F1EC 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 @@ -496352,12 +496352,12 @@ sub_810F1EC: ; 810F1EC 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 @@ -496365,49 +496365,49 @@ sub_810F1EC: ; 810F1EC 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 .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 @@ -496424,7 +496424,7 @@ sub_810F1EC: ; 810F1EC lsrs r0, 24 ldrh r4, [r4, 0x2] adds r0, r4 -@0810F2F2: +_0810F2F2: strh r0, [r5, 0x22] ldr r0, =0x0203841e ldrh r0, [r0, 0x4] @@ -496437,7 +496437,7 @@ sub_810F1EC: ; 810F1EC 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] @@ -496445,12 +496445,12 @@ sub_810F1EC: ; 810F1EC str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 - b @0810F330 + b _0810F330 .pool -@0810F32C: +_0810F32C: ldr r0, =sub_810F340 str r0, [r5, 0x1C] -@0810F330: +_0810F330: pop {r3} mov r8, r3 pop {r4-r7} @@ -496470,16 +496470,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 @@ -496493,14 +496493,14 @@ sub_810F340: ; 810F340 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 @@ -496514,12 +496514,12 @@ sub_810F340: ; 810F340 movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@0810F3AC: +_0810F3AC: ldr r1, =sub_810F3C8 str r1, [r5, 0x1C] adds r0, r5, 0 bl _call_via_r1 -@0810F3B6: +_0810F3B6: pop {r4,r5} pop {r0} bx r0 @@ -496543,15 +496543,15 @@ sub_810F3C8: ; 810F3C8 movs r2, 0x34 ldrsh r0, [r4, r2] cmp r0, 0xD - bne @0810F3F4 + bne _0810F3F4 ldr r0, =sub_810F400 str r0, [r4, 0x1C] - b @0810F3F8 + b _0810F3F8 .pool -@0810F3F4: +_0810F3F4: adds r0, r1, 0x1 strh r0, [r4, 0x34] -@0810F3F8: +_0810F3F8: pop {r4} pop {r0} bx r0 @@ -496567,7 +496567,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] @@ -496586,14 +496586,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 @@ -496604,10 +496604,10 @@ sub_810F400: ; 810F400 lsls r0, 16 asrs r0, 16 cmp r0, 0x10 - bne @0810F45E + bne _0810F45E ldr r0, =sub_810F46C str r0, [r3, 0x1C] -@0810F45E: +_0810F45E: pop {r4-r7} pop {r0} bx r0 @@ -496635,11 +496635,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 @@ -496649,7 +496649,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 @@ -496664,7 +496664,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 @@ -496672,7 +496672,7 @@ sub_810F46C: ; 810F46C 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 @@ -496687,7 +496687,7 @@ sub_810F46C: ; 810F46C negs r1, r1 ands r1, r2 strb r1, [r0] -@0810F502: +_0810F502: adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -496696,7 +496696,7 @@ sub_810F46C: ; 810F46C strb r0, [r2] ldr r0, =sub_810F524 str r0, [r5, 0x1C] -@0810F512: +_0810F512: pop {r4-r6} pop {r0} bx r0 @@ -496710,7 +496710,7 @@ sub_810F524: ; 810F524 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 @@ -496728,22 +496728,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 str r0, [r6, 0x1C] pop {r4-r6} @@ -496759,29 +496759,29 @@ sub_810F58C: ; 810F58C 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 @@ -496789,47 +496789,47 @@ sub_810F58C: ; 810F58C ldrh r0, [r5, 0x2] adds r0, 0x50 strh r0, [r4, 0x22] - b @0810F610 + b _0810F610 .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 .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 @@ -496856,7 +496856,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 StartObjectImageAnim @@ -496867,9 +496867,9 @@ sub_810F634: ; 810F634 adds r0, 0xA strh r0, [r5, 0x22] ldr r0, =0x0000ffff - b @0810F692 + b _0810F692 .pool -@0810F684: +_0810F684: ldrh r0, [r5, 0x20] adds r0, 0x28 strh r0, [r5, 0x20] @@ -496877,7 +496877,7 @@ sub_810F634: ; 810F634 subs r0, 0xA strh r0, [r5, 0x22] movs r0, 0x1 -@0810F692: +_0810F692: strh r0, [r5, 0x30] ldr r1, =move_anim_8072740 adds r0, r5, 0 @@ -496920,11 +496920,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 @@ -496942,10 +496942,10 @@ sub_810F6B0: ; 810F6B0 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 adds r0, r5, 0 bl oamt_set_x3A_32 @@ -496989,18 +496989,18 @@ sub_810F774: ; 810F774 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 @@ -497015,8 +497015,8 @@ sub_810F774: ; 810F774 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] @@ -497025,10 +497025,10 @@ sub_810F774: ; 810F774 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 @@ -497074,10 +497074,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 @@ -497108,9 +497108,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, =gUnknown_0859677C @@ -497137,12 +497137,12 @@ 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 .pool -@0810F8BC: +_0810F8BC: adds r0, r4, 0 bl sub_80A7D34 ldrh r0, [r4, 0xC] @@ -497151,16 +497151,16 @@ sub_810F898: ; 810F898 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] @@ -497174,9 +497174,9 @@ sub_810F898: ; 810F898 ldrh r0, [r4, 0xE] subs r0, 0x1 strh r0, [r4, 0xE] - b @0810F936 + b _0810F936 .pool -@0810F900: +_0810F900: ldr r3, =0x02020630 movs r0, 0x8 ldrsh r1, [r4, r0] @@ -497202,7 +497202,7 @@ sub_810F898: ; 810F898 bl sub_80A7344 adds r0, r5, 0 bl move_anim_task_del -@0810F936: +_0810F936: pop {r4,r5} pop {r0} bx r0 @@ -497256,9 +497256,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 @@ -497288,33 +497288,33 @@ 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 .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, =gUnknown_08596794 movs r2, 0x22 @@ -497334,33 +497334,33 @@ sub_810F9D4: ; 810F9D4 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 .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 .pool -@0810FA78: +_0810FA78: ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -497370,9 +497370,9 @@ sub_810F9D4: ; 810F9D4 negs r0, r0 strh r0, [r1, 0x24] ldrh r0, [r4, 0x20] - b @0810FABC + b _0810FABC .pool -@0810FA90: +_0810FA90: ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -497382,9 +497382,9 @@ sub_810F9D4: ; 810F9D4 strh r1, [r0, 0x24] ldrh r1, [r4, 0x20] strh r1, [r0, 0x26] - b @0810FABE + b _0810FABE .pool -@0810FAA8: +_0810FAA8: ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -497392,36 +497392,36 @@ sub_810F9D4: ; 810F9D4 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 .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] @@ -497436,17 +497436,17 @@ sub_810F9D4: ; 810F9D4 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 @@ -497454,19 +497454,19 @@ sub_810F9D4: ; 810F9D4 ldr r1, =0x02020630 adds r0, r1 bl RemoveObjectAndFreeTiles -@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 .pool -@0810FB44: +_0810FB44: movs r0, 0x52 movs r1, 0 bl SetGpuReg @@ -497475,7 +497475,7 @@ sub_810F9D4: ; 810F9D4 bl SetGpuReg adds r0, r5, 0 bl move_anim_task_del -@0810FB5A: +_0810FB5A: pop {r4-r6} pop {r0} bx r0 @@ -497491,7 +497491,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 @@ -497504,16 +497504,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] @@ -497530,7 +497530,7 @@ sub_810FBA8: ; 810FBA8 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne @0810FBD4 + bne _0810FBD4 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0x2 @@ -497544,7 +497544,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 @@ -497568,12 +497568,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 @@ -497597,9 +497597,9 @@ sub_810FBF0: ; 810FBF0 movs r1, 0x2 bl sub_80A861C adds r0, 0x8 - b @0810FD1E + b _0810FD1E .pool -@0810FC60: +_0810FC60: movs r0, 0xA strh r0, [r5, 0x1C] ldr r4, =0x02038436 @@ -497618,14 +497618,14 @@ sub_810FBF0: ; 810FBF0 movs r1, 0x4 bl sub_80A861C adds r0, 0x8 - b @0810FD12 + b _0810FD12 .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 @@ -497649,9 +497649,9 @@ sub_810FBF0: ; 810FBF0 movs r1, 0x2 bl sub_80A861C adds r0, 0x8 - b @0810FD1E + b _0810FD1E .pool -@0810FCE8: +_0810FCE8: movs r0, 0xA strh r0, [r5, 0x1C] ldr r4, =0x02038436 @@ -497670,13 +497670,13 @@ sub_810FBF0: ; 810FBF0 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] @@ -497701,19 +497701,19 @@ 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 .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, =gUnknown_08596864 movs r2, 0x1E @@ -497725,7 +497725,7 @@ sub_810FD3C: ; 810FD3C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @0810FDB4 + beq _0810FDB4 ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 @@ -497746,30 +497746,30 @@ sub_810FD3C: ; 810FD3C ands r1, r0 adds r0, r4, 0 bl StartObjectRotScalAnim -@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 .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 @@ -497782,14 +497782,14 @@ sub_810FDF0: ; 810FDF0 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 RemoveObjectAndFreeTiles -@0810FE0E: +_0810FE0E: pop {r4} pop {r0} bx r0 @@ -497818,68 +497818,68 @@ 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 .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 .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 @@ -497888,12 +497888,12 @@ sub_810FE14: ; 810FE14 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 @@ -497909,8 +497909,8 @@ sub_810FE14: ; 810FE14 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 @@ -497948,18 +497948,18 @@ 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 .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 @@ -497967,7 +497967,7 @@ sub_810FF34: ; 810FF34 movs r2, 0x26 ldrsh r0, [r5, r2] cmp r1, r0 - bgt @0810FFFE + bgt _0810FFFE ldr r0, =gUnknown_08329F40 mov r9, r0 movs r7, 0x3 @@ -497977,7 +497977,7 @@ sub_810FF34: ; 810FF34 lsls r2, 3 add r2, r12 mov r8, r2 -@0810FF88: +_0810FF88: lsls r2, r3, 16 asrs r0, r2, 15 add r0, r9 @@ -497991,24 +497991,24 @@ sub_810FF34: ; 810FF34 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 .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 @@ -498035,30 +498035,30 @@ sub_810FF34: ; 810FF34 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 .pool -@08110020: +_08110020: adds r0, r2, 0 bl move_anim_task_del -@08110026: +_08110026: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -498088,12 +498088,12 @@ 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 .pool -@0811006C: +_0811006C: ldr r1, =0x0203841e ldrb r0, [r1] bl duplicate_obj_of_side_rel2move_in_transparent_mode @@ -498102,14 +498102,14 @@ sub_8110034: ; 8110034 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 .pool -@08110094: +_08110094: ldr r2, =0x02020630 lsls r4, r0, 4 adds r4, r0 @@ -498172,7 +498172,7 @@ sub_8110034: ; 8110034 strh r1, [r7, 0x26] ldr r0, =sub_8110134 str r0, [r7] -@08110116: +_08110116: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -498196,20 +498196,20 @@ 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 .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] @@ -498244,10 +498244,10 @@ sub_8110134: ; 8110134 movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0x30 - bne @08110238 - b @0811021A + bne _08110238 + b _0811021A .pool -@081101B8: +_081101B8: ldrh r0, [r4, 0xA] subs r0, 0x4 strh r0, [r4, 0xA] @@ -498282,10 +498282,10 @@ sub_8110134: ; 8110134 movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne @08110238 - b @0811021A + bne _08110238 + b _0811021A .pool -@08110208: +_08110208: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -498294,20 +498294,20 @@ sub_8110134: ; 8110134 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 .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 @@ -498320,19 +498320,19 @@ sub_8110240: ; 8110240 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 @@ -498349,11 +498349,11 @@ sub_8110240: ; 8110240 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 @@ -498369,16 +498369,16 @@ sub_8110240: ; 8110240 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg - b @081102E2 + b _081102E2 .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 @@ -498390,19 +498390,19 @@ sub_8110240: ; 8110240 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] @@ -498419,7 +498419,7 @@ sub_8110240: ; 8110240 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] @@ -498429,7 +498429,7 @@ sub_8110240: ; 8110240 movs r1, 0x4 orrs r0, r1 strb r0, [r2] -@0811032E: +_0811032E: movs r0, 0xE0 lsls r0, 2 adds r2, r0, 0 @@ -498443,8 +498443,8 @@ sub_8110240: ; 8110240 movs r0, 0xFF ands r2, r0 strh r2, [r5, 0x34] - b @08110360 -@0811034A: + b _08110360 +_0811034A: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -498453,7 +498453,7 @@ sub_8110240: ; 8110240 bl SetGpuReg adds r0, r5, 0 bl move_anim_8072740 -@08110360: +_08110360: pop {r4,r5} pop {r0} bx r0 @@ -498466,7 +498466,7 @@ sub_8110368: ; 8110368 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @08110394 + beq _08110394 adds r0, r6, 0 movs r1, 0x2 bl StartObjectRotScalAnim @@ -498477,15 +498477,15 @@ sub_8110368: ; 8110368 ldrh r1, [r0] negs r1, r1 strh r1, [r0] - b @081103C4 + b _081103C4 .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 StartObjectRotScalAnim @@ -498502,7 +498502,7 @@ sub_8110368: ; 8110368 ldrh r0, [r1] negs r0, r0 strh r0, [r1] -@081103C4: +_081103C4: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 @@ -498557,7 +498557,7 @@ sub_8110438: ; 8110438 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @0811045C + beq _0811045C ldr r1, =0x0203841e ldrh r0, [r1] negs r0, r0 @@ -498565,15 +498565,15 @@ sub_8110438: ; 8110438 adds r0, r6, 0 movs r1, 0x2 bl StartObjectRotScalAnim - b @08110478 + b _08110478 .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 @@ -498581,7 +498581,7 @@ sub_8110438: ; 8110438 ldrh r1, [r0] negs r1, r1 strh r1, [r0] -@08110478: +_08110478: ldr r5, =0x02038437 ldrb r0, [r5] movs r1, 0x2 @@ -498632,7 +498632,7 @@ sub_81104E4: ; 81104E4 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @08110500 + beq _08110500 ldr r0, =0x0203841e movs r2, 0x4 ldrsh r1, [r0, r2] @@ -498640,7 +498640,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 @@ -498654,7 +498654,7 @@ sub_81104E4: ; 81104E4 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne @08110548 + bne _08110548 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -498668,9 +498668,9 @@ sub_81104E4: ; 81104E4 lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] - b @0811055A + b _0811055A .pool -@08110548: +_08110548: ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -498679,7 +498679,7 @@ sub_81104E4: ; 81104E4 adds r3, 0x36 movs r1, 0x1 bl sub_80A8924 -@0811055A: +_0811055A: adds r0, r5, 0 bl sub_80A6FD4 ldr r0, =0x0203841e @@ -498700,11 +498700,11 @@ sub_811057C: ; 811057C 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 @@ -498718,7 +498718,7 @@ sub_811057C: ; 811057C movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x3A] -@081105AE: +_081105AE: pop {r4} pop {r0} bx r0 @@ -498741,22 +498741,22 @@ 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 .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 @@ -498766,11 +498766,11 @@ sub_81105B4: ; 81105B4 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 str r0, [r4, 0x1C] pop {r4} @@ -498789,7 +498789,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 @@ -498807,17 +498807,17 @@ 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 @@ -498851,18 +498851,18 @@ sub_81106A4: ; 81106A4 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] @@ -498877,7 +498877,7 @@ sub_81106A4: ; 81106A4 movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @081106F6 + bne _081106F6 adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -498886,7 +498886,7 @@ sub_81106A4: ; 81106A4 strb r0, [r2] ldr r0, =sub_8110700 str r0, [r4, 0x1C] -@081106F6: +_081106F6: pop {r4} pop {r0} bx r0 @@ -498918,20 +498918,20 @@ sub_8110720: ; 8110720 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 .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 @@ -498942,11 +498942,11 @@ sub_8110720: ; 8110720 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 @@ -498957,19 +498957,19 @@ sub_8110720: ; 8110720 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] @@ -498979,7 +498979,7 @@ sub_8110720: ; 8110720 ldrsh r1, [r0, r2] negs r1, r1 strh r1, [r0] -@081107B2: +_081107B2: adds r0, r7, 0 movs r1, 0x1 bl sub_80A69CC @@ -499056,12 +499056,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] @@ -499118,11 +499118,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 @@ -499134,14 +499134,14 @@ sub_81108CC: ; 81108CC 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 @@ -499153,7 +499153,7 @@ sub_81108CC: ; 81108CC bl sub_80A6900 lsls r0, 24 cmp r0, 0 - bne @08110988 + bne _08110988 ldrh r0, [r4, 0x24] ldrh r1, [r4, 0x20] adds r0, r1 @@ -499186,15 +499186,15 @@ sub_81108CC: ; 81108CC 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 @@ -499211,13 +499211,13 @@ sub_8110994: ; 8110994 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @081109B0 + bne _081109B0 ldr r4, =0x02038436 - b @081109B2 + b _081109B2 .pool -@081109B0: +_081109B0: ldr r4, =0x02038437 -@081109B2: +_081109B2: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -499250,7 +499250,7 @@ sub_81109F0: ; 81109F0 movs r1, 0x6 ldrsh r0, [r6, r1] cmp r0, 0 - beq @08110A10 + beq _08110A10 ldr r0, =0x02038437 ldrb r0, [r0] adds r2, r5, 0 @@ -499259,7 +499259,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 @@ -499340,17 +499340,17 @@ 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 .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] @@ -499392,17 +499392,17 @@ sub_8110B38: ; 8110B38 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 .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] @@ -499452,10 +499452,10 @@ 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 @@ -499486,12 +499486,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 @@ -499524,15 +499524,15 @@ sub_8110BCC: ; 8110BCC 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 @@ -499563,19 +499563,19 @@ 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 .pool -@08110CE4: +_08110CE4: ldr r1, =0x02022e18 ldrh r0, [r1] adds r0, 0x6 -@08110CEA: +_08110CEA: strh r0, [r1] ldr r1, =0x02022e1a ldr r3, =0x0000ffff @@ -499591,23 +499591,23 @@ sub_8110CB0: ; 8110CB0 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 .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 @@ -499618,7 +499618,7 @@ sub_8110CB0: ; 8110CB0 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @08110E3A + bne _08110E3A strh r5, [r4, 0x1C] ldrh r1, [r4, 0x1E] adds r1, 0x1 @@ -499634,13 +499634,13 @@ sub_8110CB0: ; 8110CB0 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 @@ -499650,11 +499650,11 @@ sub_8110CB0: ; 8110CB0 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 @@ -499664,7 +499664,7 @@ sub_8110CB0: ; 8110CB0 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @08110E3A + bne _08110E3A movs r0, 0 strh r0, [r4, 0x1C] ldrh r1, [r4, 0x1E] @@ -499681,13 +499681,13 @@ sub_8110CB0: ; 8110CB0 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 @@ -499697,22 +499697,22 @@ sub_8110CB0: ; 8110CB0 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 .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] @@ -499730,7 +499730,7 @@ sub_8110CB0: ; 8110CB0 bl lcd_bg_operations adds r0, r5, 0 bl move_anim_task_del -@08110E3A: +_08110E3A: add sp, 0x10 pop {r4,r5} pop {r0} @@ -499745,18 +499745,18 @@ sub_8110E4C: ; 8110E4C 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] @@ -499771,12 +499771,12 @@ sub_8110E4C: ; 8110E4C movs r1, 0x10 orrs r0, r1 strb r0, [r5, 0x3] - b @08110E9C + b _08110E9C .pool -@08110E98: +_08110E98: ldr r0, =0x0000ffc0 strh r0, [r5, 0x20] -@08110E9C: +_08110E9C: ldr r4, =0x0203841e ldrh r0, [r4] strh r0, [r5, 0x22] @@ -499790,9 +499790,9 @@ sub_8110E4C: ; 8110E4C ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b @08110F24 + b _08110F24 .pool -@08110EC8: +_08110EC8: ldrh r1, [r5, 0x30] ldrh r3, [r5, 0x34] adds r1, r3 @@ -499817,7 +499817,7 @@ sub_8110E4C: ; 8110E4C movs r1, 0x38 ldrsh r0, [r5, r1] cmp r0, 0 - bne @08110F0E + bne _08110F0E movs r2, 0x20 ldrsh r0, [r5, r2] movs r3, 0x24 @@ -499826,9 +499826,9 @@ sub_8110E4C: ; 8110E4C 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 @@ -499837,11 +499837,11 @@ sub_8110E4C: ; 8110E4C movs r1, 0x20 negs r1, r1 cmp r0, r1 - bge @08110F24 -@08110F20: + bge _08110F24 +_08110F20: ldr r0, =move_anim_8072740 str r0, [r5, 0x1C] -@08110F24: +_08110F24: pop {r4,r5} pop {r0} bx r0 @@ -499929,22 +499929,22 @@ 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 .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] @@ -499955,9 +499955,9 @@ sub_8110F74: ; 8110F74 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] @@ -500032,23 +500032,23 @@ 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 .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 @@ -500083,33 +500083,33 @@ sub_81110A4: ; 81110A4 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 .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 @@ -500118,14 +500118,14 @@ sub_81110A4: ; 81110A4 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] @@ -500147,9 +500147,9 @@ sub_81110A4: ; 81110A4 lsls r0, 16 asrs r0, 19 strh r0, [r1, 0x26] - b @0811120C + b _0811120C .pool -@081111AC: +_081111AC: ldrh r0, [r4, 0x10] ldrh r2, [r4, 0xC] adds r0, r2 @@ -500166,7 +500166,7 @@ sub_81110A4: ; 81110A4 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 @@ -500179,26 +500179,26 @@ sub_81110A4: ; 81110A4 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 @@ -500213,39 +500213,39 @@ 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 .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, =gUnknown_08596C28 movs r5, 0 - b @08111270 + b _08111270 .pool -@08111254: +_08111254: ldr r3, =gUnknown_08596C40 movs r5, 0x50 - b @08111270 + b _08111270 .pool -@08111260: +_08111260: ldr r3, =gUnknown_08596C40 movs r5, 0x40 - b @08111270 + b _08111270 .pool -@0811126C: +_0811126C: ldr r3, =gUnknown_08596C40 movs r5, 0x30 -@08111270: +_08111270: ldrh r1, [r4, 0xC] lsls r1, 16 asrs r1, 19 @@ -500270,7 +500270,7 @@ sub_8111214: ; 8111214 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq @081112FC + beq _081112FC ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -500314,12 +500314,12 @@ sub_8111214: ; 8111214 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 @@ -500333,13 +500333,13 @@ sub_811131C: ; 811131C bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @0811134E + beq _0811134E ldr r0, =sub_81110A4 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 @@ -500348,10 +500348,10 @@ sub_811131C: ; 811131C ldrh r0, [r1, 0x1E] subs r0, 0x1 strh r0, [r1, 0x1E] -@08111348: +_08111348: adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0811134E: +_0811134E: pop {r4} pop {r0} bx r0 @@ -500375,9 +500375,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 @@ -500431,7 +500431,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] @@ -500442,20 +500442,20 @@ 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 @@ -500470,11 +500470,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 StartObjectRotScalAnim -@08111434: +_08111434: adds r0, r4, 0 bl sub_80A7820 pop {r4} @@ -500555,10 +500555,10 @@ 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 @@ -500572,26 +500572,26 @@ sub_81114EC: ; 81114EC 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} @@ -500612,12 +500612,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] @@ -500632,12 +500632,12 @@ sub_811152C: ; 811152C 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] @@ -500661,7 +500661,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] @@ -500670,7 +500670,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 @@ -500689,14 +500689,14 @@ sub_8111590: ; 8111590 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 @@ -500757,12 +500757,12 @@ sub_8111674: ; 8111674 bl sub_80A6F3C lsls r0, 24 cmp r0, 0 - beq @08111694 + beq _08111694 ldr r0, =sub_81116E8 str r0, [r4, 0x1C] - b @081116DE + b _081116DE .pool -@08111694: +_08111694: movs r1, 0x38 ldrsh r0, [r4, r1] movs r1, 0xA @@ -500786,19 +500786,19 @@ sub_8111674: ; 8111674 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 @@ -500836,20 +500836,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] @@ -500858,12 +500858,12 @@ sub_81116E8: ; 81116E8 strb r0, [r2] ldr r0, =sub_80A67F4 str r0, [r4, 0x1C] - b @0811175E + b _0811175E .pool -@08111758: +_08111758: adds r0, r4, 0 bl sub_8111764 -@0811175E: +_0811175E: pop {r4} pop {r0} bx r0 @@ -500877,24 +500877,24 @@ sub_8111764: ; 8111764 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 .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] @@ -500902,13 +500902,13 @@ sub_8111764: ; 8111764 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq @081117B0 + beq _081117B0 adds r0, r2, 0x1 - b @081117B2 + b _081117B2 .pool -@081117B0: +_081117B0: subs r0, r2, 0x1 -@081117B2: +_081117B2: strh r0, [r4, 0x3A] ldrh r0, [r4, 0x3A] movs r1, 0x10 @@ -500922,26 +500922,26 @@ sub_8111764: ; 8111764 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 @@ -500982,20 +500982,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] @@ -501017,10 +501017,10 @@ sub_8111814: ; 8111814 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 @@ -501102,7 +501102,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] @@ -501120,10 +501120,10 @@ sub_8111914: ; 8111914 movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0x9 - bne @0811195C + bne _0811195C ldr r0, =sub_811196C str r0, [r4] -@0811195C: +_0811195C: pop {r4} pop {r0} bx r0 @@ -501145,12 +501145,12 @@ 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 .pool -@08111994: +_08111994: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -501161,15 +501161,15 @@ sub_811196C: ; 811196C 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 @@ -501180,7 +501180,7 @@ sub_811196C: ; 811196C movs r0, 0x52 movs r1, 0 bl SetGpuReg -@081119D8: +_081119D8: pop {r4,r5} pop {r0} bx r0 @@ -501272,19 +501272,19 @@ sub_8111A88: ; 8111A88 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 @@ -501304,15 +501304,15 @@ sub_8111A88: ; 8111A88 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 @@ -501352,9 +501352,9 @@ sub_8111A88: ; 8111A88 ldrsh r1, [r5, r2] bl __divsi3 strh r0, [r5, 0x3C] - b @08111B82 + b _08111B82 .pool -@08111B3C: +_08111B3C: ldrh r0, [r5, 0x3A] ldrh r1, [r5, 0x36] adds r0, r1 @@ -501374,7 +501374,7 @@ sub_8111A88: ; 8111A88 strh r0, [r5, 0x34] lsls r0, 16 cmp r0, 0 - bgt @08111B96 + bgt _08111B96 ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x2 @@ -501388,16 +501388,16 @@ sub_8111A88: ; 8111A88 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 .pool -@08111B90: +_08111B90: adds r0, r5, 0 bl move_anim_8074EE0 -@08111B96: +_08111B96: pop {r4,r5} pop {r0} bx r0 @@ -501428,7 +501428,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] @@ -501436,35 +501436,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 @@ -501484,23 +501484,23 @@ sub_8111BB4: ; 8111BB4 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 @@ -501523,12 +501523,12 @@ 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 .pool -@08111C80: +_08111C80: strh r1, [r5, 0xA] movs r0, 0xF strh r0, [r5, 0xC] @@ -501561,7 +501561,7 @@ sub_8111C50: ; 8111C50 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 @@ -501577,9 +501577,9 @@ sub_8111C50: ; 8111C50 lsls r0, 2 adds r0, r4 movs r1, 0x70 - b @08111D12 + b _08111D12 .pool -@08111CF4: +_08111CF4: movs r0, 0x8 ldrsh r1, [r5, r0] lsls r0, r1, 4 @@ -501595,7 +501595,7 @@ sub_8111C50: ; 8111C50 lsls r0, 2 adds r0, r4 ldr r1, =0x0000ff90 -@08111D12: +_08111D12: strh r1, [r0, 0x32] ldr r4, =0x02020630 movs r0, 0x8 @@ -501632,7 +501632,7 @@ sub_8111C50: ; 8111C50 str r1, [r0] ldr r0, =sub_8111D78 str r0, [r5] -@08111D5C: +_08111D5C: pop {r4-r6} pop {r0} bx r0 @@ -501652,18 +501652,18 @@ 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 .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] @@ -501671,27 +501671,27 @@ sub_8111D78: ; 8111D78 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] @@ -501704,11 +501704,11 @@ sub_8111D78: ; 8111D78 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 @@ -501719,16 +501719,16 @@ sub_8111D78: ; 8111D78 bl obj_delete_but_dont_free_vram movs r0, 0x1 strh r0, [r4, 0x10] - b @08111E48 + b _08111E48 .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 SetGpuReg @@ -501738,11 +501738,11 @@ sub_8111D78: ; 8111D78 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 @@ -501789,23 +501789,23 @@ 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 .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 AllocObjectPalette @@ -501815,23 +501815,23 @@ sub_8111E78: ; 8111E78 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 FreeObjectPaletteByTag -@08111EFE: +_08111EFE: adds r0, r4, 0 bl move_anim_task_del - b @081120CC + b _081120CC .pool -@08111F0C: +_08111F0C: ldr r4, =0x02020630 movs r1, 0x8 ldrsh r0, [r5, r1] @@ -501913,19 +501913,19 @@ sub_8111E78: ; 8111E78 lsls r0, 4 strh r0, [r5, 0x10] cmp r6, 0x1 - bne @08111FC4 + bne _08111FC4 movs r1, 0x80 lsls r1, 2 - b @08111FC8 + b _08111FC8 .pool -@08111FC4: +_08111FC4: movs r1, 0x80 lsls r1, 3 -@08111FC8: +_08111FC8: movs r0, 0 bl ResetGpuRegBits - b @081120C6 -@08111FD0: + b _081120C6 +_08111FD0: movs r1, 0x24 ldrsh r0, [r5, r1] adds r0, 0x10 @@ -501948,9 +501948,9 @@ sub_8111E78: ; 8111E78 movs r1, 0x10 movs r2, 0xA bl pal_fade_1 - b @081120C6 + b _081120C6 .pool -@08112014: +_08112014: ldr r2, =0x02020630 movs r0, 0x22 ldrsh r1, [r5, r0] @@ -501965,11 +501965,11 @@ sub_8111E78: ; 8111E78 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 @@ -501981,9 +501981,9 @@ sub_8111E78: ; 8111E78 movs r2, 0x4 str r2, [sp, 0x4] str r6, [sp, 0x8] - b @0811206C + b _0811206C .pool -@08112054: +_08112054: lsls r0, r2, 24 lsrs r0, 24 adds r1, r2, 0 @@ -501996,54 +501996,54 @@ sub_8111E78: ; 8111E78 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 SetGpuReg - b @08112098 + b _08112098 .pool -@08112090: +_08112090: ldr r1, =0x00003f44 movs r0, 0x50 bl SetGpuReg -@08112098: +_08112098: movs r1, 0x80 lsls r1, 5 movs r0, 0x52 bl SetGpuReg - b @081120C6 + b _081120C6 .pool -@081120A8: +_081120A8: cmp r6, 0x1 - bne @081120B8 + bne _081120B8 movs r1, 0x80 lsls r1, 2 movs r0, 0 bl SetGpuRegBits - b @081120C2 -@081120B8: + b _081120C2 +_081120B8: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl SetGpuRegBits -@081120C2: +_081120C2: ldr r0, =sub_81120DC 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 @@ -502071,7 +502071,7 @@ sub_81120DC: ; 81120DC ands r0, r1 strh r0, [r4, 0x12] cmp r0, 0 - bne @08112114 + bne _08112114 ldr r1, =gUnknown_08329F40 movs r2, 0xA ldrsh r0, [r4, r2] @@ -502082,11 +502082,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, =gUnknown_08329F40 movs r2, 0xA ldrsh r0, [r4, r2] @@ -502099,7 +502099,7 @@ sub_81120DC: ; 81120DC movs r1, 0x10 subs r1, r0 strh r1, [r4, 0xE] -@08112136: +_08112136: ldrh r1, [r4, 0xE] lsls r1, 8 ldrh r0, [r4, 0xC] @@ -502111,14 +502111,14 @@ sub_81120DC: ; 81120DC 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 str r1, [r4] adds r0, r5, 0 bl _call_via_r1 -@0811215E: +_0811215E: pop {r4,r5} pop {r0} bx r0 @@ -502143,18 +502143,18 @@ 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 .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] @@ -502164,27 +502164,27 @@ sub_8112170: ; 8112170 lsrs r0, 24 strh r0, [r4, 0x24] cmp r6, 0x1 - bne @081121D0 + bne _081121D0 movs r1, 0x80 lsls r1, 2 - b @081121D4 + b _081121D4 .pool -@081121D0: +_081121D0: movs r1, 0x80 lsls r1, 3 -@081121D4: +_081121D4: movs r0, 0 bl ResetGpuRegBits - 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 .pool -@081121F0: +_081121F0: ldr r3, =0x02020630 movs r0, 0x24 ldrsh r1, [r4, r0] @@ -502213,22 +502213,22 @@ sub_8112170: ; 8112170 movs r1, 0 bl SetGpuReg cmp r6, 0x1 - bne @08112248 + bne _08112248 movs r1, 0x80 lsls r1, 2 movs r0, 0 bl SetGpuRegBits - b @08112252 + b _08112252 .pool -@08112248: +_08112248: movs r1, 0x80 lsls r1, 3 movs r0, 0 bl SetGpuRegBits -@08112252: +_08112252: adds r0, r5, 0 bl move_anim_task_del -@08112258: +_08112258: ldrh r0, [r4, 0x26] adds r0, 0x1 strh r0, [r4, 0x26] @@ -502249,7 +502249,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 @@ -502266,9 +502266,9 @@ sub_8112264: ; 8112264 adds r0, r2 lsrs r5, r0, 16 ldr r4, =0x02038437 - b @081122D0 + b _081122D0 .pool -@081122AC: +_081122AC: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0 @@ -502285,7 +502285,7 @@ sub_8112264: ; 8112264 adds r0, r2 lsrs r5, r0, 16 ldr r4, =0x02038436 -@081122D0: +_081122D0: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -502374,7 +502374,7 @@ sub_8112384: ; 8112384 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 @@ -502394,9 +502394,9 @@ 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 @@ -502453,29 +502453,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 @@ -502489,7 +502489,7 @@ sub_81123C4: ; 81123C4 lsrs r0, 24 mov r8, r0 cmp r0, 0x40 - beq @08112502 + beq _08112502 adds r0, r4, 0 movs r1, 0x2 bl sub_80A5C6C @@ -502554,7 +502554,7 @@ sub_81123C4: ; 81123C4 ldrh r0, [r2, 0x20] adds r0, 0x1 strh r0, [r2, 0x20] -@08112502: +_08112502: ldr r2, [sp, 0x10] movs r3, 0x80 lsls r3, 9 @@ -502562,10 +502562,10 @@ sub_81123C4: ; 81123C4 lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @08112436 - b @081125B4 + ble _08112436 + b _081125B4 .pool -@08112530: +_08112530: ldr r0, =gUnknown_08596DB8 ldr r7, [sp, 0x4] ldr r2, [sp, 0x8] @@ -502580,7 +502580,7 @@ sub_81123C4: ; 81123C4 lsrs r0, 24 mov r8, r0 cmp r0, 0x40 - beq @081125B4 + beq _081125B4 movs r3, 0x30 mov r10, r3 movs r0, 0x28 @@ -502629,7 +502629,7 @@ sub_81123C4: ; 81123C4 movs r0, 0x1 ldr r2, [sp] strh r0, [r2, 0x20] -@081125B4: +_081125B4: ldr r0, =sub_81125E0 ldr r3, [sp] str r0, [r3] @@ -502657,35 +502657,35 @@ 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 .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 @@ -502693,24 +502693,24 @@ sub_81125E0: ; 81125E0 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] @@ -502722,34 +502722,34 @@ sub_81125E0: ; 81125E0 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] @@ -502758,24 +502758,24 @@ sub_81125E0: ; 81125E0 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] @@ -502788,10 +502788,10 @@ sub_81125E0: ; 81125E0 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 @@ -502809,26 +502809,26 @@ sub_81125E0: ; 81125E0 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 .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 SetGpuReg @@ -502837,7 +502837,7 @@ sub_81125E0: ; 81125E0 bl SetGpuReg adds r0, r5, 0 bl move_anim_task_del -@08112752: +_08112752: pop {r4,r5} pop {r0} bx r0 @@ -502870,18 +502870,18 @@ 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 .pool -@081127B8: +_081127B8: movs r6, 0xC8 -@081127BA: +_081127BA: ldr r1, =0x02022e24 lsls r3, r6, 16 asrs r2, r3, 16 @@ -502945,9 +502945,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 @@ -503038,9 +503038,9 @@ sub_811280C: ; 811280C bl __fixunsdfsi lsls r0, 16 lsrs r5, r0, 16 - b @08112966 + b _08112966 .pool -@08112938: +_08112938: movs r2, 0 mov r9, r2 movs r7, 0xF0 @@ -503062,7 +503062,7 @@ sub_811280C: ; 811280C bl pal_fade_maybe ldr r0, =sub_8112994 str r0, [r4] -@08112966: +_08112966: ldr r1, =0x02022e24 mov r2, r9 lsls r0, r2, 8 @@ -503095,7 +503095,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 @@ -503115,7 +503115,7 @@ sub_8112994: ; 8112994 bl SetGpuReg adds r0, r5, 0 bl move_anim_task_del -@081129DA: +_081129DA: pop {r4,r5} pop {r0} bx r0 @@ -503133,7 +503133,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] @@ -503143,12 +503143,12 @@ sub_81129F0: ; 81129F0 movs r0, 0x10 orrs r1, r0 strb r1, [r4, 0x3] - b @08112A28 + b _08112A28 .pool -@08112A24: +_08112A24: ldr r2, =0x0000ffe8 movs r3, 0x2 -@08112A28: +_08112A28: lsls r0, r2, 16 asrs r0, 16 ldrh r1, [r4, 0x20] @@ -503173,10 +503173,10 @@ sub_8112A4C: ; 8112A4C 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 @@ -503185,7 +503185,7 @@ sub_8112A4C: ; 8112A4C lsls r0, 16 lsrs r0, 16 cmp r0, 0xE - bls @08112AC4 + bls _08112AC4 ldrh r0, [r3, 0x20] adds r0, r1 strh r0, [r3, 0x20] @@ -503208,7 +503208,7 @@ sub_8112A4C: ; 8112A4C lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne @08112AC0 + bne _08112AC0 movs r0, 0x1E strh r0, [r3, 0x2E] ldr r0, =sub_80A64B0 @@ -503216,13 +503216,13 @@ sub_8112A4C: ; 8112A4C ldr r1, =sub_8112ACC adds r0, r3, 0 bl oamt_set_x3A_32 - b @08112AC4 + b _08112AC4 .pool -@08112AC0: +_08112AC0: movs r0, 0x28 -@08112AC2: +_08112AC2: strh r0, [r3, 0x2E] -@08112AC4: +_08112AC4: pop {r4} pop {r0} bx r0 @@ -503235,7 +503235,7 @@ sub_8112ACC: ; 8112ACC movs r0, 0x2E ldrsh r5, [r4, r0] cmp r5, 0 - bne @08112AF6 + bne _08112AF6 movs r1, 0xFD lsls r1, 6 movs r0, 0x50 @@ -503248,17 +503248,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] @@ -503275,7 +503275,7 @@ sub_8112ACC: ; 8112ACC movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x10 - bne @08112B3A + bne _08112B3A adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -503284,7 +503284,7 @@ sub_8112ACC: ; 8112ACC strb r0, [r2] ldr r0, =sub_8112B44 str r0, [r4, 0x1C] -@08112B3A: +_08112B3A: pop {r4,r5} pop {r0} bx r0 @@ -503328,11 +503328,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 @@ -503354,7 +503354,7 @@ sub_8112B78: ; 8112B78 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - bne @08112BE8 + bne _08112BE8 ldr r0, =0x0000050b strh r0, [r5, 0x3A] movs r1, 0xFD @@ -503364,11 +503364,11 @@ sub_8112B78: ; 8112B78 ldrh r1, [r5, 0x3A] movs r0, 0x52 bl SetGpuReg - b @08112C40 + b _08112C40 .pool -@08112BE8: +_08112BE8: cmp r0, 0x1E - ble @08112C40 + ble _08112C40 ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] @@ -503383,16 +503383,16 @@ sub_8112B78: ; 8112B78 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 @@ -503401,9 +503401,9 @@ sub_8112B78: ; 8112B78 bl SetGpuReg 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] @@ -503412,7 +503412,7 @@ sub_8112B78: ; 8112B78 strb r0, [r2] ldr r0, =sub_8112C4C str r0, [r5, 0x1C] -@08112C40: +_08112C40: pop {r4-r7} pop {r0} bx r0 @@ -503523,26 +503523,26 @@ 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 .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 @@ -503553,7 +503553,7 @@ sub_8112D10: ; 8112D10 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq @08112DAA + beq _08112DAA ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -503566,9 +503566,9 @@ sub_8112D10: ; 8112D10 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 @@ -503584,119 +503584,119 @@ sub_8112D10: ; 8112D10 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 .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 SetGpuReg - 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 SetGpuReg @@ -503705,7 +503705,7 @@ sub_8112D10: ; 8112D10 bl SetGpuReg adds r0, r7, 0 bl move_anim_task_del -@08112E96: +_08112E96: pop {r4-r7} pop {r0} bx r0 @@ -503718,14 +503718,14 @@ sub_8112E9C: ; 8112E9C 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 @@ -503742,7 +503742,7 @@ sub_8112E9C: ; 8112E9C lsls r0, 16 lsrs r0, 16 cmp r0, 0x7E - bhi @08112EF4 + bhi _08112EF4 ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -503754,9 +503754,9 @@ sub_8112E9C: ; 8112E9C adds r1, 0x1 movs r0, 0x3 ands r1, r0 - b @08112F08 + b _08112F08 .pool -@08112EF4: +_08112EF4: ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -503767,7 +503767,7 @@ sub_8112E9C: ; 8112E9C movs r2, 0x3 ldrb r1, [r0, 0x12] ands r1, r2 -@08112F08: +_08112F08: lsls r1, 2 ldrb r2, [r4, 0x5] movs r0, 0xD @@ -503799,13 +503799,13 @@ sub_8112E9C: ; 8112E9C 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 RemoveObjectAndFreeTiles -@08112F56: +_08112F56: pop {r4} pop {r0} bx r0 @@ -503859,7 +503859,7 @@ sub_8112FB8: ; 8112FB8 movs r1, 0x34 ldrsh r3, [r5, r1] cmp r3, 0 - beq @08113020 + beq _08113020 subs r0, 0x1 strh r0, [r5, 0x34] movs r2, 0x2E @@ -503894,13 +503894,13 @@ 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 .pool -@08113020: +_08113020: ldr r2, =0x02020630 movs r0, 0x38 ldrsh r1, [r5, r0] @@ -503927,7 +503927,7 @@ sub_8112FB8: ; 8112FB8 strh r1, [r0, 0x22] ldr r0, =move_anim_8074EE0 str r0, [r5, 0x1C] -@08113054: +_08113054: pop {r4,r5} pop {r0} bx r0 @@ -503955,7 +503955,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] @@ -503968,15 +503968,15 @@ sub_8113064: ; 8113064 negs r0, r0 strh r0, [r2, 0x8] adds r1, r2, 0 - b @081130BE + b _081130BE .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 @@ -504029,7 +504029,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] @@ -504046,9 +504046,9 @@ sub_8113100: ; 8113100 ldrh r1, [r5, 0x36] adds r0, r1 strh r0, [r5, 0x36] - b @0811318E + b _0811318E .pool -@08113164: +_08113164: ldr r1, =0x0203841e ldrh r0, [r1] ldrh r2, [r5, 0x20] @@ -504069,7 +504069,7 @@ sub_8113100: ; 8113100 adds r0, r5, 0 movs r1, 0x1 bl StartObjectImageAnim -@0811318E: +_0811318E: ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r5, 0x2E] @@ -504092,13 +504092,13 @@ sub_81131B4: ; 81131B4 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @081131D0 + bne _081131D0 ldr r4, =0x02038436 - b @081131D2 + b _081131D2 .pool -@081131D0: +_081131D0: ldr r4, =0x02038437 -@081131D2: +_081131D2: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -504140,11 +504140,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 StartObjectRotScalAnim -@0811323E: +_0811323E: adds r0, r4, 0 bl sub_8113100 pop {r4} @@ -504189,13 +504189,13 @@ 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 .pool -@081132B0: +_081132B0: lsrs r0, r1, 17 -@081132B2: +_081132B2: strh r0, [r6, 0x3C] movs r1, 0x3A ldrsh r0, [r6, r1] @@ -504224,11 +504224,11 @@ sub_81132E0: ; 81132E0 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 @@ -504253,36 +504253,36 @@ sub_81132E0: ; 81132E0 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 @@ -504293,17 +504293,17 @@ sub_81132E0: ; 81132E0 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 @@ -504322,33 +504322,33 @@ sub_81132E0: ; 81132E0 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 @@ -504371,17 +504371,17 @@ 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 .pool -@08113424: +_08113424: ldr r0, =0x04000018 str r0, [sp] ldr r0, =0x02022e1c -@0811342A: +_0811342A: ldrh r0, [r0] strh r0, [r4, 0xC] ldr r0, =0xa2600001 @@ -504403,19 +504403,19 @@ sub_81133E8: ; 81133E8 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] @@ -504429,8 +504429,8 @@ sub_81133E8: ; 81133E8 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] @@ -504457,28 +504457,28 @@ 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 .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] @@ -504487,25 +504487,25 @@ sub_81134B8: ; 81134B8 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] @@ -504513,28 +504513,28 @@ sub_81134B8: ; 81134B8 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 .pool -@08113568: +_08113568: adds r0, r3, 0 bl move_anim_task_del -@0811356E: +_0811356E: pop {r0} bx r0 thumb_func_end sub_81134B8 @@ -504550,13 +504550,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, =gUnknown_08329F40 mov r8, r0 ldr r6, =0x02039b28 -@08113592: +_08113592: lsls r2, r4, 1 ldrb r1, [r6, 0x14] lsls r0, r1, 4 @@ -504584,8 +504584,8 @@ sub_8113574: ; 8113574 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 @@ -504664,14 +504664,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} @@ -504710,10 +504710,10 @@ 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 @@ -504743,17 +504743,17 @@ sub_81136E8: ; 81136E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08113734 + bne _08113734 ldr r1, =0x00003f42 movs r0, 0x50 bl SetGpuReg - b @0811373C + b _0811373C .pool -@08113734: +_08113734: ldr r1, =0x00003f44 movs r0, 0x50 bl SetGpuReg -@0811373C: +_0811373C: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -504785,7 +504785,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 @@ -504801,7 +504801,7 @@ sub_811375C: ; 811375C bl SetGpuReg strh r5, [r6, 0xC] cmp r4, 0x10 - bne @081137DE + bne _081137DE ldr r2, =0x02020630 ldr r1, =0x020241e4 ldr r0, =0x02038436 @@ -504819,13 +504819,13 @@ sub_811375C: ; 811375C strb r1, [r0] adds r0, r7, 0 bl move_anim_task_del - b @081137DE + b _081137DE .pool -@081137D8: +_081137D8: ldrh r0, [r6, 0xC] adds r0, 0x1 strh r0, [r6, 0xC] -@081137DE: +_081137DE: pop {r4-r7} pop {r0} bx r0 @@ -504874,7 +504874,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 @@ -504890,7 +504890,7 @@ sub_811381C: ; 811381C bl SetGpuReg strh r5, [r6, 0xC] cmp r4, 0 - bne @08113882 + bne _08113882 movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -504899,13 +504899,13 @@ sub_811381C: ; 811381C bl SetGpuReg adds r0, r7, 0 bl move_anim_task_del - b @08113882 + b _08113882 .pool -@0811387C: +_0811387C: ldrh r0, [r6, 0xC] adds r0, 0x1 strh r0, [r6, 0xC] -@08113882: +_08113882: pop {r4-r7} pop {r0} bx r0 @@ -504926,17 +504926,17 @@ sub_8113888: ; 8113888 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081138BC + bne _081138BC ldr r1, =0x00003f42 movs r0, 0x50 bl SetGpuReg - b @081138C4 + b _081138C4 .pool -@081138BC: +_081138BC: ldr r1, =0x00003f44 movs r0, 0x50 bl SetGpuReg -@081138C4: +_081138C4: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -505018,7 +505018,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 @@ -505032,7 +505032,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 @@ -505047,7 +505047,7 @@ sub_8113950: ; 8113950 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] @@ -505056,16 +505056,16 @@ sub_8113950: ; 8113950 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 @@ -505127,10 +505127,10 @@ sub_8113A18: ; 8113A18 movs r3, 0x32 ldrsh r1, [r2, r3] cmp r0, r1 - bne @08113A4E + bne _08113A4E ldr r0, =sub_8113A58 str r0, [r2, 0x1C] -@08113A4E: +_08113A4E: pop {r0} bx r0 .pool @@ -505159,10 +505159,10 @@ 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 @@ -505176,13 +505176,13 @@ 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 .pool -@08113AAC: +_08113AAC: ldr r0, =0x02038437 -@08113AAE: +_08113AAE: ldrb r5, [r0] movs r6, 0x14 ldrh r2, [r4, 0x4] @@ -505199,20 +505199,20 @@ sub_8113A90: ; 8113A90 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 .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 @@ -505223,8 +505223,8 @@ sub_8113A90: ; 8113A90 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 @@ -505235,8 +505235,8 @@ sub_8113A90: ; 8113A90 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 @@ -505246,8 +505246,8 @@ sub_8113A90: ; 8113A90 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 @@ -505257,13 +505257,13 @@ sub_8113A90: ; 8113A90 movs r1, 0x2 bl sub_80A861C adds r0, 0x10 -@08113B54: +_08113B54: strh r0, [r4, 0x22] adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim movs r6, 0xEC -@08113B60: +_08113B60: movs r0, 0x20 strh r0, [r4, 0x2E] lsls r0, r6, 24 @@ -505293,10 +505293,10 @@ sub_8113B90: ; 8113B90 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 @@ -505347,13 +505347,13 @@ 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 .pool -@08113C1C: +_08113C1C: ldr r0, =0x0000ffc0 -@08113C1E: +_08113C1E: strh r0, [r5, 0x18] ldr r0, =0x02038436 ldrb r0, [r0] @@ -505362,7 +505362,7 @@ sub_8113BAC: ; 8113BAC 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 @@ -505383,11 +505383,11 @@ sub_8113BAC: ; 8113BAC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @08113CB0 + bne _08113CB0 ldr r1, =0x02022e1c - b @08113CAA + b _08113CAA .pool -@08113C80: +_08113C80: ldr r0, =0x02022e1e ldrh r0, [r0] strh r0, [r5, 0x1C] @@ -505404,13 +505404,13 @@ sub_8113BAC: ; 8113BAC 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 @@ -505432,7 +505432,7 @@ sub_8113BAC: ; 8113BAC movs r0, 0xF0 lsls r0, 3 adds r6, r4, r0 -@08113CDC: +_08113CDC: lsls r1, r3, 1 adds r2, r1, r4 ldrh r0, [r5, 0x1C] @@ -505444,7 +505444,7 @@ sub_8113BAC: ; 8113BAC 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] @@ -505492,30 +505492,30 @@ 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 .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] @@ -505524,24 +505524,24 @@ sub_8113D60: ; 8113D60 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] @@ -505553,13 +505553,13 @@ sub_8113D60: ; 8113D60 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] @@ -505570,9 +505570,9 @@ sub_8113D60: ; 8113D60 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] @@ -505587,9 +505587,9 @@ sub_8113D60: ; 8113D60 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 @@ -505599,23 +505599,23 @@ sub_8113D60: ; 8113D60 lsls r2, 16 lsls r1, 16 cmp r2, r1 - bne @08113E72 - b @08113E5E + bne _08113E72 + b _08113E5E .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 .pool -@08113E6C: +_08113E6C: adds r0, r2, 0 bl move_anim_task_del -@08113E72: +_08113E72: pop {r4} pop {r0} bx r0 @@ -505635,28 +505635,28 @@ 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 .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] @@ -505671,9 +505671,9 @@ sub_8113E78: ; 8113E78 bl SetGpuReg adds r0, r6, 0 bl move_anim_task_del - b @081140A6 + b _081140A6 .pool -@08113EF8: +_08113EF8: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status_permutated @@ -505681,29 +505681,29 @@ sub_8113E78: ; 8113E78 lsrs r0, 24 strh r0, [r5, 0xE] cmp r0, 0x1 - bne @08113F24 + bne _08113F24 ldr r1, =0x00003f42 movs r0, 0x50 bl SetGpuReg ldr r1, =0x02022e1c - b @08113F2E + b _08113F2E .pool -@08113F24: +_08113F24: ldr r1, =0x00003f44 movs r0, 0x50 bl SetGpuReg ldr r1, =0x02022e18 -@08113F2E: +_08113F2E: ldrh r0, [r1] adds r0, 0xF0 strh r0, [r1] - b @08114044 + b _08114044 .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 @@ -505715,9 +505715,9 @@ sub_8113E78: ; 8113E78 movs r0, 0 movs r2, 0x20 bl rboxid_80040B8 - b @08113F78 + b _08113F78 .pool -@08113F68: +_08113F68: ldr r0, =0x02022e1e ldrh r0, [r0] strh r0, [r5, 0x1C] @@ -505725,12 +505725,12 @@ sub_8113E78: ; 8113E78 movs r1, 0x90 movs r2, 0x20 bl rboxid_80040B8 -@08113F78: +_08113F78: movs r0, 0x3 bl sub_8114374 - b @08114044 + b _08114044 .pool -@08113F84: +_08113F84: ldr r4, =0x02038437 ldrb r0, [r4] movs r1, 0x1 @@ -505762,13 +505762,13 @@ sub_8113E78: ; 8113E78 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne @08113FD8 + bne _08113FD8 ldr r0, =0x0000fff4 - b @08113FDA + b _08113FDA .pool -@08113FD8: +_08113FD8: ldr r0, =0x0000ffc0 -@08113FDA: +_08113FDA: strh r0, [r5, 0x18] ldrh r0, [r5, 0x18] strh r0, [r5, 0x10] @@ -505777,19 +505777,19 @@ sub_8113E78: ; 8113E78 strh r0, [r5, 0x1E] movs r0, 0x8 strh r0, [r5, 0x20] - b @08114044 + b _08114044 .pool -@08113FF0: +_08113FF0: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 - bne @08114000 + bne _08114000 ldr r0, =0x04000016 - b @08114002 + b _08114002 .pool -@08114000: +_08114000: ldr r0, =0x0400001a -@08114002: +_08114002: str r0, [sp, 0x10] movs r3, 0 add r4, sp, 0x10 @@ -505797,7 +505797,7 @@ sub_8113E78: ; 8113E78 movs r0, 0xF0 lsls r0, 3 adds r7, r6, r0 -@08114010: +_08114010: lsls r1, r3, 1 adds r2, r1, r6 ldrh r0, [r5, 0x1C] @@ -505813,7 +505813,7 @@ sub_8113E78: ; 8113E78 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x6F - bls @08114010 + bls _08114010 ldr r1, =0xa2600001 str r1, [r4, 0x4] movs r2, 0 @@ -505823,27 +505823,27 @@ sub_8113E78: ; 8113E78 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 .pool -@08114058: +_08114058: movs r1, 0xE ldrsh r0, [r5, r1] cmp r0, 0x1 - bne @08114070 + bne _08114070 ldr r1, =0x00003f3d movs r0, 0x4A bl SetGpuReg - b @08114078 + b _08114078 .pool -@08114070: +_08114070: ldr r1, =0x00003f3b movs r0, 0x4A bl SetGpuReg -@08114078: +_08114078: ldr r1, =0x00003f3f movs r0, 0x48 bl SetGpuReg @@ -505865,7 +505865,7 @@ sub_8113E78: ; 8113E78 bl SetGpuReg ldr r0, =sub_81140C8 str r0, [r5] -@081140A6: +_081140A6: add sp, 0x1C pop {r4-r7} pop {r0} @@ -505886,23 +505886,23 @@ 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 .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] @@ -505912,9 +505912,9 @@ sub_81140C8: ; 81140C8 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 @@ -505922,29 +505922,29 @@ sub_81140C8: ; 81140C8 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 @@ -505960,9 +505960,9 @@ sub_81140C8: ; 81140C8 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 @@ -505970,23 +505970,23 @@ sub_81140C8: ; 81140C8 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 .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] @@ -505995,24 +505995,24 @@ sub_81140C8: ; 81140C8 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] @@ -506024,23 +506024,23 @@ sub_81140C8: ; 81140C8 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 .pool -@08114210: +_08114210: ldr r0, =0x02022e24 movs r1, 0 strh r1, [r0] @@ -506055,7 +506055,7 @@ sub_81140C8: ; 81140C8 bl SetGpuReg adds r0, r5, 0 bl move_anim_task_del -@08114232: +_08114232: pop {r4,r5} pop {r0} bx r0 @@ -506074,7 +506074,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 @@ -506085,11 +506085,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 @@ -506111,22 +506111,22 @@ sub_8114244: ; 8114244 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 @@ -506141,7 +506141,7 @@ sub_8114244: ; 8114244 ldrh r2, [r6, 0x1C] adds r1, r2 strh r1, [r3] -@081142DA: +_081142DA: add r5, r8 adds r0, r4, 0x1 lsls r0, 16 @@ -506151,8 +506151,8 @@ sub_8114244: ; 8114244 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 @@ -506162,13 +506162,13 @@ sub_8114244: ; 8114244 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 @@ -506178,17 +506178,17 @@ sub_8114244: ; 8114244 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 .pool -@08114338: +_08114338: movs r1, 0x1C ldrsh r0, [r6, r1] adds r5, r0, 0 @@ -506198,7 +506198,7 @@ sub_8114244: ; 8114244 movs r2, 0xF0 lsls r2, 3 adds r6, r3, r2 -@0811434A: +_0811434A: lsls r0, r4, 16 asrs r0, 16 lsls r2, r0, 1 @@ -506212,8 +506212,8 @@ sub_8114244: ; 8114244 lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x6F - ble @0811434A -@08114366: + ble _0811434A +_08114366: pop {r3} mov r8, r3 pop {r4-r7} @@ -506235,14 +506235,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 @@ -506251,12 +506251,12 @@ sub_8114374: ; 8114374 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 @@ -506311,7 +506311,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 @@ -506332,7 +506332,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} @@ -506368,12 +506368,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} @@ -506447,33 +506447,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 @@ -506481,7 +506481,7 @@ sub_81144F8: ; 81144F8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081145D6 + bne _081145D6 ldr r3, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r4] @@ -506509,24 +506509,24 @@ sub_81144F8: ; 81144F8 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 .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 @@ -506535,9 +506535,9 @@ sub_81144F8: ; 81144F8 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @08114650 + b _08114650 .pool -@08114640: +_08114640: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -506546,13 +506546,13 @@ sub_81144F8: ; 81144F8 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 @@ -506606,19 +506606,19 @@ sub_81144F8: ; 81144F8 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 .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 @@ -506665,9 +506665,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 @@ -506678,7 +506678,7 @@ sub_8114748: ; 8114748 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 @@ -506695,11 +506695,11 @@ sub_8114748: ; 8114748 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 @@ -506715,7 +506715,7 @@ sub_8114748: ; 8114748 movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne @08114886 + bne _08114886 ldr r2, =0x020241e4 ldr r0, =0x02038436 ldrb r1, [r0] @@ -506739,11 +506739,11 @@ sub_8114748: ; 8114748 ands r0, r3 orrs r0, r1 strb r0, [r2, 0x5] - b @08114886 + b _08114886 .pool -@08114824: +_08114824: cmp r0, 0x3 - bne @08114886 + bne _08114886 ldr r0, =0x02022e24 strh r5, [r0] ldr r0, =0x02022e26 @@ -506758,12 +506758,12 @@ sub_8114748: ; 8114748 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 GetGpuReg adds r1, r0, 0 @@ -506783,7 +506783,7 @@ sub_8114748: ; 8114748 bl SetGpuReg adds r0, r6, 0 bl move_anim_task_del -@08114886: +_08114886: add sp, 0x10 pop {r4-r6} pop {r0} @@ -506802,48 +506802,48 @@ 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 .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 @@ -506852,17 +506852,17 @@ sub_811489C: ; 811489C 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 .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 @@ -506874,7 +506874,7 @@ sub_811489C: ; 811489C ldr r1, =0x0203841e ldrb r1, [r1, 0x2] bl sub_80A750C -@0811494A: +_0811494A: adds r0, r5, 0 bl move_anim_task_del pop {r4,r5} @@ -506891,18 +506891,18 @@ sub_8114960: ; 8114960 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} @@ -506961,7 +506961,7 @@ sub_81149FC: ; 81149FC bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @08114A50 + beq _08114A50 ldrh r0, [r5, 0x24] ldrh r1, [r5, 0x20] adds r0, r1 @@ -506994,7 +506994,7 @@ sub_81149FC: ; 81149FC bl sub_80A68D4 ldr r0, =sub_8114A60 str r0, [r5, 0x1C] -@08114A50: +_08114A50: pop {r4,r5} pop {r0} bx r0 @@ -507008,10 +507008,10 @@ sub_8114A60: ; 8114A60 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 @@ -507028,12 +507028,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] @@ -507093,21 +507093,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] @@ -507148,7 +507148,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 @@ -507172,14 +507172,14 @@ 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 - b @08114C02 + b _08114C02 .pool -@08114BF4: +_08114BF4: ldrh r0, [r6, 0x2] strh r0, [r5, 0x20] ldrh r0, [r6, 0x4] @@ -507187,7 +507187,7 @@ sub_8114B80: ; 8114B80 negs r0, r0 strh r0, [r5, 0x26] ldr r0, =sub_8114C4C -@08114C02: +_08114C02: str r0, [r5, 0x1C] pop {r4-r6} pop {r0} @@ -507205,14 +507205,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] @@ -507221,10 +507221,10 @@ sub_8114C10: ; 8114C10 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 @@ -507236,29 +507236,29 @@ sub_8114C4C: ; 8114C4C 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 @@ -507282,10 +507282,10 @@ sub_8114C4C: ; 8114C4C 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 @@ -507304,13 +507304,13 @@ sub_8114CBC: ; 8114CBC movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 - bne @08114CE8 + bne _08114CE8 ldr r0, =sub_8114CFC - b @08114CEA + b _08114CEA .pool -@08114CE8: +_08114CE8: ldr r0, =sub_8114EB4 -@08114CEA: +_08114CEA: str r0, [r1] ldr r1, [r1] adds r0, r2, 0 @@ -507333,23 +507333,23 @@ 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 .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 @@ -507362,19 +507362,19 @@ sub_8114CFC: ; 8114CFC 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 .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 @@ -507388,10 +507388,10 @@ sub_8114CFC: ; 8114CFC 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] @@ -507404,17 +507404,17 @@ sub_8114CFC: ; 8114CFC movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b @08114E7E + b _08114E7E .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 @@ -507426,13 +507426,13 @@ sub_8114CFC: ; 8114CFC 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, =gUnknown_08329F40 movs r2, 0xC ldrsh r0, [r4, r2] @@ -507447,20 +507447,20 @@ sub_8114CFC: ; 8114CFC movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0x1 - bne @08114E20 + bne _08114E20 ldr r1, =0x02022e1a - b @08114E22 + b _08114E22 .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 @@ -507468,13 +507468,13 @@ sub_8114CFC: ; 8114CFC movs r3, 0x1E ldrsh r0, [r4, r3] cmp r0, 0x1 - bne @08114E4C + bne _08114E4C ldr r1, =0x02022e1a - b @08114E4E + b _08114E4E .pool -@08114E4C: +_08114E4C: ldr r1, =0x02022e1e -@08114E4E: +_08114E4E: ldrh r0, [r4, 0x22] subs r0, r2 strh r0, [r1] @@ -507491,19 +507491,19 @@ sub_8114CFC: ; 8114CFC adds r0, r3, 0 subs r0, r2 strh r0, [r1, 0x24] - b @08114E7E + b _08114E7E .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 .pool -@08114E8C: +_08114E8C: adds r0, r2, 0 bl move_anim_task_del ldr r2, =0x02020630 @@ -507518,7 +507518,7 @@ sub_8114CFC: ; 8114CFC movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@08114EAA: +_08114EAA: pop {r4} pop {r0} bx r0 @@ -507554,13 +507554,13 @@ sub_8114EB4: ; 8114EB4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08114F00 + bne _08114F00 ldr r0, =0x02022e1a - b @08114F02 + b _08114F02 .pool -@08114F00: +_08114F00: ldr r0, =0x02022e1e -@08114F02: +_08114F02: strh r4, [r0] adds r0, r5, 0 bl move_anim_task_del @@ -507584,13 +507584,13 @@ sub_8114F14: ; 8114F14 movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0 - bne @08114F40 + bne _08114F40 ldr r0, =sub_8114F54 - b @08114F42 + b _08114F42 .pool -@08114F40: +_08114F40: ldr r0, =sub_8114FD8 -@08114F42: +_08114F42: str r0, [r1] ldr r1, [r1] adds r0, r2, 0 @@ -507613,12 +507613,12 @@ 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 .pool -@08114F78: +_08114F78: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -507657,12 +507657,12 @@ sub_8114F54: ; 8114F54 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @08114FD2 + b _08114FD2 .pool -@08114FCC: +_08114FCC: adds r0, r2, 0 bl move_anim_task_del -@08114FD2: +_08114FD2: pop {r4,r5} pop {r0} bx r0 @@ -507681,21 +507681,21 @@ 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 .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 @@ -507708,13 +507708,13 @@ sub_8114FD8: ; 8114FD8 lsrs r0, 24 strh r0, [r4, 0x1E] cmp r0, 0x1 - bne @08115044 + bne _08115044 ldr r0, =0x02022e18 - b @08115046 + b _08115046 .pool -@08115044: +_08115044: ldr r0, =0x02022e1c -@08115046: +_08115046: ldrh r0, [r0] strh r0, [r4, 0x20] ldr r0, =0x02038436 @@ -507727,16 +507727,16 @@ sub_8114FD8: ; 8114FD8 strh r1, [r4, 0x24] adds r0, 0x20 strh r0, [r4, 0x26] - b @081150C2 + b _081150C2 .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] @@ -507746,9 +507746,9 @@ sub_8114FD8: ; 8114FD8 adds r0, r2 movs r1, 0x60 strh r1, [r0, 0x26] - b @081150C2 + b _081150C2 .pool -@08115094: +_08115094: ldr r2, =0x02020630 movs r0, 0x1C ldrsh r1, [r4, r0] @@ -507768,20 +507768,20 @@ sub_8114FD8: ; 8114FD8 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 .pool -@081150D4: +_081150D4: adds r0, r2, 0 bl move_anim_task_del -@081150DA: +_081150DA: pop {r4} pop {r0} bx r0 @@ -507798,33 +507798,33 @@ 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 .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 @@ -507837,12 +507837,12 @@ sub_81150E0: ; 81150E0 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 @@ -507851,7 +507851,7 @@ sub_81150E0: ; 81150E0 movs r0, 0xF0 lsls r0, 3 adds r5, r4, r0 -@08115158: +_08115158: asrs r2, r1, 16 lsls r1, r2, 1 adds r0, r1, r4 @@ -507862,8 +507862,8 @@ sub_81150E0: ; 81150E0 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 @@ -507892,20 +507892,20 @@ 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 .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 @@ -507913,7 +507913,7 @@ sub_81151A0: ; 81151A0 ldrsh r0, [r1, r2] negs r0, r0 strh r0, [r1, 0x4] -@081151DA: +_081151DA: adds r0, r4, 0 movs r1, 0x2 bl sub_80A5C6C @@ -507955,10 +507955,10 @@ sub_8115228: ; 8115228 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 @@ -507972,13 +507972,13 @@ sub_8115244: ; 8115244 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08115260 + bne _08115260 ldr r0, =0x02038436 - b @08115262 + b _08115262 .pool -@08115260: +_08115260: ldr r0, =0x02038437 -@08115262: +_08115262: ldrb r5, [r0] adds r0, r5, 0 movs r1, 0 @@ -508042,17 +508042,17 @@ 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 .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 @@ -508061,26 +508061,26 @@ sub_81152DC: ; 81152DC 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 - b @0811539E + b _0811539E .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 @@ -508095,33 +508095,33 @@ sub_81152DC: ; 81152DC 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 .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 -@0811539E: +_0811539E: str r0, [r4] -@081153A0: +_081153A0: pop {r4-r6} pop {r0} bx r0 @@ -508141,45 +508141,45 @@ 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 .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 .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] @@ -508188,49 +508188,49 @@ sub_81153AC: ; 81153AC 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 .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 .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] @@ -508238,20 +508238,20 @@ sub_81153AC: ; 81153AC 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 .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 .pool @@ -508270,25 +508270,25 @@ 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 .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 @@ -508300,13 +508300,13 @@ sub_81154A4: ; 81154A4 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 @@ -508314,7 +508314,7 @@ sub_81154A4: ; 81154A4 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble @0811557E + ble _0811557E strh r5, [r4, 0xA] adds r0, r4, 0 bl sub_8115588 @@ -508324,31 +508324,31 @@ sub_81154A4: ; 81154A4 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 @@ -508366,11 +508366,11 @@ sub_81154A4: ; 81154A4 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 @@ -508386,7 +508386,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 @@ -508398,8 +508398,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 @@ -508408,16 +508408,16 @@ sub_8115588: ; 8115588 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 @@ -508435,8 +508435,8 @@ sub_8115588: ; 8115588 movs r1, 0x22 ldrsh r0, [r3, r1] cmp r2, r0 - blt @081155D0 -@081155F4: + blt _081155D0 +_081155F4: pop {r4-r7} pop {r0} bx r0 @@ -508453,9 +508453,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 @@ -508475,22 +508475,22 @@ sub_8115628: ; 8115628 ands r0, r1 adds r6, r2, 0 cmp r0, 0 - beq @08115648 + beq _08115648 ldr r0, =0x02038437 - b @0811564A + b _0811564A .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 ldrb r1, [r6, 0x2] bl AddTask @@ -508553,7 +508553,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] @@ -508561,16 +508561,16 @@ sub_81156D0: ; 81156D0 strh r1, [r0] adds r0, r3, 0 bl remove_task - b @0811571C + b _0811571C .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 @@ -508598,22 +508598,22 @@ 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 .pool -@0811576C: +_0811576C: ldrh r0, [r5, 0x6] strh r0, [r4, 0x30] strh r1, [r4, 0x36] adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim -@0811577A: +_0811577A: ldr r0, =0x0203841e ldrh r0, [r0, 0x8] strh r0, [r4, 0x34] @@ -508643,7 +508643,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 @@ -508651,13 +508651,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 @@ -508672,10 +508672,10 @@ sub_8115798: ; 8115798 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 @@ -508760,10 +508760,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 .pool @@ -508817,26 +508817,26 @@ sub_81158F8: ; 81158F8 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 str r0, [r4, 0x1C] - b @0811597C + b _0811597C .pool -@08115930: +_08115930: movs r2, 0x3C ldrsh r0, [r4, r2] bl sub_811583C @@ -508846,22 +508846,22 @@ sub_81158F8: ; 81158F8 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 @@ -508874,7 +508874,7 @@ sub_81158F8: ; 81158F8 ldrh r0, [r4, 0x32] subs r0, 0x1 strh r0, [r4, 0x32] -@0811597C: +_0811597C: pop {r4} pop {r0} bx r0 @@ -508889,7 +508889,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 @@ -508898,7 +508898,7 @@ sub_8115984: ; 8115984 bl sub_80A2A20 adds r0, r4, 0 bl move_anim_8072740 -@081159AA: +_081159AA: pop {r4} pop {r0} bx r0 @@ -509031,7 +509031,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 @@ -509042,35 +509042,35 @@ 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 .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 @@ -509110,37 +509110,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 @@ -509217,7 +509217,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 @@ -509228,35 +509228,35 @@ 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 .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 @@ -509356,7 +509356,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 @@ -509367,35 +509367,35 @@ 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 .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 @@ -509467,27 +509467,27 @@ 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 .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 str r0, [r4] - b @08115EAC + b _08115EAC .pool -@08115E4C: +_08115E4C: ldrh r0, [r4, 0x16] bl IndexOfObjectPaletteTag lsls r0, 24 @@ -509500,7 +509500,7 @@ sub_8115E00: ; 8115E00 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq @08115E7A + beq _08115E7A ldrb r3, [r4, 0x10] ldrh r0, [r4, 0xE] str r0, [sp] @@ -509508,8 +509508,8 @@ sub_8115E00: ; 8115E00 movs r1, 0 adds r2, r3, 0 bl pal_fade_maybe - b @08115E8A -@08115E7A: + b _08115E8A +_08115E7A: ldrb r3, [r4, 0x14] ldrh r0, [r4, 0x12] str r0, [sp] @@ -509517,7 +509517,7 @@ sub_8115E00: ; 8115E00 movs r1, 0 adds r2, r3, 0 bl pal_fade_maybe -@08115E8A: +_08115E8A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -509535,7 +509535,7 @@ sub_8115E00: ; 8115E00 ldrh r0, [r1, 0xC] subs r0, 0x1 strh r0, [r1, 0xC] -@08115EAC: +_08115EAC: add sp, 0x4 pop {r4,r5} pop {r0} @@ -509556,7 +509556,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 @@ -509577,7 +509577,7 @@ sub_8115EB8: ; 8115EB8 bl pal_fade_maybe adds r0, r4, 0 bl move_anim_task_del -@08115EFE: +_08115EFE: add sp, 0x4 pop {r4,r5} pop {r0} @@ -509606,7 +509606,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] @@ -509615,27 +509615,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 @@ -509668,7 +509668,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] @@ -509684,7 +509684,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] @@ -509700,14 +509700,14 @@ sub_8115F94: ; 8115F94 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 @@ -509726,29 +509726,29 @@ sub_8115F94: ; 8115F94 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 @@ -509762,12 +509762,12 @@ sub_8115F94: ; 8115F94 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 @@ -509800,37 +509800,37 @@ 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 .pool -@081160DC: +_081160DC: cmp r0, 0x2 - beq @081160F4 - b @08116104 -@081160E2: + beq _081160F4 + b _08116104 +_081160E2: ldr r1, =0x02022e20 - b @081160F6 + b _081160F6 .pool -@081160EC: +_081160EC: ldr r1, =0x02022e22 - b @081160F6 + b _081160F6 .pool -@081160F4: +_081160F4: ldr r1, =0x02021bbc -@081160F6: +_081160F6: adds r0, r4, 0 bl oamt_set_x3A_32 - b @0811610C + b _0811610C .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 @@ -509846,9 +509846,9 @@ sub_81160A4: ; 81160A4 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bhi @08116130 + bhi _08116130 bl sub_81161F4 -@08116130: +_08116130: ldr r0, =sub_8116148 str r0, [r4, 0x1C] pop {r4} @@ -509865,18 +509865,18 @@ sub_8116148: ; 8116148 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 @@ -509892,8 +509892,8 @@ sub_8116148: ; 8116148 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 @@ -509907,18 +509907,18 @@ sub_8116148: ; 8116148 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 @@ -509935,11 +509935,11 @@ sub_8116148: ; 8116148 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 @@ -509982,7 +509982,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] @@ -510004,16 +510004,16 @@ sub_81161F4: ; 81161F4 adds r0, r6 adds r0, 0x3E ldrb r1, [r0] - b @08116298 + b _08116298 .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 @@ -510023,7 +510023,7 @@ sub_81161F4: ; 81161F4 adds r0, 0x3E ldrb r1, [r0] movs r2, 0x2 -@08116298: +_08116298: orrs r1, r2 strb r1, [r0] pop {r4-r6} @@ -510082,21 +510082,21 @@ 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 .pool -@08116330: +_08116330: ldrh r0, [r3, 0x8] -@08116332: +_08116332: strh r0, [r6] ldr r2, =0x02022e22 ldrh r3, [r2] @@ -510108,14 +510108,14 @@ sub_81162F8: ; 81162F8 movs r7, 0xA ldrsh r0, [r4, r7] cmn r3, r0 - bne @08116354 + bne _08116354 movs r0, 0 - b @08116358 + b _08116358 .pool -@08116354: +_08116354: ldrh r0, [r4, 0xA] negs r0, r0 -@08116358: +_08116358: strh r0, [r2] adds r0, r1, r5 lsls r0, 3 @@ -510128,16 +510128,16 @@ sub_81162F8: ; 81162F8 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 @@ -510153,17 +510153,17 @@ 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 .pool -@081163AC: +_081163AC: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 -@081163B4: +_081163B4: ldr r0, =sub_80A67BC str r0, [r5, 0x1C] ldr r1, =move_anim_8072740 @@ -510185,17 +510185,17 @@ 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 .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] @@ -510219,16 +510219,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} @@ -510247,29 +510247,29 @@ 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 StartObjectRotScalAnim 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 .pool -@08116494: +_08116494: adds r0, r4, 0 movs r1, 0 bl sub_80A6980 -@0811649C: +_0811649C: bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 @@ -510358,17 +510358,17 @@ sub_8116560: ; 8116560 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 .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] @@ -510393,17 +510393,17 @@ 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 .pool -@081165CC: +_081165CC: adds r0, r5, 0 movs r1, 0x1 bl sub_80A6980 -@081165D4: +_081165D4: ldr r0, =sub_81165E4 str r0, [r5, 0x1C] pop {r4,r5} @@ -510437,10 +510437,10 @@ 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 @@ -510494,41 +510494,41 @@ 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 .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 .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 .pool -@081166D4: +_081166D4: mov r1, sp ldr r0, =0x02038436 ldrb r0, [r0] @@ -510536,43 +510536,43 @@ sub_8116664: ; 8116664 ldr r0, =0x02038437 ldrb r0, [r0] strb r0, [r1, 0x1] - b @0811670E + b _0811670E .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 .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 @@ -510581,12 +510581,12 @@ sub_8116664: ; 8116664 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 @@ -510610,73 +510610,73 @@ 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 .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 .pool -@081167C4: +_081167C4: ldr r1, =0x0203841e movs r0, 0x9E lsls r0, 4 - b @08116830 + b _08116830 .pool -@081167D0: +_081167D0: ldr r1, =0x0203841e ldr r0, =0x00002f1e - b @08116830 + b _08116830 .pool -@081167E0: +_081167E0: ldr r1, =0x0203841e movs r0, 0x90 lsls r0, 7 - b @08116830 + b _08116830 .pool -@081167EC: +_081167EC: ldr r1, =0x0203841e ldr r0, =0x00007ecb - b @08116830 + b _08116830 .pool -@081167FC: +_081167FC: ldr r1, =0x0203841e ldr r0, =0x00007ecb - b @08116830 + b _08116830 .pool -@0811680C: +_0811680C: ldr r1, =0x0203841e ldr r0, =0x00002a16 - b @08116830 + b _08116830 .pool -@0811681C: +_0811681C: ldr r1, =0x0203841e ldr r0, =0x00000d2e - b @08116830 + b _08116830 .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 @@ -510762,7 +510762,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] @@ -510772,27 +510772,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 @@ -510804,26 +510804,26 @@ sub_81168B8: ; 81168B8 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 .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 @@ -510871,10 +510871,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 .pool @@ -510921,23 +510921,23 @@ 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 .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] @@ -510949,9 +510949,9 @@ sub_81169F8: ; 81169F8 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 @@ -510995,22 +510995,22 @@ sub_81169F8: ; 81169F8 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 .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 @@ -511024,11 +511024,11 @@ sub_8116AD0: ; 8116AD0 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] @@ -511046,7 +511046,7 @@ sub_8116AD0: ; 8116AD0 strh r0, [r1] adds r0, r4, 0 bl obj_delete_but_dont_free_vram -@08116B08: +_08116B08: pop {r4} pop {r0} bx r0 @@ -511106,7 +511106,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 @@ -511117,28 +511117,28 @@ sub_8116B14: ; 8116B14 ldrh r1, [r4] movs r0, 0xA bl SetGpuReg -@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 @@ -511146,7 +511146,7 @@ sub_8116B14: ; 8116B14 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08116C26 + bne _08116C26 ldr r3, =0x02020630 ldr r1, =0x020241e4 ldrb r0, [r5] @@ -511179,24 +511179,24 @@ sub_8116B14: ; 8116B14 movs r0, 0xA bl SetGpuReg 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 .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 @@ -511205,9 +511205,9 @@ sub_8116B14: ; 8116B14 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @08116CA0 + b _08116CA0 .pool -@08116C90: +_08116C90: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -511216,13 +511216,13 @@ sub_8116B14: ; 8116B14 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 @@ -511316,7 +511316,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 @@ -511328,7 +511328,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 @@ -511346,7 +511346,7 @@ sub_8116D64: ; 8116D64 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @08116DF6 + bne _08116DF6 movs r0, 0xA bl GetGpuReg add r1, sp, 0x10 @@ -511359,7 +511359,7 @@ sub_8116D64: ; 8116D64 ldrh r1, [r1] movs r0, 0xA bl SetGpuReg -@08116DF6: +_08116DF6: movs r0, 0 bl GetGpuReg adds r1, r0, 0 @@ -511395,7 +511395,7 @@ sub_8116D64: ; 8116D64 movs r1, 0x14 ldrsh r0, [r5, r1] cmp r0, 0x1 - bne @08116E7C + bne _08116E7C ldr r2, =0x020241e4 ldr r0, =0x02038436 ldrb r1, [r0] @@ -511419,12 +511419,12 @@ sub_8116D64: ; 8116D64 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 @@ -511445,7 +511445,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 @@ -511457,7 +511457,7 @@ sub_8116EB4: ; 8116EB4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls @08116EC8 + bls _08116EC8 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -511481,13 +511481,13 @@ sub_8116F04: ; 8116F04 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - bne @08116F24 + bne _08116F24 ldr r0, =0x02038436 - b @08116F26 + b _08116F26 .pool -@08116F24: +_08116F24: ldr r0, =0x02038437 -@08116F26: +_08116F26: ldrb r0, [r0] strb r0, [r1] ldr r4, =0x0203a110 @@ -511499,22 +511499,22 @@ sub_8116F04: ; 8116F04 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] @@ -511548,42 +511548,42 @@ sub_8116F04: ; 8116F04 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] @@ -511612,27 +511612,27 @@ sub_8116F04: ; 8116F04 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 .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] @@ -511642,9 +511642,9 @@ sub_8116F04: ; 8116F04 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @081170BA + b _081170BA .pool -@081170A8: +_081170A8: ldr r1, =0x0202406e ldr r0, [r4] ldrb r0, [r0] @@ -511654,12 +511654,12 @@ sub_8116F04: ; 8116F04 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 @@ -511698,7 +511698,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] @@ -511707,26 +511707,26 @@ 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, =gUnknown_08C2D930 mov r0, sp movs r2, 0 bl sub_80A6D60 - b @08117162 + b _08117162 .pool -@08117158: +_08117158: ldr r1, =gUnknown_08C2DA4C mov r0, sp movs r2, 0 bl sub_80A6D60 -@08117162: +_08117162: mov r0, sp ldrb r0, [r0, 0x9] ldr r1, =gUnknown_08C2D720 @@ -511738,64 +511738,64 @@ sub_81170EC: ; 81170EC 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 .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, =gUnknown_08C2DB88 - b @081171E6 + b _081171E6 .pool -@081171BC: +_081171BC: ldr r0, =gUnknown_08C2DB68 - b @081171E6 + b _081171E6 .pool -@081171C4: +_081171C4: ldr r0, =gUnknown_08C2DBA8 - b @081171E6 + b _081171E6 .pool -@081171CC: +_081171CC: ldr r0, =gUnknown_08C2DBC8 - b @081171E6 + b _081171E6 .pool -@081171D4: +_081171D4: ldr r0, =gUnknown_08C2DC08 - b @081171E6 + b _081171E6 .pool -@081171DC: +_081171DC: ldr r0, =gUnknown_08C2DC28 - b @081171E6 + b _081171E6 .pool -@081171E4: +_081171E4: ldr r0, =gUnknown_08C2DC48 -@081171E6: +_081171E6: mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 movs r2, 0x20 bl decompress_palette - b @08117206 + b _08117206 .pool -@081171F8: +_081171F8: ldr r0, =gUnknown_08C2DBE8 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] @@ -511807,7 +511807,7 @@ sub_81170EC: ; 81170EC ldrsh r0, [r0, r4] adds r4, r1, 0 cmp r0, 0x1 - bne @08117248 + bne _08117248 movs r0, 0x40 strh r0, [r3] ldr r2, =0x03005e00 @@ -511816,38 +511816,38 @@ sub_81170EC: ; 81170EC lsls r0, 3 adds r0, r2 ldr r1, =0x0000fffd - b @08117254 + b _08117254 .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 .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 @@ -511870,7 +511870,7 @@ sub_81170EC: ; 81170EC movs r1, 0x4 ldrsh r0, [r3, r1] cmp r0, 0 - bne @081172CC + bne _081172CC movs r0, 0x40 negs r0, r0 bl sub_80A5278 @@ -511879,9 +511879,9 @@ sub_81170EC: ; 81170EC asrs r1, 24 movs r0, 0xEF bl audio_play_and_stuff - b @081172E0 + b _081172E0 .pool -@081172CC: +_081172CC: movs r0, 0x40 negs r0, r0 bl sub_80A5278 @@ -511890,7 +511890,7 @@ sub_81170EC: ; 81170EC asrs r1, 24 movs r0, 0xF5 bl audio_play_and_stuff -@081172E0: +_081172E0: add sp, 0x10 pop {r3} mov r8, r3 @@ -511917,28 +511917,28 @@ 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 .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 @@ -511956,11 +511956,11 @@ sub_81172EC: ; 81172EC 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] @@ -511969,17 +511969,17 @@ sub_81172EC: ; 81172EC 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] @@ -511996,15 +511996,15 @@ sub_81172EC: ; 81172EC 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] @@ -512020,12 +512020,12 @@ sub_81172EC: ; 81172EC 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 GetGpuReg adds r1, r0, 0 @@ -512054,7 +512054,7 @@ sub_81172EC: ; 81172EC 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 @@ -512062,11 +512062,11 @@ sub_81172EC: ; 81172EC lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeTiles -@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 @@ -512085,7 +512085,7 @@ sub_81172EC: ; 81172EC ands r0, r3 orrs r0, r1 strb r0, [r2, 0x5] -@08117466: +_08117466: ldr r4, =0x0203a110 ldr r0, [r4] bl Free @@ -512093,7 +512093,7 @@ sub_81172EC: ; 81172EC str r0, [r4] adds r0, r6, 0 bl move_anim_task_del -@08117478: +_08117478: pop {r4-r6} pop {r0} bx r0 @@ -512161,37 +512161,37 @@ 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 .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] @@ -512199,26 +512199,26 @@ sub_8117500: ; 8117500 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 @@ -512228,26 +512228,26 @@ sub_8117500: ; 8117500 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 .pool -@081175B8: +_081175B8: adds r0, r2, 0 bl move_anim_task_del -@081175BE: +_081175BE: pop {r4-r6} pop {r0} bx r0 @@ -512260,22 +512260,22 @@ sub_81175C4: ; 81175C4 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] @@ -512283,13 +512283,13 @@ sub_81175C4: ; 81175C4 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 @@ -512306,29 +512306,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 @@ -512354,20 +512354,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 @@ -512434,7 +512434,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] @@ -512442,7 +512442,7 @@ sub_81176D8: ; 81176D8 bl sub_80A6DAC adds r0, r5, 0 bl remove_task -@0811773E: +_0811773E: pop {r4-r7} pop {r0} bx r0 @@ -512505,9 +512505,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 @@ -512524,17 +512524,17 @@ sub_81177E4: ; 81177E4 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] @@ -512555,12 +512555,12 @@ sub_81177E4: ; 81177E4 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} @@ -512609,19 +512609,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] @@ -512666,7 +512666,7 @@ sub_8117854: ; 8117854 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @08117930 + bne _08117930 ldrb r0, [r4] movs r1, 0xD negs r1, r1 @@ -512674,26 +512674,26 @@ sub_8117854: ; 8117854 movs r0, 0x4 orrs r1, r0 strb r1, [r4] -@08117930: +_08117930: ldrh r1, [r4] movs r0, 0xA bl SetGpuReg 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 .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 @@ -512701,9 +512701,9 @@ sub_8117854: ; 8117854 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @08117996 + b _08117996 .pool -@08117988: +_08117988: ldr r1, =0x0202406e lsls r0, r7, 1 adds r0, r1 @@ -512711,13 +512711,13 @@ sub_8117854: ; 8117854 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] @@ -512728,7 +512728,7 @@ sub_8117854: ; 8117854 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 @@ -512737,7 +512737,7 @@ sub_8117854: ; 8117854 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x20] -@081179CC: +_081179CC: mov r0, sp bl sub_80A6B30 mov r0, sp @@ -512812,32 +512812,32 @@ 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 .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 @@ -512850,18 +512850,18 @@ sub_8117A60: ; 8117A60 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 .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] @@ -512870,9 +512870,9 @@ sub_8117A60: ; 8117A60 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 @@ -512890,9 +512890,9 @@ sub_8117A60: ; 8117A60 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] @@ -512901,13 +512901,13 @@ sub_8117A60: ; 8117A60 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] @@ -512916,7 +512916,7 @@ sub_8117A60: ; 8117A60 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 @@ -512932,7 +512932,7 @@ sub_8117A60: ; 8117A60 movs r0, 0x20 ldrsh r4, [r5, r0] cmp r4, 0 - bne @08117C0C + bne _08117C0C movs r0, 0 bl sub_80A477C ldr r0, =0x02022e24 @@ -512949,7 +512949,7 @@ sub_8117A60: ; 8117A60 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - bne @08117BB2 + bne _08117BB2 movs r0, 0xA bl GetGpuReg mov r1, sp @@ -512964,7 +512964,7 @@ sub_8117A60: ; 8117A60 ldrh r1, [r0] movs r0, 0xA bl SetGpuReg -@08117BB2: +_08117BB2: movs r0, 0 bl GetGpuReg adds r1, r0, 0 @@ -512993,7 +512993,7 @@ sub_8117A60: ; 8117A60 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 @@ -513001,10 +513001,10 @@ sub_8117A60: ; 8117A60 lsls r0, 2 adds r0, r4 bl RemoveObjectAndFreeTiles -@08117C06: +_08117C06: adds r0, r6, 0 bl move_anim_task_del -@08117C0C: +_08117C0C: add sp, 0x4 pop {r4-r6} pop {r0} @@ -513086,7 +513086,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] @@ -513099,32 +513099,32 @@ 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 .pool -@08117CE4: +_08117CE4: cmp r0, 0x1 - bne @08117CF0 + bne _08117CF0 ldr r0, =0x02038436 - b @08117CF6 + b _08117CF6 .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 @@ -513161,7 +513161,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] @@ -513174,32 +513174,32 @@ 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 .pool -@08117D80: +_08117D80: cmp r0, 0x1 - bne @08117D8C + bne _08117D8C ldr r0, =0x02038436 - b @08117D92 + b _08117D92 .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 @@ -513236,7 +513236,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] @@ -513249,32 +513249,32 @@ 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 .pool -@08117E1C: +_08117E1C: cmp r0, 0x1 - bne @08117E28 + bne _08117E28 ldr r0, =0x02038436 - b @08117E2E + b _08117E2E .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 @@ -513300,16 +513300,16 @@ 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 .pool -@08117E80: +_08117E80: ldr r0, =0x0203841e strh r1, [r0, 0xE] -@08117E84: +_08117E84: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -513352,15 +513352,15 @@ 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 .pool -@08117EF8: +_08117EF8: ldr r1, =0x0203841e movs r0, 0 -@08117EFC: +_08117EFC: strh r0, [r1, 0xE] adds r0, r5, 0 bl move_anim_task_del @@ -513412,11 +513412,11 @@ sub_8117F60: ; 8117F60 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 @@ -513447,7 +513447,7 @@ sub_8117F60: ; 8117F60 ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -@08117FB4: +_08117FB4: pop {r4} pop {r0} bx r0 @@ -513465,7 +513465,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 @@ -513489,7 +513489,7 @@ sub_8117FD0: ; 8117FD0 strb r0, [r3] adds r0, r4, 0 bl remove_task -@08118014: +_08118014: pop {r4} pop {r0} bx r0 @@ -513506,9 +513506,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, =gUnknown_0859741A adds r0, r6, r0 ldrb r0, [r0] @@ -513516,23 +513516,23 @@ lcd_bg_operations: ; 811802C 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 .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] @@ -513540,9 +513540,9 @@ lcd_bg_operations: ; 811802C ands r0, r1 orrs r0, r3 strb r0, [r2, 0x1] - b @08118124 + b _08118124 .pool -@08118098: +_08118098: ldr r3, =0x0203a114 movs r0, 0x1 adds r1, r4, 0 @@ -513551,9 +513551,9 @@ lcd_bg_operations: ; 811802C ldrb r2, [r3, 0x1] movs r0, 0x21 negs r0, r0 - b @0811811E + b _0811811E .pool -@081180B0: +_081180B0: ldr r3, =0x0203a114 movs r0, 0x1 adds r1, r4, 0 @@ -513562,9 +513562,9 @@ lcd_bg_operations: ; 811802C ldrb r2, [r3] movs r0, 0x41 negs r0, r0 - b @081180EE + b _081180EE .pool -@081180C8: +_081180C8: ldr r3, =0x0203a114 movs r0, 0x3 adds r1, r4, 0 @@ -513573,9 +513573,9 @@ lcd_bg_operations: ; 811802C ldrb r2, [r3] movs r0, 0xD negs r0, r0 - b @081180EE + b _081180EE .pool -@081180E0: +_081180E0: ldr r3, =0x0203a114 movs r0, 0x3 adds r1, r4, 0 @@ -513583,13 +513583,13 @@ lcd_bg_operations: ; 811802C ldrb r2, [r3] movs r0, 0x4 negs r0, r0 -@081180EE: +_081180EE: ands r0, r2 orrs r0, r1 strb r0, [r3] - b @08118124 + b _08118124 .pool -@081180FC: +_081180FC: ldr r2, =0x0203a114 lsls r3, r4, 7 ldrb r1, [r2] @@ -513597,9 +513597,9 @@ lcd_bg_operations: ; 811802C ands r0, r1 orrs r0, r3 strb r0, [r2] - b @08118124 + b _08118124 .pool -@08118110: +_08118110: ldr r3, =0x0203a114 movs r0, 0x1F adds r1, r4, 0 @@ -513607,18 +513607,18 @@ lcd_bg_operations: ; 811802C 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, =gUnknown_0859741A adds r0, r6, r0 ldrb r0, [r0] ldr r1, =0x0203a114 ldrh r1, [r1] bl SetGpuReg -@08118132: +_08118132: pop {r4-r6} pop {r0} bx r0 @@ -513634,7 +513634,7 @@ sub_8118140: ; 8118140 lsls r1, 24 lsrs r4, r1, 24 cmp r2, 0x3 - bhi @081181C8 + bhi _081181C8 ldr r0, =gUnknown_0859741E adds r0, r2, r0 ldrb r0, [r0] @@ -513642,60 +513642,60 @@ 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 .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} @@ -513713,52 +513713,52 @@ 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 - b @08118258 + b _08118258 .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 - b @08118258 + b _08118258 .pool -@0811821C: +_0811821C: ldr r0, =0x003f0100 ands r0, r2 cmp r0, 0 - beq @08118230 + beq _08118230 ldr r0, =task_battle_intro_anim - b @08118258 + b _08118258 .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 - b @08118258 + b _08118258 .pool -@08118250: +_08118250: ldr r1, =gUnknown_08597424 lsls r0, r4, 2 adds r0, r1 ldr r0, [r0] -@08118258: +_08118258: movs r1, 0 bl AddTask lsls r0, 24 @@ -513841,49 +513841,49 @@ 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 .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 .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 @@ -513894,17 +513894,17 @@ task_battle_intro_80BC47C: ; 81182EC 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 SetGpuReg - b @0811852A -@0811839C: + b _0811852A +_0811839C: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -513915,9 +513915,9 @@ task_battle_intro_80BC47C: ; 81182EC 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 @@ -513934,9 +513934,9 @@ task_battle_intro_80BC47C: ; 81182EC ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b @0811852A + b _0811852A .pool -@081183E4: +_081183E4: lsls r0, r4, 2 adds r1, r0, r4 lsls r1, 3 @@ -513947,44 +513947,44 @@ task_battle_intro_80BC47C: ; 81182EC 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 .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 @@ -513994,17 +513994,17 @@ task_battle_intro_80BC47C: ; 81182EC 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 @@ -514016,9 +514016,9 @@ task_battle_intro_80BC47C: ; 81182EC 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 @@ -514026,7 +514026,7 @@ task_battle_intro_80BC47C: ; 81182EC 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 @@ -514039,8 +514039,8 @@ task_battle_intro_80BC47C: ; 81182EC 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 @@ -514049,7 +514049,7 @@ task_battle_intro_80BC47C: ; 81182EC movs r0, 0xC ldrsh r2, [r1, r0] cmp r2, 0 - bne @0811852A + bne _0811852A movs r0, 0x3 mov r3, r9 strb r0, [r3, 0x15] @@ -514077,12 +514077,12 @@ task_battle_intro_80BC47C: ; 81182EC lsls r1, 7 movs r0, 0xC bl SetGpuReg - b @0811852A + b _0811852A .pool -@08118524: +_08118524: adds r0, r4, 0 bl sub_811828C -@0811852A: +_0811852A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -514109,29 +514109,29 @@ 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 .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 .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 @@ -514140,17 +514140,17 @@ task00_battle_intro_80BC6C8: ; 8118538 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] @@ -514158,13 +514158,13 @@ task00_battle_intro_80BC6C8: ; 8118538 movs r2, 0x14 ldrsh r0, [r4, r2] cmp r0, 0xB3 - bgt @081185C8 + bgt _081185C8 adds r0, r1, 0x4 - b @081185CA + b _081185CA .pool -@081185C8: +_081185C8: adds r0, r1, 0x6 -@081185CA: +_081185CA: strh r0, [r4, 0x14] ldr r2, =0x03005e00 adds r0, r6, r5 @@ -514175,33 +514175,33 @@ task00_battle_intro_80BC6C8: ; 8118538 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 .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 @@ -514213,19 +514213,19 @@ task00_battle_intro_80BC6C8: ; 8118538 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq @08118640 + beq _08118640 strh r3, [r2, 0xC] - b @08118644 + b _08118644 .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 @@ -514235,18 +514235,18 @@ task00_battle_intro_80BC6C8: ; 8118538 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 SetGpuReg - b @0811881A + b _0811881A .pool -@08118678: +_08118678: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -514257,9 +514257,9 @@ task00_battle_intro_80BC6C8: ; 8118538 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 @@ -514278,9 +514278,9 @@ task00_battle_intro_80BC6C8: ; 8118538 ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b @0811881A + b _0811881A .pool -@081186C8: +_081186C8: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -514289,12 +514289,12 @@ task00_battle_intro_80BC6C8: ; 8118538 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 SetGpuReg @@ -514304,37 +514304,37 @@ task00_battle_intro_80BC6C8: ; 8118538 movs r0, 0x54 movs r1, 0 bl SetGpuReg - b @08118728 + b _08118728 .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 @@ -514343,10 +514343,10 @@ task00_battle_intro_80BC6C8: ; 8118538 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 @@ -514354,7 +514354,7 @@ task00_battle_intro_80BC6C8: ; 8118538 mov r12, r2 mov r7, r8 adds r4, r1, 0 -@08118760: +_08118760: lsls r2, r3, 1 ldrb r1, [r7, 0x14] lsls r0, r1, 4 @@ -514366,9 +514366,9 @@ task00_battle_intro_80BC6C8: ; 8118538 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 @@ -514376,7 +514376,7 @@ task00_battle_intro_80BC6C8: ; 8118538 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 @@ -514389,8 +514389,8 @@ task00_battle_intro_80BC6C8: ; 8118538 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 @@ -514398,7 +514398,7 @@ task00_battle_intro_80BC6C8: ; 8118538 movs r3, 0xC ldrsh r2, [r1, r3] cmp r2, 0 - bne @0811881A + bne _0811881A movs r0, 0x3 mov r3, r8 strb r0, [r3, 0x15] @@ -514426,12 +514426,12 @@ task00_battle_intro_80BC6C8: ; 8118538 lsls r1, 7 movs r0, 0xC bl SetGpuReg - b @0811881A + b _0811881A .pool -@08118814: +_08118814: adds r0, r5, 0 bl sub_811828C -@0811881A: +_0811881A: ldr r0, =0x03005e00 adds r1, r6, r5 lsls r1, 3 @@ -514439,11 +514439,11 @@ task00_battle_intro_80BC6C8: ; 8118538 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x4 - beq @08118832 + beq _08118832 ldrh r1, [r1, 0x10] movs r0, 0x52 bl SetGpuReg -@08118832: +_08118832: add sp, 0x4 pop {r3} mov r8, r3 @@ -514474,23 +514474,23 @@ 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 .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 SetGpuReg @@ -514512,19 +514512,19 @@ task_battle_intro_anim: ; 8118844 ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq @081188E4 + beq _081188E4 movs r0, 0x10 - b @081188E6 + b _081188E6 .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 @@ -514535,18 +514535,18 @@ task_battle_intro_anim: ; 8118844 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 SetGpuReg - b @08118A96 + b _08118A96 .pool -@0811891C: +_0811891C: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -514557,9 +514557,9 @@ task_battle_intro_anim: ; 8118844 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 @@ -514579,9 +514579,9 @@ task_battle_intro_anim: ; 8118844 ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b @08118A96 + b _08118A96 .pool -@0811896C: +_0811896C: lsls r0, r5, 2 adds r1, r0, r5 lsls r1, 3 @@ -514591,39 +514591,39 @@ task_battle_intro_anim: ; 8118844 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 @@ -514632,16 +514632,16 @@ task_battle_intro_anim: ; 8118844 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 @@ -514653,9 +514653,9 @@ task_battle_intro_anim: ; 8118844 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 @@ -514663,7 +514663,7 @@ task_battle_intro_anim: ; 8118844 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 @@ -514676,8 +514676,8 @@ task_battle_intro_anim: ; 8118844 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 @@ -514686,7 +514686,7 @@ task_battle_intro_anim: ; 8118844 movs r3, 0xC ldrsh r2, [r1, r3] cmp r2, 0 - bne @08118A96 + bne _08118A96 movs r0, 0x3 mov r6, r8 strb r0, [r6, 0x15] @@ -514714,12 +514714,12 @@ task_battle_intro_anim: ; 8118844 lsls r1, 7 movs r0, 0xC bl SetGpuReg - b @08118A96 + b _08118A96 .pool -@08118A90: +_08118A90: adds r0, r5, 0 bl sub_811828C -@08118A96: +_08118A96: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -514728,11 +514728,11 @@ task_battle_intro_anim: ; 8118844 movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0x4 - beq @08118AB0 + beq _08118AB0 ldrh r1, [r1, 0x10] movs r0, 0x52 bl SetGpuReg -@08118AB0: +_08118AB0: add sp, 0x4 pop {r3} mov r8, r3 @@ -514759,11 +514759,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 @@ -514772,19 +514772,19 @@ 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 .pool -@08118B18: +_08118B18: str r5, [sp] ldr r1, =0x0600e000 ldr r4, =0x05000200 @@ -514798,7 +514798,7 @@ task00_battle_intro_wireless: ; 8118AC0 bl CpuSet movs r0, 0x1 strh r0, [r7, 0x10] -@08118B36: +_08118B36: ldr r0, =0x03005e00 lsls r2, r6, 2 adds r1, r2, r6 @@ -514809,23 +514809,23 @@ task00_battle_intro_wireless: ; 8118AC0 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 .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 @@ -514834,8 +514834,8 @@ task00_battle_intro_wireless: ; 8118AC0 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 @@ -514845,9 +514845,9 @@ task00_battle_intro_wireless: ; 8118AC0 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] @@ -514908,9 +514908,9 @@ task00_battle_intro_wireless: ; 8118AC0 ldr r1, =0x00003f06 movs r0, 0x4A bl SetGpuReg - b @08118D5A + b _08118D5A .pool -@08118C38: +_08118C38: ldr r1, =0x02022e26 ldrh r0, [r1] subs r0, 0xFF @@ -514921,9 +514921,9 @@ task00_battle_intro_wireless: ; 8118AC0 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 @@ -514939,20 +514939,20 @@ task00_battle_intro_wireless: ; 8118AC0 ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b @08118D5A + b _08118D5A .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 @@ -514961,10 +514961,10 @@ task00_battle_intro_wireless: ; 8118AC0 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 @@ -514972,7 +514972,7 @@ task00_battle_intro_wireless: ; 8118AC0 mov r8, r2 mov r7, r12 adds r4, r1, 0 -@08118CB4: +_08118CB4: lsls r2, r3, 1 ldrb r1, [r7, 0x14] lsls r0, r1, 4 @@ -514984,9 +514984,9 @@ task00_battle_intro_wireless: ; 8118AC0 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 @@ -514994,7 +514994,7 @@ task00_battle_intro_wireless: ; 8118AC0 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 @@ -515007,8 +515007,8 @@ task00_battle_intro_wireless: ; 8118AC0 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 @@ -515016,7 +515016,7 @@ task00_battle_intro_wireless: ; 8118AC0 movs r3, 0xC ldrsh r0, [r1, r3] cmp r0, 0 - bne @08118D5A + bne _08118D5A movs r0, 0x3 mov r2, r12 strb r0, [r2, 0x15] @@ -515039,12 +515039,12 @@ task00_battle_intro_wireless: ; 8118AC0 lsls r1, 7 movs r0, 0xC bl SetGpuReg - b @08118D5A + b _08118D5A .pool -@08118D54: +_08118D54: adds r0, r6, 0 bl sub_811828C -@08118D5A: +_08118D5A: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -515069,32 +515069,32 @@ 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 .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 @@ -515104,9 +515104,9 @@ sub_8118D68: ; 8118D68 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] @@ -515144,9 +515144,9 @@ sub_8118D68: ; 8118D68 subs r2, 0xC0 adds r0, r2, 0 strh r0, [r1] - b @08118FB2 + b _08118FB2 .pool -@08118E4C: +_08118E4C: ldr r2, =0x02022e26 ldrh r3, [r2] movs r1, 0x80 @@ -515160,20 +515160,20 @@ sub_8118D68: ; 8118D68 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 @@ -515188,9 +515188,9 @@ sub_8118D68: ; 8118D68 ldr r0, =0x0000fffe ands r0, r1 strh r0, [r2] - b @08118FB2 + b _08118FB2 .pool -@08118EA8: +_08118EA8: ldr r3, =0x02022e26 ldrh r2, [r3] movs r0, 0xFF @@ -515199,12 +515199,12 @@ sub_8118D68: ; 8118D68 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 @@ -515213,10 +515213,10 @@ sub_8118D68: ; 8118D68 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] @@ -515225,13 +515225,13 @@ sub_8118D68: ; 8118D68 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 .pool -@08118F00: +_08118F00: ldr r1, =0x02022e16 ldrh r0, [r1] adds r3, r0, 0x2 @@ -515248,15 +515248,15 @@ sub_8118D68: ; 8118D68 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 @@ -515292,16 +515292,16 @@ sub_8118D68: ; 8118D68 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 .pool -@08118FAC: +_08118FAC: adds r0, r4, 0 bl sub_811828C -@08118FB2: +_08118FB2: add sp, 0x4 pop {r4-r6} pop {r0} @@ -515366,24 +515366,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] @@ -515391,12 +515391,12 @@ sub_8118FBC: ; 8118FBC 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 @@ -515473,20 +515473,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 @@ -515498,7 +515498,7 @@ sub_8119094: ; 8119094 mov r7, r8 adds r1, r7, r0 subs r2, r3, r2 -@08119132: +_08119132: adds r0, r4, 0 orrs r0, r6 strh r0, [r1] @@ -515506,12 +515506,12 @@ sub_8119094: ; 8119094 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 @@ -515538,17 +515538,17 @@ MovePlayerOnBike: ; 8119164 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @0811918C + beq _0811918C adds r0, r3, 0 adds r1, r4, 0 bl MovePlayerOnMachBike - b @08119194 + b _08119194 .pool -@0811918C: +_0811918C: adds r0, r3, 0 adds r1, r4, 0 bl MovePlayerOnAcroBike -@08119194: +_08119194: pop {r4} pop {r0} bx r0 @@ -515588,41 +515588,41 @@ CheckMovementInputMachBike: ; 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 .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 .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 @@ -515656,18 +515656,18 @@ sub_8119238: ; 8119238 bl sub_8119F74 lsls r0, 24 cmp r0, 0 - beq @08119270 + beq _08119270 adds r0, r5, 0 bl PlayerTurnInPlace bl sub_811A128 - b @0811927A + b _0811927A .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 @@ -515691,21 +515691,21 @@ 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 sub_8119344 - b @0811933A + b _0811933A .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 @@ -515715,34 +515715,34 @@ sub_8119280: ; 8119280 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 PlayerJumpLedge - b @0811933A -@081192E8: + b _0811933A +_081192E8: bl sub_811A128 cmp r4, 0x4 - bne @08119304 + bne _08119304 adds r0, r5, 0 bl IsPlayerCollidingWithFarawayIslandMew lsls r0, 24 cmp r0, 0 - beq @08119304 + beq _08119304 adds r0, r5, 0 bl PlayerOnBikeCollideWithFarawayIslandMew - 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 PlayerOnBikeCollide - b @0811933A -@08119316: + b _0811933A +_08119316: ldr r1, =gUnknown_0859745C ldrb r0, [r6, 0xA] lsls r0, 2 @@ -515757,10 +515757,10 @@ sub_8119280: ; 8119280 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 @@ -515776,11 +515776,11 @@ sub_8119344: ; 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 @@ -515790,35 +515790,35 @@ sub_8119344: ; 8119344 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 PlayerJumpLedge - b @081193BE + b _081193BE .pool -@08119380: +_08119380: bl sub_811A128 cmp r4, 0x4 - bne @0811939C + bne _0811939C adds r0, r5, 0 bl IsPlayerCollidingWithFarawayIslandMew lsls r0, 24 cmp r0, 0 - beq @0811939C + beq _0811939C adds r0, r5, 0 bl PlayerOnBikeCollideWithFarawayIslandMew - 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 PlayerOnBikeCollide - b @081193BE -@081193AE: + b _081193BE +_081193AE: ldr r0, =gUnknown_0859745C ldrb r1, [r6, 0xA] lsls r1, 2 @@ -515826,7 +515826,7 @@ sub_8119344: ; 8119344 ldr r1, [r1] adds r0, r7, 0 bl _call_via_r1 -@081193BE: +_081193BE: pop {r4-r7} pop {r0} bx r0 @@ -515900,50 +515900,50 @@ CheckMovementInputAcroBikeNormal: ; 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 .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] @@ -515956,12 +515956,12 @@ CheckMovementInputAcroBikeNormal: ; 811942C bl CheckMovementInputAcroBike lsls r0, 24 lsrs r0, 24 - b @081194C0 + b _081194C0 .pool -@081194BC: +_081194BC: movs r0, 0x2 strb r0, [r2, 0x2] -@081194C0: +_081194C0: pop {r4-r6} pop {r1} bx r1 @@ -515980,16 +515980,16 @@ CheckMovementInputAcroBikeChangingDirection: ; 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 .pool -@081194F4: +_081194F4: bl player_get_direction_upper_nybble lsls r0, 24 lsrs r6, r0, 24 @@ -515998,7 +515998,7 @@ CheckMovementInputAcroBikeChangingDirection: ; 81194C8 lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne @08119536 + bne _08119536 bl sub_811A128 movs r0, 0x1 strb r0, [r4, 0xB] @@ -516008,22 +516008,22 @@ CheckMovementInputAcroBikeChangingDirection: ; 81194C8 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 @@ -516052,58 +516052,58 @@ CheckMovementInputAcroBikeStandingWheelie: ; 8119540 lsls r4, 16 lsrs r4, 16 cmp r4, 0 - bne @08119594 + bne _08119594 strb r4, [r5, 0xA] ldrb r0, [r1, 0x1E] bl MetatileBehavior_IsBumpySlope 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 .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 .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 @@ -516137,14 +516137,14 @@ CheckMovementInputAcroBikeBunnyHop: ; 81195E0 mov r1, r8 ands r0, r1 cmp r0, 0 - bne @08119652 + bne _08119652 bl sub_811A128 ldrb r0, [r7, 0x1E] bl MetatileBehavior_IsBumpySlope lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq @08119648 + beq _08119648 movs r0, 0x2 strb r0, [r4, 0x8] adds r0, r6, 0 @@ -516153,37 +516153,37 @@ CheckMovementInputAcroBikeBunnyHop: ; 81195E0 bl CheckMovementInputAcroBike lsls r0, 24 lsrs r0, 24 - b @08119676 + b _08119676 .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 @@ -516224,39 +516224,39 @@ CheckMovementInputAcroBikeMovingWheelie: ; 8119688 mov r1, r8 ands r0, r1 cmp r0, 0 - bne @08119720 + bne _08119720 bl sub_811A128 ldrb r0, [r7, 0x1E] bl MetatileBehavior_IsBumpySlope 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 .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 .pool -@0811970C: +_0811970C: mov r0, r9 strb r0, [r4, 0x8] adds r0, r6, 0 @@ -516265,34 +516265,34 @@ CheckMovementInputAcroBikeMovingWheelie: ; 8119688 bl CheckMovementInputAcroBike 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 @@ -516393,10 +516393,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 PlayerFaceDirection pop {r4,r5} @@ -516423,13 +516423,13 @@ 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 .pool -@08119868: +_08119868: adds r0, r5, 0 bl sub_8119E38 lsls r0, 24 @@ -516439,36 +516439,36 @@ sub_8119830: ; 8119830 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 PlayerJumpLedge - b @081198BA -@0811988A: + b _081198BA +_0811988A: cmp r4, 0x4 - bne @081198A2 + bne _081198A2 adds r0, r5, 0 bl IsPlayerCollidingWithFarawayIslandMew lsls r0, 24 cmp r0, 0 - beq @081198A2 + beq _081198A2 adds r0, r5, 0 bl PlayerOnBikeCollideWithFarawayIslandMew - 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 PlayerOnBikeCollide - b @081198BA -@081198B4: + b _081198BA +_081198B4: adds r0, r6, 0 bl PlayerGoSpeed2 -@081198BA: +_081198BA: pop {r4-r6} pop {r0} bx r0 @@ -516491,10 +516491,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} @@ -516520,10 +516520,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} @@ -516549,10 +516549,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} @@ -516578,10 +516578,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} @@ -516607,41 +516607,41 @@ 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 .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 @@ -516658,22 +516658,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 @@ -516693,7 +516693,7 @@ sub_8119A24: ; 8119A24 lsrs r0, 24 movs r1, 0x2 bl player_npc_set_state_and_x22_etc -@08119A84: +_08119A84: pop {r4,r5} pop {r0} bx r0 @@ -516728,13 +516728,13 @@ 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 .pool -@08119ADC: +_08119ADC: adds r0, r4, 0 bl sub_8119E38 lsls r0, 24 @@ -516744,36 +516744,36 @@ sub_8119AA4: ; 8119AA4 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 MetatileBehavior_IsBumpySlope 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 @@ -516797,13 +516797,13 @@ 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 .pool -@08119B6C: +_08119B6C: adds r0, r4, 0 bl sub_8119E38 lsls r0, 24 @@ -516813,36 +516813,36 @@ sub_8119B34: ; 8119B34 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 MetatileBehavior_IsBumpySlope 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 @@ -516866,13 +516866,13 @@ 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 .pool -@08119BFC: +_08119BFC: adds r0, r4, 0 bl sub_8119E38 lsls r0, 24 @@ -516882,25 +516882,25 @@ sub_8119BC4: ; 8119BC4 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 PlayerJumpLedge - 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 @@ -516919,11 +516919,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 .pool @@ -516944,20 +516944,20 @@ 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 .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 @@ -516966,20 +516966,20 @@ sub_8119C64: ; 8119C64 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 .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 @@ -516993,50 +516993,50 @@ sub_8119CCC: ; 8119CCC 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 .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 @@ -517047,7 +517047,7 @@ sub_8119D30: ; 8119D30 push {r4-r6,lr} movs r6, 0 movs r5, 0 -@08119D36: +_08119D36: ldr r0, =gUnknown_085974C0 adds r4, r5, r0 ldr r0, =0x02037590 @@ -517059,26 +517059,26 @@ sub_8119D30: ; 8119D30 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 .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 @@ -517100,7 +517100,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 @@ -517109,7 +517109,7 @@ sub_8119D80: ; 8119D80 lsls r1, 24 lsrs r1, 24 cmp r1, 0 - bne @08119D9C + bne _08119D9C movs r0, 0x1 strb r0, [r4, 0x14] pop {r4} @@ -517134,7 +517134,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 @@ -517143,7 +517143,7 @@ sub_8119DBC: ; 8119DBC lsls r1, 24 lsrs r1, 24 cmp r1, 0 - bne @08119DD8 + bne _08119DD8 movs r0, 0x1 strb r0, [r4, 0x1C] pop {r4} @@ -517161,33 +517161,33 @@ 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 @@ -517262,21 +517262,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 IsRunningDisallowedByMetatile 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} @@ -517292,18 +517292,18 @@ sub_8119EF0: ; 8119EF0 bl IsRunningDisallowedByMetatile 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 .pool -@08119F10: +_08119F10: movs r0, 0 -@08119F12: +_08119F12: pop {r1} bx r1 thumb_func_end sub_8119EF0 @@ -517318,23 +517318,23 @@ IsRunningDisallowedByMetatile: ; 8119F18 bl MetatileBehavior_IsRunningDisallowed lsls r0, 24 cmp r0, 0 - bne @08119F42 + bne _08119F42 adds r0, r4, 0 bl MetatileBehavior_IsFortreeBridge lsls r0, 24 cmp r0, 0 - beq @08119F46 + beq _08119F46 bl PlayerGetZCoord 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 @@ -517346,14 +517346,14 @@ sub_8119F50: ; 8119F50 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 .pool @@ -517371,33 +517371,33 @@ sub_8119F74: ; 8119F74 adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bhi @08119F9E + bhi _08119F9E adds r0, r4, 0 bl MetatileBehavior_IsIsolatedVerticalRail lsls r0, 24 cmp r0, 0 - bne @08119FB6 + bne _08119FB6 adds r0, r4, 0 bl MetatileBehavior_IsVerticalRail - b @08119FB0 -@08119F9E: + b _08119FB0 +_08119F9E: adds r0, r5, 0 bl MetatileBehavior_IsIsolatedHorizontalRail lsls r0, 24 cmp r0, 0 - bne @08119FB6 + bne _08119FB6 adds r0, r5, 0 bl MetatileBehavior_IsHorizontalRail -@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 @@ -517415,23 +517415,23 @@ 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 @@ -517445,7 +517445,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 @@ -517462,13 +517462,13 @@ sub_8119FF8: ; 8119FF8 bl IsRunningDisallowedByMetatile lsls r0, 24 cmp r0, 0 - bne @0811A038 + bne _0811A038 movs r0, 0 - b @0811A03A + b _0811A03A .pool -@0811A038: +_0811A038: movs r0, 0x1 -@0811A03A: +_0811A03A: add sp, 0x4 pop {r4} pop {r1} @@ -517482,7 +517482,7 @@ player_should_look_direction_be_enforced_upon_movement: ; 811A044 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @0811A078 + beq _0811A078 ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -517494,13 +517494,13 @@ player_should_look_direction_be_enforced_upon_movement: ; 811A044 bl MetatileBehavior_IsBumpySlope lsls r0, 24 cmp r0, 0 - beq @0811A078 + beq _0811A078 movs r0, 0 - b @0811A07A + b _0811A07A .pool -@0811A078: +_0811A078: movs r0, 0x1 -@0811A07A: +_0811A07A: pop {r1} bx r1 thumb_func_end player_should_look_direction_be_enforced_upon_movement @@ -517519,14 +517519,14 @@ GetOnOffBike: ; 811A080 movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq @0811A0B0 + beq _0811A0B0 movs r0, 0x1 bl SetPlayerAvatarTransitionFlags bl sav1_reset_battle_music_maybe bl sub_8085784 - b @0811A0C4 + b _0811A0C4 .pool -@0811A0B0: +_0811A0B0: adds r0, r2, 0 bl SetPlayerAvatarTransitionFlags ldr r4, =0x00000193 @@ -517534,7 +517534,7 @@ GetOnOffBike: ; 811A080 bl sav1_set_battle_music_maybe adds r0, r4, 0 bl sub_80858C4 -@0811A0C4: +_0811A0C4: pop {r4} pop {r0} bx r0 @@ -517554,25 +517554,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 .pool @@ -517614,31 +517614,31 @@ 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 .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 @@ -517653,7 +517653,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 @@ -517670,14 +517670,14 @@ sub_811A188: ; 811A188 bl MetatileBehavior_IsBumpySlope lsls r0, 24 cmp r0, 0 - beq @0811A1D0 + beq _0811A1D0 movs r0, 0x2 strb r0, [r5, 0x8] bl player_get_direction_upper_nybble lsls r0, 24 lsrs r0, 24 bl sub_808C1B4 -@0811A1D0: +_0811A1D0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -517696,20 +517696,20 @@ IsRunningDisallowed: ; 811A1DC movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @0811A1FC + beq _0811A1FC adds r0, r2, 0 bl IsRunningDisallowedByMetatile lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0811A204 -@0811A1FC: + bne _0811A204 +_0811A1FC: movs r0, 0x1 - b @0811A206 + b _0811A206 .pool -@0811A204: +_0811A204: movs r0, 0 -@0811A206: +_0811A206: pop {r1} bx r1 thumb_func_end IsRunningDisallowed @@ -517805,26 +517805,26 @@ sub_811A2C0: ; 811A2C0 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 adds r0, r4, 0 bl sub_811A2A4 -@0811A2F2: +_0811A2F2: pop {r4} pop {r0} bx r0 @@ -517845,24 +517845,24 @@ 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 .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 bl SetVBlankCallback movs r4, 0x1 @@ -517879,9 +517879,9 @@ sub_811A2FC: ; 811A2FC movs r3, 0 bl pal_fade_maybe movs r0, 0x5 - b @0811A41A + b _0811A41A .pool -@0811A370: +_0811A370: bl sub_811AAAC lsls r0, 16 lsrs r4, r0, 16 @@ -517889,7 +517889,7 @@ sub_811A2FC: ; 811A2FC adds r0, r4, 0 bl sub_811A88C cmp r0, 0 - beq @0811A39E + beq _0811A39E movs r0, 0x1 negs r0, r0 movs r1, 0x2 @@ -517901,10 +517901,10 @@ sub_811A2FC: ; 811A2FC 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] @@ -517913,57 +517913,57 @@ sub_811A2FC: ; 811A2FC movs r3, 0x10 bl pal_fade_maybe 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 .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 .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} @@ -517984,31 +517984,31 @@ 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 .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 ResetAllObjectData bl ResetObjectPaletteAllocator 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 @@ -518017,34 +518017,34 @@ sub_811A428: ; 811A428 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 @@ -518072,67 +518072,67 @@ sub_811A4F0: ; 811A4F0 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 .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 .pool -@0811A578: +_0811A578: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00002bbc adds r4, r0, r2 - b @0811A7C2 + b _0811A7C2 .pool -@0811A58C: +_0811A58C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00002bc8 adds r4, r0, r3 - b @0811A7C2 + b _0811A7C2 .pool -@0811A5A0: +_0811A5A0: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bd4 adds r4, r0, r1 - b @0811A7C2 + b _0811A7C2 .pool -@0811A5B4: +_0811A5B4: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -518143,9 +518143,9 @@ sub_811A4F0: ; 811A4F0 adds r0, r3 ldr r1, [r2] adds r4, r1, r0 - b @0811A7C2 + b _0811A7C2 .pool -@0811A5D8: +_0811A5D8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00002e36 @@ -518153,17 +518153,17 @@ sub_811A4F0: ; 811A4F0 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 .pool -@0811A604: +_0811A604: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -518176,9 +518176,9 @@ sub_811A4F0: ; 811A4F0 adds r4, r0, r1 ldr r0, =0x020375e4 ldrb r5, [r0] - b @0811A7C2 + b _0811A7C2 .pool -@0811A630: +_0811A630: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -518195,9 +518195,9 @@ sub_811A4F0: ; 811A4F0 adds r0, 0x1C adds r4, r1, r0 movs r5, 0x1 - b @0811A7C2 + b _0811A7C2 .pool -@0811A664: +_0811A664: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -518209,9 +518209,9 @@ sub_811A4F0: ; 811A4F0 ldr r1, =0x000027ce adds r4, r0, r1 movs r5, 0 - b @0811A7C2 + b _0811A7C2 .pool -@0811A688: +_0811A688: ldr r4, =0x02021ec4 ldr r1, =0x03005d8c ldr r0, [r1] @@ -518224,9 +518224,9 @@ sub_811A4F0: ; 811A4F0 adds r0, r3 ldrh r0, [r0] strh r0, [r4, 0x2] - b @0811A7C2 + b _0811A7C2 .pool -@0811A6B4: +_0811A6B4: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002baa @@ -518235,9 +518235,9 @@ sub_811A4F0: ; 811A4F0 adds r0, r2, 0 strh r0, [r4] movs r5, 0x1 - b @0811A7C2 + b _0811A7C2 .pool -@0811A6D4: +_0811A6D4: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -518254,9 +518254,9 @@ sub_811A4F0: ; 811A4F0 adds r0, 0x4 adds r4, r1, r0 movs r5, 0 - b @0811A7C2 + b _0811A7C2 .pool -@0811A708: +_0811A708: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -518268,16 +518268,16 @@ sub_811A4F0: ; 811A4F0 ldr r1, =0x000027e4 adds r4, r0, r1 movs r5, 0x1 - b @0811A7C2 + b _0811A7C2 .pool -@0811A72C: +_0811A72C: ldr r4, =0x02021ec4 adds r0, r4, 0 movs r1, 0x2 bl sub_811F88C - b @0811A7C2 + b _0811A7C2 .pool -@0811A73C: +_0811A73C: ldr r2, =0x03005d8c ldr r0, =0x020375e2 ldrh r1, [r0] @@ -518294,41 +518294,41 @@ sub_811A4F0: ; 811A4F0 adds r0, r2, 0 strh r0, [r1, 0x14] movs r5, 0x2 - b @0811A7C2 + b _0811A7C2 .pool -@0811A770: +_0811A770: ldr r0, =0x03005d8c ldr r0, [r0] ldr r3, =0x00003b6e adds r4, r0, r3 - b @0811A7C2 + b _0811A7C2 .pool -@0811A784: +_0811A784: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003b5a adds r4, r0, r1 - b @0811A7C2 + b _0811A7C2 .pool -@0811A798: +_0811A798: ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x00003b6c adds r4, r0, r2 - b @0811A7C2 + b _0811A7C2 .pool -@0811A7AC: +_0811A7AC: ldr r0, =0x03005d90 ldr r0, [r0] movs r3, 0x82 lsls r3, 1 adds r4, r0, r3 - b @0811A7C2 + b _0811A7C2 .pool -@0811A7BC: +_0811A7BC: bl sub_801B058 adds r4, r0, 0 -@0811A7C2: +_0811A7C2: bl overworld_free_bg_tilemaps ldr r0, =0x020375e0 ldrb r0, [r0] @@ -518336,7 +518336,7 @@ sub_811A4F0: ; 811A4F0 adds r1, r4, 0 adds r3, r5, 0 bl sub_811A20C -@0811A7D4: +_0811A7D4: pop {r4,r5} pop {r0} bx r0 @@ -518353,23 +518353,23 @@ 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 .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 @@ -518378,9 +518378,9 @@ sub_811A7E4: ; 811A7E4 strh r1, [r0, 0x16] bl overworld_free_bg_tilemaps bl sub_811A8F0 - b @0811A84E + b _0811A84E .pool -@0811A840: +_0811A840: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -518388,7 +518388,7 @@ sub_811A7E4: ; 811A7E4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@0811A84E: +_0811A84E: pop {r0} bx r0 .pool @@ -518411,17 +518411,17 @@ sub_811A868: ; 811A868 lsrs r2, r0, 16 movs r0, 0 ldr r1, =gUnknown_08597530 -@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 .pool @@ -518541,11 +518541,11 @@ sub_811A95C: ; 811A95C bl Alloc str r0, [r4] cmp r0, 0 - bne @0811A984 + bne _0811A984 movs r0, 0 - b @0811AA7E + b _0811AA7E .pool -@0811A984: +_0811A984: movs r7, 0 strb r5, [r0] ldr r0, [r4] @@ -518565,7 +518565,7 @@ sub_811A95C: ; 811A95C lsls r0, 24 lsrs r6, r0, 24 cmp r5, 0x10 - bne @0811A9C6 + bne _0811A9C6 ldr r0, [r4] adds r0, 0x14 bl sub_811BDF0 @@ -518576,8 +518576,8 @@ sub_811A95C: ; 811A95C 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] @@ -518590,7 +518590,7 @@ sub_811A95C: ; 811A95C ldr r0, [r0] str r0, [r3, 0x34] adds r0, r2, 0 -@0811A9DE: +_0811A9DE: ldr r3, =0x0203a118 ldr r2, [r3] ldr r1, =gUnknown_08597550 @@ -518615,31 +518615,31 @@ sub_811A95C: ; 811A95C 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 .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 @@ -518651,13 +518651,13 @@ sub_811A95C: ; 811A95C 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] @@ -518670,7 +518670,7 @@ sub_811A95C: ; 811A95C adds r0, 0x1 strb r0, [r2, 0xD] movs r0, 0x1 -@0811AA7E: +_0811AA7E: pop {r3} mov r8, r3 pop {r4-r7} @@ -518685,11 +518685,11 @@ sub_811AA90: ; 811AA90 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 @@ -518703,65 +518703,65 @@ sub_811AAAC: ; 811AAAC 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 .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 @@ -518773,19 +518773,19 @@ sub_811AB44: ; 811AB44 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 @@ -518798,7 +518798,7 @@ sub_811AB68: ; 811AB68 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0811ABB8 + beq _0811ABB8 bl sub_811BF78 ldr r1, =0x0203a118 ldr r3, [r1] @@ -518812,43 +518812,43 @@ sub_811AB68: ; 811AB68 ldr r0, [r1] strb r2, [r0, 0xC] movs r0, 0x9 - b @0811ACCC + b _0811ACCC .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] @@ -518856,7 +518856,7 @@ sub_811AB68: ; 811AB68 ldrsb r0, [r2, r0] ldr r6, =gUnknown_08597550 cmp r0, 0 - bge @0811ABF8 + bge _0811ABF8 ldrb r0, [r2, 0x1] lsls r1, r0, 1 adds r1, r0 @@ -518864,7 +518864,7 @@ sub_811AB68: ; 811AB68 adds r1, r6 ldrb r0, [r1, 0x2] strb r0, [r2, 0x6] -@0811ABF8: +_0811ABF8: ldr r3, [r4] movs r2, 0x6 ldrsb r2, [r3, r2] @@ -518876,10 +518876,10 @@ sub_811AB68: ; 811AB68 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] @@ -518890,61 +518890,61 @@ sub_811AB68: ; 811AB68 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 .pool -@0811AC48: +_0811AC48: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] - b @0811ABDA + b _0811ABDA .pool -@0811AC58: +_0811AC58: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x6] adds r0, 0x1 - b @0811ABD8 + b _0811ABD8 .pool -@0811AC68: +_0811AC68: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 strb r0, [r1, 0x5] - b @0811ABDA + b _0811ABDA .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] @@ -518955,25 +518955,25 @@ sub_811AB68: ; 811AB68 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 @@ -518988,76 +518988,76 @@ sub_811ACDC: ; 811ACDC 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 .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 @@ -519070,92 +519070,92 @@ sub_811ACDC: ; 811ACDC 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 .pool -@0811ADC0: +_0811ADC0: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] adds r0, 0x1 strb r0, [r1, 0x5] - b @0811AD6E + b _0811AD6E .pool -@0811ADD0: +_0811ADD0: ldr r1, =0x0203a118 ldr r0, [r1] strb r3, [r0, 0x6] adds r6, r1, 0 - b @0811AD70 + b _0811AD70 .pool -@0811ADE0: +_0811ADE0: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 strb r0, [r1, 0x5] - b @0811AD6E + b _0811AD6E .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 @@ -519171,15 +519171,15 @@ sub_811AE44: ; 811AE44 ands r0, r2 adds r3, r1, 0 cmp r0, 0 - beq @0811AE60 + beq _0811AE60 bl sub_811B32C - b @0811AEF6 + b _0811AEF6 .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 @@ -519187,78 +519187,78 @@ sub_811AE44: ; 811AE44 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq @0811AE84 + beq _0811AE84 bl sub_811B2B0 - b @0811AEF6 + b _0811AEF6 .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 @@ -519271,72 +519271,72 @@ sub_811AF00: ; 811AF00 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 .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 @@ -519348,26 +519348,26 @@ sub_811AF8C: ; 811AF8C 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 .pool -@0811AFC0: +_0811AFC0: ldr r0, =0x020375f0 strh r1, [r0] ldr r0, =0x0203a118 @@ -519377,15 +519377,15 @@ sub_811AF8C: ; 811AF8C 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 .pool -@0811AFE4: +_0811AFE4: movs r0, 0 -@0811AFE6: +_0811AFE6: pop {r1} bx r1 thumb_func_end sub_811AF8C @@ -519397,37 +519397,37 @@ sub_811AFEC: ; 811AFEC 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 .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 .pool -@0811B038: +_0811B038: movs r0, 0 -@0811B03A: +_0811B03A: pop {r4} pop {r1} bx r1 @@ -519440,37 +519440,37 @@ sub_811B040: ; 811B040 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 .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 .pool -@0811B084: +_0811B084: movs r0, 0 -@0811B086: +_0811B086: pop {r1} bx r1 thumb_func_end sub_811B040 @@ -519483,22 +519483,22 @@ sub_811B08C: ; 811B08C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0811B0A4 + beq _0811B0A4 movs r0, 0x1A - b @0811B0B8 + b _0811B0B8 .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 @@ -519511,17 +519511,17 @@ sub_811B0BC: ; 811B0BC movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne @0811B0D4 + bne _0811B0D4 movs r0, 0 - b @0811B0E0 + b _0811B0E0 .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 .pool @@ -519545,18 +519545,18 @@ sub_811B0F8: ; 811B0F8 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] @@ -519566,19 +519566,19 @@ sub_811B0F8: ; 811B0F8 movs r0, 0x8 strb r0, [r1, 0x4] movs r0, 0x1F - b @0811B14A + b _0811B14A .pool -@0811B134: +_0811B134: ldr r4, =0x020375f0 bl sub_811B4EC strh r0, [r4] bl sub_811B3E4 movs r0, 0x18 - b @0811B14A + b _0811B14A .pool -@0811B148: +_0811B148: movs r0, 0 -@0811B14A: +_0811B14A: pop {r4} pop {r1} bx r1 @@ -519591,26 +519591,26 @@ sub_811B150: ; 811B150 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 .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 @@ -519625,20 +519625,20 @@ 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 .pool -@0811B1A8: +_0811B1A8: movs r0, 0x5 strb r0, [r1, 0x4] movs r0, 0x4 -@0811B1AE: +_0811B1AE: pop {r1} bx r1 thumb_func_end sub_811B184 @@ -519653,86 +519653,86 @@ 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 .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 @@ -519748,31 +519748,31 @@ 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 .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 @@ -519793,7 +519793,7 @@ sub_811B2B0: ; 811B2B0 ldr r0, [r0] ldrb r0, [r0, 0x9] cmp r0, 0 - bne @0811B2DC + bne _0811B2DC bl sub_811B8E8 lsls r0, 24 lsrs r0, 24 @@ -519803,21 +519803,21 @@ sub_811B2B0: ; 811B2B0 lsrs r1, 24 movs r0, 0 bl sub_811F548 - b @0811B2EC + b _0811B2EC .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 @@ -519836,11 +519836,11 @@ sub_811B2B0: ; 811B2B0 movs r0, 0x3 strb r0, [r1, 0x4] movs r0, 0xB - b @0811B326 + b _0811B326 .pool -@0811B324: +_0811B324: movs r0, 0 -@0811B326: +_0811B326: pop {r1} bx r1 thumb_func_end sub_811B2B0 @@ -519870,14 +519870,14 @@ 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 .pool -@0811B360: +_0811B360: strb r2, [r1, 0x9] -@0811B362: +_0811B362: movs r0, 0x17 pop {r1} bx r1 @@ -519890,17 +519890,17 @@ sub_811B368: ; 811B368 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 .pool -@0811B388: +_0811B388: movs r0, 0x20 bl audio_play movs r0, 0 -@0811B390: +_0811B390: pop {r1} bx r1 thumb_func_end sub_811B368 @@ -519918,28 +519918,28 @@ 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 .pool -@0811B3D8: +_0811B3D8: strb r5, [r1, 0x4] movs r0, 0xC -@0811B3DC: +_0811B3DC: pop {r4,r5} pop {r1} bx r1 @@ -519953,9 +519953,9 @@ sub_811B3E4: ; 811B3E4 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 @@ -519968,8 +519968,8 @@ sub_811B3E4: ; 811B3E4 adds r4, 0x1 ldrb r3, [r3, 0x7] cmp r4, r3 - blt @0811B3F4 -@0811B40E: + blt _0811B3F4 +_0811B40E: pop {r4,r5} pop {r0} bx r0 @@ -519984,11 +519984,11 @@ sub_811B418: ; 811B418 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 @@ -520000,8 +520000,8 @@ sub_811B418: ; 811B418 adds r3, 0x1 ldrb r2, [r2, 0x7] cmp r3, r2 - blt @0811B42C -@0811B444: + blt _0811B42C +_0811B444: pop {r4,r5} pop {r0} bx r0 @@ -520016,9 +520016,9 @@ sub_811B454: ; 811B454 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 @@ -520031,8 +520031,8 @@ sub_811B454: ; 811B454 adds r4, 0x1 ldrb r3, [r3, 0x7] cmp r4, r3 - blt @0811B464 -@0811B47E: + blt _0811B464 +_0811B47E: pop {r4,r5} pop {r0} bx r0 @@ -520067,31 +520067,31 @@ sub_811B4AC: ; 811B4AC 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 .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 @@ -520107,25 +520107,25 @@ 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 .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 @@ -520141,22 +520141,22 @@ 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 .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} @@ -520167,37 +520167,37 @@ sub_811B528: ; 811B528 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 .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 @@ -520207,63 +520207,63 @@ sub_811B568: ; 811B568 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 .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 .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 .pool -@0811B624: +_0811B624: bl sub_811B744 - b @0811B594 -@0811B62A: + b _0811B594 +_0811B62A: movs r0, 0 -@0811B62C: +_0811B62C: pop {r4} pop {r1} bx r1 @@ -520273,47 +520273,47 @@ sub_811B568: ; 811B568 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 .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 .pool -@0811B680: +_0811B680: movs r0, 0 - b @0811B662 -@0811B684: + b _0811B662 +_0811B684: ldr r0, =0x0203a118 ldr r1, [r0] ldrb r0, [r1, 0xA] @@ -520322,10 +520322,10 @@ sub_811B634: ; 811B634 bl sub_811B9C8 lsls r0, 24 cmp r0, 0 - beq @0811B6BA - b @0811B6B6 + beq _0811B6BA + b _0811B6B6 .pool -@0811B6A0: +_0811B6A0: ldr r2, =0x0203a118 ldr r1, [r2] ldrb r0, [r1, 0xA] @@ -520336,12 +520336,12 @@ sub_811B634: ; 811B634 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 .pool @@ -520352,53 +520352,53 @@ 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 .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 .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 .pool -@0811B728: +_0811B728: ldr r2, =0x0203a118 ldr r1, [r2] movs r0, 0 @@ -520406,11 +520406,11 @@ sub_811B6C4: ; 811B6C4 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 .pool @@ -520428,10 +520428,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 .pool @@ -520444,18 +520444,18 @@ sub_811B768: ; 811B768 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 .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 @@ -520465,24 +520465,24 @@ sub_811B768: ; 811B768 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 .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 @@ -520490,23 +520490,23 @@ sub_811B794: ; 811B794 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 .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 @@ -520515,91 +520515,91 @@ sub_811B794: ; 811B794 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 .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 .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 .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 .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] @@ -520607,18 +520607,18 @@ sub_811B794: ; 811B794 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 .pool -@0811B8C0: +_0811B8C0: movs r0, 0 -@0811B8C2: +_0811B8C2: pop {r4} pop {r1} bx r1 @@ -520669,17 +520669,17 @@ sub_811B908: ; 811B908 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, =gUnknown_08597748 lsls r1, r2, 3 subs r1, r2 @@ -520716,15 +520716,15 @@ sub_811B960: ; 811B960 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 @@ -520732,23 +520732,23 @@ sub_811B960: ; 811B960 thumb_func_start sub_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 .pool @@ -520757,23 +520757,23 @@ sub_811B978: ; 811B978 thumb_func_start sub_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 .pool @@ -520786,7 +520786,7 @@ sub_811B9C8: ; 811B9C8 ldr r1, [r4] ldrb r0, [r1, 0x9] cmp r0, 0 - bne @0811B9F8 + bne _0811B9F8 bl sub_811B8E8 adds r4, r0, 0 bl sub_811F3AC @@ -520796,13 +520796,13 @@ 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 .pool -@0811B9F8: +_0811B9F8: ldrb r0, [r1, 0xB] bl sub_811B960 movs r2, 0 @@ -520813,11 +520813,11 @@ sub_811B9C8: ; 811B9C8 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 @@ -520833,9 +520833,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} @@ -521004,28 +521004,28 @@ sub_811BB40: ; 811BB40 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x4 - bne @0811BB5C + bne _0811BB5C ldr r0, =gUnknown_085EC3B4 - b @0811BB7A + b _0811BB7A .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, =gUnknown_085EC706 str r0, [r2] ldr r0, =gUnknown_085EC727 - b @0811BB7E + b _0811BB7E .pool -@0811BB78: +_0811BB78: ldr r0, =gUnknown_085EC3A6 -@0811BB7A: +_0811BB7A: str r0, [r2] movs r0, 0 -@0811BB7E: +_0811BB7E: str r0, [r1] pop {r0} bx r0 @@ -521115,27 +521115,27 @@ sub_811BBF8: ; 811BBF8 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 .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 @@ -521147,34 +521147,34 @@ sub_811BC2C: ; 811BC2C 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 .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 @@ -521195,31 +521195,31 @@ sub_811BC7C: ; 811BC7C 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 .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 @@ -521241,21 +521241,21 @@ sub_811BCC8: ; 811BCC8 lsrs r3, r0, 24 movs r1, 0 ldr r2, =gUnknown_08597550 -@0811BCD2: +_0811BCD2: ldrb r0, [r2] cmp r0, r3 - bne @0811BCE4 + bne _0811BCE4 lsls r0, r1, 24 lsrs r0, 24 - b @0811BCEE + b _0811BCEE .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 @@ -521268,26 +521268,26 @@ sub_811BCF4: ; 811BCF4 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 .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 @@ -521301,26 +521301,26 @@ sub_811BD2C: ; 811BD2C 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 .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 @@ -521333,30 +521333,30 @@ sub_811BD64: ; 811BD64 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x11 - bne @0811BD80 + bne _0811BD80 bl sub_811BCF4 - b @0811BD9C + b _0811BD9C .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 @@ -521370,11 +521370,11 @@ sub_811BDB0: ; 811BDB0 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0x12 - bne @0811BDC8 + bne _0811BDC8 bl sub_811BCF4 - b @0811BDDE + b _0811BDDE .pool -@0811BDC8: +_0811BDC8: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003b58 @@ -521383,11 +521383,11 @@ sub_811BDB0: ; 811BDB0 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 .pool @@ -521407,7 +521407,7 @@ sub_811BDF0: ; 811BDF0 bl GetStringLength lsls r0, 16 cmp r0, 0 - beq @0811BE34 + beq _0811BE34 ldr r1, =0x00003b85 adds r0, r4, r1 ldrb r2, [r0] @@ -521417,13 +521417,13 @@ sub_811BDF0: ; 811BDF0 movs r0, 0 mov r1, sp bl sub_81AFC0C - b @0811BE3C + b _0811BE3C .pool -@0811BE34: +_0811BE34: ldr r1, =gUnknown_085EC6B2 movs r0, 0 bl sub_81AFC0C -@0811BE3C: +_0811BE3C: ldr r1, =gUnknown_085EC6A8 adds r0, r6, 0 bl sub_81AFC28 @@ -521443,9 +521443,9 @@ sub_811BE54: ; 811BE54 adds r4, 0x3C ldr r2, =0x02021dc4 movs r5, 0 - b @0811BE86 + b _0811BE86 .pool -@0811BE6C: +_0811BE6C: ldrh r1, [r4] adds r0, r2, 0 movs r2, 0 @@ -521458,10 +521458,10 @@ sub_811BE54: ; 811BE54 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] @@ -521478,39 +521478,39 @@ sub_811BE9C: ; 811BE9C 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 .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 FlagSet - b @0811BF14 + b _0811BF14 .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 .pool -@0811BEE4: +_0811BEE4: ldr r0, =0x020375e0 strh r1, [r0] - b @0811BF14 + b _0811BF14 .pool -@0811BEF0: +_0811BEF0: bl sub_811BE54 ldr r4, =0x020375e0 ldr r0, [r5] @@ -521519,14 +521519,14 @@ sub_811BE9C: ; 811BE9C lsls r0, 24 lsrs r0, 24 strh r0, [r4] - b @0811BF14 + b _0811BF14 .pool -@0811BF0C: +_0811BF0C: bl sub_811BF40 ldr r1, =0x020375e0 -@0811BF12: +_0811BF12: strh r0, [r1] -@0811BF14: +_0811BF14: pop {r4,r5} pop {r0} bx r0 @@ -521542,9 +521542,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 @@ -521557,7 +521557,7 @@ sub_811BF40: ; 811BF40 movs r4, 0 movs r5, 0x80 lsls r5, 9 -@0811BF48: +_0811BF48: lsls r0, r4, 2 ldr r1, =gUnknown_0859776C adds r0, r1 @@ -521565,19 +521565,19 @@ sub_811BF40: ; 811BF40 bl sub_811BC7C lsls r0, 24 cmp r0, 0 - bne @0811BF64 + bne _0811BF64 lsrs r0, r5, 16 - b @0811BF72 + b _0811BF72 .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 @@ -521605,12 +521605,12 @@ sub_811BF8C: ; 811BF8C 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 @@ -521623,24 +521623,24 @@ sub_811BFA4: ; 811BFA4 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 .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 ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_08597C54 @@ -521672,9 +521672,9 @@ sub_811BFA4: ; 811BFA4 ldr r2, =0x01000100 add r0, sp, 0x4 bl CpuFastSet - b @0811C124 + b _0811C124 .pool -@0811C044: +_0811C044: ldr r1, =gUnknown_08DCBDD0 movs r0, 0 str r0, [sp] @@ -521698,9 +521698,9 @@ sub_811BFA4: ; 811BFA4 bl sub_811E948 movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @0811C124 + b _0811C124 .pool -@0811C090: +_0811C090: ldr r1, =gUnknown_08597B54 movs r0, 0 str r0, [sp] @@ -521710,28 +521710,28 @@ sub_811BFA4: ; 811BFA4 bl copy_decompressed_tile_data_to_vram_autofree movs r0, 0x1 bl CopyBgTilemapBufferToVram - b @0811C124 + b _0811C124 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0811C12E + bne _0811C12E movs r0, 0 movs r1, 0 movs r2, 0 @@ -521754,19 +521754,19 @@ sub_811BFA4: ; 811BFA4 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} @@ -521780,11 +521780,11 @@ sub_811C13C: ; 811C13C 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 @@ -521812,145 +521812,145 @@ sub_811C170: ; 811C170 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 .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 @@ -521962,26 +521962,26 @@ sub_811C2D4: ; 811C2D4 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811C2EC + beq _0811C2EC cmp r0, 0x1 - beq @0811C2FA - b @0811C304 + beq _0811C2FA + b _0811C304 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811C306 -@0811C304: + b _0811C306 +_0811C304: movs r0, 0x1 -@0811C306: +_0811C306: pop {r4} pop {r1} bx r1 @@ -522029,17 +522029,17 @@ 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 .pool -@0811C380: +_0811C380: ldrh r1, [r4] mov r0, sp bl CopyEasyChatWord @@ -522047,7 +522047,7 @@ sub_811C30C: ; 811C30C mov r1, sp movs r2, 0 bl GetStringWidth -@0811C392: +_0811C392: adds r0, 0x11 lsls r1, r6, 16 asrs r1, 16 @@ -522059,8 +522059,8 @@ sub_811C30C: ; 811C30C lsls r0, 24 lsrs r5, r0, 24 cmp r5, r7 - bcc @0811C36C -@0811C3AA: + bcc _0811C36C +_0811C3AA: ldr r1, =gUnknown_08597C30 mov r2, r10 lsls r0, r2, 2 @@ -522113,12 +522113,12 @@ sub_811C404: ; 811C404 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811C41C + beq _0811C41C cmp r0, 0x1 - beq @0811C436 - b @0811C440 + beq _0811C436 + b _0811C440 .pool -@0811C41C: +_0811C41C: bl sub_811DF90 movs r0, 0x2 bl sub_811D104 @@ -522128,15 +522128,15 @@ sub_811C404: ; 811C404 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811C440 -@0811C436: + b _0811C440 +_0811C436: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811C442 -@0811C440: + b _0811C442 +_0811C440: movs r0, 0x1 -@0811C442: +_0811C442: pop {r4} pop {r1} bx r1 @@ -522149,12 +522149,12 @@ sub_811C448: ; 811C448 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811C460 + beq _0811C460 cmp r0, 0x1 - beq @0811C47A - b @0811C484 + beq _0811C47A + b _0811C484 .pool -@0811C460: +_0811C460: bl sub_811DF90 movs r0, 0x3 bl sub_811D104 @@ -522164,15 +522164,15 @@ sub_811C448: ; 811C448 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811C484 -@0811C47A: + b _0811C484 +_0811C47A: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811C486 -@0811C484: + b _0811C486 +_0811C484: movs r0, 0x1 -@0811C486: +_0811C486: pop {r4} pop {r1} bx r1 @@ -522185,12 +522185,12 @@ sub_811C48C: ; 811C48C ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811C4A4 + beq _0811C4A4 cmp r0, 0x1 - beq @0811C4BE - b @0811C4C8 + beq _0811C4BE + b _0811C4C8 .pool -@0811C4A4: +_0811C4A4: bl sub_811DF90 movs r0, 0x1 bl sub_811D104 @@ -522200,15 +522200,15 @@ sub_811C48C: ; 811C48C ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811C4C8 -@0811C4BE: + b _0811C4C8 +_0811C4BE: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811C4CA -@0811C4C8: + b _0811C4CA +_0811C4C8: movs r0, 0x1 -@0811C4CA: +_0811C4CA: pop {r4} pop {r1} bx r1 @@ -522221,12 +522221,12 @@ sub_811C4D0: ; 811C4D0 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811C4E8 + beq _0811C4E8 cmp r0, 0x1 - beq @0811C506 - b @0811C510 + beq _0811C506 + b _0811C510 .pool -@0811C4E8: +_0811C4E8: bl sub_811DFB0 movs r0, 0 bl sub_811D104 @@ -522237,15 +522237,15 @@ sub_811C4D0: ; 811C4D0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811C510 -@0811C506: + b _0811C510 +_0811C506: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811C512 -@0811C510: + b _0811C512 +_0811C510: movs r0, 0x1 -@0811C512: +_0811C512: pop {r4} pop {r1} bx r1 @@ -522258,13 +522258,13 @@ sub_811C518: ; 811C518 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 .pool -@0811C530: +_0811C530: bl sub_811DFB0 movs r0, 0 bl sub_811D104 @@ -522273,11 +522273,11 @@ sub_811C518: ; 811C518 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@0811C546: +_0811C546: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 -@0811C54E: +_0811C54E: pop {r4} pop {r1} bx r1 @@ -522290,21 +522290,21 @@ sub_811C554: ; 811C554 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 .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 HideBg @@ -522314,44 +522314,44 @@ sub_811C554: ; 811C554 movs r3, 0 bl sub_811DE5C bl sub_811D6D4 - b @0811C5DA -@0811C5A4: + b _0811C5DA +_0811C5A4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0811C618 + bne _0811C618 movs r0, 0 bl sub_811D9CC - b @0811C5DA -@0811C5B6: + b _0811C5DA +_0811C5B6: bl IsDma3ManagerBusyWithBgCopy 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 IsDma3ManagerBusyWithBgCopy 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 .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 @@ -522361,13 +522361,13 @@ sub_811C554: ; 811C554 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@0811C60E: +_0811C60E: movs r0, 0 - b @0811C61A + b _0811C61A .pool -@0811C618: +_0811C618: movs r0, 0x1 -@0811C61A: +_0811C61A: pop {r1} bx r1 thumb_func_end sub_811C554 @@ -522379,31 +522379,31 @@ sub_811C620: ; 811C620 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 .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 @@ -522411,35 +522411,35 @@ sub_811C620: ; 811C620 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 .pool -@0811C690: +_0811C690: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0811C6B8 + bne _0811C6B8 bl sub_811DFB0 movs r0, 0 bl ShowBg -@0811C6A4: +_0811C6A4: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811C6B8 + b _0811C6B8 .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 @@ -522451,63 +522451,63 @@ sub_811C6C0: ; 811C6C0 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 .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 IsDma3ManagerBusyWithBgCopy 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 .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 @@ -522515,13 +522515,13 @@ sub_811C6C0: ; 811C6C0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@0811C76E: +_0811C76E: movs r0, 0 - b @0811C77A + b _0811C77A .pool -@0811C778: +_0811C778: movs r0, 0x1 -@0811C77A: +_0811C77A: pop {r1} bx r1 thumb_func_end sub_811C6C0 @@ -522542,12 +522542,12 @@ sub_811C78C: ; 811C78C ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811C7A4 + beq _0811C7A4 cmp r0, 0x1 - beq @0811C7B4 - b @0811C7CA + beq _0811C7B4 + b _0811C7CA .pool -@0811C7A4: +_0811C7A4: movs r0, 0x1 movs r1, 0x4 bl sub_811DDAC @@ -522555,18 +522555,18 @@ sub_811C78C: ; 811C78C 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 @@ -522579,18 +522579,18 @@ sub_811C7D4: ; 811C7D4 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 .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 @@ -522599,24 +522599,24 @@ sub_811C7D4: ; 811C7D4 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 .pool -@0811C828: +_0811C828: movs r0, 0x1 -@0811C82A: +_0811C82A: pop {r4} pop {r1} bx r1 @@ -522629,61 +522629,61 @@ sub_811C830: ; 811C830 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 .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 IsDma3ManagerBusyWithBgCopy 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 .pool -@0811C8B8: +_0811C8B8: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0811C8E8 + bne _0811C8E8 bl sub_811E288 movs r0, 0x1 bl sub_811E6E0 @@ -522694,13 +522694,13 @@ sub_811C830: ; 811C830 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@0811C8DE: +_0811C8DE: movs r0, 0 - b @0811C8EA + b _0811C8EA .pool -@0811C8E8: +_0811C8E8: movs r0, 0x1 -@0811C8EA: +_0811C8EA: pop {r1} bx r1 thumb_func_end sub_811C830 @@ -522712,71 +522712,71 @@ sub_811C8F0: ; 811C8F0 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 .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 IsDma3ManagerBusyWithBgCopy 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 ShowBg -@0811C962: +_0811C962: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811C994 + b _0811C994 .pool -@0811C974: +_0811C974: bl IsDma3ManagerBusyWithBgCopy 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 .pool -@0811C994: +_0811C994: movs r0, 0x1 -@0811C996: +_0811C996: pop {r1} bx r1 thumb_func_end sub_811C8F0 @@ -522788,80 +522788,80 @@ sub_811C99C: ; 811C99C 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 .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 IsDma3ManagerBusyWithBgCopy 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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0811CA54 + bne _0811CA54 movs r0, 0 bl ShowBg -@0811CA24: +_0811CA24: ldr r0, =0x0203a11c ldr r1, [r0] ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811CA54 + b _0811CA54 .pool -@0811CA34: +_0811CA34: bl IsDma3ManagerBusyWithBgCopy 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 .pool -@0811CA54: +_0811CA54: movs r0, 0x1 -@0811CA56: +_0811CA56: pop {r1} bx r1 thumb_func_end sub_811C99C @@ -522873,60 +522873,60 @@ sub_811CA5C: ; 811CA5C 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 .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 IsDma3ManagerBusyWithBgCopy 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 IsDma3ManagerBusyWithBgCopy 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 .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 @@ -522937,11 +522937,11 @@ sub_811CA5C: ; 811CA5C adds r0, 0x1 strh r0, [r1] movs r0, 0 - b @0811CB12 + b _0811CB12 .pool -@0811CB10: +_0811CB10: movs r0, 0x1 -@0811CB12: +_0811CB12: pop {r1} bx r1 thumb_func_end sub_811CA5C @@ -522962,41 +522962,41 @@ sub_811CB24: ; 811CB24 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 .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 IsDma3ManagerBusyWithBgCopy 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 @@ -523004,12 +523004,12 @@ sub_811CB24: ; 811CB24 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 @@ -523022,54 +523022,54 @@ sub_811CB98: ; 811CB98 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 .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 IsDma3ManagerBusyWithBgCopy 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 @@ -523082,27 +523082,27 @@ sub_811CC08: ; 811CC08 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0811CC86 + bne _0811CC86 bl sub_811BBDC adds r4, r0, 0 bl sub_811DE48 @@ -523114,17 +523114,17 @@ sub_811CC08: ; 811CC08 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 @@ -523132,12 +523132,12 @@ sub_811CC08: ; 811CC08 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 @@ -523150,27 +523150,27 @@ sub_811CC90: ; 811CC90 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 .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @0811CD0A + bne _0811CD0A bl sub_811BBDC adds r4, r0, 0 bl sub_811DE48 @@ -523182,29 +523182,29 @@ sub_811CC90: ; 811CC90 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 @@ -523217,12 +523217,12 @@ sub_811CD14: ; 811CD14 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811CD2C + beq _0811CD2C cmp r0, 0x1 - beq @0811CD40 - b @0811CD4A + beq _0811CD40 + b _0811CD4A .pool -@0811CD2C: +_0811CD2C: bl sub_811DF90 movs r0, 0x4 bl sub_811D104 @@ -523230,15 +523230,15 @@ sub_811CD14: ; 811CD14 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811CD4A -@0811CD40: + b _0811CD4A +_0811CD40: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811CD4C -@0811CD4A: + b _0811CD4C +_0811CD4A: movs r0, 0x1 -@0811CD4C: +_0811CD4C: pop {r4} pop {r1} bx r1 @@ -523251,12 +523251,12 @@ sub_811CD54: ; 811CD54 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811CD6C + beq _0811CD6C cmp r0, 0x1 - beq @0811CD80 - b @0811CD8A + beq _0811CD80 + b _0811CD8A .pool -@0811CD6C: +_0811CD6C: bl sub_811DF90 movs r0, 0x5 bl sub_811D104 @@ -523264,15 +523264,15 @@ sub_811CD54: ; 811CD54 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811CD8A -@0811CD80: + b _0811CD8A +_0811CD80: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811CD8C -@0811CD8A: + b _0811CD8C +_0811CD8A: movs r0, 0x1 -@0811CD8C: +_0811CD8C: pop {r4} pop {r1} bx r1 @@ -523285,12 +523285,12 @@ sub_811CD94: ; 811CD94 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811CDAC + beq _0811CDAC cmp r0, 0x1 - beq @0811CDC0 - b @0811CDCA + beq _0811CDC0 + b _0811CDCA .pool -@0811CDAC: +_0811CDAC: bl sub_811DF90 movs r0, 0x6 bl sub_811D104 @@ -523298,15 +523298,15 @@ sub_811CD94: ; 811CD94 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811CDCA -@0811CDC0: + b _0811CDCA +_0811CDC0: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811CDCC -@0811CDCA: + b _0811CDCC +_0811CDCA: movs r0, 0x1 -@0811CDCC: +_0811CDCC: pop {r4} pop {r1} bx r1 @@ -523319,12 +523319,12 @@ sub_811CDD4: ; 811CDD4 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811CDEC + beq _0811CDEC cmp r0, 0x1 - beq @0811CE00 - b @0811CE0A + beq _0811CE00 + b _0811CE0A .pool -@0811CDEC: +_0811CDEC: bl sub_811DF90 movs r0, 0x7 bl sub_811D104 @@ -523332,15 +523332,15 @@ sub_811CDD4: ; 811CDD4 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811CE0A -@0811CE00: + b _0811CE0A +_0811CE00: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811CE0C -@0811CE0A: + b _0811CE0C +_0811CE0A: movs r0, 0x1 -@0811CE0C: +_0811CE0C: pop {r4} pop {r1} bx r1 @@ -523353,12 +523353,12 @@ sub_811CE14: ; 811CE14 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811CE2C + beq _0811CE2C cmp r0, 0x1 - beq @0811CE40 - b @0811CE4A + beq _0811CE40 + b _0811CE4A .pool -@0811CE2C: +_0811CE2C: bl sub_811DF90 movs r0, 0x8 bl sub_811D104 @@ -523366,15 +523366,15 @@ sub_811CE14: ; 811CE14 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811CE4A -@0811CE40: + b _0811CE4A +_0811CE40: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811CE4C -@0811CE4A: + b _0811CE4C +_0811CE4A: movs r0, 0x1 -@0811CE4C: +_0811CE4C: pop {r4} pop {r1} bx r1 @@ -523387,12 +523387,12 @@ sub_811CE54: ; 811CE54 ldr r0, [r4] ldrh r0, [r0] cmp r0, 0 - beq @0811CE6C + beq _0811CE6C cmp r0, 0x1 - beq @0811CE80 - b @0811CE8A + beq _0811CE80 + b _0811CE8A .pool -@0811CE6C: +_0811CE6C: bl sub_811DF90 movs r0, 0x9 bl sub_811D104 @@ -523400,15 +523400,15 @@ sub_811CE54: ; 811CE54 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @0811CE8A -@0811CE80: + b _0811CE8A +_0811CE80: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 - b @0811CE8C -@0811CE8A: + b _0811CE8C +_0811CE8A: movs r0, 0x1 -@0811CE8C: +_0811CE8C: pop {r4} pop {r1} bx r1 @@ -523424,7 +523424,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 @@ -523462,11 +523462,11 @@ sub_811CE94: ; 811CE94 ldr r1, [r4] strb r0, [r1, 0xA] movs r0, 0x1 - b @0811CEFE + b _0811CEFE .pool -@0811CEFC: +_0811CEFC: movs r0, 0 -@0811CEFE: +_0811CEFE: pop {r4} pop {r1} bx r1 @@ -523561,7 +523561,7 @@ sub_811CFCC: ; 811CFCC bl sub_811BA88 adds r5, r0, 0 cmp r5, 0 - beq @0811D020 + beq _0811D020 movs r0, 0x1 adds r1, r5, 0 movs r2, 0x90 @@ -523592,7 +523592,7 @@ sub_811CFCC: ; 811CFCC movs r0, 0 movs r1, 0x3 bl CopyWindowToVram -@0811D020: +_0811D020: add sp, 0x14 pop {r4,r5} pop {r0} @@ -523723,84 +523723,84 @@ 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 .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, =gUnknown_085EC743 str r0, [sp, 0xC] - b @0811D1BC + b _0811D1BC .pool -@0811D180: +_0811D180: ldr r0, =gUnknown_085EC752 str r0, [sp, 0xC] - b @0811D1BC + b _0811D1BC .pool -@0811D18C: +_0811D18C: ldr r0, =gUnknown_085EC4C9 str r0, [sp, 0xC] ldr r0, =gUnknown_085EC4E9 - b @0811D1BA + b _0811D1BA .pool -@0811D19C: +_0811D19C: ldr r0, =gUnknown_085EC765 str r0, [sp, 0xC] - b @0811D1BC + b _0811D1BC .pool -@0811D1A8: +_0811D1A8: ldr r0, =gUnknown_085EC520 str r0, [sp, 0xC] - b @0811D1BC + b _0811D1BC .pool -@0811D1B4: +_0811D1B4: ldr r0, =gUnknown_085EC672 str r0, [sp, 0xC] ldr r0, =gUnknown_085EC688 -@0811D1BA: +_0811D1BA: str r0, [sp, 0x10] -@0811D1BC: +_0811D1BC: movs r0, 0x1 movs r1, 0x11 bl FillWindowPixelBuffer ldr r2, [sp, 0xC] cmp r2, 0 - beq @0811D1E0 + beq _0811D1E0 movs r0, 0x1 str r0, [sp] movs r0, 0xFF @@ -523811,10 +523811,10 @@ sub_811D104: ; 811D104 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 @@ -523825,7 +523825,7 @@ sub_811D104: ; 811D104 movs r1, 0x1 movs r3, 0 bl sub_811D028 -@0811D1FC: +_0811D1FC: movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram @@ -523937,10 +523937,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] @@ -523949,19 +523949,19 @@ sub_811D2C8: ; 811D2C8 movs r7, 0 ldr r0, [sp, 0x14] cmp r7, r0 - bge @0811D402 -@0811D316: + bge _0811D402 +_0811D316: add r0, sp, 0xC ldr r1, =gUnknown_08597C8C 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 @@ -523977,25 +523977,25 @@ sub_811D2C8: ; 811D2C8 mov r9, r0 adds r1, r7, 0x1 mov r10, r1 - b @0811D3CE + b _0811D3CE .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 CopyEasyChatWord adds r2, r0, 0 adds r4, 0x2 - b @0811D3A2 + b _0811D3A2 .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 @@ -524003,48 +524003,48 @@ sub_811D2C8: ; 811D2C8 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 WriteColorChangeControlCode 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 AppendString 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 @@ -524066,8 +524066,8 @@ sub_811D2C8: ; 811D2C8 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] @@ -524103,10 +524103,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, =gUnknown_08597C30 lsls r2, r6, 2 adds r2, r0 @@ -524122,11 +524122,11 @@ sub_811D424: ; 811D424 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 @@ -524141,7 +524141,7 @@ sub_811D424: ; 811D424 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 @@ -524150,14 +524150,14 @@ sub_811D424: ; 811D424 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 @@ -524166,10 +524166,10 @@ sub_811D424: ; 811D424 strh r1, [r0] adds r6, r4, 0 cmp r6, r12 - blt @0811D474 - b @0811D5D6 + blt _0811D474 + b _0811D5D6 .pool -@0811D4D4: +_0811D4D4: ldr r4, =gUnknown_08597C30 mov r10, r4 lsls r6, 2 @@ -524199,7 +524199,7 @@ sub_811D424: ; 811D424 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 @@ -524207,14 +524207,14 @@ sub_811D424: ; 811D424 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 @@ -524224,12 +524224,12 @@ sub_811D424: ; 811D424 strh r1, [r0] adds r6, 0x1 cmp r6, r12 - bge @0811D590 + bge _0811D590 ldr r0, =gUnknown_08597C30 add r0, r9 ldrb r0, [r0] lsls r3, r0, 27 -@0811D546: +_0811D546: lsrs r0, r3, 27 subs r7, r0, 0x1 lsls r1, r6, 5 @@ -524242,7 +524242,7 @@ sub_811D424: ; 811D424 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 @@ -524251,14 +524251,14 @@ sub_811D424: ; 811D424 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 @@ -524268,8 +524268,8 @@ sub_811D424: ; 811D424 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] @@ -524285,7 +524285,7 @@ sub_811D424: ; 811D424 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 @@ -524293,21 +524293,21 @@ sub_811D424: ; 811D424 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 @@ -524333,26 +524333,26 @@ 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 .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 @@ -524360,14 +524360,14 @@ sub_811D60C: ; 811D60C 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 CopyToBgTilemapBufferRect - b @0811D67C -@0811D668: + b _0811D67C +_0811D668: movs r0, 0x20 str r0, [sp] movs r0, 0x4 @@ -524377,7 +524377,7 @@ sub_811D60C: ; 811D60C movs r2, 0 movs r3, 0xA bl CopyToBgTilemapBufferRect -@0811D67C: +_0811D67C: add sp, 0x8 pop {r4} pop {r0} @@ -524404,21 +524404,21 @@ sub_811D698: ; 811D698 movs r1, 0x11 bl FillWindowPixelBuffer 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 CopyWindowToVram @@ -524433,14 +524433,14 @@ sub_811D6D4: ; 811D6D4 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 @@ -524451,11 +524451,11 @@ sub_811D6F4: ; 811D6F4 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 @@ -524463,7 +524463,7 @@ sub_811D6F4: ; 811D6F4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x16 - beq @0811D742 + beq _0811D742 bl sub_811F424 adds r2, r0, 0 movs r0, 0x54 @@ -524482,10 +524482,10 @@ sub_811D6F4: ; 811D6F4 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 @@ -524505,7 +524505,7 @@ sub_811D758: ; 811D758 movs r4, 0xC2 lsls r4, 23 ldr r6, =gUnknown_08597C90 -@0811D764: +_0811D764: ldm r6!, {r2} lsrs r0, r4, 24 str r0, [sp] @@ -524522,7 +524522,7 @@ sub_811D758: ; 811D758 adds r4, r0 adds r5, 0x1 cmp r5, 0x3 - bls @0811D764 + bls _0811D764 add sp, 0xC pop {r4-r6} pop {r0} @@ -524592,11 +524592,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 @@ -524606,7 +524606,7 @@ sub_811D7EC: ; 811D7EC adds r0, r5, 0 adds r1, r4, 0 bl sub_811D864 -@0811D828: +_0811D828: pop {r4,r5} pop {r0} bx r0 @@ -524622,7 +524622,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 @@ -524632,7 +524632,7 @@ sub_811D830: ; 811D830 adds r0, r5, 0 adds r1, r4, 0 bl sub_811D864 -@0811D85C: +_0811D85C: pop {r4,r5} pop {r0} bx r0 @@ -524660,8 +524660,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 @@ -524670,7 +524670,7 @@ sub_811D864: ; 811D864 mov r10, r0 lsls r0, r1, 24 lsrs r7, r0, 24 -@0811D89E: +_0811D89E: mov r1, r8 lsls r0, r1, 16 lsrs r0, 16 @@ -524681,7 +524681,7 @@ sub_811D864: ; 811D864 lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - beq @0811D926 + beq _0811D926 ldr r5, =0x0203a11c ldr r0, [r5] adds r0, 0xCC @@ -524692,7 +524692,7 @@ sub_811D864: ; 811D864 bl sub_811BF88 adds r1, r0, 0 cmp r1, 0 - bne @0811D8FC + bne _0811D8FC ldr r2, [r5] adds r2, 0xCC movs r0, 0xD @@ -524708,9 +524708,9 @@ sub_811D864: ; 811D864 movs r0, 0x2 movs r1, 0x1 bl sub_811D028 - b @0811D926 + b _0811D926 .pool -@0811D8FC: +_0811D8FC: ldr r2, [r5] adds r2, 0xCC movs r0, 0xD @@ -524731,16 +524731,16 @@ sub_811D864: ; 811D864 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 CopyWindowToVram @@ -524768,17 +524768,17 @@ 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 .pool -@0811D97C: +_0811D97C: movs r4, 0 -@0811D97E: +_0811D97E: movs r5, 0xE0 str r5, [sp] lsls r0, 16 @@ -524789,7 +524789,7 @@ sub_811D950: ; 811D950 movs r2, 0 bl FillWindowPixelRect cmp r4, 0 - beq @0811D9AA + beq _0811D9AA str r5, [sp] lsls r0, r4, 16 lsrs r0, 16 @@ -524799,7 +524799,7 @@ sub_811D950: ; 811D950 movs r2, 0 movs r3, 0 bl FillWindowPixelRect -@0811D9AA: +_0811D9AA: add sp, 0x8 pop {r4,r5} pop {r0} @@ -524824,86 +524824,86 @@ 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 .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 .pool -@0811DA18: +_0811DA18: ldr r1, =0x0203a11c ldr r2, [r1] movs r3, 0 movs r0, 0x9 - b @0811DA44 + b _0811DA44 .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 .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 .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 .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 .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 @@ -524911,9 +524911,9 @@ sub_811D9CC: ; 811D9CC 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 @@ -524928,7 +524928,7 @@ sub_811DAA4: ; 811DAA4 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] @@ -524942,11 +524942,11 @@ sub_811DAA4: ; 811DAA4 negs r0, r1 orrs r0, r1 lsrs r0, 31 - b @0811DAD6 + b _0811DAD6 .pool -@0811DAD4: +_0811DAD4: movs r0, 0 -@0811DAD6: +_0811DAD6: pop {r4} pop {r1} bx r1 @@ -524968,144 +524968,144 @@ sub_811DADC: ; 811DADC movs r3, 0xA bl FillBgTilemapBufferRect_Palette0 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 .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 CopyBgTilemapBufferToVram add sp, 0x8 @@ -525148,7 +525148,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 @@ -525156,14 +525156,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 @@ -525183,10 +525183,10 @@ sub_811DC28: ; 811DC28 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 @@ -525197,7 +525197,7 @@ sub_811DC28: ; 811DC28 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 @@ -525205,14 +525205,14 @@ sub_811DC28: ; 811DC28 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 @@ -525222,8 +525222,8 @@ sub_811DC28: ; 811DC28 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 @@ -525235,7 +525235,7 @@ sub_811DC28: ; 811DC28 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 @@ -525243,14 +525243,14 @@ sub_811DC28: ; 811DC28 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 @@ -525323,7 +525323,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 @@ -525334,17 +525334,17 @@ 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 .pool -@0811DE00: +_0811DE00: movs r0, 0x2 adds r1, r2, 0 movs r2, 0 bl ChangeBgY -@0811DE0A: +_0811DE0A: pop {r4,r5} pop {r0} bx r0 @@ -525362,7 +525362,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 @@ -525371,11 +525371,11 @@ sub_811DE10: ; 811DE10 movs r2, 0x1 bl ChangeBgY movs r0, 0x1 - b @0811DE42 + b _0811DE42 .pool -@0811DE40: +_0811DE40: movs r0, 0 -@0811DE42: +_0811DE42: pop {r1} bx r1 thumb_func_end sub_811DE10 @@ -525428,13 +525428,13 @@ sub_811DE90: ; 811DE90 bl LoadTaggedObjectPalettes movs r5, 0 ldr r4, =gUnknown_08597CE8 -@0811DEA2: +_0811DEA2: adds r0, r4, 0 bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0x3 - bls @0811DEA2 + bls _0811DEA2 pop {r4,r5} pop {r0} bx r0 @@ -525492,14 +525492,14 @@ sub_811DF28: ; 811DF28 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] @@ -525507,10 +525507,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 .pool @@ -525675,12 +525675,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 @@ -525689,7 +525689,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 @@ -525697,9 +525697,9 @@ sub_811E088: ; 811E088 movs r1, 0 ldrsb r1, [r4, r1] bl sub_811E0EC - b @0811E0E4 + b _0811E0E4 .pool -@0811E0D4: +_0811E0D4: mov r0, sp ldrb r0, [r0] lsls r0, 24 @@ -525707,7 +525707,7 @@ sub_811E088: ; 811E088 movs r1, 0 ldrsb r1, [r4, r1] bl sub_811E1A4 -@0811E0E4: +_0811E0E4: add sp, 0x4 pop {r4} pop {r0} @@ -525726,7 +525726,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] @@ -525760,9 +525760,9 @@ sub_811E0EC: ; 811E0EC adds r0, r6 ldr r1, [r0] strh r5, [r1, 0x20] - b @0811E192 + b _0811E192 .pool -@0811E150: +_0811E150: ldr r6, =0x0203a11c ldr r0, [r6] movs r4, 0xB7 @@ -525794,7 +525794,7 @@ sub_811E0EC: ; 811E0EC ldr r1, [r0] mov r2, r8 strh r2, [r1, 0x20] -@0811E192: +_0811E192: ldr r0, [r0] strh r4, [r0, 0x22] pop {r3} @@ -525818,7 +525818,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 @@ -525826,26 +525826,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, =gUnknown_08597D08 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 @@ -525874,9 +525874,9 @@ sub_811E1A4: ; 811E1A4 ldr r0, [r0] mov r1, r8 strh r1, [r0, 0x22] - b @0811E27A + b _0811E27A .pool -@0811E234: +_0811E234: ldr r6, =0x0203a11c ldr r0, [r6] movs r4, 0xB7 @@ -525910,7 +525910,7 @@ sub_811E1A4: ; 811E1A4 strh r2, [r1, 0x20] ldr r0, [r0] strh r4, [r0, 0x22] -@0811E27A: +_0811E27A: pop {r3} mov r8, r3 pop {r4-r7} @@ -525965,7 +525965,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] @@ -525973,10 +525973,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 .pool @@ -526029,7 +526029,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] @@ -526038,7 +526038,7 @@ sub_811E34C: ; 811E34C strh r1, [r0, 0x24] ldr r0, [r2] strh r1, [r0, 0x2E] -@0811E376: +_0811E376: pop {r4} pop {r0} bx r0 @@ -526055,7 +526055,7 @@ sub_811E380: ; 811E380 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq @0811E3A2 + beq _0811E3A2 bl RemoveObjectAndFreeTiles ldr r0, [r4] movs r1, 0xB9 @@ -526063,7 +526063,7 @@ sub_811E380: ; 811E380 adds r0, r1 movs r1, 0 str r1, [r0] -@0811E3A2: +_0811E3A2: pop {r4} pop {r0} bx r0 @@ -526124,13 +526124,13 @@ sub_811E418: ; 811E418 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 .pool -@0811E430: +_0811E430: movs r0, 0xBA lsls r0, 2 adds r2, r0 @@ -526142,12 +526142,12 @@ sub_811E418: ; 811E418 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 @@ -526155,8 +526155,8 @@ sub_811E418: ; 811E418 ldr r0, [r0] movs r1, 0x1 bl StartObjectImageAnim - b @0811E476 -@0811E466: + b _0811E476 +_0811E466: ldr r0, [r4] movs r1, 0xBB lsls r1, 2 @@ -526164,15 +526164,15 @@ sub_811E418: ; 811E418 ldr r0, [r0] movs r1, 0x2 bl StartObjectImageAnim -@0811E476: +_0811E476: ldr r0, =0x0203a11c ldr r1, [r0] ldrb r0, [r1, 0x9] adds r0, 0x1 strb r0, [r1, 0x9] - b @0811E4A4 + b _0811E4A4 .pool -@0811E488: +_0811E488: movs r1, 0xBB lsls r1, 2 adds r0, r2, r1 @@ -526182,14 +526182,14 @@ sub_811E418: ; 811E418 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 @@ -526221,13 +526221,13 @@ sub_811E4D0: ; 811E4D0 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 .pool -@0811E4E8: +_0811E4E8: movs r1, 0xBB lsls r1, 2 adds r0, r3, r1 @@ -526237,11 +526237,11 @@ sub_811E4D0: ; 811E4D0 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 @@ -526256,7 +526256,7 @@ sub_811E4D0: ; 811E4D0 movs r0, 0x40 negs r0, r0 cmp r1, r0 - bgt @0811E552 + bgt _0811E552 movs r4, 0xBB lsls r4, 2 adds r0, r3, r4 @@ -526279,10 +526279,10 @@ sub_811E4D0: ; 811E4D0 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 @@ -526310,7 +526310,7 @@ sub_811E578: ; 811E578 bl sub_811BBB0 lsls r0, 24 cmp r0, 0 - bne @0811E59C + bne _0811E59C ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB @@ -526319,9 +526319,9 @@ sub_811E578: ; 811E578 ldr r0, [r0] movs r1, 0x1 bl StartObjectImageAnim - b @0811E5AE + b _0811E5AE .pool -@0811E59C: +_0811E59C: ldr r0, =0x0203a11c ldr r0, [r0] movs r1, 0xBB @@ -526330,7 +526330,7 @@ sub_811E578: ; 811E578 ldr r0, [r0] movs r1, 0x2 bl StartObjectImageAnim -@0811E5AE: +_0811E5AE: pop {r0} bx r0 .pool @@ -526365,7 +526365,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 @@ -526377,7 +526377,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 @@ -526386,7 +526386,7 @@ sub_811E5D4: ; 811E5D4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @0811E636 + beq _0811E636 ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBD @@ -526403,7 +526403,7 @@ sub_811E5D4: ; 811E5D4 movs r2, 0x2 orrs r1, r2 strb r1, [r0] -@0811E636: +_0811E636: bl sub_811E6B0 pop {r4} pop {r0} @@ -526423,9 +526423,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 @@ -526445,9 +526445,9 @@ sub_811E64C: ; 811E64C 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 @@ -526494,7 +526494,7 @@ sub_811E6B0: ; 811E6B0 sub_811E6E0: ; 811E6E0 push {lr} cmp r0, 0 - bne @0811E6FC + bne _0811E6FC ldr r0, =0x0203a11c ldr r2, [r0] movs r1, 0xBC @@ -526502,9 +526502,9 @@ sub_811E6E0: ; 811E6E0 adds r0, r2, r1 ldr r0, [r0] movs r1, 0x60 - b @0811E70A + b _0811E70A .pool -@0811E6FC: +_0811E6FC: ldr r0, =0x0203a11c ldr r2, [r0] movs r1, 0xBC @@ -526512,7 +526512,7 @@ sub_811E6E0: ; 811E6E0 adds r0, r2, r1 ldr r0, [r0] movs r1, 0x78 -@0811E70A: +_0811E70A: strh r1, [r0, 0x20] movs r3, 0xBD lsls r3, 2 @@ -526536,7 +526536,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 @@ -526548,7 +526548,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 @@ -526557,7 +526557,7 @@ sub_811E720: ; 811E720 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @0811E77E + beq _0811E77E ldr r0, =0x0203a11c ldr r2, [r0] movs r0, 0xBF @@ -526571,7 +526571,7 @@ sub_811E720: ; 811E720 str r0, [r2] movs r1, 0x1 bl StartObjectImageAnim -@0811E77E: +_0811E77E: bl sub_811E7F8 pop {r4} pop {r0} @@ -526591,9 +526591,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 @@ -526613,9 +526613,9 @@ sub_811E794: ; 811E794 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 @@ -526666,30 +526666,30 @@ sub_811E828: ; 811E828 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, =DummyObjectCallback movs r4, 0 @@ -526701,7 +526701,7 @@ sub_811E828: ; 811E828 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq @0811E892 + beq _0811E892 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -526714,15 +526714,15 @@ sub_811E828: ; 811E828 strb r1, [r0, 0x5] movs r1, 0x2 bl StartObjectImageAnim -@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 @@ -526732,7 +526732,7 @@ sub_811E828: ; 811E828 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x40 - beq @0811E8D0 + beq _0811E8D0 ldr r1, =0x02020630 lsls r0, r2, 4 adds r0, r2 @@ -526745,7 +526745,7 @@ sub_811E828: ; 811E828 strb r1, [r0, 0x5] movs r1, 0x3 bl StartObjectImageAnim -@0811E8D0: +_0811E8D0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -526763,29 +526763,29 @@ 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 .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 @@ -526797,17 +526797,17 @@ sub_811E920: ; 811E920 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, =gUnknown_08597E60 lsls r1, 2 adds r1, r4, r1 adds r1, r0 ldrb r0, [r1] adds r0, 0x4 -@0811E93E: +_0811E93E: pop {r4} pop {r1} bx r1 @@ -526825,7 +526825,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 @@ -526876,11 +526876,11 @@ sub_811E948: ; 811E948 ldr r1, =gUnknown_08597E60 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 @@ -526895,14 +526895,14 @@ sub_811E948: ; 811E948 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 PutWindowTilemap -@0811E9FA: +_0811E9FA: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -526921,33 +526921,33 @@ sub_811EA28: ; 811EA28 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 FlagGet - b @0811EA60 + b _0811EA60 .pool -@0811EA48: +_0811EA48: cmp r1, 0x15 - beq @0811EA5C - b @0811EA66 -@0811EA4E: + beq _0811EA5C + b _0811EA66 +_0811EA4E: ldr r0, =0x00000866 bl FlagGet - b @0811EA60 + b _0811EA60 .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 @@ -526959,25 +526959,25 @@ start_menu_is_selected_item_valid: ; 811EA6C 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, =gEasyChatGroups lsls r1, r4, 3 adds r1, r0 ldrh r0, [r1, 0x6] -@0811EA9A: +_0811EA9A: pop {r4} pop {r1} bx r1 @@ -526991,54 +526991,54 @@ sub_811EAA4: ; 811EAA4 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, =gEasyChatGroups 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 .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 @@ -527052,41 +527052,41 @@ sub_811EB10: ; 811EB10 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, =gUnknown_085F5490 ldrh r0, [r0] - b @0811EB50 + b _0811EB50 .pool -@0811EB3C: +_0811EB3C: ldr r0, =gUnknown_085FA1D4 ldrh r0, [r0] - b @0811EB50 + b _0811EB50 .pool -@0811EB48: +_0811EB48: ldr r1, =gEasyChatGroups 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 .pool -@0811EB5C: +_0811EB5C: movs r0, 0x1 -@0811EB5E: +_0811EB5E: pop {r1} bx r1 thumb_func_end sub_811EB10 @@ -527100,30 +527100,30 @@ GetEasyChatWord: ; 811EB64 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, =gSpeciesNames adds r0, r1 - b @0811EBB2 + b _0811EBB2 .pool -@0811EB90: +_0811EB90: movs r0, 0xD muls r0, r2 ldr r1, =gMoveNames adds r0, r1 - b @0811EBB2 + b _0811EBB2 .pool -@0811EBA0: +_0811EBA0: ldr r1, =gEasyChatGroups lsls r0, 3 adds r0, r1 @@ -527133,7 +527133,7 @@ GetEasyChatWord: ; 811EB64 lsls r0, 2 adds r0, r1 ldr r0, [r0] -@0811EBB2: +_0811EBB2: pop {r1} bx r1 .pool @@ -527150,29 +527150,29 @@ CopyEasyChatWord: ; 811EBBC bl sub_811EAA4 lsls r0, 24 cmp r0, 0 - beq @0811EBD8 + beq _0811EBD8 ldr r1, =gUnknown_085EEA42 - b @0811EBEA + b _0811EBEA .pool -@0811EBD8: +_0811EBD8: ldr r0, =0x0000ffff cmp r4, r0 - beq @0811EBFC + beq _0811EBFC ldr r1, =0x000001ff ands r1, r4 lsrs r0, r6, 25 bl GetEasyChatWord adds r1, r0, 0 -@0811EBEA: +_0811EBEA: adds r0, r5, 0 bl CopyString - b @0811EC02 + b _0811EC02 .pool -@0811EBFC: +_0811EBFC: movs r0, 0xFF strb r0, [r5] adds r0, r5, 0 -@0811EC02: +_0811EC02: pop {r4-r6} pop {r1} bx r1 @@ -527196,15 +527196,15 @@ ConvertEasyChatWordsToString: ; 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] @@ -527213,18 +527213,18 @@ ConvertEasyChatWordsToString: ; 811EC08 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 @@ -527237,8 +527237,8 @@ ConvertEasyChatWordsToString: ; 811EC08 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] @@ -527278,45 +527278,45 @@ 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 .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] @@ -527325,18 +527325,18 @@ sub_811EC98: ; 811EC98 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 @@ -527344,25 +527344,25 @@ sub_811EC98: ; 811EC98 adds r4, r0, 0 ldr r0, [sp, 0x4] cmp r0, 0 - bne @0811ED4C + bne _0811ED4C movs r0, 0xFE - b @0811ED4E + b _0811ED4E .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] @@ -527385,29 +527385,29 @@ sub_811ED7C: ; 811ED7C adds r4, r0, 0 ldr r0, =0x0000ffff cmp r4, r0 - bne @0811ED94 + bne _0811ED94 movs r0, 0 - b @0811EDBA + b _0811EDBA .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 GetEasyChatWord - b @0811EDB2 + b _0811EDB2 .pool -@0811EDB0: +_0811EDB0: ldr r0, =gUnknown_085EEA42 -@0811EDB2: +_0811EDB2: bl GetStringLength lsls r0, 16 lsrs r0, 16 -@0811EDBA: +_0811EDBA: pop {r4,r5} pop {r1} bx r1 @@ -527433,17 +527433,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] @@ -527456,21 +527456,21 @@ sub_811EDC4: ; 811EDC4 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 @@ -527497,14 +527497,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, =gEasyChatGroups lsls r0, r4, 3 adds r0, r1 @@ -527512,7 +527512,7 @@ sub_811EE38: ; 811EE38 lsls r0, r2, 1 adds r0, r1 ldrh r2, [r0] -@0811EE74: +_0811EE74: movs r0, 0x7F ands r0, r4 lsls r0, 9 @@ -527536,22 +527536,22 @@ sub_811EE90: ; 811EE90 bl sub_811EA28 lsls r0, 24 cmp r0, 0 - bne @0811EEB0 + bne _0811EEB0 ldr r0, =0x0000ffff - b @0811EEC4 + b _0811EEC4 .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 @@ -527563,28 +527563,28 @@ sub_811EECC: ; 811EECC 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 .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 .pool -@0811EF04: +_0811EF04: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bbc @@ -527596,35 +527596,35 @@ sub_811EECC: ; 811EECC bl sub_811EDC4 lsls r0, 24 cmp r0, 0 - beq @0811EF44 + beq _0811EF44 movs r2, 0x2 movs r3, 0x3 - b @0811EF48 + b _0811EF48 .pool -@0811EF2C: +_0811EF2C: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002bc8 - b @0811EF42 + b _0811EF42 .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 ConvertEasyChatWordsToString adds r0, r4, 0 bl box_related_two__3 -@0811EF58: +_0811EF58: pop {r4,r5} pop {r0} bx r0 @@ -527639,9 +527639,9 @@ sub_811EF6C: ; 811EF6C 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 @@ -527680,7 +527680,7 @@ sub_811EFC0: ; 811EFC0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x20 - bhi @0811EFE4 + bhi _0811EFE4 lsrs r3, r0, 27 movs r2, 0x7 ands r2, r1 @@ -527694,7 +527694,7 @@ sub_811EFC0: ; 811EFC0 ldrb r2, [r1] orrs r0, r2 strb r0, [r1] -@0811EFE4: +_0811EFE4: pop {r0} bx r0 .pool @@ -527705,21 +527705,21 @@ 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} @@ -527733,9 +527733,9 @@ sub_811F01C: ; 811F01C 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 @@ -527745,9 +527745,9 @@ sub_811F01C: ; 811F01C adds r0, r1, 0 orrs r4, r0 adds r0, r4, 0 - b @0811F084 + b _0811F084 .pool -@0811F048: +_0811F048: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -527757,28 +527757,28 @@ sub_811F01C: ; 811F01C 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 @@ -527792,9 +527792,9 @@ sub_811F090: ; 811F090 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 @@ -527802,9 +527802,9 @@ sub_811F090: ; 811F090 adds r0, r1, 0 orrs r4, r0 adds r0, r4, 0 - b @0811F0EC + b _0811F0EC .pool -@0811F0B4: +_0811F0B4: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -527813,27 +527813,27 @@ sub_811F090: ; 811F090 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 @@ -527858,15 +527858,15 @@ sub_811F108: ; 811F108 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 .pool -@0811F128: +_0811F128: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -527879,8 +527879,8 @@ sub_811F108: ; 811F108 ldrh r7, [r0, 0x4] movs r6, 0 cmp r6, r7 - bcs @0811F172 -@0811F146: + bcs _0811F172 +_0811F146: ldrh r0, [r5] bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -527889,22 +527889,22 @@ sub_811F108: ; 811F108 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 @@ -527918,7 +527918,7 @@ sub_811F184: ; 811F184 ldr r5, =0x03005d8c ldr r4, =0x00002bb0 ldr r3, =gUnknown_0859E62C -@0811F18E: +_0811F18E: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -527930,12 +527930,12 @@ sub_811F184: ; 811F184 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, =gUnknown_0859E634 -@0811F1AE: +_0811F1AE: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -527947,12 +527947,12 @@ sub_811F184: ; 811F184 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, =gUnknown_0859E640 -@0811F1CE: +_0811F1CE: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -527964,12 +527964,12 @@ sub_811F184: ; 811F184 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, =gUnknown_0859E64C -@0811F1EE: +_0811F1EE: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -527981,18 +527981,18 @@ sub_811F184: ; 811F184 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 @@ -528005,17 +528005,17 @@ sub_811F184: ; 811F184 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 @@ -528024,7 +528024,7 @@ sub_811F184: ; 811F184 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x3F - bls @0811F244 + bls _0811F244 pop {r4-r7} pop {r0} bx r0 @@ -528039,15 +528039,15 @@ sub_811F28C: ; 811F28C bl Alloc str r0, [r4] cmp r0, 0 - beq @0811F2B0 + beq _0811F2B0 bl sub_811F2D4 bl sub_811F46C movs r0, 0x1 - b @0811F2B2 + b _0811F2B2 .pool -@0811F2B0: +_0811F2B0: movs r0, 0 -@0811F2B2: +_0811F2B2: pop {r4} pop {r1} bx r1 @@ -528059,11 +528059,11 @@ sub_811F2B8: ; 811F2B8 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 @@ -528081,7 +528081,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 @@ -528091,9 +528091,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 @@ -528105,12 +528105,12 @@ sub_811F2D4: ; 811F2D4 strh r3, [r0] adds r3, 0x1 cmp r3, 0x10 - ble @0811F2FE + ble _0811F2FE ldr r0, =0x00000864 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @0811F358 + beq _0811F358 ldr r0, =0x0203a120 ldr r2, [r0] ldrh r0, [r2] @@ -528138,12 +528138,12 @@ sub_811F2D4: ; 811F2D4 adds r3, r0 movs r0, 0x13 strh r0, [r3] -@0811F358: +_0811F358: ldr r0, =0x00000866 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @0811F37A + beq _0811F37A ldr r0, =0x0203a120 ldr r0, [r0] ldrh r1, [r0] @@ -528155,10 +528155,10 @@ sub_811F2D4: ; 811F2D4 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] @@ -528170,7 +528170,7 @@ sub_811F2D4: ; 811F2D4 adds r0, r1 movs r1, 0x15 strh r1, [r0] -@0811F398: +_0811F398: pop {r4,r5} pop {r0} bx r0 @@ -528195,16 +528195,16 @@ 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 .pool -@0811F3D8: +_0811F3D8: movs r0, 0x16 -@0811F3DA: +_0811F3DA: pop {r1} bx r1 thumb_func_end sub_811F3B8 @@ -528227,17 +528227,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 @@ -528273,17 +528273,17 @@ CopyEasyChatWordPadded: ; 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 @@ -528301,7 +528301,7 @@ sub_811F46C: ; 811F46C push {r5-r7} sub sp, 0x10 movs r3, 0 -@0811F47A: +_0811F47A: ldr r2, =gEasyChatWordsByLetterPointers lsls r1, r3, 3 adds r0, r2, 0x4 @@ -528324,20 +528324,20 @@ sub_811F46C: ; 811F46C 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 .pool -@0811F4C8: +_0811F4C8: ldr r0, =0x0203a120 ldr r2, [r0] mov r0, r10 @@ -528361,41 +528361,41 @@ sub_811F46C: ; 811F46C ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] - b @0811F526 + b _0811F526 .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 @@ -528412,14 +528412,14 @@ sub_811F548: ; 811F548 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 @@ -528441,17 +528441,17 @@ 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 .pool -@0811F5A4: +_0811F5A4: ldr r0, =0x0000ffff -@0811F5A6: +_0811F5A6: pop {r1} bx r1 .pool @@ -528483,34 +528483,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 @@ -528525,19 +528525,19 @@ sub_811F5C4: ; 811F5C4 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 .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 @@ -528545,7 +528545,7 @@ sub_811F5C4: ; 811F5C4 adds r6, r1, 0 lsls r2, 24 mov r9, r2 -@0811F664: +_0811F664: ldrh r4, [r6, 0x4] adds r0, r4, 0 mov r2, r9 @@ -528553,7 +528553,7 @@ sub_811F5C4: ; 811F5C4 bl sub_811F764 lsls r0, 24 cmp r0, 0 - beq @0811F690 + beq _0811F690 ldr r0, =0x0203a120 ldr r1, [r0] lsls r0, r5, 1 @@ -528567,12 +528567,12 @@ sub_811F5C4: ; 811F5C4 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} @@ -528601,7 +528601,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 @@ -528610,7 +528610,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 @@ -528635,8 +528635,8 @@ sub_811F6B8: ; 811F6B8 adds r3, r5 ldrh r3, [r3] cmp r4, r3 - bcc @0811F6E6 -@0811F718: + bcc _0811F6E6 +_0811F718: adds r0, r6, 0 pop {r3} mov r8, r3 @@ -528656,25 +528656,25 @@ 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 .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 @@ -528688,38 +528688,38 @@ sub_811F764: ; 811F764 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 .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 @@ -528728,29 +528728,29 @@ sub_811F764: ; 811F764 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, =gEasyChatGroups lsls r0, r2, 3 adds r0, r1 @@ -528760,7 +528760,7 @@ sub_811F764: ; 811F764 lsls r0, 2 adds r0, r1 ldrb r0, [r0, 0x8] -@0811F82C: +_0811F82C: pop {r4} pop {r1} bx r1 @@ -528774,20 +528774,20 @@ sub_811F838: ; 811F838 lsrs r3, r0, 16 movs r2, 0 ldr r1, =gUnknown_0859E658 -@0811F842: +_0811F842: ldrh r0, [r1] cmp r0, r3 - bne @0811F850 + bne _0811F850 movs r0, 0x1 - b @0811F85A + b _0811F85A .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 @@ -528803,16 +528803,16 @@ 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 @@ -528828,17 +528828,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 .pool @@ -528851,11 +528851,11 @@ sub_811F8BC: ; 811F8BC 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 .pool @@ -528873,17 +528873,17 @@ 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 .pool -@0811F904: +_0811F904: movs r0, 0 -@0811F906: +_0811F906: pop {r4,r5} pop {r1} bx r1 @@ -528940,18 +528940,18 @@ 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 .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 @@ -528959,7 +528959,7 @@ sub_811F960: ; 811F960 movs r4, 0 adds r7, r5, 0 adds r7, 0xE0 -@0811F99E: +_0811F99E: ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] @@ -528972,7 +528972,7 @@ sub_811F960: ; 811F960 lsls r4, 16 lsrs r4, 16 cmp r4, 0x5 - bls @0811F99E + bls _0811F99E ldr r0, [r6] ldr r0, [r0, 0x2C] adds r0, 0x40 @@ -528982,9 +528982,9 @@ sub_811F960: ; 811F960 ldr r1, [r6] ldr r0, =0x000010b4 adds r1, r0 - b @0811FA1E + b _0811FA1E .pool -@0811F9D8: +_0811F9D8: ldr r0, =0x0203a124 ldr r0, [r0] ldr r0, [r0, 0x2C] @@ -528995,7 +528995,7 @@ sub_811F960: ; 811F960 movs r4, 0 adds r7, r5, 0 adds r7, 0xE0 -@0811F9EE: +_0811F9EE: ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] @@ -529008,7 +529008,7 @@ sub_811F960: ; 811F960 lsls r4, 16 lsrs r4, 16 cmp r4, 0x5 - bls @0811F9EE + bls _0811F9EE ldr r0, [r6] ldr r0, [r0, 0x2C] adds r0, 0xA0 @@ -529018,13 +529018,13 @@ sub_811F960: ; 811F960 ldr r1, [r6] ldr r2, =0x000010b4 adds r1, r2 -@0811FA1E: +_0811FA1E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0811FA88 + b _0811FA88 .pool -@0811FA30: +_0811FA30: ldr r0, [r1, 0x2C] adds r0, 0xC0 adds r1, r5, 0 @@ -529033,7 +529033,7 @@ sub_811F960: ; 811F960 movs r4, 0 adds r7, r5, 0 adds r7, 0xE0 -@0811FA42: +_0811FA42: ldr r6, =0x0203a124 ldr r0, [r6] ldr r0, [r0, 0x2C] @@ -529046,7 +529046,7 @@ sub_811F960: ; 811F960 lsls r4, 16 lsrs r4, 16 cmp r4, 0x5 - bls @0811FA42 + bls _0811FA42 ldr r0, [r6] ldr r0, [r0, 0x2C] movs r1, 0x80 @@ -529061,13 +529061,13 @@ sub_811F960: ; 811F960 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@0811FA7C: +_0811FA7C: movs r0, 0 - b @0811FA8A + b _0811FA8A .pool -@0811FA88: +_0811FA88: movs r0, 0x1 -@0811FA8A: +_0811FA8A: pop {r4-r7} pop {r1} bx r1 @@ -529077,11 +529077,11 @@ sub_811F960: ; 811F960 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 @@ -529103,7 +529103,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 @@ -529115,7 +529115,7 @@ sub_811FAA4: ; 811FAA4 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 @@ -529135,7 +529135,7 @@ 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 @@ -529152,17 +529152,17 @@ sub_811FAF8: ; 811FAF8 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 RemoveObjectAndFreeTiles ldr r0, [r6] adds r0, 0xC @@ -529173,17 +529173,17 @@ sub_811FAF8: ; 811FAF8 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 RemoveObjectAndFreeTiles ldr r0, [r6] adds r0, 0x14 @@ -529194,24 +529194,24 @@ sub_811FAF8: ; 811FAF8 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 RemoveObjectAndFreeTiles ldr r0, [r4] str r7, [r0, 0x24] -@0811FB8A: +_0811FB8A: ldr r0, [r4] ldr r0, [r0, 0x28] cmp r0, 0 - beq @0811FB9A + beq _0811FB9A bl RemoveObjectAndFreeTiles ldr r0, [r4] str r7, [r0, 0x28] -@0811FB9A: +_0811FB9A: pop {r4-r7} pop {r0} bx r0 @@ -529228,7 +529228,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 @@ -529238,19 +529238,19 @@ 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 .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 @@ -529261,16 +529261,16 @@ sub_811FBA4: ; 811FBA4 lsls r0, 24 asrs r0, 24 cmp r0, 0x5 - ble @0811FC64 + ble _0811FC64 ldr r0, [r2] strb r5, [r0, 0x5] - b @0811FC64 + b _0811FC64 .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 @@ -529278,23 +529278,23 @@ sub_811FBA4: ; 811FBA4 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 .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 @@ -529307,23 +529307,23 @@ sub_811FBA4: ; 811FBA4 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 @@ -529433,7 +529433,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 @@ -529443,9 +529443,9 @@ sub_811FC80: ; 811FC80 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 @@ -529464,7 +529464,7 @@ sub_811FC80: ; 811FC80 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] @@ -529489,7 +529489,7 @@ sub_811FC80: ; 811FC80 lsls r1, 14 adds r0, r1 mov r9, r0 -@0811FDC8: +_0811FDC8: lsls r2, r5, 4 adds r2, 0x10 ldr r3, [sp, 0x4C] @@ -529506,9 +529506,9 @@ sub_811FC80: ; 811FC80 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 @@ -529525,7 +529525,7 @@ sub_811FC80: ; 811FC80 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x3 - bls @0811FDC8 + bls _0811FDC8 ldr r0, =DummyObjectCallback str r0, [r4, 0x14] adds r0, r4, 0 @@ -529536,7 +529536,7 @@ sub_811FC80: ; 811FC80 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @0811FEA8 + beq _0811FEA8 ldr r0, [r6] lsls r1, r3, 4 adds r1, r3 @@ -529574,13 +529574,13 @@ sub_811FC80: ; 811FC80 movs r2, 0x2 movs r3, 0 bl CalcVecFromObjectCenterToObjectUpperLeft - b @0811FEAE + b _0811FEAE .pool -@0811FEA8: +_0811FEA8: ldr r1, [r6] movs r0, 0 str r0, [r1, 0x28] -@0811FEAE: +_0811FEAE: ldr r0, =sub_811FF7C str r0, [r4, 0x14] ldr r0, [sp, 0x48] @@ -529595,7 +529595,7 @@ sub_811FC80: ; 811FC80 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @0811FF20 + beq _0811FF20 ldr r0, =0x0203a124 ldr r2, [r0] lsls r1, r3, 4 @@ -529611,32 +529611,32 @@ sub_811FC80: ; 811FC80 ldr r0, [r2, 0x24] movs r1, 0x8 bl StartObjectImageAnim - b @0811FF28 + b _0811FF28 .pool -@0811FEFC: +_0811FEFC: ldr r0, =0x0203a124 ldr r0, [r0] lsls r1, r5, 2 adds r0, 0xC - b @0811FF14 + b _0811FF14 .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 .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 @@ -529665,21 +529665,21 @@ 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 StartObjectImageAnim - b @0811FF76 + b _0811FF76 .pool -@0811FF6C: +_0811FF6C: lsls r1, 25 lsrs r1, 24 adds r0, r2, 0 bl StartObjectImageAnim -@0811FF76: +_0811FF76: pop {r0} bx r0 thumb_func_end sub_811FF40 @@ -529707,9 +529707,9 @@ sub_811FF94: ; 811FF94 lsls r1, 16 lsrs r1, 16 cmp r2, 0 - bne @0811FFA4 + bne _0811FFA4 ldr r2, =gUnknown_0859E65C -@0811FFA4: +_0811FFA4: movs r3, 0x10 bl sub_811FFD4 pop {r1} @@ -529725,9 +529725,9 @@ sub_811FFB4: ; 811FFB4 lsls r1, 16 lsrs r1, 16 cmp r2, 0 - bne @0811FFC4 + bne _0811FFC4 ldr r2, =gUnknown_0859E65C -@0811FFC4: +_0811FFC4: movs r3, 0x1 bl sub_811FFD4 pop {r1} @@ -529792,17 +529792,17 @@ sub_811FFD4: ; 811FFD4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - bne @08120068 + bne _08120068 movs r0, 0 - b @08120072 + b _08120072 .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 @@ -529848,7 +529848,7 @@ sub_81200A0: ; 81200A0 ldr r0, =0x00002e2a adds r2, r0 ldr r4, =gUnknown_0859EFE4 -@081200C6: +_081200C6: lsls r0, r3, 1 adds r1, r2, r0 adds r0, r4 @@ -529858,7 +529858,7 @@ sub_81200A0: ; 81200A0 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x5 - bls @081200C6 + bls _081200C6 pop {r4} pop {r0} bx r0 @@ -529931,35 +529931,35 @@ 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 .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 @@ -530018,7 +530018,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 @@ -530029,14 +530029,14 @@ sub_8120210: ; 8120210 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 @@ -530046,7 +530046,7 @@ sub_8120210: ; 8120210 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x5 - bls @0812024E + bls _0812024E movs r0, 0x1 strb r0, [r5] pop {r4-r6} @@ -530065,14 +530065,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 @@ -530080,18 +530080,18 @@ sub_8120280: ; 8120280 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] @@ -530102,18 +530102,18 @@ sub_8120280: ; 8120280 bl CopyEasyChatWord 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] @@ -530124,31 +530124,31 @@ sub_8120280: ; 8120280 bl CopyEasyChatWord 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 @@ -530200,17 +530200,17 @@ sub_812038C: ; 812038C lsrs r1, r0, 16 ldr r0, =0x0000ffff cmp r1, r0 - bne @081203AC + bne _081203AC ldr r1, =0x020375f0 movs r0, 0 - b @081203B6 + b _081203B6 .pool -@081203AC: +_081203AC: ldr r0, =0x02021cc4 bl CopyEasyChatWord ldr r1, =0x020375f0 movs r0, 0x1 -@081203B6: +_081203B6: strh r0, [r1] pop {r0} bx r0 @@ -530226,18 +530226,18 @@ 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 .pool -@081203EC: +_081203EC: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -@081203F2: +_081203F2: pop {r0} bx r0 .pool @@ -530252,9 +530252,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 @@ -530263,7 +530263,7 @@ sub_81203FC: ; 81203FC ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - beq @08120480 + beq _08120480 bl GenerateRandomNumber adds r4, r0, 0 lsls r4, 16 @@ -530289,9 +530289,9 @@ sub_81203FC: ; 81203FC adds r2, r0, 0 ldr r1, =gUnknown_08294301 bl CopyString - b @081204A2 + b _081204A2 .pool -@08120480: +_08120480: ldr r0, =0x02021fc4 ldr r3, =gUnknown_0859F010 ldrb r2, [r5, 0x2] @@ -530308,7 +530308,7 @@ sub_81203FC: ; 81203FC adds r1, r3 ldr r1, [r1] bl CopyString -@081204A2: +_081204A2: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -530316,14 +530316,14 @@ sub_81203FC: ; 81203FC bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne @081204C4 + bne _081204C4 movs r0, 0xA - b @081204C8 + b _081204C8 .pool -@081204C4: +_081204C4: ldrb r0, [r5, 0x1] adds r0, 0x1 -@081204C8: +_081204C8: strb r0, [r5, 0x1] ldr r1, =0x020375f0 movs r0, 0x1 @@ -530359,20 +530359,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 @@ -530390,11 +530390,11 @@ sub_81204DC: ; 81204DC 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 @@ -530410,13 +530410,13 @@ sub_81204DC: ; 81204DC 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 @@ -530425,9 +530425,9 @@ sub_81204DC: ; 81204DC 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 @@ -530436,9 +530436,9 @@ sub_81204DC: ; 81204DC lsls r0, 16 lsrs r7, r0, 16 adds r4, r5, 0x1 - b @0812060E + b _0812060E .pool -@081205BC: +_081205BC: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -530450,30 +530450,30 @@ sub_81204DC: ; 81204DC 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] @@ -530481,11 +530481,11 @@ sub_81204DC: ; 81204DC 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 @@ -530543,32 +530543,32 @@ sub_8120670: ; 8120670 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 .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 @@ -530652,24 +530652,24 @@ sub_8120748: ; 8120748 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 .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 @@ -530677,27 +530677,27 @@ sub_8120748: ; 8120748 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 .pool -@081207BC: +_081207BC: ldrb r1, [r6] lsls r1, 1 adds r0, r6, 0 @@ -530721,41 +530721,41 @@ sub_8120748: ; 8120748 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 @@ -530767,19 +530767,19 @@ sub_8120748: ; 8120748 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 @@ -530807,28 +530807,28 @@ sub_8120748: ; 8120748 adds r0, r4, 0 adds r1, r5, 0 bl MPlayPitchControl - b @08120938 + b _08120938 .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 @@ -530849,44 +530849,44 @@ sub_8120748: ; 8120748 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 .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 @@ -530909,24 +530909,24 @@ 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 .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 @@ -530938,18 +530938,18 @@ sub_8120944: ; 8120944 movs r0, 0x4 bl sub_80A31E8 movs r0, 0x1 - b @08120B4E + b _08120B4E .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 @@ -530963,38 +530963,38 @@ sub_8120944: ; 8120944 ldr r7, =0x03006130 ldrh r2, [r5, 0x12] ldr r6, =0x0203a128 - b @08120A02 + b _08120A02 .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 @@ -531012,42 +531012,42 @@ sub_8120944: ; 8120944 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 @@ -531056,11 +531056,11 @@ sub_8120944: ; 8120944 bl script_env_2_enable_and_set_ctx_running adds r0, r6, 0 bl remove_task - b @08120B50 + b _08120B50 .pool -@08120AB0: +_08120AB0: cmp r4, 0 - bne @08120AC6 + bne _08120AC6 bl sub_81206F0 ldrh r0, [r5, 0xE] adds r0, 0x1 @@ -531068,10 +531068,10 @@ sub_8120944: ; 8120944 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 @@ -531079,10 +531079,10 @@ sub_8120944: ; 8120944 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] @@ -531090,10 +531090,10 @@ sub_8120944: ; 8120944 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 @@ -531101,29 +531101,29 @@ sub_8120944: ; 8120944 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 @@ -531133,20 +531133,20 @@ sub_8120944: ; 8120944 ldrh r0, [r0, 0x4] strh r0, [r5, 0xC] movs r0, 0x4 - b @08120B4E + b _08120B4E .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} @@ -531170,43 +531170,43 @@ sub_8120B70: ; 8120B70 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 StopMusicWhileStringIsPrinted -@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 @@ -531216,7 +531216,7 @@ sub_8120B70: ; 8120B70 mov r0, sp bl sub_8009228 cmp r0, 0 - beq @08120BF8 + beq _08120BF8 mov r0, sp movs r1, 0 movs r2, 0x8 @@ -531233,12 +531233,12 @@ sub_8120B70: ; 8120B70 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} @@ -531256,101 +531256,101 @@ 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 .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} @@ -531367,9 +531367,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 @@ -531377,12 +531377,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 @@ -531393,20 +531393,20 @@ sub_8120CD0: ; 8120CD0 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 @@ -531423,113 +531423,113 @@ sub_8120D34: ; 8120D34 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 .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 StripExtendedControlCodes 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 StripExtendedControlCodes -@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 @@ -531551,7 +531551,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 @@ -531564,7 +531564,7 @@ sub_8120E08: ; 8120E08 strb r0, [r1] adds r3, 0x1 cmp r3, 0x3 - ble @08120E24 + ble _08120E24 pop {r4,r5} pop {r0} bx r0 @@ -531594,9 +531594,9 @@ sub_8120E74: ; 8120E74 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 @@ -531608,20 +531608,20 @@ sub_8120E88: ; 8120E88 adds r3, r0, 0 movs r2, 0 ldr r1, =gUnknown_0859F048 -@08120E90: +_08120E90: ldrb r0, [r1] cmp r0, r3 - bne @08120EA0 + bne _08120EA0 adds r0, r1, 0 - b @08120EAA + b _08120EAA .pool -@08120EA0: +_08120EA0: adds r1, 0x10 adds r2, 0x1 cmp r2, 0x23 - ble @08120E90 + ble _08120E90 ldr r0, =gUnknown_0859F278 -@08120EAA: +_08120EAA: pop {r1} bx r1 .pool @@ -531662,20 +531662,20 @@ sub_8120ED8: ; 8120ED8 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 @@ -531735,13 +531735,13 @@ sub_8120F4C: ; 8120F4C adds r0, r5, 0 bl sub_8120F08 cmp r4, r0 - bhi @08120F74 + bhi _08120F74 movs r0, 0 - b @08120F76 + b _08120F76 .pool -@08120F74: +_08120F74: movs r0, 0x1 -@08120F76: +_08120F76: pop {r4,r5} pop {r1} bx r1 @@ -531857,18 +531857,18 @@ sub_8121064: ; 8121064 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 @@ -531888,8 +531888,8 @@ sub_8121064: ; 8121064 strb r2, [r0] subs r5, 0x1 cmp r5, 0 - bne @08121080 -@081210B0: + bne _08121080 +_081210B0: pop {r4-r7} pop {r0} bx r0 @@ -531918,7 +531918,7 @@ sub_81210B8: ; 81210B8 movs r1, 0x24 bl sub_8121064 movs r5, 0 -@081210E4: +_081210E4: ldr r1, =gUnknown_0859F048 mov r2, r9 adds r0, r2, r5 @@ -531932,24 +531932,24 @@ sub_81210B8: ; 81210B8 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 @@ -531958,28 +531958,28 @@ sub_81210B8: ; 81210B8 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 .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 @@ -532050,28 +532050,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 GetStringWidth 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 @@ -532098,10 +532098,10 @@ sub_81211EC: ; 81211EC 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 @@ -532120,15 +532120,15 @@ sub_81211EC: ; 81211EC 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, =gUnknown_085EB7EA @@ -532176,52 +532176,52 @@ 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 .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 .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 @@ -532284,16 +532284,16 @@ sub_81213D8: ; 81213D8 ldrb r4, [r1] bl sub_8120F4C cmp r0, 0x1 - beq @08121414 + beq _08121414 movs r0, 0 - b @0812141E + b _0812141E .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 @@ -532310,13 +532310,13 @@ sub_8121424: ; 8121424 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0 - beq @08121448 + beq _08121448 movs r0, 0x1 - b @0812144A + b _0812144A .pool -@08121448: +_08121448: movs r0, 0 -@0812144A: +_0812144A: pop {r1} bx r1 thumb_func_end sub_8121424 @@ -532376,30 +532376,30 @@ 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 .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 @@ -532410,9 +532410,9 @@ sub_8121478: ; 8121478 adds r0, r1 lsls r0, 2 ldr r1, =gUnknown_0859F3B4 - b @08121540 + b _08121540 .pool -@0812152C: +_0812152C: movs r0, 0x8A lsls r0, 2 adds r2, r1, r0 @@ -532423,7 +532423,7 @@ sub_8121478: ; 8121478 adds r0, r1 lsls r0, 2 ldr r1, =gUnknown_0859F458 -@08121540: +_08121540: adds r0, r1 str r0, [r2] ldrh r0, [r5, 0x1E] @@ -532435,7 +532435,7 @@ sub_8121478: ; 8121478 movs r1, 0xCD lsls r1, 17 cmp r0, r1 - bhi @081215AC + bhi _081215AC ldr r1, =0x0203a134 ldr r2, [r1] ldr r3, =0x0000021a @@ -532443,30 +532443,30 @@ sub_8121478: ; 8121478 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 .pool -@0812158C: +_0812158C: ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0x1 strb r0, [r1] - b @081215BA + b _081215BA .pool -@0812159C: +_0812159C: ldr r0, =0x0000021b adds r1, r2, r0 movs r0, 0x2 strb r0, [r1] - b @081215BA + b _081215BA .pool -@081215AC: +_081215AC: ldr r0, =0x0203a134 ldr r1, [r0] ldr r2, =0x0000021b @@ -532474,7 +532474,7 @@ sub_8121478: ; 8121478 movs r2, 0 strb r2, [r1] adds r3, r0, 0 -@081215BA: +_081215BA: ldr r1, [r3] movs r3, 0x85 lsls r3, 2 @@ -532506,43 +532506,43 @@ 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 .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] @@ -532551,18 +532551,18 @@ sub_81215EC: ; 81215EC ldr r2, =0x01000200 add r0, sp, 0x8 bl CpuSet - b @081219D4 + b _081219D4 .pool -@08121688: +_08121688: bl sub_80A1A74 - b @081219D4 -@0812168E: + b _081219D4 +_0812168E: bl clear_tasks - b @081219D4 -@08121694: + b _081219D4 +_08121694: bl ResetAllObjectData - b @081219D4 -@0812169A: + b _081219D4 +_0812169A: bl ResetObjectPaletteAllocator bl reset_temp_tile_data_buffers movs r0, 0x10 @@ -532593,11 +532593,11 @@ sub_81215EC: ; 81215EC movs r1, 0 bl SetGpuReg movs r0, 0x52 -@081216EC: +_081216EC: movs r1, 0 bl SetGpuReg - b @081219D4 -@081216F4: + b _081219D4 +_081216F4: movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_0859F290 @@ -532616,15 +532616,15 @@ sub_81215EC: ; 81215EC adds r1, r0 movs r0, 0x2 bl SetBgTilemap - b @081219D4 + b _081219D4 .pool -@08121730: +_08121730: ldr r0, =gUnknown_0859F29C bl InitWindows bl DeactivateAllTextPrinters - b @081219D4 + b _081219D4 .pool -@08121740: +_08121740: ldr r2, =gUnknown_0859F2B8 ldr r0, =0x0203a134 ldr r0, [r0] @@ -532643,17 +532643,17 @@ sub_81215EC: ; 81215EC movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @081219D4 + b _081219D4 .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 @@ -532686,17 +532686,17 @@ sub_81215EC: ; 81215EC movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer - b @081219D4 + b _081219D4 .pool -@081217D8: +_081217D8: movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0x1 bl CopyBgTilemapBufferToVram movs r0, 0x2 bl CopyBgTilemapBufferToVram - b @081219D4 -@081217EC: + b _081219D4 +_081217EC: bl sub_8098C64 movs r1, 0xF0 movs r2, 0x20 @@ -532776,9 +532776,9 @@ sub_81215EC: ; 81215EC adds r0, r1 ldrh r0, [r0] strh r0, [r5, 0x16] - b @081219D4 + b _081219D4 .pool -@081218B0: +_081218B0: ldr r0, =0x0203a134 ldr r0, [r0] movs r1, 0x86 @@ -532786,13 +532786,13 @@ sub_81215EC: ; 81215EC 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 .pool -@081218CC: +_081218CC: ldr r0, =0x0203a134 ldr r0, [r0] movs r2, 0x86 @@ -532800,19 +532800,19 @@ sub_81215EC: ; 81215EC adds r0, r2 ldrb r0, [r0] cmp r0, 0 - bne @081218DE - b @081219D4 -@081218DE: + bne _081218DE + b _081219D4 +_081218DE: bl sub_8121B1C bl RunTextPrinters - b @081219D4 + b _081219D4 .pool -@081218EC: +_081218EC: bl sub_8087598 cmp r0, 0x1 - bne @081219D4 - b @081219E2 -@081218F6: + bne _081219D4 + b _081219E2 +_081218F6: ldr r0, =sub_8121C50 bl SetVBlankCallback ldr r2, =0x02037fd4 @@ -532820,9 +532820,9 @@ sub_81215EC: ; 81215EC movs r1, 0x80 orrs r0, r1 strb r0, [r2, 0x8] - b @081219D4 + b _081219D4 .pool -@08121910: +_08121910: ldr r5, =0x0203a134 ldr r0, [r5] movs r1, 0x85 @@ -532838,12 +532838,12 @@ sub_81215EC: ; 81215EC adds r0, r2 ldrb r0, [r0] cmp r0, 0x1 - beq @08121940 + beq _08121940 cmp r0, 0x2 - beq @08121958 - b @081219D4 + beq _08121958 + b _081219D4 .pool -@08121940: +_08121940: adds r0, r4, 0 bl sub_80D2F68 ldr r1, =DummyObjectCallback @@ -532852,9 +532852,9 @@ sub_81215EC: ; 81215EC str r0, [sp, 0x4] adds r0, r4, 0 movs r2, 0x60 - b @0812196A + b _0812196A .pool -@08121958: +_08121958: adds r0, r4, 0 bl sub_80D2F68 ldr r1, =DummyObjectCallback @@ -532863,7 +532863,7 @@ sub_81215EC: ; 81215EC str r0, [sp, 0x4] adds r0, r4, 0 movs r2, 0x28 -@0812196A: +_0812196A: movs r3, 0x80 bl sub_80D2D78 ldr r1, [r5] @@ -532871,9 +532871,9 @@ sub_81215EC: ; 81215EC lsls r2, 2 adds r1, r2 strb r0, [r1] - b @081219D4 + b _081219D4 .pool -@08121980: +_08121980: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -532904,9 +532904,9 @@ sub_81215EC: ; 81215EC ldr r1, =sub_8121C98 str r1, [r0] movs r0, 0x1 - b @081219E4 + b _081219E4 .pool -@081219D4: +_081219D4: ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 @@ -532914,9 +532914,9 @@ sub_81215EC: ; 81215EC ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@081219E2: +_081219E2: movs r0, 0 -@081219E4: +_081219E4: add sp, 0xC pop {r4-r6} pop {r1} @@ -532927,23 +532927,23 @@ sub_81215EC: ; 81215EC thumb_func_start sub_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 bl SetMainCallback2 - b @08121A18 + b _08121A18 .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 @@ -532963,10 +532963,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] @@ -533004,8 +533004,8 @@ sub_8121A1C: ; 8121A1C 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 @@ -533023,7 +533023,7 @@ sub_8121A1C: ; 8121A1C adds r0, r1, r3 ldrb r0, [r0] cmp r0, 0 - bne @08121AF0 + bne _08121AF0 ldr r1, =gUnknown_085EEA78 adds r0, r2, 0 bl CopyString @@ -533045,9 +533045,9 @@ sub_8121A1C: ; 8121A1C ldr r0, =0x00000219 adds r2, r0 strb r1, [r2] - b @08121B0C + b _08121B0C .pool -@08121AF0: +_08121AF0: movs r2, 0x80 lsls r2, 2 adds r0, r1, r2 @@ -533061,7 +533061,7 @@ sub_8121A1C: ; 8121A1C ldr r2, =0x00000219 adds r0, r2 strb r1, [r0] -@08121B0C: +_08121B0C: pop {r3} mov r8, r3 pop {r4-r7} @@ -533099,19 +533099,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] @@ -533146,7 +533146,7 @@ sub_8121B1C: ; 8121B1C adds r0, r7, r0 lsls r0, 24 lsrs r7, r0, 24 -@08121BB8: +_08121BB8: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -533156,8 +533156,8 @@ sub_8121B1C: ; 8121B1C ldr r0, [r0] ldrb r0, [r0] cmp r6, r0 - bcc @08121B60 -@08121BCC: + bcc _08121B60 +_08121BCC: ldr r1, =gUnknown_085EEA78 add r0, sp, 0xC bl CopyString @@ -533232,10 +533232,10 @@ sub_8121C64: ; 8121C64 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @08121C7C + beq _08121C7C bl CallObjectCallbacks bl PrepareSpritesForOamLoad -@08121C7C: +_08121C7C: ldr r0, [r4] movs r1, 0x84 lsls r1, 2 @@ -533254,7 +533254,7 @@ sub_8121C98: ; 8121C98 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 @@ -533262,7 +533262,7 @@ sub_8121C98: ; 8121C98 adds r0, r1 ldr r1, =sub_8121CC0 str r1, [r0] -@08121CB2: +_08121CB2: pop {r0} bx r0 .pool @@ -533277,7 +533277,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 @@ -533292,7 +533292,7 @@ sub_8121CC0: ; 8121CC0 adds r0, r1 ldr r1, =sub_8121D00 str r1, [r0] -@08121CEE: +_08121CEE: add sp, 0x4 pop {r0} bx r0 @@ -533305,7 +533305,7 @@ sub_8121D00: ; 8121D00 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 @@ -533318,9 +533318,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] @@ -533340,7 +533340,7 @@ sub_8121D00: ; 8121D00 ldr r1, =0x02020630 adds r0, r1 bl sub_80D2EF8 -@08121D58: +_08121D58: ldr r4, =0x0203a134 ldr r0, [r4] ldr r2, =0x0000222c @@ -533358,7 +533358,7 @@ sub_8121D00: ; 8121D00 bl Free movs r0, 0 str r0, [r4] -@08121D88: +_08121D88: pop {r4} pop {r0} bx r0 @@ -533493,11 +533493,11 @@ DisplayMessageAndContinueTask: ; 8121E7C ldr r4, =0x02021fc4 ldr r0, [sp, 0x30] cmp r0, r4 - beq @08121EC0 + beq _08121EC0 adds r0, r4, 0 ldr r1, [sp, 0x30] bl ExpandStringRefs -@08121EC0: +_08121EC0: ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 @@ -533563,12 +533563,12 @@ Task_ContinueTaskAfterMessagePrints: ; 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 @@ -533638,35 +533638,35 @@ 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 .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 @@ -533687,76 +533687,76 @@ 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 .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 @@ -533769,28 +533769,28 @@ GetLRKeysState: ; 81220D0 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 .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 GetLRKeysState @@ -533802,28 +533802,28 @@ sub_812210C: ; 812210C 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 .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 @@ -533834,23 +533834,23 @@ sub_8122148: ; 8122148 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 InUnionRoom cmp r0, 0x1 - bne @08122174 -@08122166: + bne _08122174 +_08122166: movs r0, 0 - b @08122176 + b _08122176 .pool -@08122174: +_08122174: movs r0, 0x1 -@08122176: +_08122176: pop {r1} bx r1 thumb_func_end sub_8122148 @@ -533862,22 +533862,22 @@ itemid_80BF6D8_mail_related: ; 812217C lsrs r4, r0, 16 bl is_c1_link_related_active cmp r0, 0x1 - beq @08122192 + beq _08122192 bl InUnionRoom 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 @@ -533888,18 +533888,18 @@ 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 .pool -@081221C8: +_081221C8: movs r0, 0 -@081221CA: +_081221CA: pop {r1} bx r1 thumb_func_end sub_81221AC @@ -533910,14 +533910,14 @@ sub_81221D0: ; 81221D0 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 @@ -533929,16 +533929,16 @@ sub_81221EC: ; 81221EC 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 @@ -533957,35 +533957,35 @@ 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 @@ -534002,26 +534002,26 @@ 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 @@ -534042,20 +534042,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] @@ -534068,22 +534068,22 @@ sub_8122298: ; 8122298 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] @@ -534095,14 +534095,14 @@ sub_8122298: ; 8122298 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 @@ -534130,9 +534130,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, =gUnknown_0859F524 movs r2, 0 @@ -534142,7 +534142,7 @@ sub_8122344: ; 8122344 adds r4, r1, r5 strb r0, [r4] cmp r5, 0 - beq @0812237E + beq _0812237E ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -534150,7 +534150,7 @@ sub_8122344: ; 8122344 adds r0, r7 movs r1, 0x1 bl StartObjectImageAnim -@0812237E: +_0812237E: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -534165,8 +534165,8 @@ sub_8122344: ; 8122344 lsls r0, 24 lsrs r5, r0, 24 cmp r5, r6 - bcc @08122358 -@0812239C: + bcc _08122358 +_0812239C: pop {r3} mov r8, r3 pop {r4-r7} @@ -534183,12 +534183,12 @@ sub_81223B0: ; 81223B0 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 @@ -534196,9 +534196,9 @@ sub_81223B0: ; 81223B0 lsls r0, 2 adds r0, r7 bl RemoveObjectAndFreeResources - b @081223EC + b _081223EC .pool -@081223DC: +_081223DC: adds r0, r6, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -534206,13 +534206,13 @@ sub_81223B0: ; 81223B0 lsls r0, 2 adds r0, r7 bl RemoveObjectAndFreeTiles -@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 @@ -534228,7 +534228,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 @@ -534236,7 +534236,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 @@ -534253,8 +534253,8 @@ sub_81223FC: ; 81223FC lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcc @0812241C -@0812243E: + bcc _0812241C +_0812243E: pop {r4-r7} pop {r0} bx r0 @@ -534285,19 +534285,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 @@ -534306,9 +534306,9 @@ sub_8122448: ; 8122448 adds r0, r5 mov r1, r12 strh r1, [r0, 0x24] - b @081224AE + b _081224AE .pool -@081224A0: +_081224A0: adds r2, r6, r3 ldrb r1, [r2] lsls r0, r1, 4 @@ -534316,7 +534316,7 @@ sub_8122448: ; 8122448 lsls r0, 2 adds r0, r5 strh r7, [r0, 0x24] -@081224AE: +_081224AE: ldrb r1, [r2] lsls r0, r1, 4 adds r0, r1 @@ -534329,8 +534329,8 @@ sub_8122448: ; 8122448 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 @@ -534344,7 +534344,7 @@ sub_81224D4: ; 81224D4 push {r4-r7,lr} movs r6, 0 ldr r5, =0x03005d8c -@081224DA: +_081224DA: movs r0, 0xA bl sub_811EE38 ldr r1, [r5] @@ -534357,23 +534357,23 @@ sub_81224D4: ; 81224D4 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 .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] @@ -534399,7 +534399,7 @@ sub_81224D4: ; 81224D4 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x4 - bls @081224DA + bls _081224DA ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00002e68 @@ -534424,9 +534424,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] @@ -534437,7 +534437,7 @@ sub_8122580: ; 8122580 movs r2, 0x80 negs r2, r2 mov r8, r2 -@081225AA: +_081225AA: ldr r2, [sp] mov r3, r10 lsls r0, r3, 3 @@ -534450,14 +534450,14 @@ sub_8122580: ; 8122580 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 @@ -534469,12 +534469,12 @@ sub_8122580: ; 8122580 movs r0, 0x7F ands r1, r0 cmp r1, 0 - bne @0812269E + bne _0812269E movs r0, 0x40 orrs r0, r6 - b @0812269C + b _0812269C .pool -@081225F8: +_081225F8: lsrs r0, r3, 25 subs r2, r0 mov r0, r8 @@ -534483,7 +534483,7 @@ sub_8122580: ; 8122580 movs r0, 0x40 orrs r0, r6 strb r0, [r5, 0x1] -@08122608: +_08122608: ldrb r7, [r5] lsls r0, r7, 25 lsrs r0, 25 @@ -534494,7 +534494,7 @@ sub_8122580: ; 8122580 lsrs r0, 16 lsrs r1, r6, 25 cmp r0, r1 - bls @08122678 + bls _08122678 adds r0, r4, 0 bl __umodsi3 adds r3, r0, 0 @@ -534518,7 +534518,7 @@ sub_8122580: ; 8122580 ands r0, r1 ldr r3, [sp, 0x4] cmp r0, 0 - beq @08122662 + beq _08122662 adds r1, r3, 0 mov r0, r9 ands r1, r0 @@ -534526,8 +534526,8 @@ sub_8122580: ; 8122580 ands r0, r7 orrs r0, r1 strb r0, [r5] - b @0812269E -@08122662: + b _0812269E +_08122662: ldrh r0, [r5] lsls r0, 18 lsrs r0, 25 @@ -534538,8 +534538,8 @@ sub_8122580: ; 8122580 ands r1, r7 orrs r1, r0 strb r1, [r5] - b @0812269E -@08122678: + b _0812269E +_08122678: mov r2, r9 ands r4, r2 mov r0, r8 @@ -534552,24 +534552,24 @@ sub_8122580: ; 8122580 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 @@ -534577,7 +534577,7 @@ sub_8122580: ; 8122580 movs r1, 0x5 movs r2, 0 bl sub_8122804 -@081226BE: +_081226BE: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -534604,22 +534604,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 FlagGet lsls r0, 24 cmp r0, 0 - bne @08122744 + bne _08122744 adds r0, r4, 0 bl FlagSet ldr r0, =0x00000894 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @08122744 + bne _08122744 ldr r0, =0x03005d8c ldr r1, [r0] mov r0, r8 @@ -534633,9 +534633,9 @@ sub_81226D8: ; 81226D8 adds r1, r3 strh r0, [r1] movs r0, 0x1 - b @081227F4 + b _081227F4 .pool -@08122744: +_08122744: mov r0, r8 ldrh r1, [r0, 0x2] lsls r1, 16 @@ -534650,7 +534650,7 @@ sub_81226D8: ; 81226D8 mov r0, sp bl sub_8122B28 movs r5, 0 -@08122762: +_08122762: ldr r6, =0x03005d8c lsls r4, r5, 3 ldr r1, =0x00002e68 @@ -534663,13 +534663,13 @@ sub_81226D8: ; 81226D8 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 @@ -534684,8 +534684,8 @@ sub_81226D8: ; 81226D8 lsls r2, 16 lsrs r2, 16 cmp r2, r5 - bhi @08122788 -@081227A6: + bhi _08122788 +_081227A6: mov r3, r12 ldr r2, [r3] ldr r0, =0x00002e68 @@ -534696,22 +534696,22 @@ sub_81226D8: ; 81226D8 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 .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 @@ -534721,9 +534721,9 @@ sub_81226D8: ; 81226D8 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 @@ -534748,18 +534748,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 @@ -534769,7 +534769,7 @@ sub_8122804: ; 8122804 bl atk90_changetypestoenemyattacktype lsls r0, 24 cmp r0, 0 - beq @08122858 + beq _08122858 ldr r2, [r4] ldr r3, [r4, 0x4] ldr r0, [r6] @@ -534778,19 +534778,19 @@ sub_8122804: ; 8122804 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 @@ -534816,24 +534816,24 @@ sub_812287C: ; 812287C bl Alloc mov r10, r0 cmp r0, 0 - beq @08122980 + beq _08122980 adds r0, r4, 0 bl Alloc 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 @@ -534847,17 +534847,17 @@ sub_812287C: ; 812287C 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 @@ -534867,7 +534867,7 @@ sub_812287C: ; 812287C asrs r0, 16 ldr r3, [sp] cmp r0, 0 - bge @08122918 + bge _08122918 ldr r0, [r4] ldr r1, [r4, 0x4] mov r2, r8 @@ -534878,8 +534878,8 @@ sub_812287C: ; 812287C 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] @@ -534887,24 +534887,24 @@ sub_812287C: ; 812287C 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 @@ -534916,7 +534916,7 @@ sub_812287C: ; 812287C adds r1, r0 mov r8, r1 movs r5, 0 -@0812295E: +_0812295E: ldm r4!, {r0,r1} mov r2, r8 adds r2, 0x8 @@ -534927,12 +534927,12 @@ sub_812287C: ; 812287C 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 @@ -534982,7 +534982,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] @@ -534990,7 +534990,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] @@ -535000,7 +535000,7 @@ sub_81229C8: ; 81229C8 lsrs r0, 24 negs r0, r0 lsrs r4, r0, 31 -@08122A0C: +_08122A0C: ldr r0, =0x020375f0 strh r4, [r0] pop {r4} @@ -535037,25 +535037,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] @@ -535063,11 +535063,11 @@ atk90_changetypestoenemyattacktype: ; 8122A58 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] @@ -535075,32 +535075,32 @@ atk90_changetypestoenemyattacktype: ; 8122A58 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] @@ -535108,37 +535108,37 @@ atk90_changetypestoenemyattacktype: ; 8122A58 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 @@ -535156,7 +535156,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 @@ -535165,7 +535165,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 @@ -535173,7 +535173,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 @@ -535212,7 +535212,7 @@ sub_8122BB0: ; 8122BB0 adds r5, r0, 0 movs r4, 0 ldr r6, =0x03005d8c -@08122BB8: +_08122BB8: lsls r1, r4, 3 ldr r0, [r6] adds r1, r0 @@ -535222,18 +535222,18 @@ sub_8122BB0: ; 8122BB0 bl sub_8122BF0 lsls r0, 24 cmp r0, 0 - beq @08122BDC + beq _08122BDC movs r0, 0x1 - b @08122BE8 + b _08122BE8 .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 @@ -535245,23 +535245,23 @@ sub_8122BF0: ; 8122BF0 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 @@ -535276,18 +535276,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 @@ -535296,11 +535296,11 @@ sub_8122C1C: ; 8122C1C 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 @@ -535315,25 +535315,25 @@ sub_8122C5C: ; 8122C5C lsrs r1, 16 movs r3, 0 ldr r2, =gUnknown_0859F53C -@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 .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 @@ -535348,15 +535348,15 @@ sub_8122C94: ; 8122C94 lsrs r1, 16 bl sub_8122C5C cmp r0, 0 - beq @08122CB4 + beq _08122CB4 lsls r0, 3 ldr r1, =gUnknown_0859F534 adds r0, r1 - b @08122CB6 + b _08122CB6 .pool -@08122CB4: +_08122CB4: movs r0, 0 -@08122CB6: +_08122CB6: pop {r1} bx r1 thumb_func_end sub_8122C94 @@ -535366,17 +535366,17 @@ sub_8122C94: ; 8122C94 sub_8122CBC: ; 8122CBC push {lr} cmp r0, 0 - beq @08122CD4 + beq _08122CD4 cmp r0, 0x16 - bhi @08122CD4 + bhi _08122CD4 lsls r0, 3 ldr r1, =gUnknown_0859F534 adds r0, r1 - b @08122CD6 + b _08122CD6 .pool -@08122CD4: +_08122CD4: movs r0, 0 -@08122CD6: +_08122CD6: pop {r1} bx r1 thumb_func_end sub_8122CBC @@ -535388,11 +535388,11 @@ sub_8122CDC: ; 8122CDC 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 @@ -535415,16 +535415,16 @@ sub_8122CF8: ; 8122CF8 strb r2, [r0] ldr r1, [r3] cmp r2, 0x1 - bne @08122D28 + bne _08122D28 ldr r0, =sub_8123254 - b @08122D2A + b _08122D2A .pool -@08122D28: +_08122D28: ldr r0, =sub_81230C4 -@08122D2A: +_08122D2A: str r0, [r1, 0x18] cmp r4, 0 - beq @08122D64 + beq _08122D64 ldr r1, [r3] ldr r0, [r4] lsls r0, 30 @@ -535447,9 +535447,9 @@ sub_8122CF8: ; 8122CF8 adds r0, 0x83 movs r1, 0x1 strb r1, [r0] - b @08122D80 + b _08122D80 .pool -@08122D64: +_08122D64: ldr r0, [r3] adds r0, 0x80 movs r1, 0x2 @@ -535464,7 +535464,7 @@ sub_8122CF8: ; 8122CF8 ldr r0, [r3] adds r0, 0x83 strb r4, [r0] -@08122D80: +_08122D80: pop {r4,r5} pop {r0} bx r0 @@ -535501,60 +535501,60 @@ 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 .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, =gUnknown_0859F77C movs r2, 0 str r2, [sp] - b @08122E52 + b _08122E52 .pool -@08122E18: +_08122E18: ldr r0, =gUnknown_0859F77C ldr r1, =0x06008000 bl LZ77UnCompVram - b @08123014 + b _08123014 .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] @@ -535562,31 +535562,31 @@ sub_8122DB0: ; 8122DB0 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 .pool -@08122E64: +_08122E64: ldr r0, =gUnknown_085A04E0 ldr r1, =0x0600e000 bl LZ77UnCompVram - b @08123014 + b _08123014 .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, =gUnknown_0859F73C movs r1, 0x70 movs r2, 0x60 bl gpu_pal_apply - b @08123014 + b _08123014 .pool -@08122E94: +_08122E94: ldr r0, =gUnknown_0859F60C ldr r1, =0x0203a144 ldr r1, [r1] @@ -535594,9 +535594,9 @@ sub_8122DB0: ; 8122DB0 lsls r2, 1 adds r1, r2 bl LZ77UnCompWram - b @08123014 + b _08123014 .pool -@08122EB0: +_08122EB0: ldr r0, =gUnknown_0859F650 ldr r1, =0x0203a144 ldr r1, [r1] @@ -535604,9 +535604,9 @@ sub_8122DB0: ; 8122DB0 lsls r5, 2 adds r1, r5 bl LZ77UnCompWram - b @08123014 + b _08123014 .pool -@08122ECC: +_08122ECC: bl sub_81238AC ldr r4, =0x0203a144 ldr r2, [r4] @@ -535633,16 +535633,16 @@ sub_8122DB0: ; 8122DB0 ldrh r1, [r1] movs r2, 0x10 bl GetMapName - b @08123014 + b _08123014 .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] @@ -535653,9 +535653,9 @@ sub_8122DB0: ; 8122DB0 movs r2, 0 movs r3, 0 bl sub_81236C4 - b @08123014 + b _08123014 .pool -@08122F3C: +_08122F3C: adds r1, r4, 0 adds r1, 0x54 ldrh r0, [r1] @@ -535694,8 +535694,8 @@ sub_8122DB0: ; 8122DB0 movs r2, 0x38 movs r3, 0x48 bl sub_81236C4 - b @08123014 -@08122F8C: + b _08123014 +_08122F8C: bl sub_8123FB0 bl sub_81237B4 ldr r4, =0x0203a144 @@ -535713,7 +535713,7 @@ sub_8122DB0: ; 8122DB0 adds r0, 0x83 ldrb r0, [r0] cmp r0, 0 - beq @08123002 + beq _08123002 adds r0, r1, 0 adds r0, 0x80 ldrb r0, [r0] @@ -535748,17 +535748,17 @@ sub_8122DB0: ; 8122DB0 movs r1, 0x4 movs r2, 0x1 bl SetBgAttribute -@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 .pool -@08123014: +_08123014: ldr r0, =0x0203a144 ldr r1, [r0] adds r1, 0x79 @@ -535766,7 +535766,7 @@ sub_8122DB0: ; 8122DB0 adds r0, 0x1 strb r0, [r1] movs r0, 0x1 -@08123022: +_08123022: add sp, 0xC pop {r4,r5} pop {r1} @@ -535801,7 +535801,7 @@ sub_812305C: ; 812305C ldr r0, [r4] ldr r0, [r0, 0x1C] cmp r0, 0 - beq @08123080 + beq _08123080 bl RemoveObjectAndFreeTiles ldr r0, [r4] adds r0, 0x58 @@ -535811,11 +535811,11 @@ sub_812305C: ; 812305C adds r0, 0x5A ldrh r0, [r0] bl FreeObjectPaletteByTag -@08123080: +_08123080: ldr r0, [r4] ldr r0, [r0, 0x20] cmp r0, 0 - beq @081230A0 + beq _081230A0 bl RemoveObjectAndFreeTiles ldr r0, [r4] adds r0, 0x70 @@ -535825,7 +535825,7 @@ sub_812305C: ; 812305C adds r0, 0x72 ldrh r0, [r0] bl FreeObjectPaletteByTag -@081230A0: +_081230A0: pop {r4} pop {r0} bx r0 @@ -535862,83 +535862,83 @@ 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 .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 @@ -535946,7 +535946,7 @@ sub_81230C4: ; 81230C4 ldr r1, [r2] ldr r0, =_swiopen str r0, [r1, 0x18] -@08123184: +_08123184: adds r0, r4, 0 pop {r4} pop {r1} @@ -535965,23 +535965,23 @@ _swiopen: ; 8123190 lsls r0, 24 asrs r0, 24 cmp r0, 0 - beq @081231AC + beq _081231AC movs r0, 0x2 - b @08123248 + b _08123248 .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 @@ -535989,12 +535989,12 @@ _swiopen: ; 8123190 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 @@ -536002,12 +536002,12 @@ _swiopen: ; 8123190 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 @@ -536015,12 +536015,12 @@ _swiopen: ; 8123190 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 @@ -536037,19 +536037,19 @@ _swiopen: ; 8123190 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 str r0, [r1, 0x18] movs r0, 0x3 -@08123248: +_08123248: pop {r4,r5} pop {r1} bx r1 @@ -536075,7 +536075,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 @@ -536083,33 +536083,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 @@ -536118,52 +536118,52 @@ sub_8123254: ; 8123254 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 str r1, [r0, 0x18] adds r0, 0x6C movs r1, 0 strh r1, [r0] -@0812331A: +_0812331A: adds r0, r4, 0 pop {r4-r6} pop {r1} @@ -536206,7 +536206,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 @@ -536214,9 +536214,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 @@ -536228,9 +536228,9 @@ sub_8123334: ; 8123334 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 @@ -536241,11 +536241,11 @@ sub_8123334: ; 8123334 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 @@ -536259,15 +536259,15 @@ sub_8123334: ; 8123334 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 @@ -536277,11 +536277,11 @@ sub_8123334: ; 8123334 ldr r0, =sub_8123254 str r0, [r2, 0x18] movs r0, 0x3 - b @08123412 + b _08123412 .pool -@08123410: +_08123410: movs r0, 0x2 -@08123412: +_08123412: pop {r4,r5} pop {r1} bx r1 @@ -536297,7 +536297,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 @@ -536325,18 +536325,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] @@ -536352,9 +536352,9 @@ sub_8123418: ; 8123418 lsls r0, 9 str r0, [r2, 0x4C] ldr r0, =0xfffff800 - b @081234FA + b _081234FA .pool -@0812349C: +_0812349C: adds r0, r2, 0 adds r0, 0x5C movs r6, 0 @@ -536375,17 +536375,17 @@ sub_8123418: ; 8123418 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] @@ -536404,7 +536404,7 @@ sub_8123418: ; 8123418 str r0, [r2, 0x4C] movs r0, 0x80 lsls r0, 4 -@081234FA: +_081234FA: str r0, [r2, 0x50] ldr r0, [r5] adds r0, 0x6E @@ -536428,18 +536428,18 @@ sub_8123514: ; 8123514 ldrh r1, [r2] adds r5, r0, 0 cmp r1, 0xF - bls @08123530 + bls _08123530 movs r0, 0 - b @081236B8 + b _081236B8 .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 @@ -536457,17 +536457,17 @@ sub_8123514: ; 8123514 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 @@ -536475,9 +536475,9 @@ sub_8123514: ; 8123514 ldrb r0, [r0] ldr r2, =sub_8123254 cmp r0, 0 - bne @08123584 + bne _08123584 ldr r2, =sub_81230C4 -@08123584: +_08123584: str r2, [r1, 0x18] adds r0, r1, 0 adds r0, 0x58 @@ -536487,9 +536487,9 @@ sub_8123514: ; 8123514 bl sub_81240D4 bl sub_81243DC movs r4, 0 - b @08123686 + b _08123686 .pool -@081235A4: +_081235A4: ldr r2, [r3, 0x3C] ldr r0, [r3, 0x44] adds r2, r0 @@ -536513,7 +536513,7 @@ sub_8123514: ; 8123514 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 @@ -536521,10 +536521,10 @@ sub_8123514: ; 8123514 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 @@ -536532,8 +536532,8 @@ sub_8123514: ; 8123514 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 @@ -536542,11 +536542,11 @@ sub_8123514: ; 8123514 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 @@ -536556,10 +536556,10 @@ sub_8123514: ; 8123514 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 @@ -536569,8 +536569,8 @@ sub_8123514: ; 8123514 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 @@ -536580,35 +536580,35 @@ sub_8123514: ; 8123514 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 .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 @@ -536633,7 +536633,7 @@ sub_8123514: ; 8123514 movs r3, 0x48 bl sub_81236C4 adds r0, r4, 0 -@081236B8: +_081236B8: add sp, 0xC pop {r4-r6} pop {r1} @@ -536773,7 +536773,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 SetGpuReg @@ -536809,7 +536809,7 @@ sub_81237B4: ; 81237B4 adds r0, 0x7D movs r1, 0 strb r1, [r0] -@0812381A: +_0812381A: pop {r4} pop {r0} bx r0 @@ -536840,13 +536840,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} @@ -536864,16 +536864,16 @@ 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 .pool -@08123890: +_08123890: subs r0, r3, 0x1 lsls r0, 16 lsrs r3, r0, 16 @@ -536884,7 +536884,7 @@ sub_812386C: ; 812386C adds r0, r3, r0 adds r0, r1 ldrb r0, [r0] -@081238A4: +_081238A4: pop {r1} bx r1 .pool @@ -536904,17 +536904,17 @@ 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 .pool -@081238DC: +_081238DC: ldr r1, [r3] movs r0, 0x4 ldrsb r0, [r1, r0] @@ -536926,25 +536926,25 @@ sub_81238AC: ; 81238AC 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 .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 @@ -536964,23 +536964,23 @@ sub_81238AC: ; 81238AC 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 .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 @@ -537012,9 +537012,9 @@ sub_81238AC: ; 81238AC ldr r0, [r4] ldrh r6, [r0, 0x28] ldrh r3, [r0, 0x2A] - b @08123ABE + b _08123ABE .pool -@081239C8: +_081239C8: ldr r0, =0x0203a144 ldr r0, [r0] ldrb r1, [r2, 0x14] @@ -537026,9 +537026,9 @@ sub_81238AC: ; 81238AC mov r9, r2 movs r6, 0x1 movs r3, 0x1 - b @08123ABE + b _08123ABE .pool -@081239E4: +_081239E4: ldr r4, =0x03005d8c ldr r1, [r4] movs r0, 0x14 @@ -537056,16 +537056,16 @@ sub_81238AC: ; 81238AC ldr r0, [r4] ldrh r6, [r0, 0x18] ldrh r3, [r0, 0x1A] - b @08123ABE + b _08123ABE .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 @@ -537080,9 +537080,9 @@ sub_81238AC: ; 81238AC lsrs r1, 16 bl get_mapheader_by_bank_and_number adds r5, r0, 0 - b @08123A8A + b _08123A8A .pool -@08123A64: +_08123A64: ldr r0, =0x03005d8c ldr r0, [r0] adds r7, r0, 0 @@ -537101,23 +537101,23 @@ sub_81238AC: ; 81238AC 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 .pool -@08123AAC: +_08123AAC: ldr r0, [r4] adds r0, 0x7F -@08123AB0: +_08123AB0: strb r1, [r0] ldr r0, [r5] ldrh r2, [r0] @@ -537125,7 +537125,7 @@ sub_81238AC: ; 81238AC mov r9, r0 ldrh r6, [r7, 0x4] ldrh r3, [r7, 0x6] -@08123ABE: +_08123ABE: str r6, [sp] ldr r5, =gRegionMapEntries ldr r4, =0x0203a144 @@ -537145,9 +537145,9 @@ sub_81238AC: ; 81238AC 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 @@ -537155,12 +537155,12 @@ sub_81238AC: ; 81238AC 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 @@ -537171,99 +537171,99 @@ sub_81238AC: ; 81238AC 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 .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 .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] @@ -537283,7 +537283,7 @@ sub_81238AC: ; 81238AC adds r0, 0x2 adds r2, 0x56 strh r0, [r2] -@08123BEC: +_08123BEC: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -537320,49 +537320,49 @@ 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 .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 .pool -@08123C64: +_08123C64: ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0xC strh r0, [r1] - b @08123D10 + b _08123D10 .pool -@08123C74: +_08123C74: ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x27 strh r0, [r1] - b @08123D10 + b _08123D10 .pool -@08123C84: +_08123C84: ldr r2, =0x0203a144 ldr r1, [r2] movs r0, 0x2E strh r0, [r1] - b @08123D10 + b _08123D10 .pool -@08123C94: +_08123C94: mov r0, sp ldrb r0, [r0] ldrb r1, [r4] @@ -537384,9 +537384,9 @@ sub_8123C00: ; 8123C00 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] @@ -537395,12 +537395,12 @@ sub_8123C00: ; 8123C00 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 @@ -537408,9 +537408,9 @@ sub_8123C00: ; 8123C00 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] @@ -537419,11 +537419,11 @@ sub_8123C00: ; 8123C00 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 @@ -537465,141 +537465,141 @@ get_flagnr_blue_points: ; 8123D58 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 .pool -@08123DD8: +_08123DD8: movs r0, 0x87 lsls r0, 4 - b @08123E4A -@08123DDE: + b _08123E4A +_08123DDE: ldr r0, =0x00000871 - b @08123E4A + b _08123E4A .pool -@08123DE8: +_08123DE8: ldr r0, =0x00000872 - b @08123E4A + b _08123E4A .pool -@08123DF0: +_08123DF0: ldr r0, =0x00000873 - b @08123E4A + b _08123E4A .pool -@08123DF8: +_08123DF8: ldr r0, =0x00000874 - b @08123E4A + b _08123E4A .pool -@08123E00: +_08123E00: ldr r0, =0x00000875 - b @08123E4A + b _08123E4A .pool -@08123E08: +_08123E08: ldr r0, =0x00000876 - b @08123E4A + b _08123E4A .pool -@08123E10: +_08123E10: ldr r0, =0x00000877 - b @08123E4A + b _08123E4A .pool -@08123E18: +_08123E18: ldr r0, =0x00000878 - b @08123E4A + b _08123E4A .pool -@08123E20: +_08123E20: ldr r0, =0x00000879 - b @08123E4A + b _08123E4A .pool -@08123E28: +_08123E28: ldr r0, =0x0000087a - b @08123E4A + b _08123E4A .pool -@08123E30: +_08123E30: ldr r0, =0x0000087b - b @08123E4A + b _08123E4A .pool -@08123E38: +_08123E38: ldr r0, =0x0000087c - b @08123E4A + b _08123E4A .pool -@08123E40: +_08123E40: ldr r0, =0x0000087d - b @08123E4A + b _08123E4A .pool -@08123E48: +_08123E48: ldr r0, =0x0000087e -@08123E4A: +_08123E4A: bl FlagGet 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 .pool -@08123E60: +_08123E60: ldr r0, =0x000008a8 bl FlagGet adds r1, r0, 0 @@ -537610,9 +537610,9 @@ get_flagnr_blue_points: ; 8123D58 asrs r0, 31 movs r1, 0x4 ands r0, r1 - b @08123E96 + b _08123E96 .pool -@08123E7C: +_08123E7C: ldr r0, =0x000008a9 bl FlagGet adds r1, r0, 0 @@ -537621,11 +537621,11 @@ get_flagnr_blue_points: ; 8123D58 negs r0, r1 orrs r0, r1 lsrs r0, 31 - b @08123E96 + b _08123E96 .pool -@08123E94: +_08123E94: movs r0, 0x1 -@08123E96: +_08123E96: pop {r1} bx r1 thumb_func_end get_flagnr_blue_points @@ -537651,41 +537651,41 @@ sub_8123EB4: ; 8123EB4 lsrs r3, r0, 16 movs r2, 0 ldr r1, =gUnknown_085A1B84 -@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 .pool -@08123ED4: +_08123ED4: adds r1, 0x2 adds r2, 0x1 cmp r2, 0x2 - bls @08123EBE + bls _08123EBE ldr r1, =gUnknown_085A1B24 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 .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 @@ -537699,9 +537699,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, =gUnknown_085A1B8A lsls r1, 16 asrs r1, 15 @@ -537725,9 +537725,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, =gUnknown_085A1BAC @@ -537752,20 +537752,20 @@ sub_8123F74: ; 8123F74 lsrs r2, r0, 24 movs r1, 0 ldr r3, =gUnknown_085A1BCC -@08123F7E: +_08123F7E: adds r0, r1, r3 ldrb r0, [r0] cmp r0, r2 - bne @08123F90 + bne _08123F90 movs r0, 0x1 - b @08123F98 + b _08123F98 .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 @@ -537789,30 +537789,30 @@ sub_8123FB0: ; 8123FB0 ldr r1, [r0] ldrh r0, [r1] cmp r0, 0xD5 - bne @08123FC8 + bne _08123FC8 movs r0, 0 strb r0, [r1, 0x3] - b @0812402E + b _0812402E .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 @@ -537825,29 +537825,29 @@ sub_8123FB0: ; 8123FB0 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 .pool -@08124028: +_08124028: ldr r0, =0x0203a144 ldr r0, [r0] strb r6, [r0, 0x3] -@0812402E: +_0812402E: pop {r4-r6} pop {r0} bx r0 @@ -537863,15 +537863,15 @@ sub_8124038: ; 8124038 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - bne @08124058 - b @0812407A + bne _08124058 + b _0812407A .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 @@ -537881,15 +537881,15 @@ sub_8124038: ; 8124038 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 @@ -537907,7 +537907,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] @@ -537929,7 +537929,7 @@ sub_8124088: ; 8124088 ldrb r0, [r3] subs r0, 0x1 strb r0, [r3] -@081240C6: +_081240C6: pop {r4} pop {r0} bx r0 @@ -537987,7 +537987,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 @@ -537998,9 +537998,9 @@ sub_81240D4: ; 81240D4 orrs r0, r1 str r0, [r2, 0x4] ldr r0, =sub_8124088 - b @0812416E + b _0812416E .pool -@08124158: +_08124158: movs r3, 0xA1 lsls r3, 2 adds r0, r4, r3 @@ -538012,7 +538012,7 @@ sub_81240D4: ; 81240D4 orrs r0, r1 str r0, [r2, 0x4] ldr r0, =nullsub_48 -@0812416E: +_0812416E: str r0, [sp, 0x14] adds r0, r2, 0 bl LoadObjectPic @@ -538026,7 +538026,7 @@ sub_81240D4: ; 81240D4 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @08124228 + beq _08124228 ldr r4, =0x0203a144 ldr r2, [r4] lsls r0, r1, 4 @@ -538038,7 +538038,7 @@ sub_81240D4: ; 81240D4 adds r2, 0x78 ldrb r0, [r2] cmp r0, 0x1 - bne @081241DC + bne _081241DC ldrb r1, [r3, 0x3] movs r0, 0x3F ands r0, r1 @@ -538057,9 +538057,9 @@ sub_81240D4: ; 81240D4 ldr r0, [r2, 0x1C] movs r1, 0x1 bl StartObjectImageAnim - b @08124204 + b _08124204 .pool -@081241DC: +_081241DC: ldrb r1, [r3, 0x3] movs r0, 0x3F ands r0, r1 @@ -538080,7 +538080,7 @@ sub_81240D4: ; 81240D4 lsls r0, 3 adds r0, 0x4 strh r0, [r2, 0x22] -@08124204: +_08124204: ldr r4, =0x0203a144 ldr r0, [r4] ldr r1, [r0, 0x1C] @@ -538098,7 +538098,7 @@ sub_81240D4: ; 81240D4 ldr r1, [r1, 0x1C] movs r0, 0x1 strh r0, [r1, 0x34] -@08124228: +_08124228: add sp, 0x28 pop {r4-r7} pop {r0} @@ -538113,7 +538113,7 @@ sub_8124238: ; 8124238 ldr r0, [r4] ldr r0, [r0, 0x1C] cmp r0, 0 - beq @0812425C + beq _0812425C bl RemoveObjectAndFreeTiles ldr r0, [r4] adds r0, 0x58 @@ -538123,7 +538123,7 @@ sub_8124238: ; 8124238 adds r0, 0x5A ldrh r0, [r0] bl FreeObjectPaletteByTag -@0812425C: +_0812425C: pop {r4} pop {r0} bx r0 @@ -538191,23 +538191,23 @@ 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 .pool -@08124304: +_08124304: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0x1 - bne @08124316 + bne _08124316 ldr r0, =gUnknown_085A08EC str r0, [sp, 0x18] ldr r0, =gUnknown_085A08CC str r0, [sp, 0x20] -@08124316: +_08124316: adds r0, r6, 0 bl LoadObjectPic adds r0, r4, 0 @@ -538231,7 +538231,7 @@ sub_8124288: ; 8124288 adds r0, 0x78 ldrb r0, [r0] cmp r0, 0 - bne @08124384 + bne _08124384 adds r0, r2, 0 adds r0, 0x74 ldrh r0, [r0] @@ -538247,9 +538247,9 @@ sub_8124288: ; 8124288 strh r0, [r1, 0x22] ldr r1, [r2, 0x20] ldr r0, =sub_81244EC - b @081243A2 + b _081243A2 .pool -@08124384: +_08124384: adds r0, r2, 0 adds r0, 0x74 ldrh r0, [r0] @@ -538265,9 +538265,9 @@ sub_8124288: ; 8124288 strh r0, [r1, 0x22] ldr r1, [r2, 0x20] ldr r0, =sub_812445C -@081243A2: +_081243A2: str r0, [r1, 0x1C] -@081243A4: +_081243A4: add sp, 0x28 pop {r4-r6} pop {r0} @@ -538282,7 +538282,7 @@ sub_81243B0: ; 81243B0 ldr r0, [r3] ldr r2, [r0, 0x20] cmp r2, 0 - beq @081243CE + beq _081243CE adds r2, 0x3E ldrb r0, [r2] movs r1, 0x4 @@ -538292,7 +538292,7 @@ sub_81243B0: ; 81243B0 ldr r1, [r0, 0x20] ldr r0, =DummyObjectCallback str r0, [r1, 0x1C] -@081243CE: +_081243CE: pop {r0} bx r0 .pool @@ -538305,12 +538305,12 @@ sub_81243DC: ; 81243DC 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] @@ -538326,9 +538326,9 @@ sub_81243DC: ; 81243DC strh r0, [r1, 0x22] ldr r1, [r3, 0x20] ldr r0, =sub_812445C - b @08124444 + b _08124444 .pool -@0812441C: +_0812441C: adds r0, r3, 0 adds r0, 0x74 ldrh r0, [r0] @@ -538349,7 +538349,7 @@ sub_81243DC: ; 81243DC strh r2, [r0, 0x26] ldr r1, [r3, 0x20] ldr r0, =sub_81244EC -@08124444: +_08124444: str r0, [r1, 0x1C] adds r1, 0x3E ldrb r2, [r1] @@ -538357,7 +538357,7 @@ sub_81243DC: ; 81243DC negs r0, r0 ands r0, r2 strb r0, [r1] -@08124452: +_08124452: pop {r0} bx r0 .pool @@ -538404,38 +538404,38 @@ 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 .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 @@ -538458,14 +538458,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 @@ -538481,16 +538481,16 @@ sub_81244F8: ; 81244F8 ands r0, r2 orrs r0, r1 strb r0, [r3] - b @08124548 + b _08124548 .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 @@ -538504,11 +538504,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 .pool @@ -538524,13 +538524,13 @@ GetMapName: ; 812456C lsls r2, 16 lsrs r4, r2, 16 cmp r1, 0x56 - bne @08124584 + bne _08124584 bl GetSecretBaseMapName adds r1, r0, 0 - b @081245B2 -@08124584: + b _081245B2 +_08124584: cmp r1, 0xD4 - bhi @081245A0 + bhi _081245A0 ldr r0, =gRegionMapEntries lsls r1, 3 adds r0, 0x4 @@ -538539,41 +538539,41 @@ GetMapName: ; 812456C adds r0, r5, 0 bl CopyString adds r1, r0, 0 - b @081245B2 + b _081245B2 .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 @@ -538585,22 +538585,22 @@ sub_81245DC: ; 81245DC lsls r1, 16 lsrs r1, 16 cmp r1, 0x56 - beq @081245F8 + beq _081245F8 cmp r1, 0x57 - bne @08124604 + bne _08124604 ldr r1, =gUnknown_085EC9D2 bl CopyString - b @0812460A + b _0812460A .pool -@081245F8: +_081245F8: ldr r1, =gUnknown_085EC9D8 bl CopyString - b @0812460A + b _0812460A .pool -@08124604: +_08124604: movs r2, 0 bl GetMapName -@0812460A: +_0812460A: pop {r1} bx r1 thumb_func_end sub_81245DC @@ -538611,13 +538611,13 @@ sub_8124610: ; 8124610 lsls r1, 16 lsrs r1, 16 cmp r1, 0x42 - beq @08124620 + beq _08124620 bl sub_81245DC - b @08124626 -@08124620: + b _08124626 +_08124620: ldr r1, =gUnknown_085EC9E4 bl CopyString -@08124626: +_08124626: pop {r1} bx r1 .pool @@ -538662,20 +538662,20 @@ sub_8124668: ; 8124668 lsrs r2, r0, 24 movs r1, 0 ldr r3, =gUnknown_085A1C34 -@08124672: +_08124672: adds r0, r1, r3 ldrb r0, [r0] cmp r2, r0 - bne @08124684 + bne _08124684 movs r0, 0x1 - b @0812468C + b _0812468C .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 @@ -538690,29 +538690,29 @@ 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 .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 @@ -538747,40 +538747,40 @@ sub_8124690: ; 8124690 bl Alloc str r0, [r4] cmp r0, 0 - bne @08124754 + bne _08124754 ldr r0, =sub_8086194 bl SetMainCallback2 - b @081248AA + b _081248AA .pool -@08124754: +_08124754: bl sub_80A1A74 bl ResetAllObjectData bl FreeAllObjectTiles bl ResetObjectPaletteAllocator - b @0812489C -@08124766: + b _0812489C +_08124766: movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085A1EE4 movs r0, 0x1 movs r2, 0x3 bl InitBgsFromTemplates - b @0812489C + b _0812489C .pool -@0812477C: +_0812477C: ldr r0, =gUnknown_085A1EF0 bl InitWindows bl DeactivateAllTextPrinters - b @0812489C + b _0812489C .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 @@ -538804,21 +538804,21 @@ sub_8124690: ; 8124690 movs r0, 0x1 str r0, [r1] bl sub_8124904 - b @0812489C + b _0812489C .pool -@081247E4: +_081247E4: ldr r0, =gUnknown_085A1C58 ldr r1, =0x0600c000 bl LZ77UnCompVram - b @0812489C + b _0812489C .pool -@081247F8: +_081247F8: ldr r0, =gUnknown_085A1C90 ldr r1, =0x0600f000 bl LZ77UnCompVram - b @0812489C + b _0812489C .pool -@0812480C: +_0812480C: ldr r0, =gUnknown_085A1C38 movs r1, 0x10 movs r2, 0x20 @@ -538840,12 +538840,12 @@ sub_8124690: ; 8124690 bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - b @0812489C + b _0812489C .pool -@0812484C: +_0812484C: bl sub_8124A70 - b @0812489C -@08124852: + b _0812489C +_08124852: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -538853,9 +538853,9 @@ sub_8124690: ; 8124690 bl sub_80A2A20 ldr r0, =sub_81248C0 bl SetVBlankCallback - b @0812489C + b _0812489C .pool -@0812486C: +_0812486C: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -538873,7 +538873,7 @@ sub_8124690: ; 8124690 bl sub_81248F4 ldr r0, =sub_81248D4 bl SetMainCallback2 -@0812489C: +_0812489C: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -538881,7 +538881,7 @@ sub_8124690: ; 8124690 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@081248AA: +_081248AA: add sp, 0xC pop {r4} pop {r0} @@ -538936,16 +538936,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, =gUnknown_085A1EDC mov r12, r0 adds r5, r2, 0 movs r6, 0 -@08124926: +_08124926: ldr r0, [r5] lsls r1, r3, 3 mov r2, r12 @@ -538953,12 +538953,12 @@ sub_8124904: ; 8124904 ldrh r0, [r0, 0x8] ldrh r1, [r4, 0x4] cmp r0, r1 - bne @081249C4 + bne _081249C4 ldrh r0, [r4, 0x6] bl FlagGet lsls r0, 24 cmp r0, 0 - beq @081249CE + beq _081249CE ldr r0, [r5] ldrb r0, [r0, 0xB] ldr r1, [r4] @@ -539009,21 +539009,21 @@ sub_8124904: ; 8124904 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x03001180 str r7, [r0] - b @081249CE + b _081249CE .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 @@ -539032,13 +539032,13 @@ sub_8124904: ; 8124904 movs r2, 0x65 movs r3, 0xD bl SetWindowBorderStyle - b @081249FC + b _081249FC .pool -@081249F4: +_081249F4: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer -@081249FC: +_081249FC: ldr r0, =0x0203a148 ldr r2, [r0] adds r2, 0xC @@ -539055,13 +539055,13 @@ sub_8124904: ; 8124904 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x03001180 str r4, [r0] - b @08124A62 + b _08124A62 .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 @@ -539070,7 +539070,7 @@ sub_8124904: ; 8124904 movs r2, 0x65 movs r3, 0xD bl SetWindowBorderStyle -@08124A48: +_08124A48: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer @@ -539081,7 +539081,7 @@ sub_8124904: ; 8124904 bl schedule_bg_copy_tilemap_to_vram movs r0, 0 str r0, [r4] -@08124A62: +_08124A62: add sp, 0xC pop {r4-r7} pop {r0} @@ -539150,7 +539150,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 @@ -539174,18 +539174,18 @@ sub_8124AD4: ; 8124AD4 ldr r2, [sp, 0x10] ldrh r0, [r2] cmp r0, 0x2 - bne @08124B38 + bne _08124B38 movs r7, 0x1 - b @08124B44 + b _08124B44 .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] @@ -539198,7 +539198,7 @@ sub_8124AD4: ; 8124AD4 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq @08124BB8 + beq _08124BB8 ldr r1, =0x02020630 mov r8, r1 lsls r4, r5, 4 @@ -539215,19 +539215,19 @@ sub_8124AD4: ; 8124AD4 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08124B9C + beq _08124B9C mov r0, r8 adds r0, 0x1C adds r0, r6, r0 ldr r1, =sub_8124CBC str r1, [r0] - b @08124BA2 + b _08124BA2 .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 @@ -539238,7 +539238,7 @@ sub_8124AD4: ; 8124AD4 bl StartObjectImageAnim mov r2, r9 strh r2, [r4, 0x2E] -@08124BB8: +_08124BB8: ldr r0, [sp, 0xC] adds r0, 0x1 lsls r0, 16 @@ -539250,7 +539250,7 @@ sub_8124AD4: ; 8124AD4 lsrs r0, 16 mov r9, r0 cmp r0, 0xF - bls @08124AFE + bls _08124AFE add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -539275,7 +539275,7 @@ sub_8124BE4: ; 8124BE4 ldr r6, =gUnknown_085A1F18 ldrh r0, [r6, 0x2] cmp r0, 0xD5 - beq @08124C9C + beq _08124C9C mov r5, sp adds r5, 0x6 add r7, sp, 0x4 @@ -539284,7 +539284,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 @@ -539292,7 +539292,7 @@ sub_8124BE4: ; 8124BE4 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08124C84 + beq _08124C84 adds r0, r6, 0x2 adds r0, r4, r0 ldrh r6, [r0] @@ -539322,7 +539322,7 @@ sub_8124BE4: ; 8124BE4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @08124C84 + beq _08124C84 lsls r2, r0, 4 adds r2, r0 lsls r2, 2 @@ -539341,7 +539341,7 @@ sub_8124BE4: ; 8124BE4 movs r1, 0x6 bl StartObjectImageAnim strh r6, [r4, 0x2E] -@08124C84: +_08124C84: mov r0, r8 adds r0, 0x1 lsls r0, 16 @@ -539353,8 +539353,8 @@ sub_8124BE4: ; 8124BE4 adds r0, r1 ldrh r0, [r0] cmp r0, 0xD5 - bne @08124C0C -@08124C9C: + bne _08124C0C +_08124C9C: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -539376,14 +539376,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 @@ -539399,9 +539399,9 @@ sub_8124CBC: ; 8124CBC ands r0, r2 orrs r0, r1 strb r0, [r3] - b @08124D0E + b _08124D0E .pool -@08124D00: +_08124D00: movs r0, 0x10 strh r0, [r2, 0x30] adds r2, 0x3E @@ -539409,7 +539409,7 @@ sub_8124CBC: ; 8124CBC subs r0, 0x15 ands r0, r1 strb r0, [r2] -@08124D0E: +_08124D0E: pop {r0} bx r0 thumb_func_end sub_8124CBC @@ -539422,12 +539422,12 @@ sub_8124D14: ; 8124D14 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 .pool -@08124D2C: +_08124D2C: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -539439,15 +539439,15 @@ sub_8124D14: ; 8124D14 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 bl sub_81248F4 -@08124D56: +_08124D56: add sp, 0x4 pop {r4} pop {r0} @@ -539462,38 +539462,38 @@ sub_8124D64: ; 8124D64 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 .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] @@ -539503,9 +539503,9 @@ sub_8124D64: ; 8124D64 strb r1, [r0] ldr r0, =sub_8124E0C bl sub_81248F4 - b @08124DF8 + b _08124DF8 .pool -@08124DE0: +_08124DE0: movs r0, 0x5 bl m4aSongNumStart ldr r0, =0x0203a148 @@ -539516,7 +539516,7 @@ sub_8124D64: ; 8124D64 strb r1, [r0] ldr r0, =sub_8124E0C bl sub_81248F4 -@08124DF8: +_08124DF8: pop {r4} pop {r0} bx r0 @@ -539531,12 +539531,12 @@ sub_8124E0C: ; 8124E0C 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 .pool -@08124E24: +_08124E24: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -539548,68 +539548,68 @@ sub_8124E0C: ; 8124E0C 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 .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 .pool -@08124E98: +_08124E98: ldr r0, =0x000008b4 bl FlagGet 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 .pool -@08124EBC: +_08124EBC: ldr r3, =gUnknown_085A1E3C ldr r0, =0x0203a148 ldr r0, [r0] @@ -539620,11 +539620,11 @@ sub_8124E0C: ; 8124E0C adds r1, r2, r0 ldrb r0, [r1] cmp r0, 0 - beq @08124EE0 + beq _08124EE0 bl sub_8084CCC - b @08124EFA + b _08124EFA .pool -@08124EE0: +_08124EE0: adds r0, r2, r3 ldrb r0, [r0] lsls r0, 24 @@ -539637,23 +539637,23 @@ sub_8124E0C: ; 8124E0C 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 bl SetMainCallback2 -@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 FreeAllWindowBuffers -@08124F1A: +_08124F1A: add sp, 0x4 pop {r4} pop {r0} @@ -539691,97 +539691,97 @@ 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 .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 .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 @@ -539792,7 +539792,7 @@ sub_8124F2C: ; 8124F2C bl sub_81250B8 movs r0, 0x4 bl sub_8125170 -@081250B4: +_081250B4: pop {r0} bx r0 thumb_func_end sub_8124F2C @@ -539811,14 +539811,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 @@ -539838,30 +539838,30 @@ sub_81250B8: ; 81250B8 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 @@ -539869,15 +539869,15 @@ sub_81250B8: ; 81250B8 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 @@ -539902,10 +539902,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 @@ -539925,7 +539925,7 @@ sub_8125170: ; 8125170 mov r0, r10 ldrb r0, [r0] cmp r5, r0 - bcs @081251FC + bcs _081251FC movs r1, 0x80 lsls r1, 8 mov r9, r1 @@ -539933,29 +539933,29 @@ sub_8125170: ; 8125170 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 @@ -539963,15 +539963,15 @@ sub_8125170: ; 8125170 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 @@ -539987,13 +539987,13 @@ 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 @@ -540010,11 +540010,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 @@ -540033,36 +540033,36 @@ sub_8125250: ; 8125250 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 @@ -540082,11 +540082,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] @@ -540112,16 +540112,16 @@ sub_81252E8: ; 81252E8 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 @@ -540133,7 +540133,7 @@ sub_81252E8: ; 81252E8 mov r1, sp strh r0, [r1] ldr r3, [sp, 0x4] -@0812535C: +_0812535C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -540144,15 +540144,15 @@ sub_81252E8: ; 81252E8 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 @@ -540176,11 +540176,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 @@ -540199,37 +540199,37 @@ sub_81253A4: ; 81253A4 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 @@ -540250,11 +540250,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 @@ -540273,36 +540273,36 @@ sub_8125448: ; 8125448 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 @@ -540322,10 +540322,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 @@ -540352,8 +540352,8 @@ sub_81254E0: ; 81254E0 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 @@ -540371,8 +540371,8 @@ sub_81254E0: ; 81254E0 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 @@ -540382,18 +540382,18 @@ sub_81254E0: ; 81254E0 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 @@ -540423,9 +540423,9 @@ sub_81254E0: ; 81254E0 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 @@ -540448,8 +540448,8 @@ sub_81254E0: ; 81254E0 ldrb r0, [r0] subs r0, 0x1 cmp r7, r0 - blt @081255BE -@081255F0: + blt _081255BE +_081255F0: mov r2, r8 ldrb r1, [r2] lsls r1, 1 @@ -540462,8 +540462,8 @@ sub_81254E0: ; 81254E0 ldr r0, =0x03006174 ldrb r0, [r0] cmp r6, r0 - bcc @0812557E -@0812560C: + bcc _0812557E +_0812560C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -540483,11 +540483,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 @@ -540506,36 +540506,36 @@ sub_8125630: ; 8125630 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 @@ -540559,28 +540559,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 @@ -540588,7 +540588,7 @@ sub_81256C8: ; 81256C8 movs r2, 0x80 lsls r2, 8 mov r9, r2 -@08125716: +_08125716: lsls r0, r7, 1 mov r2, r10 ldr r1, [r2] @@ -540600,13 +540600,13 @@ sub_81256C8: ; 81256C8 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 @@ -540616,13 +540616,13 @@ sub_81256C8: ; 81256C8 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 @@ -540637,14 +540637,14 @@ sub_81256C8: ; 81256C8 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 @@ -540653,49 +540653,49 @@ sub_81256C8: ; 81256C8 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 @@ -540717,10 +540717,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 @@ -540745,22 +540745,22 @@ sub_81257F8: ; 81257F8 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 @@ -540769,15 +540769,15 @@ sub_81257F8: ; 81257F8 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 @@ -540797,11 +540797,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] @@ -540827,15 +540827,15 @@ sub_81258A0: ; 81258A0 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] @@ -540844,7 +540844,7 @@ sub_81258A0: ; 81258A0 mov r1, sp strh r0, [r1] ldr r2, [sp, 0x4] -@0812590C: +_0812590C: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -540855,15 +540855,15 @@ sub_81258A0: ; 81258A0 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 @@ -540914,11 +540914,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 @@ -540929,9 +540929,9 @@ sub_8125954: ; 8125954 strb r0, [r1] ldrb r0, [r3, 0x1] add r0, r8 - b @081259D6 + b _081259D6 .pool -@081259C4: +_081259C4: mov r0, r8 lsls r2, r0, 2 mov r4, sp @@ -540941,21 +540941,21 @@ sub_8125954: ; 8125954 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 @@ -540967,18 +540967,18 @@ sub_8125954: ; 8125954 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 @@ -540997,7 +540997,7 @@ sub_8125954: ; 8125954 adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne @08125B02 + bne _08125B02 movs r7, 0x1F ands r7, r1 lsls r0, r1, 16 @@ -541007,11 +541007,11 @@ sub_8125954: ; 8125954 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 @@ -541023,11 +541023,11 @@ sub_8125954: ; 8125954 lsls r0, 16 lsrs r4, r0, 16 cmp r7, 0x1F - bls @08125AEC + bls _08125AEC movs r7, 0x1F - b @08125AEC + b _08125AEC .pool -@08125A78: +_08125A78: mov r1, r10 lsls r0, r1, 1 add r0, r10 @@ -541047,65 +541047,65 @@ sub_8125954: ; 8125954 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 .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 @@ -541114,9 +541114,9 @@ sub_8125954: ; 8125954 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 @@ -541172,19 +541172,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 @@ -541218,22 +541218,22 @@ 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 .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 @@ -541241,8 +541241,8 @@ sub_8125B98: ; 8125B98 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 @@ -541250,41 +541250,41 @@ sub_8125B98: ; 8125B98 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 @@ -541312,16 +541312,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 .pool @@ -541333,26 +541333,26 @@ sub_8125C98: ; 8125C98 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 @@ -541395,7 +541395,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 @@ -541422,38 +541422,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 @@ -541461,50 +541461,50 @@ sub_8125CF4: ; 8125CF4 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 @@ -541538,7 +541538,7 @@ sub_8125CF4: ; 8125CF4 lsls r5, 16 lsrs r5, 16 adds r0, r5, 0 -@08125E10: +_08125E10: add sp, 0x14 pop {r4-r7} pop {r1} @@ -541560,14 +541560,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 @@ -541624,35 +541624,35 @@ sub_8125E18: ; 8125E18 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 @@ -541684,7 +541684,7 @@ sub_8125E18: ; 8125E18 orrs r5, r0 lsls r0, r5, 16 lsrs r0, 16 -@08125F28: +_08125F28: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -541710,14 +541710,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 @@ -541774,35 +541774,35 @@ sub_8125F38: ; 8125F38 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 @@ -541833,7 +541833,7 @@ sub_8125F38: ; 8125F38 orrs r5, r0 lsls r0, r5, 16 lsrs r0, 16 -@08126046: +_08126046: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -541863,24 +541863,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 @@ -541889,7 +541889,7 @@ sub_8126058: ; 8126058 ldr r1, [sp, 0x4] adds r1, r0 mov r12, r1 -@081260AA: +_081260AA: lsls r0, r4, 3 mov r2, r12 adds r3, r2, r0 @@ -541925,36 +541925,36 @@ sub_8126058: ; 8126058 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 @@ -541963,7 +541963,7 @@ sub_8126058: ; 8126058 ldr r1, [sp, 0x4] adds r1, r0 mov r12, r1 -@08126134: +_08126134: lsls r0, r4, 2 mov r2, r12 adds r3, r2, r0 @@ -542001,19 +542001,19 @@ sub_8126058: ; 8126058 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 @@ -542060,45 +542060,45 @@ 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 .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 @@ -542185,7 +542185,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 @@ -542200,7 +542200,7 @@ sub_8126334: ; 8126334 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xD - bls @08126346 + bls _08126346 pop {r4,r5} pop {r0} bx r0 @@ -542216,7 +542216,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 @@ -542229,7 +542229,7 @@ sub_8126370: ; 8126370 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x1F - bls @0812637E + bls _0812637E pop {r4} pop {r0} bx r0 @@ -542247,10 +542247,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 @@ -542258,9 +542258,9 @@ sub_81263A4: ; 81263A4 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 @@ -542269,8 +542269,8 @@ sub_81263A4: ; 81263A4 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 @@ -542280,8 +542280,8 @@ sub_81263A4: ; 81263A4 movs r3, 0 ldrb r5, [r5] cmp r3, r5 - bcs @081264E4 -@081263F4: + bcs _081264E4 +_081263F4: ldr r2, =0x03006168 ldr r0, =0x03006178 ldrb r1, [r0] @@ -542303,25 +542303,25 @@ sub_81263A4: ; 81263A4 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 .pool -@08126464: +_08126464: adds r0, r4, 0 bl sub_81267C4 lsls r0, 16 @@ -542330,66 +542330,66 @@ sub_81263A4: ; 81263A4 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 .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 @@ -542409,10 +542409,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 @@ -542433,51 +542433,51 @@ sub_81264FC: ; 81264FC 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 .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} @@ -542496,10 +542496,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 @@ -542519,21 +542519,21 @@ sub_81265B4: ; 81265B4 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 .pool -@08126624: +_08126624: adds r0, r4, 0 str r2, [sp] bl sub_8126908 @@ -542541,7 +542541,7 @@ sub_81265B4: ; 81265B4 adds r0, r1 strh r0, [r4] ldr r2, [sp] -@08126634: +_08126634: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -542549,15 +542549,15 @@ sub_81265B4: ; 81265B4 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 @@ -542577,10 +542577,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 @@ -542600,21 +542600,21 @@ sub_8126664: ; 8126664 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 .pool -@081266D4: +_081266D4: adds r0, r4, 0 str r2, [sp] bl sub_812693C @@ -542622,7 +542622,7 @@ sub_8126664: ; 8126664 adds r0, r1 strh r0, [r4] ldr r2, [sp] -@081266E4: +_081266E4: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -542630,15 +542630,15 @@ sub_8126664: ; 8126664 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 @@ -542658,10 +542658,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 @@ -542681,21 +542681,21 @@ sub_8126714: ; 8126714 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 .pool -@08126784: +_08126784: adds r0, r4, 0 str r2, [sp] bl sub_8126838 @@ -542703,7 +542703,7 @@ sub_8126714: ; 8126714 adds r0, r1 strh r0, [r4] ldr r2, [sp] -@08126794: +_08126794: adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 @@ -542711,15 +542711,15 @@ sub_8126714: ; 8126714 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 @@ -542745,51 +542745,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 @@ -542813,118 +542813,118 @@ 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 @@ -542949,12 +542949,12 @@ 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 @@ -542990,18 +542990,18 @@ sub_8126968: ; 8126968 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 @@ -543010,10 +543010,10 @@ sub_8126968: ; 8126968 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 @@ -543022,7 +543022,7 @@ sub_8126968: ; 8126968 ldr r1, =0x00002728 adds r0, r1 str r0, [r2, 0x4] -@081269AC: +_081269AC: pop {r0} bx r0 .pool @@ -543037,7 +543037,7 @@ sub_81269D4: ; 81269D4 ldr r0, =0x0203a188 adds r4, r1, r0 cmp r1, 0 - bne @08126A28 + bne _08126A28 ldr r0, =gUnknown_085A6B90 ldr r1, [r0, 0x4] ldr r0, [r0] @@ -543054,22 +543054,22 @@ 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 .pool -@08126A28: +_08126A28: lsls r0, r1, 3 ldr r1, =gUnknown_085A6B90 adds r0, r1 -@08126A2E: +_08126A2E: bl AddWindow strb r0, [r4] ldrb r0, [r4] @@ -543224,7 +543224,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 @@ -543234,10 +543234,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, =gUnknown_085A6B48 @@ -543249,9 +543249,9 @@ sub_8126B80: ; 8126B80 ldr r1, [r0] adds r0, r5, 0 bl _call_via_r1 - b @08126C00 + b _08126C00 .pool -@08126BD8: +_08126BD8: bl GetMenuCursorPos ldr r1, =0x0203a150 strb r0, [r1] @@ -543259,16 +543259,16 @@ sub_8126B80: ; 8126B80 asrs r0, 24 ldrb r1, [r1] cmp r0, r1 - beq @08126C00 + beq _08126C00 bl sub_8126C08 - b @08126C00 + b _08126C00 .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 @@ -543313,7 +543313,7 @@ sub_8126C48: ; 8126C48 bl sub_8161B10 lsls r0, 24 cmp r0, 0 - bne @08126C7C + bne _08126C7C ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EA83D adds r0, r4, 0 @@ -543322,9 +543322,9 @@ sub_8126C48: ; 8126C48 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField - b @08126C96 + b _08126C96 .pool -@08126C7C: +_08126C7C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -543337,7 +543337,7 @@ sub_8126C48: ; 8126C48 strb r2, [r0] adds r0, r5, 0 bl sub_8126DCC -@08126C96: +_08126C96: pop {r4,r5} pop {r0} bx r0 @@ -543353,7 +543353,7 @@ sub_8126CA4: ; 8126CA4 bl sub_81299AC lsls r0, 24 cmp r0, 0 - bne @08126CD8 + bne _08126CD8 ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EAAEC adds r0, r4, 0 @@ -543362,9 +543362,9 @@ sub_8126CA4: ; 8126CA4 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField - b @08126D00 + b _08126D00 .pool -@08126CD8: +_08126CD8: movs r0, 0 bl sub_8126A58 movs r0, 0 @@ -543382,7 +543382,7 @@ sub_8126CA4: ; 8126CA4 strh r1, [r0, 0xC] ldr r1, =sub_8129ABC str r1, [r0] -@08126D00: +_08126D00: pop {r4,r5} pop {r0} bx r0 @@ -543397,7 +543397,7 @@ sub_8126D10: ; 8126D10 bl sub_8161B10 lsls r0, 24 cmp r0, 0 - bne @08126D44 + bne _08126D44 ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EA83D adds r0, r4, 0 @@ -543406,9 +543406,9 @@ sub_8126D10: ; 8126D10 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField - b @08126D5E + b _08126D5E .pool -@08126D44: +_08126D44: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -543421,7 +543421,7 @@ sub_8126D10: ; 8126D10 strb r2, [r0] adds r0, r5, 0 bl sub_8126DCC -@08126D5E: +_08126D5E: pop {r4,r5} pop {r0} bx r0 @@ -543438,17 +543438,17 @@ sub_8126D6C: ; 8126D6C ldr r0, =0x0203a17c ldrb r0, [r0, 0x9] cmp r0, 0 - bne @08126D98 + bne _08126D98 ldr r0, =gUnknown_0823B4E8 bl script_env_1_execute_new_script adds r0, r4, 0 bl remove_task - b @08126D9E + b _08126D9E .pool -@08126D98: +_08126D98: adds r0, r4, 0 bl sub_816B060 -@08126D9E: +_08126D9E: pop {r4} pop {r0} bx r0 @@ -543579,26 +543579,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] @@ -543607,9 +543607,9 @@ sub_8126E8C: ; 8126E8C adds r1, r4, 0 movs r2, 0x8 bl sub_8126F68 - b @08126F0C + b _08126F0C .pool -@08126EF8: +_08126EF8: lsls r3, r4, 28 lsrs r3, 24 movs r0, 0 @@ -543619,12 +543619,12 @@ sub_8126E8C: ; 8126E8C 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 @@ -543634,9 +543634,9 @@ sub_8126E8C: ; 8126E8C ldrsh r0, [r1, r2] ldr r2, =gUnknown_085E8CF0 cmp r0, 0x2 - bne @08126F2C + bne _08126F2C ldr r2, =gUnknown_085EB7EA -@08126F2C: +_08126F2C: lsls r0, r4, 4 adds r0, 0x1 lsls r0, 24 @@ -543689,10 +543689,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 @@ -543780,17 +543780,17 @@ sub_8127058: ; 8127058 ldr r1, =gUnknown_085EA7C8 bl CopyString cmp r4, 0x1 - bne @08127078 + bne _08127078 movs r0, 0x4 strb r0, [r5, 0x2] movs r0, 0x5 - b @0812707E + b _0812707E .pool -@08127078: +_08127078: movs r0, 0x2 strb r0, [r5, 0x2] movs r0, 0x3 -@0812707E: +_0812707E: strb r0, [r5, 0x5] pop {r4,r5} pop {r0} @@ -543807,7 +543807,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 @@ -543815,31 +543815,31 @@ 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 .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 @@ -543858,7 +543858,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 @@ -543882,9 +543882,9 @@ sub_81270E8: ; 81270E8 adds r0, r1 ldr r1, =sub_8127620 str r1, [r0] - b @0812716E + b _0812716E .pool -@08127154: +_08127154: movs r0, 0x1 bl sub_8126A58 ldr r4, =0x02021fc4 @@ -543895,7 +543895,7 @@ sub_81270E8: ; 81270E8 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField -@0812716E: +_0812716E: pop {r4,r5} pop {r0} bx r0 @@ -543931,15 +543931,15 @@ 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 .pool -@081271C0: +_081271C0: adds r0, r2, 0 bl sub_8127268 -@081271C6: +_081271C6: pop {r0} bx r0 thumb_func_end sub_812719C @@ -544046,18 +544046,18 @@ 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 .pool -@081272B8: +_081272B8: ldr r2, =0x00000521 adds r0, r2 strb r1, [r0] -@081272BE: +_081272BE: pop {r0} bx r0 .pool @@ -544123,25 +544123,25 @@ 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 .pool -@08127378: +_08127378: ldr r0, =0x02021cc4 movs r1, 0 bl sub_8127058 -@08127380: +_08127380: movs r6, 0 ldr r1, =0x0203a18c ldr r0, [r1] @@ -544151,9 +544151,9 @@ sub_8127330: ; 8127330 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 @@ -544184,8 +544184,8 @@ sub_8127330: ; 8127330 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 @@ -544261,10 +544261,10 @@ sub_8127480: ; 8127480 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} @@ -544286,7 +544286,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 @@ -544295,26 +544295,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} @@ -544332,7 +544332,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] @@ -544355,7 +544355,7 @@ sub_8127500: ; 8127500 ldr r2, =0x00000522 adds r1, r2 strb r0, [r1] -@08127540: +_08127540: add sp, 0x10 pop {r4} pop {r0} @@ -544372,14 +544372,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 @@ -544484,7 +544484,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 @@ -544498,13 +544498,13 @@ 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 .pool -@081276A4: +_081276A4: movs r0, 0x5 bl audio_play ldr r0, =gUnknown_085A6B78 @@ -544516,9 +544516,9 @@ sub_812764C: ; 812764C ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 - b @08127700 + b _08127700 .pool -@081276C4: +_081276C4: movs r0, 0x5 bl audio_play ldr r0, =0x0203a172 @@ -544542,7 +544542,7 @@ sub_812764C: ; 812764C ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -@08127700: +_08127700: pop {r3} mov r8, r3 pop {r4-r7} @@ -544588,11 +544588,11 @@ sub_8127744: ; 8127744 ldr r0, =0x0203a151 ldrb r0, [r0] cmp r4, r0 - bcc @08127770 + bcc _08127770 ldr r2, =gUnknown_085E8D62 - b @08127782 + b _08127782 .pool -@08127770: +_08127770: ldr r1, =gUnknown_085A5C08 ldr r0, =0x0203a14c ldr r0, [r0] @@ -544602,7 +544602,7 @@ sub_8127744: ; 8127744 adds r1, 0x18 adds r0, r1 ldr r2, [r0] -@08127782: +_08127782: movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -544637,22 +544637,22 @@ sub_81277BC: ; 81277BC 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 .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 @@ -544664,22 +544664,22 @@ sub_81277E8: ; 81277E8 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 .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 @@ -544707,14 +544707,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] @@ -544723,11 +544723,11 @@ sub_8127814: ; 8127814 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 @@ -544739,36 +544739,36 @@ sub_8127814: ; 8127814 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 .pool -@081278D0: +_081278D0: lsls r0, r4, 16 lsrs r2, r0, 16 mov r1, r8 @@ -544777,18 +544777,18 @@ sub_8127814: ; 8127814 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 @@ -544797,11 +544797,11 @@ sub_8127814: ; 8127814 ldrb r0, [r0] adds r7, r6, 0x1 cmp r0, 0 - beq @0812799A + beq _0812799A movs r2, 0 - b @0812798C + b _0812798C .pool -@08127918: +_08127918: ldr r0, =0x0203a14c ldr r1, [r0] adds r1, r2 @@ -544814,60 +544814,60 @@ sub_8127814: ; 8127814 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 .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 @@ -544900,29 +544900,29 @@ 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 .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 @@ -544975,7 +544975,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 @@ -544983,7 +544983,7 @@ sub_8127A5C: ; 8127A5C bl sub_81269D4 adds r0, r4, 0 bl sub_8127620 -@08127A82: +_08127A82: pop {r4} pop {r0} bx r0 @@ -545091,23 +545091,23 @@ 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, =gUnknown_085A72E4 adds r0, r1, r0 ldrb r0, [r0] lsls r0, 28 lsrs r0, 16 - b @08127B86 + b _08127B86 .pool -@08127B7C: +_08127B7C: ldr r0, =gUnknown_085A72EC adds r0, r1, r0 ldrb r0, [r0] lsls r0, 28 lsrs r0, 16 -@08127B86: +_08127B86: pop {r1} bx r1 .pool @@ -545140,13 +545140,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 @@ -545163,9 +545163,9 @@ sub_8127B90: ; 8127B90 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] @@ -545179,7 +545179,7 @@ sub_8127B90: ; 8127B90 adds r1, r2, 0 muls r1, r3 str r1, [sp, 0x20] -@08127C0A: +_08127C0A: ldr r0, [sp] add r0, r10 lsls r0, 16 @@ -545205,24 +545205,24 @@ sub_8127B90: ; 8127B90 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 .pool -@08127C60: +_08127C60: movs r0, 0 mov r8, r0 -@08127C64: +_08127C64: ldr r1, [sp, 0x24] ldrb r0, [r1, 0x11] lsls r7, r5, 16 @@ -545230,7 +545230,7 @@ sub_8127B90: ; 8127B90 lsls r2, 16 mov r9, r2 cmp r0, 0x3 - beq @08127C8E + beq _08127C8E asrs r0, r7, 16 asrs r1, r2, 16 bl MapGridGetMetatileBehaviorAt @@ -545241,10 +545241,10 @@ sub_8127B90: ; 8127B90 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, =gUnknown_085A5C08 adds r0, r3, r4 @@ -545258,7 +545258,7 @@ sub_8127B90: ; 8127B90 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 @@ -545278,9 +545278,9 @@ sub_8127B90: ; 8127B90 lsls r2, r3, 16 lsrs r2, 16 bl MapGridSetMetatileEntryAt - b @08127D06 + b _08127D06 .pool -@08127CE0: +_08127CE0: asrs r0, r7, 16 mov r2, r9 asrs r1, r2, 16 @@ -545299,7 +545299,7 @@ sub_8127B90: ; 8127B90 lsls r2, r3, 16 lsrs r2, 16 bl MapGridSetMetatileIdAt -@08127D06: +_08127D06: mov r0, r10 adds r0, 0x1 lsls r0, 16 @@ -545307,18 +545307,18 @@ sub_8127B90: ; 8127B90 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 @@ -545344,98 +545344,98 @@ 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 .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} @@ -545458,7 +545458,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 @@ -545467,28 +545467,28 @@ sub_8127E18: ; 8127E18 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08127F1C + bne _08127F1C adds r0, r4, 0 bl FlagReset 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 @@ -545496,8 +545496,8 @@ sub_8127E18: ; 8127E18 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 @@ -545551,15 +545551,15 @@ sub_8127E18: ; 8127E18 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl sub_808F254 - b @08127F26 + b _08127F26 .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 @@ -545577,25 +545577,25 @@ sub_8127F38: ; 8127F38 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 .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 @@ -545608,13 +545608,13 @@ sub_8127F68: ; 8127F68 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, =gUnknown_085EA9AE adds r0, r4, 0 @@ -545623,19 +545623,19 @@ sub_8127F68: ; 8127F68 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField - b @0812804C + b _0812804C .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 @@ -545648,9 +545648,9 @@ sub_8127F68: ; 8127F68 strh r1, [r0, 0xC] ldr r1, =sub_8128060 str r1, [r0] - b @0812804C + b _0812804C .pool -@08127FE8: +_08127FE8: ldr r0, =0x02021cc4 ldr r4, =0x0203a17c ldrb r1, [r4, 0x8] @@ -545659,24 +545659,24 @@ sub_8127F68: ; 8127F68 bl ConvertIntToDecimalString ldrb r0, [r4, 0x9] cmp r0, 0 - bne @08128018 + bne _08128018 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA8EA bl ExpandStringRefs - b @08128020 + b _08128020 .pool -@08128018: +_08128018: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA931 bl ExpandStringRefs -@08128020: +_08128020: ldr r1, =0x02021fc4 ldr r2, =sub_8127A5C adds r0, r5, 0 bl DisplayItemMessageOnField - b @0812804C + b _0812804C .pool -@08128038: +_08128038: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EA8D2 adds r0, r4, 0 @@ -545685,7 +545685,7 @@ sub_8127F68: ; 8127F68 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField -@0812804C: +_0812804C: pop {r4,r5} pop {r0} bx r0 @@ -545705,31 +545705,31 @@ 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 .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 .pool -@081280AC: +_081280AC: ldr r4, =0x02037fd4 ldrb r0, [r4, 0x8] movs r1, 0x80 @@ -545756,19 +545756,19 @@ sub_8128060: ; 8128060 strb r0, [r4, 0x8] movs r0, 0x2 strh r0, [r7, 0xC] - b @08128112 + b _08128112 .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 @@ -545866,33 +545866,33 @@ SetUpPlacingDecorationPlayerAvatar: ; 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, =DummyObjectCallback str r0, [sp] movs r0, 0xC1 - b @08128214 + b _08128214 .pool -@0812820C: +_0812820C: ldr r1, =DummyObjectCallback movs r0, 0 str r0, [sp] movs r0, 0xC2 -@08128214: +_08128214: movs r3, 0x48 bl AddPseudoFieldObject ldr r1, =0x0203aa39 @@ -545944,37 +545944,37 @@ 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 .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 .pool -@081282E4: +_081282E4: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 @@ -545983,9 +545983,9 @@ sub_812826C: ; 812826C movs r1, 0x2 strh r1, [r0, 0x12] movs r1, 0x1 - b @081283B0 + b _081283B0 .pool -@081282FC: +_081282FC: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 @@ -545994,36 +545994,36 @@ sub_812826C: ; 812826C movs r1, 0x3 strh r1, [r0, 0x12] movs r1, 0x1 - b @081283B0 + b _081283B0 .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 .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 .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 .pool -@08128350: +_08128350: ldr r0, =0x03005e00 lsls r1, r3, 2 adds r1, r3 @@ -546036,9 +546036,9 @@ sub_812826C: ; 812826C ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b @081283B2 + b _081283B2 .pool -@08128370: +_08128370: ldr r1, =0x03005e00 lsls r0, r3, 2 adds r0, r3 @@ -546047,33 +546047,33 @@ sub_812826C: ; 812826C movs r1, 0x2 strh r1, [r0, 0x12] movs r1, 0x4 - b @081283B0 + b _081283B0 .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 .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 .pool @@ -546172,15 +546172,15 @@ 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 @@ -546206,22 +546206,22 @@ 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 .pool -@081284EC: +_081284EC: movs r0, 0x1 -@081284EE: +_081284EE: pop {r4,r5} pop {r1} bx r1 @@ -546240,29 +546240,29 @@ 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 @@ -546293,33 +546293,33 @@ 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 .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 @@ -546336,13 +546336,13 @@ sub_812853C: ; 812853C 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 @@ -546387,9 +546387,9 @@ sub_812853C: ; 812853C 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 @@ -546397,9 +546397,9 @@ sub_812853C: ; 812853C 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] @@ -546409,27 +546409,27 @@ sub_812853C: ; 812853C 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 .pool -@08128680: +_08128680: movs r6, 0 mov r3, r10 lsls r3, 2 @@ -546438,12 +546438,12 @@ sub_812853C: ; 812853C 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] @@ -546456,10 +546456,10 @@ sub_812853C: ; 812853C 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] @@ -546502,15 +546502,15 @@ sub_812853C: ; 812853C 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] @@ -546519,9 +546519,9 @@ sub_812853C: ; 812853C 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] @@ -546531,24 +546531,24 @@ sub_812853C: ; 812853C 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 @@ -546563,12 +546563,12 @@ sub_812853C: ; 812853C 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 @@ -546607,14 +546607,14 @@ sub_812853C: ; 812853C 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] @@ -546623,9 +546623,9 @@ sub_812853C: ; 812853C 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] @@ -546635,25 +546635,25 @@ sub_812853C: ; 812853C 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 .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 @@ -546668,14 +546668,14 @@ sub_812853C: ; 812853C 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 @@ -546689,30 +546689,30 @@ sub_812853C: ; 812853C bl sub_8089328 lsls r0, 24 cmp r0, 0 - beq @0812890C + beq _0812890C adds r0, r4, 0 adds r1, r5, 0x1 bl MapGridGetMetatileIdAt 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 .pool -@081288B8: +_081288B8: mov r3, r10 lsls r1, r3, 2 adds r0, r1, r3 @@ -546724,12 +546724,12 @@ sub_812853C: ; 812853C 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 @@ -546748,23 +546748,23 @@ sub_812853C: ; 812853C 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 @@ -546773,16 +546773,16 @@ sub_812853C: ; 812853C 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 @@ -546812,7 +546812,7 @@ sub_8128950: ; 8128950 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081289A4 + bne _081289A4 ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EA897 adds r0, r4, 0 @@ -546821,9 +546821,9 @@ sub_8128950: ; 8128950 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField - b @081289BE + b _081289BE .pool -@081289A4: +_081289A4: movs r0, 0x20 bl audio_play ldr r4, =0x02021fc4 @@ -546834,7 +546834,7 @@ sub_8128950: ; 8128950 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField -@081289BE: +_081289BE: pop {r4,r5} pop {r0} bx r0 @@ -546878,7 +546878,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 @@ -546888,9 +546888,9 @@ sub_81289F0: ; 81289F0 ldrh r1, [r1, 0xA] adds r2, r3, 0 bl sub_8127D38 - b @08128A64 + b _08128A64 .pool -@08128A44: +_08128A44: ldr r2, =0x0203aa34 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -546906,7 +546906,7 @@ sub_81289F0: ; 81289F0 strh r0, [r2] ldr r0, =gUnknown_08275D1F bl script_env_1_execute_new_script -@08128A64: +_08128A64: ldr r2, =0x02020630 ldr r0, =0x0203aa38 ldrb r1, [r0] @@ -546920,9 +546920,9 @@ sub_81289F0: ; 81289F0 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} @@ -546941,31 +546941,31 @@ 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 .pool -@08128AF0: +_08128AF0: ldr r0, =0x0203a172 ldrb r1, [r0] ldr r0, =0x0203a14c @@ -546987,49 +546987,49 @@ sub_8128AAC: ; 8128AAC subs r1, 0x7 adds r0, r1 strb r0, [r2] - b @08128AD2 + b _08128AD2 .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 .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 @@ -547105,26 +547105,26 @@ 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 .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 .pool -@08128C30: +_08128C30: bl sub_812A3C8 ldr r0, =0x00000be5 bl FreeObjectPaletteByTag @@ -547135,7 +547135,7 @@ c1_overworld_prev_quest: ; 8128BEC bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@08128C4C: +_08128C4C: pop {r4,r5} pop {r0} bx r0 @@ -547155,46 +547155,46 @@ 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 .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, =gUnknown_08275D0C bl script_env_1_execute_new_script - b @08128CAC + b _08128CAC .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 str r1, [r0] -@08128CCA: +_08128CCA: pop {r4-r6} pop {r0} bx r0 @@ -547241,7 +547241,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 @@ -547249,15 +547249,15 @@ 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 .pool -@08128D48: +_08128D48: ldrb r0, [r3] cmp r0, 0x2 - bne @08128D6C + bne _08128D6C movs r0, 0x2 ldrsh r1, [r2, r0] subs r1, 0x7 @@ -547265,30 +547265,30 @@ sub_8128D10: ; 8128D10 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 .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 @@ -547299,17 +547299,17 @@ sub_8128D10: ; 8128D10 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 .pool -@08128DAC: +_08128DAC: movs r0, 0x1 -@08128DAE: +_08128DAE: pop {r4} pop {r1} bx r1 @@ -547323,19 +547323,19 @@ sub_8128DB4: ; 8128DB4 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 .pool -@08128DD8: +_08128DD8: movs r0, 0x1 -@08128DDA: +_08128DDA: pop {r1} bx r1 thumb_func_end sub_8128DB4 @@ -547390,42 +547390,42 @@ 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, =gUnknown_085A72D4 movs r3, 0x18 ldrsh r1, [r4, r3] lsls r1, 3 - b @08128E76 + b _08128E76 .pool -@08128E68: +_08128E68: cmp r0, 0x2 - bne @08128E88 + bne _08128E88 ldr r0, =gUnknown_085A72D4 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 .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] @@ -547445,12 +547445,12 @@ sub_8128E18: ; 8128E18 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] @@ -547470,12 +547470,12 @@ sub_8128E18: ; 8128E18 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] @@ -547495,12 +547495,12 @@ sub_8128E18: ; 8128E18 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] @@ -547520,23 +547520,23 @@ sub_8128E18: ; 8128E18 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] @@ -547556,28 +547556,28 @@ sub_8128E18: ; 8128E18 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} @@ -547628,15 +547628,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 .pool @@ -547687,10 +547687,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, =gTilesetPointer_SecretBase ldr r0, [r0] lsls r1, r2, 5 @@ -547700,29 +547700,29 @@ sub_8129088: ; 8129088 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 .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 @@ -547767,12 +547767,12 @@ sub_8129088: ; 8129088 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 @@ -547797,13 +547797,13 @@ sub_8129088: ; 8129088 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 @@ -547818,8 +547818,8 @@ sub_8129088: ; 8129088 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x1F - bls @0812917C -@0812919A: + bls _0812917C +_0812919A: add sp, 0x20 pop {r4-r7} pop {r0} @@ -547831,7 +547831,7 @@ 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 @@ -547844,7 +547844,7 @@ sub_81291A4: ; 81291A4 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x3F - bls @081291AA + bls _081291AA pop {r4,r5} pop {r0} bx r0 @@ -547879,9 +547879,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 @@ -547916,8 +547916,8 @@ sub_81291E8: ; 81291E8 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} @@ -548003,40 +548003,40 @@ sub_81292E8: ; 81292E8 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 @@ -548055,7 +548055,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 FreeObjectPaletteByTag adds r0, r5, 0 @@ -548085,9 +548085,9 @@ gpu_pal_decompress_alloc_tag_and_upload: ; 8129334 movs r2, 0 movs r3, 0 bl AddObjectToFront - b @081293C6 + b _081293C6 .pool -@081293B4: +_081293B4: ldr r0, [r4, 0x1C] ldrh r0, [r0] ldr r1, =DummyObjectCallback @@ -548096,7 +548096,7 @@ gpu_pal_decompress_alloc_tag_and_upload: ; 8129334 movs r2, 0 movs r3, 0 bl AddPseudoFieldObject -@081293C6: +_081293C6: lsls r0, 24 lsrs r0, 24 add sp, 0x4 @@ -548120,7 +548120,7 @@ AddDecorationIconObjectFromIconTable: ; 81293D8 bl AllocItemIconTemporaryBuffers lsls r0, 24 cmp r0, 0 - beq @08129490 + beq _08129490 adds r0, r5, 0 movs r1, 0 bl GetDecorationIconPicOrPalette @@ -548179,11 +548179,11 @@ AddDecorationIconObjectFromIconTable: ; 81293D8 adds r0, r5, 0 bl Free adds r0, r4, 0 - b @08129492 + b _08129492 .pool -@08129490: +_08129490: movs r0, 0x40 -@08129492: +_08129492: add sp, 0x10 pop {r4-r7} pop {r1} @@ -548199,9 +548199,9 @@ GetDecorationIconPicOrPalette: ; 812949C lsls r1, 24 lsrs r0, r1, 24 cmp r3, 0x78 - bls @081294AC + bls _081294AC movs r3, 0 -@081294AC: +_081294AC: ldr r2, =gUnknown_085A6BE8 lsls r0, 2 lsls r1, r3, 3 @@ -548237,7 +548237,7 @@ AddDecorationIconObjectFromFieldObject: ; 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] @@ -548305,9 +548305,9 @@ AddDecorationIconObjectFromFieldObject: ; 81294C0 lsrs r5, r0, 24 adds r0, r4, 0 bl Free - b @081295BA + b _081295BA .pool -@081295A4: +_081295A4: ldr r0, [r4, 0x1C] ldrh r0, [r0] ldr r1, =DummyObjectCallback @@ -548318,7 +548318,7 @@ AddDecorationIconObjectFromFieldObject: ; 81294C0 bl AddPseudoFieldObject lsls r0, 24 lsrs r5, r0, 24 -@081295BA: +_081295BA: adds r0, r5, 0 add sp, 0x14 pop {r3} @@ -548360,7 +548360,7 @@ AddDecorationIconObject: ; 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 @@ -548368,7 +548368,7 @@ AddDecorationIconObject: ; 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 @@ -548380,15 +548380,15 @@ AddDecorationIconObject: ; 81295CC adds r0, 0x4 strh r0, [r1, 0x24] lsls r0, r7, 16 - b @081296B2 + b _081296B2 .pool -@08129634: +_08129634: ldr r0, =gUnknown_085A6BE8 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 @@ -548396,7 +548396,7 @@ AddDecorationIconObject: ; 81295CC 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 @@ -548409,17 +548409,17 @@ AddDecorationIconObject: ; 81295CC 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 .pool -@08129680: +_08129680: strh r7, [r5, 0x26] - b @081296BC -@08129684: + b _081296BC +_08129684: adds r0, r3, 0 adds r1, r2, 0 mov r2, r12 @@ -548427,11 +548427,11 @@ AddDecorationIconObject: ; 81295CC 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 @@ -548444,13 +548444,13 @@ AddDecorationIconObject: ; 81295CC 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 @@ -548465,7 +548465,7 @@ AddDecorationIconObject: ; 81295CC orrs r0, r1 strb r0, [r2, 0x5] adds r0, r4, 0 -@081296D8: +_081296D8: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -548506,18 +548506,18 @@ 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 .pool -@08129738: +_08129738: ldr r1, =0x020375e4 ldrb r0, [r2] strh r0, [r1] - b @08129796 + b _08129796 .pool -@08129744: +_08129744: ldr r3, =gUnknown_085A5C08 ldr r2, =0x0203a17c ldr r1, =0x0203aa44 @@ -548532,7 +548532,7 @@ sub_8129708: ; 8129708 adds r0, r3 ldrb r0, [r0, 0x11] cmp r0, 0x4 - bne @08129796 + bne _08129796 ldrh r0, [r4, 0x4] strh r0, [r6] ldrb r0, [r4] @@ -548542,24 +548542,24 @@ sub_8129708: ; 8129708 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 @@ -548574,32 +548574,32 @@ sub_81297AC: ; 81297AC 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 .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 @@ -548614,8 +548614,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 @@ -548642,25 +548642,25 @@ sub_81297F8: ; 81297F8 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 @@ -548690,8 +548690,8 @@ sub_81297F8: ; 81297F8 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 @@ -548700,21 +548700,21 @@ sub_81297F8: ; 81297F8 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 @@ -548739,31 +548739,31 @@ 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 .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 DrawWholeMapView ldr r0, =gUnknown_08275D2E bl script_env_1_execute_new_script @@ -548772,22 +548772,22 @@ sub_81298EC: ; 81298EC bl sub_8197434 movs r0, 0x2 strh r0, [r4, 0xC] - b @08129994 + b _08129994 .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, =gUnknown_085EAAC5 adds r0, r4, 0 @@ -548799,9 +548799,9 @@ sub_81298EC: ; 81298EC 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 @@ -548815,25 +548815,25 @@ sub_81299AC: ; 81299AC 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 .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 @@ -548868,18 +548868,18 @@ SetUpPuttingAwayDecorationPlayerAvatar: ; 81299DC ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne @08129A3C + bne _08129A3C ldr r1, =DummyObjectCallback str r0, [sp] movs r0, 0xC1 - b @08129A44 + b _08129A44 .pool -@08129A3C: +_08129A3C: ldr r1, =DummyObjectCallback movs r0, 0 str r0, [sp] movs r0, 0xC2 -@08129A44: +_08129A44: movs r2, 0x88 movs r3, 0x48 bl AddPseudoFieldObject @@ -548944,48 +548944,48 @@ 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 .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 .pool -@08129B0C: +_08129B0C: bl SetUpPuttingAwayDecorationPlayerAvatar 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 @@ -549139,15 +549139,15 @@ sub_8129C74: ; 8129C74 ldr r0, =0x0203aac4 ldrb r0, [r0] cmp r0, 0 - beq @08129CA8 + beq _08129CA8 ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EAAA3 adds r0, r4, 0 bl ExpandStringRefs ldr r2, =sub_812A1A0 - b @08129D14 + b _08129D14 .pool -@08129CA8: +_08129CA8: lsls r1, r5, 2 adds r1, r5 lsls r1, 3 @@ -549165,14 +549165,14 @@ sub_8129C74: ; 8129C74 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] @@ -549199,13 +549199,13 @@ sub_8129C74: ; 8129C74 adds r0, r4, 0 bl ExpandStringRefs ldr r2, =sub_812A1F0 -@08129D14: +_08129D14: adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField - b @08129D50 + b _08129D50 .pool -@08129D3C: +_08129D3C: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EAA81 adds r0, r4, 0 @@ -549214,7 +549214,7 @@ sub_8129C74: ; 8129C74 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField -@08129D50: +_08129D50: pop {r4,r5} pop {r0} bx r0 @@ -549231,15 +549231,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 .pool @@ -549255,71 +549255,71 @@ 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 .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 @@ -549411,30 +549411,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 MapGridGetMetatileIdAt 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 @@ -549446,11 +549446,11 @@ sub_8129E74: ; 8129E74 lsrs r1, 24 bl sub_8129E0C movs r0, 0x1 - b @08129F12 + b _08129F12 .pool -@08129F10: +_08129F10: movs r0, 0 -@08129F12: +_08129F12: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -549482,7 +549482,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 @@ -549493,20 +549493,20 @@ sub_8129F20: ; 8129F20 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 FlagGet lsls r0, 24 cmp r0, 0 - bne @08129FB0 + bne _08129FB0 ldr r0, =0x0203aac4 ldrb r1, [r0] lsls r1, 3 @@ -549517,15 +549517,15 @@ sub_8129F20: ; 8129F20 adds r0, r2 ldrh r0, [r0] strh r0, [r1, 0x4] - b @08129FBA + b _08129FBA .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 @@ -549540,20 +549540,20 @@ sub_8129FC8: ; 8129FC8 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, =gUnknown_085A5C08 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 @@ -549566,25 +549566,25 @@ sub_8129FC8: ; 8129FC8 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 .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 @@ -549615,10 +549615,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] @@ -549629,22 +549629,22 @@ sub_812A040: ; 812A040 movs r2, 0xF ands r2, r0 cmp r1, 0 - beq @0812A0BA + beq _0812A0BA ldr r0, =gUnknown_085A5C08 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 @@ -549654,14 +549654,14 @@ sub_812A040: ; 812A040 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 @@ -549686,19 +549686,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 @@ -549710,26 +549710,26 @@ sub_812A0E8: ; 812A0E8 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 .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] @@ -549750,7 +549750,7 @@ sub_812A0E8: ; 812A0E8 lsls r2, 24 lsrs r2, 24 bl sub_812A040 -@0812A18C: +_0812A18C: pop {r4-r7} pop {r0} bx r0 @@ -549866,25 +549866,25 @@ 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 .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 .pool -@0812A29C: +_0812A29C: bl sub_812A3C8 ldr r0, =0x03005dac ldr r1, =sub_812A334 @@ -549893,7 +549893,7 @@ sub_812A25C: ; 812A25C bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@0812A2B2: +_0812A2B2: pop {r4,r5} pop {r0} bx r0 @@ -549913,46 +549913,46 @@ 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 .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, =gUnknown_08275D0C bl script_env_1_execute_new_script - b @0812A30C + b _0812A30C .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 str r1, [r0] -@0812A32A: +_0812A32A: pop {r4-r6} pop {r0} bx r0 @@ -549994,22 +549994,22 @@ 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 @@ -550021,15 +550021,15 @@ sub_812A39C: ; 812A39C ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne @0812A3B8 + bne _0812A3B8 ldr r0, =gUnknown_085A73D8 bl LoadTaggedObjectPalette - b @0812A3BE + b _0812A3BE .pool -@0812A3B8: +_0812A3B8: ldr r0, =gUnknown_085A73E0 bl LoadTaggedObjectPalette -@0812A3BE: +_0812A3BE: pop {r0} bx r0 .pool @@ -550053,7 +550053,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] @@ -550073,9 +550073,9 @@ sub_812A3D4: ; 812A3D4 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField - b @0812A444 + b _0812A444 .pool -@0812A430: +_0812A430: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EA9E0 adds r0, r4, 0 @@ -550084,7 +550084,7 @@ sub_812A3D4: ; 812A3D4 adds r0, r5, 0 adds r1, r4, 0 bl DisplayItemMessageOnField -@0812A444: +_0812A444: pop {r4,r5} pop {r0} bx r0 @@ -550157,12 +550157,12 @@ 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 .pool -@0812A500: +_0812A500: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -550173,19 +550173,19 @@ sub_812A4DC: ; 812A4DC 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 bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@0812A530: +_0812A530: add sp, 0x4 pop {r4,r5} pop {r0} @@ -550235,51 +550235,51 @@ 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 .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 @@ -550295,17 +550295,17 @@ sub_812A588: ; 812A588 bl ShowBg movs r0, 0x3 bl ShowBg - 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 @@ -550313,12 +550313,12 @@ sub_812A588: ; 812A588 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0812A666 + b _0812A666 .pool -@0812A660: +_0812A660: ldr r0, =sub_812A670 bl SetMainCallback2 -@0812A666: +_0812A666: add sp, 0x4 pop {r0} bx r0 @@ -550491,7 +550491,7 @@ sub_812A7BC: ; 812A7BC movs r0, 0x81 lsls r0, 24 mov r12, r0 -@0812A7DA: +_0812A7DA: strh r6, [r4] mov r0, sp str r0, [r1] @@ -550501,7 +550501,7 @@ sub_812A7BC: ; 812A7BC adds r2, r5 subs r3, r5 cmp r3, r5 - bhi @0812A7DA + bhi _0812A7DA strh r6, [r4] mov r0, sp str r0, [r1] @@ -550647,7 +550647,7 @@ sub_812A8C4: ; 812A8C4 movs r7, 0 ldr r0, =gUnknown_085A76B4 mov r8, r0 -@0812A934: +_0812A934: ldr r0, =0x0203ab34 ldr r4, [r0] lsls r6, r7, 1 @@ -550690,7 +550690,7 @@ sub_812A8C4: ; 812A8C4 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bls @0812A934 + bls _0812A934 bl GetCoins lsls r0, 16 lsrs r0, 16 @@ -550832,7 +550832,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] @@ -550843,7 +550843,7 @@ sub_812AAC8: ; 812AAC8 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0812AAD8 + bne _0812AAD8 pop {r4-r6} pop {r0} bx r0 @@ -550885,13 +550885,13 @@ sub_812AB38: ; 812AB38 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 @@ -550918,20 +550918,20 @@ 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 .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 @@ -550943,12 +550943,12 @@ sub_812ABA8: ; 812ABA8 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 @@ -550969,10 +550969,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 @@ -550987,20 +550987,20 @@ sub_812ABF8: ; 812ABF8 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 .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 @@ -551010,12 +551010,12 @@ sub_812ABF8: ; 812ABF8 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 @@ -551026,8 +551026,8 @@ sub_812ABF8: ; 812ABF8 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] @@ -551041,23 +551041,23 @@ sub_812ABF8: ; 812ABF8 strb r0, [r1] movs r0, 0x5F bl audio_play - b @0812ACE4 + b _0812ACE4 .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] @@ -551070,7 +551070,7 @@ sub_812ABF8: ; 812ABF8 ldrh r0, [r1, 0x12] adds r0, 0x1 strh r0, [r1, 0x12] -@0812ACB2: +_0812ACB2: ldr r0, =0x0203ab34 ldr r3, [r0] movs r1, 0x12 @@ -551078,28 +551078,28 @@ sub_812ABF8: ; 812ABF8 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} @@ -551145,7 +551145,7 @@ sub_812AD34: ; 812AD34 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq @0812AD52 + beq _0812AD52 movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -551153,7 +551153,7 @@ sub_812AD34: ; 812AD34 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] -@0812AD52: +_0812AD52: movs r0, 0 pop {r1} bx r1 @@ -551166,12 +551166,12 @@ sub_812AD60: ; 812AD60 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 @@ -551199,18 +551199,18 @@ 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 .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] @@ -551218,11 +551218,11 @@ sub_812AD80: ; 812AD80 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} @@ -551236,7 +551236,7 @@ sub_812ADF4: ; 812ADF4 bl sub_812D4CC lsls r0, 24 cmp r0, 0 - beq @0812AE18 + beq _0812AE18 movs r0, 0x1 bl sub_812DEE4 ldr r3, =0x0203ab34 @@ -551248,7 +551248,7 @@ sub_812ADF4: ; 812ADF4 ldr r1, [r3] movs r0, 0xB strb r0, [r1] -@0812AE18: +_0812AE18: movs r0, 0 pop {r1} bx r1 @@ -551264,13 +551264,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 @@ -551285,7 +551285,7 @@ sub_812AE4C: ; 812AE4C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0812AE78 + beq _0812AE78 movs r0, 0x18 bl audio_play ldr r4, =0x0203ab34 @@ -551298,7 +551298,7 @@ sub_812AE4C: ; 812AE4C ldr r1, [r4] movs r0, 0xD strb r0, [r1] -@0812AE78: +_0812AE78: movs r0, 0 pop {r4} pop {r1} @@ -551315,7 +551315,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 @@ -551326,16 +551326,16 @@ 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 .pool -@0812AEBC: +_0812AEBC: movs r0, 0 -@0812AEBE: +_0812AEBE: pop {r4} pop {r1} bx r1 @@ -551354,18 +551354,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 @@ -551377,41 +551377,41 @@ sub_812AEC4: ; 812AEC4 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 .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 .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] @@ -551419,7 +551419,7 @@ sub_812AEC4: ; 812AEC4 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq @0812AFA6 + beq _0812AFA6 ldrb r1, [r3, 0x4] movs r0, 0x3F ands r0, r1 @@ -551431,7 +551431,7 @@ sub_812AEC4: ; 812AEC4 lsls r0, 1 ands r0, r1 cmp r0, 0 - beq @0812AFA6 + beq _0812AFA6 strb r4, [r3, 0xA] ldr r0, [r2] strb r4, [r0, 0xB] @@ -551443,27 +551443,27 @@ sub_812AEC4: ; 812AEC4 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 .pool -@0812AFCC: +_0812AFCC: movs r0, 0x3 bl sub_812DEE4 ldr r1, [r4] @@ -551478,9 +551478,9 @@ sub_812AEC4: ; 812AEC4 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} @@ -551494,12 +551494,12 @@ sub_812AFFC: ; 812AFFC 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 @@ -551512,7 +551512,7 @@ sub_812B01C: ; 812B01C bl sub_812D0E0 lsls r0, 24 cmp r0, 0 - beq @0812B088 + beq _0812B088 ldr r4, =0x0203ab34 ldr r1, [r4] movs r0, 0x13 @@ -551523,46 +551523,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} @@ -551576,7 +551576,7 @@ sub_812B094: ; 812B094 bl sub_812D20C lsls r0, 24 cmp r0, 0 - bne @0812B0CC + bne _0812B0CC ldr r4, =0x0203ab34 ldr r1, [r4] movs r0, 0x13 @@ -551586,19 +551586,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} @@ -551612,7 +551612,7 @@ sub_812B0D8: ; 812B0D8 bl sub_812E054 lsls r0, 24 cmp r0, 0 - beq @0812B0FC + beq _0812B0FC ldr r2, =0x0203ab34 ldr r1, [r2] movs r0, 0x13 @@ -551622,10 +551622,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 @@ -551661,14 +551661,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 @@ -551723,7 +551723,7 @@ sub_812B1B0: ; 812B1B0 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - bne @0812B1EC + bne _0812B1EC movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -551740,25 +551740,25 @@ sub_812B1B0: ; 812B1B0 adds r0, r2 strh r0, [r1, 0xC] movs r0, 0x1B - b @0812B206 + b _0812B206 .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 @@ -551803,7 +551803,7 @@ sub_812B254: ; 812B254 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq @0812B272 + beq _0812B272 movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -551811,7 +551811,7 @@ sub_812B254: ; 812B254 ldr r1, [r0] movs r0, 0x5 strb r0, [r1] -@0812B272: +_0812B272: movs r0, 0 pop {r1} bx r1 @@ -551856,7 +551856,7 @@ sub_812B2C0: ; 812B2C0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq @0812B2DE + beq _0812B2DE movs r0, 0 movs r1, 0x1 bl sub_8197434 @@ -551864,7 +551864,7 @@ sub_812B2C0: ; 812B2C0 ldr r1, [r0] movs r0, 0x1B strb r0, [r1] -@0812B2DE: +_0812B2DE: movs r0, 0 pop {r1} bx r1 @@ -551912,9 +551912,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] @@ -551978,31 +551978,31 @@ sub_812B32C: ; 812B32C 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 @@ -552042,7 +552042,7 @@ sub_812B32C: ; 812B32C ldr r0, [r6] bl Free str r5, [r6] -@0812B470: +_0812B470: movs r0, 0 pop {r4-r6} pop {r1} @@ -552057,21 +552057,21 @@ sub_812B4EC: ; 812B4EC 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, =gUnknown_085A77FE lsls r0, r3, 1 @@ -552081,13 +552081,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, =gUnknown_085A7804 @@ -552097,7 +552097,7 @@ sub_812B4EC: ; 812B4EC ldrb r0, [r2, 0x4] orrs r0, r1 strb r0, [r2, 0x4] -@0812B54A: +_0812B54A: pop {r4} pop {r0} bx r0 @@ -552114,10 +552114,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 .pool @@ -552131,24 +552131,24 @@ sub_812B57C: ; 812B57C movs r2, 0 movs r3, 0x1 ldr r4, =gUnknown_085A77F6 -@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 .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 @@ -552173,13 +552173,13 @@ sub_812B5B0: ; 812B5B0 adds r2, r4 ldrb r1, [r2] cmp r1, r0 - bhi @0812B5E4 + bhi _0812B5E4 movs r0, 0 - b @0812B5E6 + b _0812B5E6 .pool -@0812B5E4: +_0812B5E4: movs r0, 0x1 -@0812B5E6: +_0812B5E6: pop {r4} pop {r1} bx r1 @@ -552190,7 +552190,7 @@ sub_812B5EC: ; 812B5EC push {r4-r6,lr} movs r5, 0 ldr r6, =gUnknown_085A76D2 -@0812B5F2: +_0812B5F2: bl GenerateRandomNumber movs r2, 0xFF ldr r1, =0x0203ab34 @@ -552206,14 +552206,14 @@ sub_812B5EC: ; 812B5EC 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} @@ -552232,7 +552232,7 @@ sub_812B634: ; 812B634 mov r8, r0 movs r7, 0x80 lsls r7, 17 -@0812B644: +_0812B644: bl GenerateRandomNumber movs r5, 0xFF ands r5, r0 @@ -552248,46 +552248,46 @@ sub_812B634: ; 812B634 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 .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} @@ -552307,13 +552307,13 @@ sub_812B6CC: ; 812B6CC ldr r2, [r0] ldrb r0, [r2, 0x3] cmp r0, 0 - beq @0812B6E8 + beq _0812B6E8 ldr r0, =gUnknown_085A7768 - b @0812B6EA + b _0812B6EA .pool -@0812B6E8: +_0812B6E8: ldr r0, =gUnknown_085A7702 -@0812B6EA: +_0812B6EA: lsls r1, r3, 4 adds r1, r3 ldrb r2, [r2, 0x2] @@ -552340,19 +552340,19 @@ sub_812B700: ; 812B700 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bcc @0812B754 + bcc _0812B754 movs r6, 0x5 - b @0812B72E + b _0812B72E .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 @@ -552362,12 +552362,12 @@ sub_812B700: ; 812B700 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 @@ -552388,13 +552388,13 @@ sub_812B760: ; 812B760 adds r4, r0 ldrh r4, [r4] cmp r1, r4 - bcc @0812B784 + bcc _0812B784 movs r0, 0 - b @0812B786 + b _0812B786 .pool -@0812B784: +_0812B784: movs r0, 0x1 -@0812B786: +_0812B786: pop {r4} pop {r1} bx r1 @@ -552410,25 +552410,25 @@ 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 .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 @@ -552441,11 +552441,11 @@ dp15_jump_random_unknown: ; 812B78C adds r0, r4, r5 ldrb r0, [r0] cmp r1, r0 - bcs @0812B7E8 + bcs _0812B7E8 movs r0, 0x4 - b @0812B822 + b _0812B822 .pool -@0812B7E8: +_0812B7E8: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -552465,13 +552465,13 @@ dp15_jump_random_unknown: ; 812B78C adds r1, r2 lsls r1, 24 cmp r0, r1 - bcc @0812B820 + bcc _0812B820 movs r0, 0x8 - b @0812B822 + b _0812B822 .pool -@0812B820: +_0812B820: movs r0, 0x2 -@0812B822: +_0812B822: pop {r4,r5} pop {r1} bx r1 @@ -552489,16 +552489,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 @@ -552532,7 +552532,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, =gUnknown_085A7828 @@ -552550,7 +552550,7 @@ sub_812B85C: ; 812B85C strh r0, [r2, 0x8] movs r0, 0 bl sub_812CF34 -@0812B8BC: +_0812B8BC: pop {r4,r5} pop {r0} bx r0 @@ -552581,11 +552581,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, =gUnknown_085A7828 @@ -552603,7 +552603,7 @@ sub_812B8D0: ; 812B8D0 strh r0, [r2, 0x8] movs r0, 0x1 bl sub_812CF34 -@0812B930: +_0812B930: movs r0, 0 movs r1, 0x3 bl sub_812BC44 @@ -552625,11 +552625,11 @@ sub_812B8D0: ; 812B8D0 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, =gUnknown_085A7828 @@ -552647,7 +552647,7 @@ sub_812B8D0: ; 812B8D0 strh r0, [r2, 0x8] movs r0, 0x2 bl sub_812CF34 -@0812B98E: +_0812B98E: pop {r4,r5} pop {r0} bx r0 @@ -552678,9 +552678,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, =gUnknown_085A7828 @@ -552696,10 +552696,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 @@ -552721,9 +552721,9 @@ sub_812B9A0: ; 812B9A0 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, =gUnknown_085A7828 @@ -552739,10 +552739,10 @@ sub_812B9A0: ; 812B9A0 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 @@ -552759,39 +552759,39 @@ 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, =gUnknown_085A780E adds r0, r3, r0 ldrb r0, [r0] - b @0812BAB6 + b _0812BAB6 .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 @@ -552820,13 +552820,13 @@ sub_812BADC: ; 812BADC lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @0812BAF4 + beq _0812BAF4 movs r0, 0 - b @0812BAF6 + b _0812BAF6 .pool -@0812BAF4: +_0812BAF4: movs r0, 0x1 -@0812BAF6: +_0812BAF6: pop {r1} bx r1 thumb_func_end sub_812BADC @@ -552842,7 +552842,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 @@ -552852,7 +552852,7 @@ sub_812BAFC: ; 812BAFC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0812BB0E + bne _0812BB0E pop {r4,r5} pop {r0} bx r0 @@ -552866,7 +552866,7 @@ sub_812BB34: ; 812BB34 bl sub_812CF6C lsls r0, 24 cmp r0, 0 - beq @0812BB60 + beq _0812BB60 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] @@ -552875,15 +552875,15 @@ 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 .pool -@0812BB60: +_0812BB60: movs r0, 0 -@0812BB62: +_0812BB62: pop {r4} pop {r1} bx r1 @@ -552901,14 +552901,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] @@ -552919,10 +552919,10 @@ sub_812BB68: ; 812BB68 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 @@ -552930,20 +552930,20 @@ sub_812BB68: ; 812BB68 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 @@ -552956,23 +552956,23 @@ sub_812BB68: ; 812BB68 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} @@ -552986,13 +552986,13 @@ sub_812BC20: ; 812BC20 bl sub_812CFB8 lsls r0, 24 cmp r0, 0 - beq @0812BC3A + beq _0812BC3A ldr r0, =sub_812BAFC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -@0812BC3A: +_0812BC3A: movs r0, 0 pop {r1} bx r1 @@ -553021,11 +553021,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, =gUnknown_085A766E lsls r1, 16 asrs r1, 16 @@ -553062,9 +553062,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 @@ -553099,11 +553099,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, =gUnknown_085A76AD lsls r1, 16 asrs r1, 16 @@ -553173,13 +553173,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 @@ -553193,7 +553193,7 @@ sub_812BD70: ; 812BD70 bl __modsi3 lsls r0, 16 lsrs r0, 16 -@0812BDC4: +_0812BDC4: lsls r0, 16 asrs r0, 16 pop {r4-r7} @@ -553246,13 +553246,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 @@ -553263,7 +553263,7 @@ sub_812BE0C: ; 812BE0C bl __modsi3 lsls r0, 16 lsrs r0, 16 -@0812BE4E: +_0812BE4E: lsls r0, 16 asrs r0, 16 pop {r4,r5} @@ -553278,7 +553278,7 @@ sub_812BE5C: ; 812BE5C movs r4, 0 ldr r5, =sub_812BF2C ldr r6, =0x03005e00 -@0812BE64: +_0812BE64: adds r0, r5, 0 movs r1, 0x2 bl AddTask @@ -553299,7 +553299,7 @@ sub_812BE5C: ; 812BE5C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @0812BE64 + bls _0812BE64 pop {r4-r6} pop {r0} bx r0 @@ -553387,7 +553387,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 @@ -553397,7 +553397,7 @@ sub_812BF2C: ; 812BF2C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0812BF3E + bne _0812BF3E pop {r4,r5} pop {r0} bx r0 @@ -553453,13 +553453,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, =gUnknown_085A74E4 movs r2, 0x26 ldrsh r0, [r4, r2] @@ -553469,8 +553469,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 @@ -553482,7 +553482,7 @@ sub_812BF88: ; 812BF88 adds r0, r1 ldr r0, [r0] bl _call_via_r0 -@0812BFF4: +_0812BFF4: ldr r0, =0x0203ab34 ldr r1, [r0] movs r2, 0x26 @@ -553523,16 +553523,16 @@ 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 .pool -@0812C068: +_0812C068: adds r0, r5, 0 adds r0, 0x2E adds r1, r0, r6 @@ -553540,7 +553540,7 @@ sub_812C01C: ; 812C01C 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] @@ -553559,12 +553559,12 @@ sub_812C01C: ; 812C01C 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 @@ -553575,7 +553575,7 @@ sub_812C01C: ; 812C01C 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] @@ -553586,7 +553586,7 @@ sub_812C01C: ; 812C01C ldrh r0, [r0] strh r0, [r4, 0xA] strh r1, [r4, 0xC] -@0812C0D2: +_0812C0D2: movs r0, 0 add sp, 0xC pop {r4-r7} @@ -553617,15 +553617,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] @@ -553635,7 +553635,7 @@ sub_812C0E0: ; 812C0E0 adds r1, 0x22 adds r1, r0 strh r3, [r1] -@0812C12A: +_0812C12A: movs r0, 0 pop {r4} pop {r1} @@ -553658,10 +553658,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, =gUnknown_085A7508 movs r2, 0x12 ldrsh r0, [r4, r2] @@ -553698,19 +553698,19 @@ 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 .pool -@0812C1BC: +_0812C1BC: movs r0, 0 -@0812C1BE: +_0812C1BE: pop {r4,r5} pop {r1} bx r1 @@ -553730,7 +553730,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 @@ -553740,7 +553740,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 @@ -553750,13 +553750,13 @@ 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 @@ -553771,13 +553771,13 @@ sub_812C218: ; 812C218 movs r0, 0xC2 ands r0, r1 cmp r0, 0 - bne @0812C230 + bne _0812C230 movs r0, 0 - b @0812C232 + b _0812C232 .pool -@0812C230: +_0812C230: movs r0, 0x1 -@0812C232: +_0812C232: pop {r1} bx r1 thumb_func_end sub_812C218 @@ -553794,7 +553794,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 @@ -553806,24 +553806,24 @@ sub_812C238: ; 812C238 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 .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} @@ -553848,16 +553848,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 @@ -553866,36 +553866,36 @@ sub_812C290: ; 812C290 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 .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 @@ -553906,63 +553906,63 @@ sub_812C290: ; 812C290 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 .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 @@ -554001,7 +554001,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 @@ -554015,21 +554015,21 @@ sub_812C3C8: ; 812C3C8 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 .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 @@ -554041,22 +554041,22 @@ sub_812C414: ; 812C414 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 @@ -554070,32 +554070,32 @@ sub_812C414: ; 812C414 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 .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 @@ -554109,16 +554109,16 @@ sub_812C414: ; 812C414 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 @@ -554136,12 +554136,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, =gUnknown_085A7520 ldr r0, [r2] movs r2, 0x12 @@ -554174,7 +554174,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 @@ -554185,24 +554185,24 @@ sub_812C500: ; 812C500 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 .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} @@ -554224,33 +554224,33 @@ 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 .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 .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 @@ -554261,15 +554261,15 @@ sub_812C55C: ; 812C55C 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} @@ -554281,19 +554281,19 @@ sub_812C55C: ; 812C55C 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] @@ -554309,20 +554309,20 @@ sub_812C608: ; 812C608 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 @@ -554354,12 +554354,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 @@ -554373,11 +554373,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 @@ -554389,22 +554389,22 @@ sub_812C64C: ; 812C64C 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 .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} @@ -554421,12 +554421,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 @@ -554439,11 +554439,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 @@ -554457,21 +554457,21 @@ j5_08111E84: ; 812C6CC 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 .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} @@ -554488,35 +554488,35 @@ 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 .pool -@0812C778: +_0812C778: ldr r0, =0x0203ab34 ldr r0, [r0] movs r1, 0 strh r5, [r0, 0x36] strh r1, [r0, 0x30] - b @0812C84A + b _0812C84A .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 @@ -554529,18 +554529,18 @@ sub_812C74C: ; 812C74C 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 @@ -554550,7 +554550,7 @@ sub_812C74C: ; 812C74C lsls r0, 24 lsrs r0, 24 cmp r1, r0 - beq @0812C778 + beq _0812C778 lsls r1, r6, 16 movs r2, 0x80 lsls r2, 9 @@ -554561,11 +554561,11 @@ sub_812C74C: ; 812C74C 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 @@ -554579,35 +554579,35 @@ sub_812C74C: ; 812C74C 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 .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} @@ -554623,20 +554623,20 @@ 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 @@ -554651,24 +554651,24 @@ 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 @@ -554683,43 +554683,43 @@ 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 @@ -554768,17 +554768,17 @@ sub_812C920: ; 812C920 lsls r0, 24 lsrs r1, r0, 24 cmp r5, r1 - bne @0812C994 + bne _0812C994 movs r4, 0x2 - b @0812C96A + b _0812C96A .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 @@ -554789,31 +554789,31 @@ sub_812C920: ; 812C920 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 @@ -554824,22 +554824,22 @@ sub_812C920: ; 812C920 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 @@ -554850,8 +554850,8 @@ sub_812C920: ; 812C920 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] @@ -554876,17 +554876,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 @@ -554910,19 +554910,19 @@ sub_812CA08: ; 812CA08 bl sub_812C854 lsls r0, 24 cmp r0, 0 - beq @0812CAA4 + beq _0812CAA4 movs r5, 0 - b @0812CA7E + b _0812CA7E .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] @@ -554934,20 +554934,20 @@ sub_812CA08: ; 812CA08 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] @@ -554986,22 +554986,22 @@ sub_812CA08: ; 812CA08 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 @@ -555009,20 +555009,20 @@ sub_812CA08: ; 812CA08 adds r0, r1 lsrs r0, 16 mov r8, r0 - b @0812CB4A + b _0812CB4A .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 @@ -555030,8 +555030,8 @@ sub_812CA08: ; 812CA08 adds r0, r2 lsrs r0, 16 str r0, [sp] - b @0812CAA8 -@0812CB60: + b _0812CAA8 +_0812CB60: ldr r0, =0x0203ab34 ldr r0, [r0] mov r5, sp @@ -555059,17 +555059,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 @@ -555093,20 +555093,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 @@ -555122,23 +555122,23 @@ sub_812CB80: ; 812CB80 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 .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 @@ -555175,30 +555175,30 @@ sub_812CB80: ; 812CB80 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 .pool -@0812CCB4: +_0812CCB4: ldr r7, =0x0203ab34 -@0812CCB6: +_0812CCB6: ldr r0, [r7] ldrh r0, [r0, 0x2E] movs r1, 0x3 @@ -555235,28 +555235,28 @@ sub_812CB80: ; 812CB80 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 .pool -@0812CD34: +_0812CD34: pop {r3} mov r8, r3 pop {r4-r7} @@ -555351,11 +555351,11 @@ 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 @@ -555438,11 +555438,11 @@ sub_812CE7C: ; 812CE7C adds r0, r1, r0 ldrb r0, [r0] cmp r4, r0 - bcs @0812CEA8 + bcs _0812CEA8 ldr r7, =gUnknown_085A8435 adds r6, r0, 0 lsls r5, r1, 1 -@0812CE94: +_0812CE94: adds r0, r4, r5 adds r0, r7 ldrb r0, [r0] @@ -555451,8 +555451,8 @@ sub_812CE7C: ; 812CE7C lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc @0812CE94 -@0812CEA8: + bcc _0812CE94 +_0812CEA8: pop {r4-r7} pop {r0} bx r0 @@ -555469,11 +555469,11 @@ sub_812CEB8: ; 812CEB8 adds r0, r1, r0 ldrb r0, [r0] cmp r4, r0 - bcs @0812CEE4 + bcs _0812CEE4 ldr r7, =gUnknown_085A8435 adds r6, r0, 0 lsls r5, r1, 1 -@0812CED0: +_0812CED0: adds r0, r4, r5 adds r0, r7 ldrb r0, [r0] @@ -555482,8 +555482,8 @@ sub_812CEB8: ; 812CEB8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r6 - bcc @0812CED0 -@0812CEE4: + bcc _0812CED0 +_0812CEE4: pop {r4-r7} pop {r0} bx r0 @@ -555495,7 +555495,7 @@ sub_812CEF4: ; 812CEF4 push {r4,r5,lr} movs r4, 0 ldr r5, =0x02020630 -@0812CEFA: +_0812CEFA: ldr r0, =sub_812D024 bl obj_add_empty_with_callback lsls r0, 24 @@ -555514,7 +555514,7 @@ sub_812CEF4: ; 812CEF4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls @0812CEFA + bls _0812CEFA pop {r4,r5} pop {r0} bx r0 @@ -555558,7 +555558,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 @@ -555568,22 +555568,22 @@ sub_812CF6C: ; 812CF6C 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 .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 @@ -555593,7 +555593,7 @@ sub_812CF6C: ; 812CF6C sub_812CFB8: ; 812CFB8 push {r4,lr} movs r4, 0 -@0812CFBC: +_0812CFBC: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x44 @@ -555602,18 +555602,18 @@ sub_812CFB8: ; 812CFB8 bl sub_812CFEC lsls r0, 24 cmp r0, 0 - bne @0812CFD8 + bne _0812CFD8 movs r0, 0 - b @0812CFE4 + b _0812CFE4 .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 @@ -555632,22 +555632,22 @@ sub_812CFEC: ; 812CFEC movs r2, 0x30 ldrsh r0, [r1, r2] cmp r0, 0 - bne @0812D00C + bne _0812D00C movs r0, 0x1 - b @0812D01E + b _0812D01E .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 @@ -555659,7 +555659,7 @@ sub_812D024: ; 812D024 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] @@ -555668,7 +555668,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 @@ -555682,35 +555682,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, =gUnknown_085A8430 movs r3, 0x2E ldrsh r0, [r2, r3] @@ -555722,7 +555722,7 @@ sub_812D024: ; 812D024 adds r1, r3, 0 adds r2, r3, 0 bl sub_80B6128 -@0812D0A6: +_0812D0A6: pop {r4-r7} pop {r0} bx r0 @@ -555767,11 +555767,11 @@ sub_812D0E0: ; 812D0E0 movs r1, 0xC ldrsh r0, [r0, r1] cmp r0, 0 - beq @0812D10C + beq _0812D10C movs r0, 0 - b @0812D120 + b _0812D120 .pool -@0812D10C: +_0812D10C: adds r0, r2, 0 bl remove_task ldr r0, =gUnknown_085A84AC @@ -555780,7 +555780,7 @@ sub_812D0E0: ; 812D0E0 movs r2, 0x20 bl gpu_pal_apply movs r0, 0x1 -@0812D120: +_0812D120: pop {r1} bx r1 .pool @@ -555804,7 +555804,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] @@ -555814,13 +555814,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, =gUnknown_085A84A0 movs r3, 0xC ldrsh r1, [r2, r3] @@ -555983,7 +555983,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 @@ -555993,17 +555993,17 @@ 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 .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 @@ -556026,7 +556026,7 @@ sub_812D28C: ; 812D28C movs r0, 0 strh r0, [r4, 0x8] strh r0, [r4, 0x26] -@0812D2FC: +_0812D2FC: pop {r4,r5} pop {r0} bx r0 @@ -556046,20 +556046,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 @@ -556081,24 +556081,24 @@ sub_812D30C: ; 812D30C 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 @@ -556112,7 +556112,7 @@ sub_812D394: ; 812D394 adds r2, r0, 0 adds r2, 0x8 movs r3, 0 -@0812D39E: +_0812D39E: lsls r0, r1, 1 adds r0, r2, r0 strh r3, [r0] @@ -556120,7 +556120,7 @@ sub_812D394: ; 812D394 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls @0812D39E + bls _0812D39E pop {r0} bx r0 thumb_func_end sub_812D394 @@ -556133,25 +556133,25 @@ sub_812D3B4: ; 812D3B4 movs r4, 0x3 movs r5, 0 cmp r5, r6 - bge @0812D41E + bge _0812D41E ldr r7, =gUnknown_085A7568 -@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 .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 @@ -556179,29 +556179,29 @@ sub_812D3B4: ; 812D3B4 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, =gUnknown_085A756A -@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 .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 @@ -556230,8 +556230,8 @@ sub_812D3B4: ; 812D3B4 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] @@ -556272,13 +556272,13 @@ sub_812D4CC: ; 812D4CC lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @0812D4E4 + beq _0812D4E4 movs r0, 0 - b @0812D4E6 + b _0812D4E6 .pool -@0812D4E4: +_0812D4E4: movs r0, 0x1 -@0812D4E6: +_0812D4E6: pop {r1} bx r1 thumb_func_end sub_812D4CC @@ -556378,11 +556378,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 @@ -556392,17 +556392,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 @@ -556427,13 +556427,13 @@ 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 @@ -556499,14 +556499,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 @@ -556530,7 +556530,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] @@ -556549,7 +556549,7 @@ sub_812D6EC: ; 812D6EC adds r0, r1 movs r1, 0x3 bl StartObjectImageAnimIfDifferent -@0812D730: +_0812D730: pop {r4} pop {r0} bx r0 @@ -556573,13 +556573,13 @@ 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 @@ -556602,45 +556602,45 @@ 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 .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 @@ -556659,14 +556659,14 @@ 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 .pool -@0812D810: +_0812D810: movs r0, 0x1 bl sub_812BCE8 ldr r1, [r6] @@ -556674,7 +556674,7 @@ sub_812D7E4: ; 812D7E4 lsrs r0, 24 ldrb r1, [r1, 0x5] cmp r0, r1 - beq @0812D842 + beq _0812D842 ldrh r0, [r4, 0x10] lsls r0, 16 asrs r0, 24 @@ -556684,17 +556684,17 @@ sub_812D7E4: ; 812D7E4 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 @@ -556703,12 +556703,12 @@ sub_812D7E4: ; 812D7E4 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 @@ -556726,7 +556726,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 @@ -556737,7 +556737,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 @@ -556752,9 +556752,9 @@ sub_812D870: ; 812D870 bl StartObjectImageAnimIfDifferent ldr r0, =0x00000187 bl fanfare_play - b @0812D914 + b _0812D914 .pool -@0812D8D0: +_0812D8D0: movs r0, 0xC0 strh r0, [r4, 0x10] adds r0, r1, 0 @@ -556779,15 +556779,15 @@ sub_812D870: ; 812D870 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 @@ -556802,21 +556802,21 @@ sub_812D920: ; 812D920 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 @@ -556850,16 +556850,16 @@ 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 .pool -@0812D998: +_0812D998: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@0812D99E: +_0812D99E: pop {r4,r5} pop {r0} bx r0 @@ -556894,15 +556894,15 @@ sub_812D9A4: ; 812D9A4 ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0 - bne @0812DA04 + bne _0812DA04 ldr r0, =sub_812D4EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task - b @0812DA1A + b _0812DA1A .pool -@0812DA04: +_0812DA04: movs r0, 0x4 bl sub_812DEE4 bl dp15_jump_random_unknown @@ -556912,7 +556912,7 @@ sub_812D9A4: ; 812D9A4 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] -@0812DA1A: +_0812DA1A: pop {r4-r6} pop {r0} bx r0 @@ -556929,32 +556929,32 @@ 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 .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 @@ -556966,13 +556966,13 @@ sub_812DA6C: ; 812DA6C bl sub_812E054 lsls r0, 24 cmp r0, 0 - beq @0812DA86 + beq _0812DA86 ldr r0, =sub_812D4EC bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -@0812DA86: +_0812DA86: pop {r0} bx r0 .pool @@ -557041,27 +557041,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 @@ -557085,7 +557085,7 @@ sub_812DB04: ; 812DB04 adds r0, 0x1 strh r0, [r4, 0x8] strh r5, [r4, 0x12] -@0812DB7A: +_0812DB7A: pop {r4,r5} pop {r0} bx r0 @@ -557105,12 +557105,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 @@ -557153,7 +557153,7 @@ sub_812DC08: ; 812DC08 asrs r6, r1, 16 lsls r0, 16 asrs r5, r0, 16 -@0812DC14: +_0812DC14: lsls r4, r2, 16 asrs r4, 16 subs r0, r4, 0x4 @@ -557176,7 +557176,7 @@ sub_812DC08: ; 812DC08 lsrs r2, r4, 16 asrs r4, 16 cmp r4, 0xE - ble @0812DC14 + ble _0812DC14 pop {r4-r6} pop {r0} bx r0 @@ -557189,7 +557189,7 @@ sub_812DC50: ; 812DC50 movs r4, 0x4 lsls r0, 16 asrs r5, r0, 16 -@0812DC58: +_0812DC58: lsls r3, r4, 5 adds r3, r5, r3 lsls r3, 16 @@ -557202,7 +557202,7 @@ sub_812DC50: ; 812DC50 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xE - bls @0812DC58 + bls _0812DC58 pop {r4,r5} pop {r0} bx r0 @@ -557242,13 +557242,13 @@ sub_812DCB4: ; 812DCB4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @0812DCCC + beq _0812DCCC movs r0, 0 - b @0812DCCE + b _0812DCCE .pool -@0812DCCC: +_0812DCCC: movs r0, 0x1 -@0812DCCE: +_0812DCCE: pop {r1} bx r1 thumb_func_end sub_812DCB4 @@ -557306,11 +557306,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 .pool @@ -557384,7 +557384,7 @@ sub_812DDC4: ; 812DDC4 movs r0, 0x6 ands r0, r1 cmp r0, 0 - beq @0812DE08 + beq _0812DE08 movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -557405,7 +557405,7 @@ sub_812DDC4: ; 812DDC4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@0812DE08: +_0812DE08: add sp, 0x4 pop {r4} pop {r0} @@ -557504,7 +557504,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] @@ -557512,7 +557512,7 @@ sub_812DE94: ; 812DE94 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls @0812DEC0 + bls _0812DEC0 pop {r0} bx r0 .pool @@ -557544,9 +557544,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] @@ -557573,8 +557573,8 @@ sub_812DEE4: ; 812DEE4 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne @0812DF1A -@0812DF52: + bne _0812DF1A +_0812DF52: pop {r3} mov r8, r3 pop {r4-r7} @@ -557608,7 +557608,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 @@ -557616,7 +557616,7 @@ sub_812DF68: ; 812DF68 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0x40 - bne @0812DFC4 + bne _0812DFC4 str r6, [sp] adds r0, r7, 0 mov r1, r8 @@ -557626,15 +557626,15 @@ sub_812DF68: ; 812DF68 lsls r0, 24 lsrs r0, 24 strh r0, [r4] - b @0812DFCE + b _0812DFCE .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 @@ -557658,7 +557658,7 @@ sub_812DFDC: ; 812DFDC ldrh r1, [r4, 0xA] ldr r0, =0x0000ffff cmp r1, r0 - beq @0812E008 + beq _0812E008 ldr r0, =gUnknown_085A7A20 movs r2, 0xA ldrsh r1, [r4, r2] @@ -557666,17 +557666,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 @@ -557686,12 +557686,12 @@ sub_812DFDC: ; 812DFDC bl RemoveObjectAndFreeTiles 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 @@ -557714,13 +557714,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 @@ -557728,18 +557728,18 @@ sub_812E054: ; 812E054 movs r5, 0x3C ldrsh r0, [r1, r5] cmp r0, 0 - beq @0812E09C + beq _0812E09C movs r0, 0 - b @0812E0A8 + b _0812E0A8 .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 @@ -557778,11 +557778,11 @@ 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, =gUnknown_085A7CE0 asrs r1, r5, 16 movs r2, 0 @@ -557810,7 +557810,7 @@ sub_812E0E4: ; 812E0E4 lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0x77 - ble @0812E0F0 + ble _0812E0F0 movs r2, 0x80 lsls r2, 9 adds r1, r7, r2 @@ -557821,7 +557821,7 @@ sub_812E0E4: ; 812E0E4 lsrs r6, r1, 16 asrs r1, 16 cmp r1, 0x2 - ble @0812E0EA + ble _0812E0EA pop {r4-r7} pop {r0} bx r0 @@ -557890,7 +557890,7 @@ sub_812E1C8: ; 812E1C8 movs r4, 0xCB movs r5, 0x1 ldr r6, =0x0000270f -@0812E1D0: +_0812E1D0: lsls r4, 16 asrs r4, 16 lsls r5, 16 @@ -557909,11 +557909,11 @@ sub_812E1C8: ; 812E1C8 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 @@ -557932,7 +557932,7 @@ sub_812E1C8: ; 812E1C8 lsrs r5, r0, 16 asrs r0, 16 cmp r0, r6 - ble @0812E1FE + ble _0812E1FE pop {r4-r6} pop {r0} bx r0 @@ -558006,13 +558006,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 @@ -558034,7 +558034,7 @@ sub_812E2A8: ; 812E2A8 strh r0, [r1] adds r0, r4, 0 bl sub_8008324 -@0812E2F6: +_0812E2F6: pop {r4} pop {r0} bx r0 @@ -558075,11 +558075,11 @@ sub_812E33C: ; 812E33C ldr r4, =0x0203aae4 ldr r0, [r4] cmp r0, 0 - bne @0812E350 + bne _0812E350 movs r0, 0x28 bl AllocZeroed str r0, [r4] -@0812E350: +_0812E350: ldr r2, [r4] ldr r0, =0x0203aad8 ldr r1, [r0] @@ -558164,11 +558164,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 @@ -558186,7 +558186,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] @@ -558194,27 +558194,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 .pool @@ -558231,11 +558231,11 @@ sub_812E474: ; 812E474 ldr r4, =0x0203aae8 ldr r0, [r4] cmp r0, 0 - bne @0812E490 + bne _0812E490 movs r0, 0x8 bl AllocZeroed str r0, [r4] -@0812E490: +_0812E490: ldr r2, [r4] ldr r0, =0x0203aad8 mov r10, r0 @@ -558293,11 +558293,11 @@ sub_812E474: ; 812E474 ldr r4, =0x0203aaec ldr r0, [r4] cmp r0, 0 - bne @0812E510 + bne _0812E510 movs r0, 0x8 bl AllocZeroed str r0, [r4] -@0812E510: +_0812E510: ldr r2, [r4] mov r3, r10 ldr r0, [r3] @@ -558363,11 +558363,11 @@ sub_812E5A8: ; 812E5A8 ldr r4, =0x0203aaf0 ldr r0, [r4] cmp r0, 0 - bne @0812E5BC + bne _0812E5BC movs r0, 0x8 bl AllocZeroed str r0, [r4] -@0812E5BC: +_0812E5BC: ldr r2, [r4] ldr r0, =0x0203aad8 ldr r0, [r0] @@ -558434,7 +558434,7 @@ sub_812E650: ; 812E650 push {r4-r6,lr} movs r4, 0 movs r5, 0 -@0812E656: +_0812E656: ldr r0, =gUnknown_085A7D88 movs r1, 0xB8 lsls r1, 1 @@ -558479,7 +558479,7 @@ sub_812E650: ; 812E650 adds r0, r6 lsrs r5, r0, 16 cmp r4, 0x2 - bls @0812E656 + bls _0812E656 pop {r4-r6} pop {r0} bx r0 @@ -558664,7 +558664,7 @@ sub_812E82C: ; 812E82C adds r0, r1 bl RemoveObjectAndFreeTiles movs r4, 0 -@0812E846: +_0812E846: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x49 @@ -558680,25 +558680,25 @@ sub_812E82C: ; 812E82C 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 @@ -558714,7 +558714,7 @@ sub_812E82C: ; 812E82C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @0812E88A + bls _0812E88A pop {r4} pop {r0} bx r0 @@ -558725,7 +558725,7 @@ sub_812E82C: ; 812E82C sub_812E8C4: ; 812E8C4 push {r4,lr} movs r4, 0 -@0812E8C8: +_0812E8C8: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x4E @@ -558741,7 +558741,7 @@ sub_812E8C4: ; 812E8C4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @0812E8C8 + bls _0812E8C8 pop {r4} pop {r0} bx r0 @@ -558764,11 +558764,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 @@ -558868,7 +558868,7 @@ sub_812E9E8: ; 812E9E8 movs r1, 0x2E ldrsh r4, [r2, r1] cmp r4, 0 - beq @0812EA0C + beq _0812EA0C subs r0, 0x1 movs r1, 0 strh r0, [r2, 0x2E] @@ -558879,8 +558879,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] @@ -558902,11 +558902,11 @@ sub_812E9E8: ; 812E9E8 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 @@ -558945,7 +558945,7 @@ sub_812EA44: ; 812EA44 sub_812EA7C: ; 812EA7C push {r4,lr} movs r4, 0 -@0812EA80: +_0812EA80: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x50 @@ -558961,7 +558961,7 @@ sub_812EA7C: ; 812EA7C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @0812EA80 + bls _0812EA80 pop {r4} pop {r0} bx r0 @@ -559052,13 +559052,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 IndexOfObjectPaletteTag lsls r0, 24 @@ -559080,7 +559080,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} @@ -559119,7 +559119,7 @@ sub_812EBCC: ; 812EBCC movs r3, 0 bl sub_80B609C movs r4, 0 -@0812EBEA: +_0812EBEA: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x52 @@ -559135,7 +559135,7 @@ sub_812EBCC: ; 812EBCC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @0812EBEA + bls _0812EBEA pop {r4} pop {r0} bx r0 @@ -559209,7 +559209,7 @@ sub_812EC94: ; 812EC94 movs r2, 0x8 bl memcpy movs r4, 0 -@0812ECA4: +_0812ECA4: ldr r0, =0x02021bbc ldrh r0, [r0] movs r1, 0x50 @@ -559256,7 +559256,7 @@ sub_812EC94: ; 812EC94 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @0812ECA4 + bls _0812ECA4 add sp, 0x8 pop {r4,r5} pop {r0} @@ -559290,17 +559290,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] @@ -559315,7 +559315,7 @@ sub_812ED20: ; 812ED20 strb r0, [r3] movs r0, 0 strh r0, [r5, 0x30] -@0812ED84: +_0812ED84: pop {r4,r5} pop {r0} bx r0 @@ -559325,7 +559325,7 @@ sub_812ED20: ; 812ED20 sub_812ED8C: ; 812ED8C push {r4,lr} movs r4, 0 -@0812ED90: +_0812ED90: ldr r0, =0x0203ab34 ldr r0, [r0] adds r0, 0x54 @@ -559341,7 +559341,7 @@ sub_812ED8C: ; 812ED8C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @0812ED90 + bls _0812ED90 pop {r4} pop {r0} bx r0 @@ -559394,20 +559394,20 @@ sub_812EE14: ; 812EE14 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 @@ -559429,14 +559429,14 @@ sub_812EE14: ; 812EE14 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] @@ -559449,10 +559449,10 @@ sub_812EE14: ; 812EE14 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 @@ -559557,10 +559557,10 @@ 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 @@ -559679,10 +559679,10 @@ sub_812EFDC: ; 812EFDC adds r4, r0 ldr r1, [r4] cmp r1, 0 - beq @0812F056 + beq _0812F056 adds r0, r2, 0 bl SetSpriteOamTables_NoPriorityFromTable -@0812F056: +_0812F056: adds r0, r7, 0 add sp, 0x18 pop {r3,r4} @@ -559721,7 +559721,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] @@ -559736,7 +559736,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] @@ -559746,7 +559746,7 @@ sub_812F080: ; 812F080 movs r0, 0x3F ands r0, r1 cmp r0, 0 - beq @0812F0F2 + beq _0812F0F2 movs r1, 0x3A ldrsh r0, [r4, r1] lsls r0, 1 @@ -559759,7 +559759,7 @@ sub_812F080: ; 812F080 adds r0, r5, r0 ldrh r0, [r0] strh r0, [r4, 0x26] -@0812F0F2: +_0812F0F2: add sp, 0x10 pop {r4,r5} pop {r0} @@ -559818,56 +559818,56 @@ sub_812F150: ; 812F150 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 .pool -@0812F1B0: +_0812F1B0: movs r0, 0 strh r0, [r2, 0x3C] -@0812F1B4: +_0812F1B4: pop {r0} bx r0 thumb_func_end sub_812F150 @@ -559879,55 +559879,55 @@ sub_812F1B8: ; 812F1B8 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 @@ -559939,22 +559939,22 @@ sub_812F21C: ; 812F21C 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 .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] @@ -559966,58 +559966,58 @@ sub_812F21C: ; 812F21C 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 .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 @@ -560030,17 +560030,17 @@ sub_812F2CC: ; 812F2CC 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] @@ -560050,14 +560050,14 @@ sub_812F2CC: ; 812F2CC 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 @@ -560065,12 +560065,12 @@ sub_812F2CC: ; 812F2CC 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 @@ -560083,14 +560083,14 @@ sub_812F2CC: ; 812F2CC 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] @@ -560102,13 +560102,13 @@ sub_812F2CC: ; 812F2CC 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 @@ -560120,30 +560120,30 @@ sub_812F36C: ; 812F36C 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] @@ -560151,7 +560151,7 @@ sub_812F36C: ; 812F36C strh r0, [r1, 0x2E] movs r0, 0 strh r0, [r1, 0x3C] -@0812F3B0: +_0812F3B0: pop {r0} bx r0 thumb_func_end sub_812F36C @@ -560163,11 +560163,11 @@ sub_812F3B4: ; 812F3B4 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] @@ -560180,7 +560180,7 @@ sub_812F3B4: ; 812F3B4 lsls r0, 16 asrs r0, 16 cmp r0, 0x20 - ble @0812F468 + ble _0812F468 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] @@ -560205,8 +560205,8 @@ sub_812F3B4: ; 812F3B4 lsrs r1, 16 movs r0, 0x4C bl SetGpuReg - b @0812F468 -@0812F416: + b _0812F468 +_0812F416: ldrh r1, [r4, 0x32] lsls r1, 16 asrs r1, 24 @@ -560215,10 +560215,10 @@ sub_812F3B4: ; 812F3B4 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 @@ -560234,7 +560234,7 @@ sub_812F3B4: ; 812F3B4 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] @@ -560247,7 +560247,7 @@ sub_812F3B4: ; 812F3B4 adds r0, r4, 0 movs r1, 0 bl StartObjectImageAnim -@0812F468: +_0812F468: pop {r4} pop {r0} bx r0 @@ -560260,7 +560260,7 @@ sub_812F470: ; 812F470 movs r1, 0x30 ldrsh r0, [r5, r1] cmp r0, 0x2 - bgt @0812F4C0 + bgt _0812F4C0 ldr r1, =gUnknown_085A8510 lsls r0, 2 adds r0, r1 @@ -560283,15 +560283,15 @@ 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 .pool -@0812F4C0: +_0812F4C0: ldr r1, =gUnknown_085A8510 movs r2, 0x30 ldrsh r0, [r5, r2] @@ -560317,10 +560317,10 @@ sub_812F470: ; 812F470 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 StartObjectImageAnimIfDifferent @@ -560354,18 +560354,18 @@ 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 .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 @@ -560387,7 +560387,7 @@ sub_812F514: ; 812F514 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@0812F58C: +_0812F58C: ldrh r0, [r4, 0x30] subs r0, 0x1 strh r0, [r4, 0x30] @@ -560396,45 +560396,45 @@ sub_812F514: ; 812F514 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} @@ -560454,12 +560454,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 @@ -560484,10 +560484,10 @@ sub_812F5E0: ; 812F5E0 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} @@ -560503,19 +560503,19 @@ sub_812F648: ; 812F648 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 @@ -560537,7 +560537,7 @@ sub_812F648: ; 812F648 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] @@ -560549,17 +560549,17 @@ sub_812F648: ; 812F648 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] @@ -560572,16 +560572,16 @@ sub_812F648: ; 812F648 movs r1, 0x30 ldrsh r0, [r5, r1] cmp r0, 0x33 - ble @0812F76C - b @0812F75E + ble _0812F76C + b _0812F75E .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, =DummyObjectCallback movs r4, 0 str r4, [sp] @@ -560605,7 +560605,7 @@ sub_812F648: ; 812F648 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] @@ -560617,17 +560617,17 @@ sub_812F648: ; 812F648 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] @@ -560640,8 +560640,8 @@ sub_812F648: ; 812F648 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] @@ -560649,7 +560649,7 @@ sub_812F648: ; 812F648 adds r1, 0x5C movs r0, 0x3F strh r0, [r1] -@0812F76C: +_0812F76C: add sp, 0x4 pop {r4-r6} pop {r0} @@ -560743,7 +560743,7 @@ sub_812F7E4: ; 812F7E4 movs r3, 0 ldr r5, =gUnknown_085A8334 adds r6, r4, 0 -@0812F822: +_0812F822: ldr r2, [r4] lsls r1, r3, 3 adds r2, r1, r2 @@ -560758,7 +560758,7 @@ sub_812F7E4: ; 812F7E4 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x15 - bls @0812F822 + bls _0812F822 ldr r3, [r6] adds r2, r3, 0 adds r2, 0x88 @@ -560811,10 +560811,10 @@ sub_812F8A0: ; 812F8A0 adds r6, r4, 0 ldr r0, =gUnknown_085A83E4 ldr r4, [r0] -@0812F8C2: +_0812F8C2: movs r2, 0 adds r1, 0x1 -@0812F8C6: +_0812F8C6: adds r0, r4, r2 ldrb r0, [r0] strb r0, [r3] @@ -560823,11 +560823,11 @@ sub_812F8A0: ; 812F8A0 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] @@ -560906,11 +560906,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 @@ -560963,7 +560963,7 @@ sub_812F980: ; 812F980 lsrs r0, r4, 16 asrs r4, 16 cmp r4, 0x3 - ble @0812F994 + ble _0812F994 mov r2, r8 ldr r1, [r2] adds r1, 0x8 @@ -560984,7 +560984,7 @@ sub_812F980: ; 812F980 movs r2, 0x2 bl LoadBgTilemap movs r0, 0x7 -@0812FA32: +_0812FA32: mov r2, r8 ldr r1, [r2] adds r1, 0xC @@ -561004,13 +561004,13 @@ sub_812F980: ; 812F980 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 @@ -561443,23 +561443,23 @@ 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 .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 @@ -561474,9 +561474,9 @@ sub_812FE58: ; 812FE58 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0812FF3E + b _0812FF3E .pool -@0812FEC8: +_0812FEC8: bl sub_80A1A74 movs r2, 0xC0 lsls r2, 19 @@ -561489,7 +561489,7 @@ sub_812FE58: ; 812FE58 ldr r6, =0x85000400 movs r7, 0x85 lsls r7, 24 -@0812FEE2: +_0812FEE2: str r5, [sp] mov r0, sp str r0, [r1] @@ -561499,7 +561499,7 @@ sub_812FE58: ; 812FE58 adds r2, r4 subs r3, r4 cmp r3, r4 - bhi @0812FEE2 + bhi _0812FEE2 str r5, [sp] mov r0, sp str r0, [r1] @@ -561509,9 +561509,9 @@ sub_812FE58: ; 812FE58 str r0, [r1, 0x8] ldr r0, [r1, 0x8] bl ResetAllObjectData - b @0812FF36 + b _0812FF36 .pool -@0812FF14: +_0812FF14: ldrh r0, [r4, 0x20] bl SeedRng bl InitKeypadData @@ -561519,25 +561519,25 @@ sub_812FE58: ; 812FE58 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 .pool -@0812FF54: +_0812FF54: ldr r0, =0x02039f5d ldrb r0, [r0] ldr r1, =0x02039f5c @@ -561570,7 +561570,7 @@ sub_812FE58: ; 812FE58 bl SetGpuReg ldr r0, =sub_812FDF8 bl SetMainCallback2 -@0812FFA0: +_0812FFA0: add sp, 0x4 pop {r4-r7} pop {r0} @@ -561585,49 +561585,49 @@ sub_812FFC8: ; 812FFC8 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 .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 .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 @@ -561636,37 +561636,37 @@ sub_812FFC8: ; 812FFC8 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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 .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 bl SetMainCallback2 -@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 @@ -561726,12 +561726,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 @@ -561761,9 +561761,9 @@ sub_813010C: ; 813010C ldr r0, =0x02021fc4 ldr r1, =gUnknown_0827EA0C bl ExpandStringRefs - b @081301A6 + b _081301A6 .pool -@08130190: +_08130190: ldr r0, =0x02021cc4 adds r1, 0xB bl CopyString @@ -561773,7 +561773,7 @@ sub_813010C: ; 813010C adds r1, r2 ldr r1, [r1] bl ExpandStringRefs -@081301A6: +_081301A6: ldr r4, =0x02021fc4 movs r0, 0x1 adds r1, r4, 0 @@ -561794,7 +561794,7 @@ sub_813010C: ; 813010C bl Print movs r0, 0x1 bl CopyBgTilemapBufferToVram -@081301D4: +_081301D4: add sp, 0xC pop {r4-r6} pop {r0} @@ -561839,16 +561839,16 @@ sub_8130238: ; 8130238 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 .pool -@0813025C: +_0813025C: ldr r1, =0x030011f6 movs r0, 0x1 strb r0, [r1] @@ -561858,7 +561858,7 @@ sub_8130238: ; 8130238 ldr r1, =0x030011f4 movs r0, 0x1E strh r0, [r1] -@0813026E: +_0813026E: pop {r0} bx r0 .pool @@ -561870,13 +561870,13 @@ sub_8130280: ; 8130280 ldr r0, =0x030011f6 ldrb r0, [r0] cmp r0, 0 - bne @08130298 + bne _08130298 movs r0, 0x4C movs r1, 0 bl SetGpuReg - b @081302C0 + b _081302C0 .pool -@08130298: +_08130298: ldr r1, =0x00000a45 movs r0, 0xA bl SetGpuReg @@ -561895,7 +561895,7 @@ sub_8130280: ; 8130280 lsrs r1, 16 movs r0, 0x4C bl SetGpuReg -@081302C0: +_081302C0: pop {r0} bx r0 .pool @@ -561930,7 +561930,7 @@ sub_81302E8: ; 81302E8 ldr r1, [r7] bl LZDecompressVram cmp r4, 0 - bne @08130348 + bne _08130348 lsls r0, r5, 3 ldr r1, =gMonFrontPicTable adds r0, r1 @@ -561947,9 +561947,9 @@ sub_81302E8: ; 81302E8 ldr r2, =0x03006190 ldr r2, [r2] bl sub_8130380 - b @0813036C + b _0813036C .pool -@08130348: +_08130348: lsls r0, r5, 3 ldr r1, =gMonBackPicTable adds r0, r1 @@ -561966,7 +561966,7 @@ sub_81302E8: ; 81302E8 ldr r2, =0x03006190 ldr r2, [r2] bl sub_8130380 -@0813036C: +_0813036C: pop {r4-r7} pop {r0} bx r0 @@ -561985,13 +561985,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 @@ -562000,7 +562000,7 @@ sub_8130380: ; 8130380 lsls r0, 5 mov r12, r0 lsls r4, r3, 3 -@081303AE: +_081303AE: movs r3, 0 lsls r0, r1, 2 adds r6, r1, 0x1 @@ -562011,7 +562011,7 @@ sub_8130380: ; 8130380 lsls r0, 7 ldr r1, [sp] adds r2, r0, r1 -@081303C2: +_081303C2: lsrs r0, r3, 1 adds r0, r5, r0 add r0, r10 @@ -562019,50 +562019,50 @@ sub_8130380: ; 8130380 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 @@ -562087,9 +562087,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] @@ -562098,57 +562098,57 @@ sub_8130430: ; 8130430 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 .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, =gUnknown_085A9A9C movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AE974 - b @081304E0 + b _081304E0 .pool -@081304A4: +_081304A4: ldr r0, =gUnknown_085AAB20 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AEE80 - b @081304E0 + b _081304E0 .pool -@081304BC: +_081304BC: ldr r0, =gUnknown_085AB750 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AF38C - b @081304E0 + b _081304E0 .pool -@081304D4: +_081304D4: ldr r0, =gUnknown_085AC288 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AF898 -@081304E0: +_081304E0: ldr r1, =0x03006190 ldr r1, [r1] bl RLUnCompWram - b @0813050C + b _0813050C .pool -@081304F8: +_081304F8: ldr r0, =gUnknown_085AD240 movs r1, 0xC0 lsls r1, 19 @@ -562157,15 +562157,15 @@ sub_8130430: ; 8130430 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 @@ -562174,22 +562174,22 @@ sub_8130430: ; 8130430 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 @@ -562204,15 +562204,15 @@ sub_8130430: ; 8130430 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] @@ -562223,20 +562223,20 @@ sub_8130430: ; 8130430 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0xF - bls @08130570 - b @08130676 + bls _08130570 + b _08130676 .pool -@081305A4: +_081305A4: cmp r5, 0x7 - bhi @081305C0 + bhi _081305C0 ldr r0, =gUnknown_085AE370 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085B02B0 - b @08130650 + b _08130650 .pool -@081305C0: +_081305C0: ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] @@ -562245,56 +562245,56 @@ sub_8130430: ; 8130430 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 .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, =gUnknown_085A9A9C movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AE974 - b @08130650 + b _08130650 .pool -@08130614: +_08130614: ldr r0, =gUnknown_085AAB20 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AEE80 - b @08130650 + b _08130650 .pool -@0813062C: +_0813062C: ldr r0, =gUnknown_085AB750 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AF38C - b @08130650 + b _08130650 .pool -@08130644: +_08130644: ldr r0, =gUnknown_085AC288 movs r1, 0xC0 lsls r1, 19 bl RLUnCompVram ldr r0, =gUnknown_085AF898 -@08130650: +_08130650: ldr r1, =0x06006000 bl RLUnCompVram - b @08130676 + b _08130676 .pool -@08130664: +_08130664: ldr r0, =gUnknown_085AD240 movs r1, 0xC0 lsls r1, 19 @@ -562302,7 +562302,7 @@ sub_8130430: ; 8130430 ldr r0, =gUnknown_085AFDA4 ldr r1, =0x06006000 bl RLUnCompVram -@08130676: +_08130676: pop {r4-r7} pop {r0} bx r0 @@ -562345,13 +562345,13 @@ sub_81306CC: ; 81306CC 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 .pool -@081306E4: +_081306E4: ldr r0, =0x030061c0 ldr r0, [r0] ldrb r0, [r0, 0xA] @@ -562359,37 +562359,37 @@ sub_81306CC: ; 81306CC 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 .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 @@ -562441,56 +562441,56 @@ 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 .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] @@ -562559,21 +562559,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, =gTrainers + 0x10 ; items offset -@081308F6: +_081308F6: lsls r2, r4, 1 ldrh r1, [r6] lsls r0, r1, 2 @@ -562583,7 +562583,7 @@ sub_81308C8: ; 81308C8 adds r2, r5 ldrh r3, [r2] cmp r3, 0 - beq @08130928 + beq _08130928 mov r0, r12 ldr r2, [r0] ldr r1, [r2, 0x18] @@ -562599,11 +562599,11 @@ sub_81308C8: ; 81308C8 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} @@ -562623,38 +562623,38 @@ 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 .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 @@ -562663,21 +562663,21 @@ sub_8130950: ; 8130950 lsrs r6, r0, 24 movs r4, 0 ldr r5, =0x020244a8 -@081309B4: +_081309B4: ldr r7, =gUnknown_0832A328 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] @@ -562692,7 +562692,7 @@ sub_8130950: ; 8130950 strb r1, [r2] adds r4, 0x1 cmp r4, 0x3 - ble @081309B4 + ble _081309B4 ldr r0, =0x020244a8 ldr r0, [r0] ldr r0, [r0, 0x1C] @@ -562708,7 +562708,7 @@ sub_8130950: ; 8130950 movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @08130A60 + beq _08130A60 ldr r5, =0x0202420c bl GenerateRandomNumber adds r4, r0, 0 @@ -562729,99 +562729,99 @@ sub_8130950: ; 8130950 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @08130A68 + beq _08130A68 eors r2, r3 strb r2, [r5] - b @08130A68 + b _08130A68 .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 .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 .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 .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 .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 .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 .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] @@ -562843,9 +562843,9 @@ sub_8130950: ; 8130950 ldr r0, [r0] orrs r1, r0 str r1, [r4, 0xC] - b @08130B72 + b _08130B72 .pool -@08130B58: +_08130B58: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -562859,13 +562859,13 @@ sub_8130950: ; 8130950 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] @@ -562873,7 +562873,7 @@ sub_8130950: ; 8130950 movs r1, 0x80 orrs r0, r1 str r0, [r2, 0xC] -@08130B8C: +_08130B8C: pop {r4-r7} pop {r0} bx r0 @@ -562890,13 +562890,13 @@ sub_8130BA4: ; 8130BA4 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne @08130BC4 + bne _08130BC4 bl sub_8130BDC - b @08130BC8 + b _08130BC8 .pool -@08130BC4: +_08130BC4: bl sub_8130CF4 -@08130BC8: +_08130BC8: lsls r0, 24 lsrs r1, r0, 24 ldr r0, =0x020241ea @@ -562920,20 +562920,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] @@ -562949,8 +562949,8 @@ sub_8130BDC: ; 8130BDC 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] @@ -562959,20 +562959,20 @@ sub_8130BDC: ; 8130BDC ands r0, r2 mov r12, r1 cmp r0, 0 - beq @08130C48 + beq _08130C48 movs r0, 0x4 - b @08130CE0 + b _08130CE0 .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] @@ -562991,10 +562991,10 @@ sub_8130BDC: ; 8130BDC 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] @@ -563004,7 +563004,7 @@ sub_8130BDC: ; 8130BDC movs r0, 0 ldrsb r0, [r2, r0] cmp r1, r0 - bne @08130CAA + bne _08130CAA mov r0, sp adds r1, r0, r6 ldrb r0, [r2] @@ -563015,7 +563015,7 @@ sub_8130BDC: ; 8130BDC lsrs r6, r0, 24 adds r1, r7, r1 strb r3, [r1] -@08130CAA: +_08130CAA: ldrb r1, [r5] mov r2, r12 ldr r0, [r2] @@ -563025,16 +563025,16 @@ sub_8130BDC: ; 8130BDC 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 @@ -563042,7 +563042,7 @@ sub_8130BDC: ; 8130BDC bl __modsi3 add r0, r8 ldrb r0, [r0] -@08130CE0: +_08130CE0: add sp, 0x8 pop {r3} mov r8, r3 @@ -563070,11 +563070,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 @@ -563083,36 +563083,36 @@ sub_8130CF4: ; 8130CF4 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 .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 .pool -@08130D70: +_08130D70: movs r0, 0xF bl sub_8130950 -@08130D76: +_08130D76: ldr r0, =0x0202420c mov r1, r8 strb r1, [r0] @@ -563123,9 +563123,9 @@ sub_8130CF4: ; 8130CF4 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] @@ -563139,19 +563139,19 @@ sub_8130CF4: ; 8130CF4 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] @@ -563162,8 +563162,8 @@ sub_8130CF4: ; 8130CF4 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] @@ -563171,24 +563171,24 @@ sub_8130CF4: ; 8130CF4 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 .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] @@ -563205,10 +563205,10 @@ sub_8130CF4: ; 8130CF4 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] @@ -563218,14 +563218,14 @@ sub_8130CF4: ; 8130CF4 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] @@ -563235,16 +563235,16 @@ sub_8130CF4: ; 8130CF4 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 @@ -563263,13 +563263,13 @@ sub_8130CF4: ; 8130CF4 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] @@ -563279,9 +563279,9 @@ sub_8130CF4: ; 8130CF4 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 @@ -563293,33 +563293,33 @@ sub_8130CF4: ; 8130CF4 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 @@ -563356,23 +563356,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, =gUnknown_082DBEF8 ldrb r0, [r2, 0x11] lsls r0, 2 @@ -563393,26 +563393,26 @@ tai_run_script: ; 8130F48 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 .pool -@08130FD4: +_08130FD4: ldrh r1, [r2, 0x2] cmp r1, 0 - beq @08130FF4 + beq _08130FF4 ldr r1, =gUnknown_085B083C mov r2, r8 ldr r0, [r2] @@ -563421,9 +563421,9 @@ tai_run_script: ; 8130F48 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - b @0813100A + b _0813100A .pool -@08130FF4: +_08130FF4: adds r0, r2, 0x4 ldrb r2, [r2, 0x1] adds r0, r2 @@ -563435,7 +563435,7 @@ tai_run_script: ; 8130F48 movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x10] -@0813100A: +_0813100A: ldr r2, =0x020244a8 ldr r0, [r2] ldr r3, [r0, 0x14] @@ -563444,7 +563444,7 @@ tai_run_script: ; 8130F48 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] @@ -563452,38 +563452,38 @@ tai_run_script: ; 8130F48 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 .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 @@ -563513,10 +563513,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] @@ -563527,18 +563527,18 @@ sub_8131074: ; 8131074 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 .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 @@ -563546,8 +563546,8 @@ sub_8131074: ; 8131074 ldrh r0, [r0] ldrh r1, [r1] cmp r0, r1 - bne @081310A0 -@081310E4: + bne _081310A0 +_081310E4: pop {r3} mov r8, r3 pop {r4-r7} @@ -563563,7 +563563,7 @@ sub_81310F0: ; 81310F0 movs r3, 0 lsrs r1, r0, 20 movs r2, 0x3 -@081310FC: +_081310FC: ldr r0, [r4] ldr r0, [r0, 0x18] adds r0, r1 @@ -563571,7 +563571,7 @@ sub_81310F0: ; 81310F0 adds r1, 0x2 subs r2, 0x1 cmp r2, 0 - bge @081310FC + bge _081310FC pop {r4} pop {r0} bx r0 @@ -563649,7 +563649,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 @@ -563661,12 +563661,12 @@ tai00_unk: ; 8131178 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081311B4 + b _081311B4 .pool -@081311B0: +_081311B0: adds r0, r2, 0x6 str r0, [r3] -@081311B4: +_081311B4: pop {r0} bx r0 thumb_func_end tai00_unk @@ -563684,7 +563684,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 @@ -563696,12 +563696,12 @@ tai01_unk: ; 81311B8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081311F4 + b _081311F4 .pool -@081311F0: +_081311F0: adds r0, r2, 0x6 str r0, [r3] -@081311F4: +_081311F4: pop {r0} bx r0 thumb_func_end tai01_unk @@ -563719,7 +563719,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 @@ -563731,12 +563731,12 @@ tai02_unk: ; 81311F8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131234 + b _08131234 .pool -@08131230: +_08131230: adds r0, r2, 0x6 str r0, [r3] -@08131234: +_08131234: pop {r0} bx r0 thumb_func_end tai02_unk @@ -563754,7 +563754,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 @@ -563766,12 +563766,12 @@ tai03_unk: ; 8131238 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131274 + b _08131274 .pool -@08131270: +_08131270: adds r0, r2, 0x6 str r0, [r3] -@08131274: +_08131274: pop {r0} bx r0 thumb_func_end tai03_unk @@ -563799,10 +563799,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] @@ -563820,13 +563820,13 @@ tai05_unk: ; 81312BC ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @081312D8 + bne _081312D8 ldr r0, =0x0203ab3c - b @081312DA + b _081312DA .pool -@081312D8: +_081312D8: ldr r0, =0x0202420c -@081312DA: +_081312DA: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -563840,7 +563840,7 @@ tai05_unk: ; 81312BC 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 @@ -563852,12 +563852,12 @@ tai05_unk: ; 81312BC lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0813131C + b _0813131C .pool -@08131318: +_08131318: adds r0, r2, 0x7 str r0, [r4] -@0813131C: +_0813131C: pop {r4} pop {r0} bx r0 @@ -563871,13 +563871,13 @@ tai06_unk: ; 8131324 ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08131340 + bne _08131340 ldr r0, =0x0203ab3c - b @08131342 + b _08131342 .pool -@08131340: +_08131340: ldr r0, =0x0202420c -@08131342: +_08131342: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -563891,7 +563891,7 @@ tai06_unk: ; 8131324 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 @@ -563903,12 +563903,12 @@ tai06_unk: ; 8131324 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08131384 + b _08131384 .pool -@08131380: +_08131380: adds r0, r2, 0x7 str r0, [r4] -@08131384: +_08131384: pop {r4} pop {r0} bx r0 @@ -563922,13 +563922,13 @@ tai07_unk: ; 813138C ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @081313A8 + bne _081313A8 ldr r0, =0x0203ab3c - b @081313AA + b _081313AA .pool -@081313A8: +_081313A8: ldr r0, =0x0202420c -@081313AA: +_081313AA: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -563942,7 +563942,7 @@ tai07_unk: ; 813138C 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 @@ -563954,12 +563954,12 @@ tai07_unk: ; 813138C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @081313EC + b _081313EC .pool -@081313E8: +_081313E8: adds r0, r2, 0x7 str r0, [r4] -@081313EC: +_081313EC: pop {r4} pop {r0} bx r0 @@ -563973,13 +563973,13 @@ tai08_unk: ; 81313F4 ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08131410 + bne _08131410 ldr r0, =0x0203ab3c - b @08131412 + b _08131412 .pool -@08131410: +_08131410: ldr r0, =0x0202420c -@08131412: +_08131412: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -563993,7 +563993,7 @@ tai08_unk: ; 81313F4 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 @@ -564005,12 +564005,12 @@ tai08_unk: ; 81313F4 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08131454 + b _08131454 .pool -@08131450: +_08131450: adds r0, r2, 0x7 str r0, [r4] -@08131454: +_08131454: pop {r4} pop {r0} bx r0 @@ -564024,13 +564024,13 @@ tai09_unk: ; 813145C ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne @08131478 + bne _08131478 ldr r0, =0x0203ab3c - b @0813147A + b _0813147A .pool -@08131478: +_08131478: ldr r0, =0x0202420c -@0813147A: +_0813147A: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -564051,7 +564051,7 @@ tai09_unk: ; 813145C ldr r0, [r0] ands r0, r2 cmp r0, 0 - beq @081314C4 + beq _081314C4 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564063,13 +564063,13 @@ tai09_unk: ; 813145C lsls r0, 24 orrs r1, r0 str r1, [r5] - b @081314CA + b _081314CA .pool -@081314C4: +_081314C4: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -@081314CA: +_081314CA: pop {r4,r5} pop {r0} bx r0 @@ -564083,13 +564083,13 @@ tai0A_unk: ; 81314D0 ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne @081314EC + bne _081314EC ldr r0, =0x0203ab3c - b @081314EE + b _081314EE .pool -@081314EC: +_081314EC: ldr r0, =0x0202420c -@081314EE: +_081314EE: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -564110,7 +564110,7 @@ tai0A_unk: ; 81314D0 ldr r0, [r0] ands r0, r2 cmp r0, 0 - bne @08131538 + bne _08131538 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564122,13 +564122,13 @@ tai0A_unk: ; 81314D0 lsls r0, 24 orrs r1, r0 str r1, [r5] - b @0813153E + b _0813153E .pool -@08131538: +_08131538: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -@0813153E: +_0813153E: pop {r4,r5} pop {r0} bx r0 @@ -564142,13 +564142,13 @@ tai0B_unk: ; 8131544 ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne @08131560 + bne _08131560 ldr r0, =0x0203ab3c - b @08131562 + b _08131562 .pool -@08131560: +_08131560: ldr r0, =0x0202420c -@08131562: +_08131562: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -564169,7 +564169,7 @@ tai0B_unk: ; 8131544 ldr r0, [r0] ands r0, r2 cmp r0, 0 - beq @081315AC + beq _081315AC ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564181,13 +564181,13 @@ tai0B_unk: ; 8131544 lsls r0, 24 orrs r1, r0 str r1, [r5] - b @081315B2 + b _081315B2 .pool -@081315AC: +_081315AC: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -@081315B2: +_081315B2: pop {r4,r5} pop {r0} bx r0 @@ -564201,13 +564201,13 @@ tai0C_unk: ; 81315B8 ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne @081315D4 + bne _081315D4 ldr r0, =0x0203ab3c - b @081315D6 + b _081315D6 .pool -@081315D4: +_081315D4: ldr r0, =0x0202420c -@081315D6: +_081315D6: ldrb r4, [r0] ldr r3, [r5] ldrb r2, [r3, 0x2] @@ -564228,7 +564228,7 @@ tai0C_unk: ; 81315B8 ldr r0, [r0] ands r0, r2 cmp r0, 0 - bne @08131620 + bne _08131620 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564240,13 +564240,13 @@ tai0C_unk: ; 81315B8 lsls r0, 24 orrs r1, r0 str r1, [r5] - b @08131626 + b _08131626 .pool -@08131620: +_08131620: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -@08131626: +_08131626: pop {r4,r5} pop {r0} bx r0 @@ -564260,13 +564260,13 @@ tai0D_unk: ; 813162C ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne @08131648 + bne _08131648 ldr r0, =0x0203ab3c - b @0813164A + b _0813164A .pool -@08131648: +_08131648: ldr r0, =0x0202420c -@0813164A: +_0813164A: ldrb r4, [r0] ldr r3, [r5] ldrb r1, [r3, 0x2] @@ -564285,7 +564285,7 @@ tai0D_unk: ; 813162C ldr r0, [r0] ands r0, r1 cmp r0, 0 - beq @08131690 + beq _08131690 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564297,13 +564297,13 @@ tai0D_unk: ; 813162C lsls r0, 24 orrs r1, r0 str r1, [r5] - b @08131696 + b _08131696 .pool -@08131690: +_08131690: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -@08131696: +_08131696: pop {r4,r5} pop {r0} bx r0 @@ -564317,13 +564317,13 @@ tai0E_unk: ; 813169C ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne @081316B8 + bne _081316B8 ldr r0, =0x0203ab3c - b @081316BA + b _081316BA .pool -@081316B8: +_081316B8: ldr r0, =0x0202420c -@081316BA: +_081316BA: ldrb r4, [r0] ldr r3, [r5] ldrb r1, [r3, 0x2] @@ -564342,7 +564342,7 @@ tai0E_unk: ; 813169C ldr r0, [r0] ands r0, r1 cmp r0, 0 - bne @08131700 + bne _08131700 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564354,13 +564354,13 @@ tai0E_unk: ; 813169C lsls r0, 24 orrs r1, r0 str r1, [r5] - b @08131706 + b _08131706 .pool -@08131700: +_08131700: adds r0, r3, 0 adds r0, 0xA str r0, [r5] -@08131706: +_08131706: pop {r4,r5} pop {r0} bx r0 @@ -564373,13 +564373,13 @@ tai0F_unk: ; 813170C ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne @08131724 + bne _08131724 ldr r0, =0x0203ab3c - b @08131726 + b _08131726 .pool -@08131724: +_08131724: ldr r0, =0x0202420c -@08131726: +_08131726: ldrb r0, [r0] bl battle_get_per_side_status movs r2, 0x1 @@ -564402,7 +564402,7 @@ tai0F_unk: ; 813170C ldrh r0, [r2] ands r0, r1 cmp r0, 0 - beq @0813177C + beq _0813177C ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564414,13 +564414,13 @@ tai0F_unk: ; 813170C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08131782 + b _08131782 .pool -@0813177C: +_0813177C: adds r0, r3, 0 adds r0, 0xA str r0, [r4] -@08131782: +_08131782: pop {r4} pop {r0} bx r0 @@ -564433,13 +564433,13 @@ tai10_unk: ; 8131788 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne @081317A0 + bne _081317A0 ldr r0, =0x0203ab3c - b @081317A2 + b _081317A2 .pool -@081317A0: +_081317A0: ldr r0, =0x0202420c -@081317A2: +_081317A2: ldrb r0, [r0] bl battle_get_per_side_status movs r2, 0x1 @@ -564462,7 +564462,7 @@ tai10_unk: ; 8131788 ldrh r0, [r2] ands r0, r1 cmp r0, 0 - bne @081317F8 + bne _081317F8 ldrb r1, [r3, 0x6] ldrb r0, [r3, 0x7] lsls r0, 8 @@ -564474,13 +564474,13 @@ tai10_unk: ; 8131788 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @081317FE + b _081317FE .pool -@081317F8: +_081317F8: adds r0, r3, 0 adds r0, 0xA str r0, [r4] -@081317FE: +_081317FE: pop {r4} pop {r0} bx r0 @@ -564497,7 +564497,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 @@ -564509,12 +564509,12 @@ tai11_unk: ; 8131804 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0813183C + b _0813183C .pool -@08131838: +_08131838: adds r0, r2, 0x6 str r0, [r3] -@0813183C: +_0813183C: pop {r0} bx r0 thumb_func_end tai11_unk @@ -564530,7 +564530,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 @@ -564542,12 +564542,12 @@ tai12_unk: ; 8131840 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131878 + b _08131878 .pool -@08131874: +_08131874: adds r0, r2, 0x6 str r0, [r3] -@08131878: +_08131878: pop {r0} bx r0 thumb_func_end tai12_unk @@ -564563,7 +564563,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 @@ -564575,12 +564575,12 @@ tai13_unk: ; 813187C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081318B4 + b _081318B4 .pool -@081318B0: +_081318B0: adds r0, r2, 0x6 str r0, [r3] -@081318B4: +_081318B4: pop {r0} bx r0 thumb_func_end tai13_unk @@ -564596,7 +564596,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 @@ -564608,12 +564608,12 @@ tai14_unk: ; 81318B8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081318F0 + b _081318F0 .pool -@081318EC: +_081318EC: adds r0, r2, 0x6 str r0, [r3] -@081318F0: +_081318F0: pop {r0} bx r0 thumb_func_end tai14_unk @@ -564639,7 +564639,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 @@ -564651,13 +564651,13 @@ tai15_unk: ; 81318F4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131942 + b _08131942 .pool -@0813193C: +_0813193C: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -@08131942: +_08131942: pop {r0} bx r0 thumb_func_end tai15_unk @@ -564683,7 +564683,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 @@ -564695,13 +564695,13 @@ tai16_unk: ; 8131948 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131996 + b _08131996 .pool -@08131990: +_08131990: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -@08131996: +_08131996: pop {r0} bx r0 thumb_func_end tai16_unk @@ -564727,7 +564727,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 @@ -564739,13 +564739,13 @@ tai17_unk: ; 813199C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081319EA + b _081319EA .pool -@081319E4: +_081319E4: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -@081319EA: +_081319EA: pop {r0} bx r0 thumb_func_end tai17_unk @@ -564771,7 +564771,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 @@ -564783,13 +564783,13 @@ tai18_unk: ; 81319F0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131A3E + b _08131A3E .pool -@08131A38: +_08131A38: adds r0, r2, 0 adds r0, 0x9 str r0, [r3] -@08131A3E: +_08131A3E: pop {r0} bx r0 thumb_func_end tai18_unk @@ -564808,7 +564808,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 @@ -564820,12 +564820,12 @@ tai19_unk: ; 8131A44 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131A84 + b _08131A84 .pool -@08131A80: +_08131A80: adds r0, r2, 0x7 str r0, [r3] -@08131A84: +_08131A84: pop {r0} bx r0 thumb_func_end tai19_unk @@ -564844,7 +564844,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 @@ -564856,12 +564856,12 @@ tai1A_unk: ; 8131A88 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08131AC8 + b _08131AC8 .pool -@08131AC4: +_08131AC4: adds r0, r2, 0x7 str r0, [r3] -@08131AC8: +_08131AC8: pop {r0} bx r0 thumb_func_end tai1A_unk @@ -564883,16 +564883,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] @@ -564905,18 +564905,18 @@ tai1B_unk: ; 8131ACC lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08131B2E + b _08131B2E .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 @@ -564940,27 +564940,27 @@ 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 .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] @@ -564973,7 +564973,7 @@ tai1C_unk: ; 8131B34 lsls r0, 24 orrs r1, r0 str r1, [r4] -@08131B98: +_08131B98: pop {r4} pop {r0} bx r0 @@ -564997,16 +564997,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] @@ -565019,18 +565019,18 @@ tai1D_unk: ; 8131BA0 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08131C06 + b _08131C06 .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 @@ -565055,27 +565055,27 @@ 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 .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] @@ -565088,7 +565088,7 @@ tai1E_unk: ; 8131C0C lsls r0, 24 orrs r1, r0 str r1, [r5] -@08131C74: +_08131C74: pop {r4,r5} pop {r0} bx r0 @@ -565107,31 +565107,31 @@ 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 .pool -@08131CCC: +_08131CCC: ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -565144,7 +565144,7 @@ tai1F_unk: ; 8131C7C lsls r0, 24 orrs r1, r0 str r1, [r4] -@08131CE4: +_08131CE4: pop {r4,r5} pop {r0} bx r0 @@ -565163,31 +565163,31 @@ 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 .pool -@08131D3C: +_08131D3C: ldr r2, [r4] ldrb r1, [r2, 0x1] ldrb r0, [r2, 0x2] @@ -565200,7 +565200,7 @@ tai20_unk: ; 8131CEC lsls r0, 24 orrs r1, r0 str r1, [r4] -@08131D54: +_08131D54: pop {r4,r5} pop {r0} bx r0 @@ -565230,21 +565230,21 @@ dp15_get_some_type: ; 8131D80 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 .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] @@ -565256,9 +565256,9 @@ dp15_get_some_type: ; 8131D80 adds r0, r2 adds r0, 0x21 ldrb r0, [r0] - b @08131E58 + b _08131E58 .pool -@08131DD8: +_08131DD8: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -565270,9 +565270,9 @@ dp15_get_some_type: ; 8131D80 adds r0, r2 adds r0, 0x21 ldrb r0, [r0] - b @08131E58 + b _08131E58 .pool -@08131DFC: +_08131DFC: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -565284,9 +565284,9 @@ dp15_get_some_type: ; 8131D80 adds r0, r2 adds r0, 0x22 ldrb r0, [r0] - b @08131E58 + b _08131E58 .pool -@08131E20: +_08131E20: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -565298,9 +565298,9 @@ dp15_get_some_type: ; 8131D80 adds r0, r2 adds r0, 0x22 ldrb r0, [r0] - b @08131E58 + b _08131E58 .pool -@08131E44: +_08131E44: ldr r0, =0x020244a8 ldr r0, [r0] ldr r3, [r0, 0x14] @@ -565311,9 +565311,9 @@ dp15_get_some_type: ; 8131D80 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] @@ -565329,34 +565329,34 @@ sub_8131E70: ; 8131E70 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08131E84 + bne _08131E84 ldr r0, =0x0203ab3c ldrb r0, [r0] - b @08131EAC + b _08131EAC .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 .pool -@08131E9C: +_08131E9C: ldr r0, =0x0203ab3c - b @08131EA6 + b _08131EA6 .pool -@08131EA4: +_08131EA4: ldr r0, =0x0202420c -@08131EA6: +_08131EA6: ldrb r1, [r0] movs r0, 0x2 eors r0, r1 -@08131EAC: +_08131EAC: pop {r1} bx r1 .pool @@ -565381,25 +565381,25 @@ 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 .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] @@ -565447,7 +565447,7 @@ dp15_is_most_powerful_move__8: ; 8131F48 ldr r6, =gBattleMoves ldr r2, =0x020244a8 cmp r1, r5 - beq @08131F86 + beq _08131F86 ldr r0, [r2] ldr r0, [r0, 0x14] ldrh r1, [r0, 0x2] @@ -565457,16 +565457,16 @@ dp15_is_most_powerful_move__8: ; 8131F48 adds r0, r6 ldrb r4, [r0] ldr r1, =gUnknown_085B09C8 -@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] @@ -565476,18 +565476,18 @@ dp15_is_most_powerful_move__8: ; 8131F48 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, =gUnknown_085B09C8 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] @@ -565506,7 +565506,7 @@ dp15_is_most_powerful_move__8: ; 8131F48 ldr r2, =gUnknown_085B09C8 ldrh r2, [r2] str r2, [sp, 0x10] -@08131FD0: +_08131FD0: movs r3, 0 ldr r5, =0x02024084 lsls r4, r6, 1 @@ -565517,7 +565517,7 @@ dp15_is_most_powerful_move__8: ; 8131F48 mov r10, r1 ldr r2, [sp, 0x10] cmp r2, r9 - beq @08132014 + beq _08132014 ldr r2, =gBattleMoves ldrb r1, [r7] movs r0, 0x58 @@ -565533,16 +565533,16 @@ dp15_is_most_powerful_move__8: ; 8131F48 adds r0, r2 ldrb r2, [r0] ldr r1, =gUnknown_085B09C8 -@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 @@ -565552,13 +565552,13 @@ dp15_is_most_powerful_move__8: ; 8131F48 adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq @081320C0 + beq _081320C0 lsls r0, r3, 1 ldr r2, =gUnknown_085B09C8 adds r0, r2 ldrh r0, [r0] cmp r0, r9 - bne @081320C0 + bne _081320C0 ldr r0, =gBattleMoves ldrh r2, [r1] lsls r1, r2, 1 @@ -565567,7 +565567,7 @@ dp15_is_most_powerful_move__8: ; 8131F48 adds r1, r0 ldrb r0, [r1, 0x1] cmp r0, 0x1 - bls @081320C0 + bls _081320C0 ldr r5, =0x020241ea strh r2, [r5] ldrb r0, [r7] @@ -565593,22 +565593,22 @@ dp15_is_most_powerful_move__8: ; 8131F48 bl __divsi3 str r0, [r4] cmp r0, 0 - bne @081320C8 + bne _081320C8 movs r0, 0x1 str r0, [r4] - b @081320C8 + b _081320C8 .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] @@ -565620,14 +565620,14 @@ dp15_is_most_powerful_move__8: ; 8131F48 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] @@ -565636,29 +565636,29 @@ dp15_is_most_powerful_move__8: ; 8131F48 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 .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] @@ -565681,21 +565681,21 @@ dp15_get_move_to_execute_B: ; 813214C 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 .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 @@ -565720,7 +565720,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 @@ -565732,12 +565732,12 @@ tai26_unk: ; 81321A4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081321DC + b _081321DC .pool -@081321D8: +_081321D8: adds r0, r2, 0x6 str r0, [r3] -@081321DC: +_081321DC: pop {r0} bx r0 thumb_func_end tai26_unk @@ -565753,7 +565753,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 @@ -565765,12 +565765,12 @@ tai27_unk: ; 81321E0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08132218 + b _08132218 .pool -@08132214: +_08132214: adds r0, r2, 0x6 str r0, [r3] -@08132218: +_08132218: pop {r0} bx r0 thumb_func_end tai27_unk @@ -565790,7 +565790,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 @@ -565802,12 +565802,12 @@ tai28_unk: ; 813221C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08132264 + b _08132264 .pool -@08132260: +_08132260: adds r0, r2, 0x6 str r0, [r3] -@08132264: +_08132264: pop {r0} bx r0 thumb_func_end tai28_unk @@ -565827,7 +565827,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 @@ -565839,12 +565839,12 @@ tai29_unk: ; 8132268 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081322B0 + b _081322B0 .pool -@081322AC: +_081322AC: adds r0, r2, 0x6 str r0, [r3] -@081322B0: +_081322B0: pop {r0} bx r0 thumb_func_end tai29_unk @@ -565873,13 +565873,13 @@ tai2C_unk: ; 81322BC ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne @081322E8 + bne _081322E8 ldr r0, =0x0203ab3c - b @081322EA + b _081322EA .pool -@081322E8: +_081322E8: ldr r0, =0x0202420c -@081322EA: +_081322EA: ldrb r5, [r0] adds r0, r5, 0 bl battle_side_get_owner @@ -565887,16 +565887,16 @@ tai2C_unk: ; 81322BC 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 @@ -565912,21 +565912,21 @@ tai2C_unk: ; 81322BC lsrs r0, 23 adds r0, r4 ldrb r6, [r0] - b @0813234E + b _0813234E .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 @@ -565935,29 +565935,29 @@ tai2C_unk: ; 81322BC 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 @@ -566014,18 +566014,18 @@ tai2F_unk: ; 8132400 ldrb r1, [r1, 0x1] mov r12, r0 cmp r1, 0x1 - bne @0813241C + bne _0813241C ldr r0, =0x0203ab3c - b @0813241E + b _0813241E .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] @@ -566034,12 +566034,12 @@ tai2F_unk: ; 8132400 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 .pool -@0813244C: +_0813244C: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r3 @@ -566049,12 +566049,12 @@ tai2F_unk: ; 8132400 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 @@ -566063,9 +566063,9 @@ tai2F_unk: ; 8132400 adds r0, 0x20 ldrb r0, [r0] str r0, [r1, 0x8] - b @08132504 + b _08132504 .pool -@08132480: +_08132480: ldr r6, =gBaseStats ldrh r0, [r4] lsls r1, r0, 3 @@ -566074,15 +566074,15 @@ tai2F_unk: ; 8132400 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] @@ -566094,9 +566094,9 @@ tai2F_unk: ; 8132400 str r0, [r2, 0x8] ldr r0, =0x0203ab38 mov r12, r0 - b @08132504 + b _08132504 .pool -@081324C4: +_081324C4: ldr r0, [r7] ldr r2, [r0, 0x14] ldrh r1, [r4] @@ -566108,19 +566108,19 @@ tai2F_unk: ; 8132400 str r0, [r2, 0x8] ldr r1, =0x0203ab38 mov r12, r1 - b @08132504 + b _08132504 .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] @@ -566131,7 +566131,7 @@ tai2F_unk: ; 8132400 adds r0, 0x20 ldrb r0, [r0] str r0, [r2, 0x8] -@08132504: +_08132504: mov r1, r12 ldr r0, [r1] adds r0, 0x2 @@ -566155,10 +566155,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] @@ -566167,13 +566167,13 @@ tai60_unk: ; 813251C 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 .pool -@0813255C: +_0813255C: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r5 @@ -566182,20 +566182,20 @@ tai60_unk: ; 813251C 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 .pool -@08132588: +_08132588: ldr r2, =gBaseStats ldrh r1, [r4] lsls r0, r1, 3 @@ -566204,25 +566204,25 @@ tai60_unk: ; 813251C 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 .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 @@ -566230,36 +566230,36 @@ tai60_unk: ; 813251C 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 .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 .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] @@ -566297,7 +566297,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 @@ -566310,7 +566310,7 @@ tai30_unk: ; 8132614 strh r0, [r7] lsls r0, 16 cmp r0, 0 - beq @081326B8 + beq _081326B8 ldrh r0, [r7] ldrb r1, [r6] ldr r2, =0x0202420c @@ -566318,49 +566318,49 @@ tai30_unk: ; 8132614 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 @@ -566406,42 +566406,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 @@ -566453,12 +566453,12 @@ dp15_simulate_damage_bonus_jump_if_eq: ; 8132700 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081327C8 + b _081327C8 .pool -@081327C4: +_081327C4: adds r0, r2, 0x6 str r0, [r3] -@081327C8: +_081327C8: pop {r4,r5} pop {r0} bx r0 @@ -566485,11 +566485,11 @@ tai34_unk: ; 81327D8 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne @08132818 + bne _08132818 ldr r0, =0x0203ab3c - b @0813281A + b _0813281A .pool -@081327F8: +_081327F8: ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x6] @@ -566503,21 +566503,21 @@ tai34_unk: ; 81327D8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0813289A + b _0813289A .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] @@ -566535,7 +566535,7 @@ tai34_unk: ; 81327D8 movs r0, 0xCE lsls r0, 1 mov r10, r0 -@08132850: +_08132850: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -566554,24 +566554,24 @@ tai34_unk: ; 81327D8 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 @@ -566593,23 +566593,23 @@ tai35_unk: ; 81328B8 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne @081328D8 + bne _081328D8 ldr r0, =0x0203ab3c - b @081328DA + b _081328DA .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] @@ -566625,7 +566625,7 @@ tai35_unk: ; 81328B8 movs r1, 0 mov r8, r1 mov r9, r2 -@0813290C: +_0813290C: movs r0, 0x64 mov r4, r8 muls r4, r0 @@ -566644,25 +566644,25 @@ tai35_unk: ; 81328B8 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] @@ -566694,46 +566694,46 @@ dp15_get_weather__8: ; 8132994 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 @@ -566760,7 +566760,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 @@ -566772,12 +566772,12 @@ tai37_unk: ; 8132A00 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08132A48 + b _08132A48 .pool -@08132A44: +_08132A44: adds r0, r2, 0x6 str r0, [r3] -@08132A48: +_08132A48: pop {r0} bx r0 thumb_func_end tai37_unk @@ -566799,7 +566799,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 @@ -566811,12 +566811,12 @@ tai38_unk: ; 8132A4C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08132A94 + b _08132A94 .pool -@08132A90: +_08132A90: adds r0, r2, 0x6 str r0, [r3] -@08132A94: +_08132A94: pop {r0} bx r0 thumb_func_end tai38_unk @@ -566829,13 +566829,13 @@ tai39_unk: ; 8132A98 ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08132AB4 + bne _08132AB4 ldr r0, =0x0203ab3c - b @08132AB6 + b _08132AB6 .pool -@08132AB4: +_08132AB4: ldr r0, =0x0202420c -@08132AB6: +_08132AB6: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -566850,7 +566850,7 @@ tai39_unk: ; 8132A98 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 @@ -566862,13 +566862,13 @@ tai39_unk: ; 8132A98 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08132AFA + b _08132AFA .pool -@08132AF4: +_08132AF4: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -@08132AFA: +_08132AFA: pop {r4} pop {r0} bx r0 @@ -566882,13 +566882,13 @@ tai3A_unk: ; 8132B00 ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08132B1C + bne _08132B1C ldr r0, =0x0203ab3c - b @08132B1E + b _08132B1E .pool -@08132B1C: +_08132B1C: ldr r0, =0x0202420c -@08132B1E: +_08132B1E: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -566903,7 +566903,7 @@ tai3A_unk: ; 8132B00 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 @@ -566915,13 +566915,13 @@ tai3A_unk: ; 8132B00 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08132B62 + b _08132B62 .pool -@08132B5C: +_08132B5C: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -@08132B62: +_08132B62: pop {r4} pop {r0} bx r0 @@ -566935,13 +566935,13 @@ tai3B_unk: ; 8132B68 ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08132B84 + bne _08132B84 ldr r0, =0x0203ab3c - b @08132B86 + b _08132B86 .pool -@08132B84: +_08132B84: ldr r0, =0x0202420c -@08132B86: +_08132B86: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -566956,7 +566956,7 @@ tai3B_unk: ; 8132B68 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 @@ -566968,13 +566968,13 @@ tai3B_unk: ; 8132B68 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08132BCA + b _08132BCA .pool -@08132BC4: +_08132BC4: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -@08132BCA: +_08132BCA: pop {r4} pop {r0} bx r0 @@ -566988,13 +566988,13 @@ tai3C_unk: ; 8132BD0 ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08132BEC + bne _08132BEC ldr r0, =0x0203ab3c - b @08132BEE + b _08132BEE .pool -@08132BEC: +_08132BEC: ldr r0, =0x0202420c -@08132BEE: +_08132BEE: ldrb r3, [r0] ldr r1, =0x02024084 ldr r2, [r4] @@ -567009,7 +567009,7 @@ tai3C_unk: ; 8132BD0 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 @@ -567021,13 +567021,13 @@ tai3C_unk: ; 8132BD0 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08132C32 + b _08132C32 .pool -@08132C2C: +_08132C2C: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -@08132C32: +_08132C32: pop {r4} pop {r0} bx r0 @@ -567050,7 +567050,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] @@ -567094,9 +567094,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 @@ -567105,7 +567105,7 @@ tai3D_unk: ; 8132C38 ldrh r1, [r0, 0x28] ldr r0, [r4] cmp r1, r0 - bgt @08132D1C + bgt _08132D1C ldr r3, =0x0203ab38 ldr r2, [r3] ldrb r1, [r2, 0x1] @@ -567119,14 +567119,14 @@ tai3D_unk: ; 8132C38 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08132D24 + b _08132D24 .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} @@ -567149,7 +567149,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] @@ -567197,7 +567197,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] @@ -567211,14 +567211,14 @@ dp15_determine_move_damage_jump_if_not_fatal: ; 8132D34 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08132E0C + b _08132E0C .pool -@08132E04: +_08132E04: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08132E0C: +_08132E0C: pop {r4-r7} pop {r0} bx r0 @@ -567234,20 +567234,20 @@ 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 .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 @@ -567259,12 +567259,12 @@ tai3F_unk: ; 8132E18 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 @@ -567273,13 +567273,13 @@ tai3F_unk: ; 8132E18 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 .pool -@08132E84: +_08132E84: ldr r3, =0x02024084 ldr r2, =0x0203ab3c ldrb r1, [r2] @@ -567290,25 +567290,25 @@ tai3F_unk: ; 8132E18 adds r0, r1, r3 ldrh r0, [r0, 0x28] cmp r0, 0 - bne @08132EA8 + bne _08132EA8 adds r0, r5, 0 - b @08132F1A + b _08132F1A .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 @@ -567320,9 +567320,9 @@ tai3F_unk: ; 8132E18 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] @@ -567334,14 +567334,14 @@ tai3F_unk: ; 8132E18 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 @@ -567351,18 +567351,18 @@ tai3F_unk: ; 8132E18 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 .pool -@08132F28: +_08132F28: ldr r2, [r6] ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] @@ -567375,7 +567375,7 @@ tai3F_unk: ; 8132E18 lsls r0, 24 orrs r1, r0 str r1, [r6] -@08132F40: +_08132F40: pop {r4-r7} pop {r0} bx r0 @@ -567390,19 +567390,19 @@ 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 .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 @@ -567414,15 +567414,15 @@ tai40_unk: ; 8132F48 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 @@ -567430,13 +567430,13 @@ tai40_unk: ; 8132F48 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 .pool -@08132FB4: +_08132FB4: movs r3, 0 ldr r4, =0x020244a8 ldr r0, [r4] @@ -567448,14 +567448,14 @@ tai40_unk: ; 8132F48 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 @@ -567465,17 +567465,17 @@ tai40_unk: ; 8132F48 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 .pool -@08133000: +_08133000: ldr r2, [r5] ldrb r1, [r2, 0x4] ldrb r0, [r2, 0x5] @@ -567488,7 +567488,7 @@ tai40_unk: ; 8132F48 lsls r0, 24 orrs r1, r0 str r1, [r5] -@08133018: +_08133018: pop {r4-r7} pop {r0} bx r0 @@ -567502,19 +567502,19 @@ tai41_unk: ; 8133020 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 .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 @@ -567525,10 +567525,10 @@ tai41_unk: ; 8133020 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 @@ -567538,18 +567538,18 @@ tai41_unk: ; 8133020 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 .pool -@08133090: +_08133090: movs r3, 0 ldr r1, =0x02024084 ldr r0, =0x0203ab3c @@ -567562,11 +567562,11 @@ tai41_unk: ; 8133020 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] @@ -567582,22 +567582,22 @@ tai41_unk: ; 8133020 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 .pool -@081330F8: +_081330F8: ldr r2, [r5] ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -567610,7 +567610,7 @@ tai41_unk: ; 8133020 lsls r0, 24 orrs r1, r0 str r1, [r5] -@08133110: +_08133110: pop {r4-r7} pop {r0} bx r0 @@ -567624,19 +567624,19 @@ tai42_unk: ; 8133118 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 .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 @@ -567647,10 +567647,10 @@ tai42_unk: ; 8133118 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 @@ -567660,18 +567660,18 @@ tai42_unk: ; 8133118 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 .pool -@08133188: +_08133188: movs r3, 0 ldr r0, =0x020244a8 ldr r0, [r0] @@ -567682,10 +567682,10 @@ tai42_unk: ; 8133118 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 @@ -567695,22 +567695,22 @@ tai42_unk: ; 8133118 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 .pool -@081331DC: +_081331DC: ldr r2, [r4] ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -567723,7 +567723,7 @@ tai42_unk: ; 8133118 lsls r0, 24 orrs r1, r0 str r1, [r4] -@081331F4: +_081331F4: pop {r4-r6} pop {r0} bx r0 @@ -567737,19 +567737,19 @@ tai43_unk: ; 81331FC ldrb r1, [r1, 0x1] adds r5, r0, 0 cmp r1, 0x1 - bne @08133218 + bne _08133218 ldr r0, =0x0203ab3c - b @0813321A + b _0813321A .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 @@ -567757,17 +567757,17 @@ tai43_unk: ; 81331FC adds r1, r0 ldrh r0, [r1, 0x4] cmp r0, 0 - beq @08133244 - b @0813325A + beq _08133244 + b _0813325A .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 @@ -567775,8 +567775,8 @@ tai43_unk: ; 81331FC 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 @@ -567788,12 +567788,12 @@ tai43_unk: ; 81331FC lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0813327C + b _0813327C .pool -@08133278: +_08133278: adds r0, r2, 0x7 str r0, [r5] -@0813327C: +_0813327C: pop {r4,r5} pop {r0} bx r0 @@ -567806,12 +567806,12 @@ tai44_unk: ; 8133284 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 .pool -@0813329C: +_0813329C: ldr r2, =0x020242bc ldr r0, =0x02024064 ldrb r1, [r0] @@ -567825,10 +567825,10 @@ tai44_unk: ; 8133284 ldrh r0, [r0, 0x4] ldrh r1, [r1, 0x2] cmp r0, r1 - beq @081332E4 - b @08133308 + beq _081332E4 + b _08133308 .pool -@081332C8: +_081332C8: ldr r2, =0x020242bc ldr r0, =0x02024064 ldrb r1, [r0] @@ -567842,8 +567842,8 @@ tai44_unk: ; 8133284 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 @@ -567855,12 +567855,12 @@ tai44_unk: ; 8133284 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0813330C + b _0813330C .pool -@08133308: +_08133308: adds r0, r3, 0x6 str r0, [r4] -@0813330C: +_0813330C: pop {r4} pop {r0} bx r0 @@ -567898,7 +567898,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] @@ -567912,14 +567912,14 @@ tai46_unk: ; 8133328 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0813337C + b _0813337C .pool -@08133374: +_08133374: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@0813337C: +_0813337C: pop {r4} pop {r0} bx r0 @@ -567946,18 +567946,18 @@ dp15_get_held_item_x12__8: ; 813339C ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne @081333B4 + bne _081333B4 ldr r0, =0x0203ab3c - b @081333B6 + b _081333B6 .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] @@ -567966,9 +567966,9 @@ dp15_get_held_item_x12__8: ; 813339C ldrb r0, [r0] bl itemid_get_x12 ldr r1, [r4] - b @081333F2 + b _081333F2 .pool -@081333E0: +_081333E0: ldr r1, =0x02024084 movs r0, 0x58 muls r0, r2 @@ -567977,7 +567977,7 @@ dp15_get_held_item_x12__8: ; 813339C bl itemid_get_x12 ldr r1, =0x020244a8 ldr r1, [r1] -@081333F2: +_081333F2: ldr r1, [r1, 0x14] lsls r0, 24 lsrs r0, 24 @@ -568008,29 +568008,29 @@ 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 .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 @@ -568042,13 +568042,13 @@ tai62_unk: ; 8133414 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0813348E + b _0813348E .pool -@08133488: +_08133488: adds r0, r2, 0 adds r0, 0x8 str r0, [r4] -@0813348E: +_0813348E: pop {r4} pop {r0} bx r0 @@ -568061,13 +568061,13 @@ tai49_unk: ; 8133494 ldr r0, [r0] ldrb r0, [r0, 0x1] cmp r0, 0x1 - bne @081334AC + bne _081334AC ldr r0, =0x0203ab3c - b @081334AE + b _081334AE .pool -@081334AC: +_081334AC: ldr r0, =0x0202420c -@081334AE: +_081334AE: ldrb r1, [r0] ldr r2, =0x02024084 movs r0, 0x58 @@ -568101,13 +568101,13 @@ dp15_enter_battle_countdown_get_state: ; 81334EC ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08133508 + bne _08133508 ldr r0, =0x0203ab3c - b @0813350A + b _0813350A .pool -@08133508: +_08133508: ldr r0, =0x0202420c -@0813350A: +_0813350A: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -568136,13 +568136,13 @@ dp15_stockpile_get_num_uses: ; 8133538 ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08133554 + bne _08133554 ldr r0, =0x0203ab3c - b @08133556 + b _08133556 .pool -@08133554: +_08133554: ldr r0, =0x0202420c -@08133556: +_08133556: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -568189,13 +568189,13 @@ dp15_get_dp08_item__8: ; 81335AC ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @081335C8 + bne _081335C8 ldr r0, =0x0203ab3c - b @081335CA + b _081335CA .pool -@081335C8: +_081335C8: ldr r0, =0x0202420c -@081335CA: +_081335CA: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -568287,13 +568287,13 @@ dp15_get_protect_endure_activity: ; 813367C ldrb r1, [r1, 0x1] adds r4, r0, 0 cmp r1, 0x1 - bne @08133698 + bne _08133698 ldr r0, =0x0203ab3c - b @0813369A + b _0813369A .pool -@08133698: +_08133698: ldr r0, =0x0202420c -@0813369A: +_0813369A: ldrb r3, [r0] ldr r0, =0x020244a8 ldr r0, [r0] @@ -568394,7 +568394,7 @@ dp15_return: ; 8133730 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] @@ -568402,7 +568402,7 @@ dp15_return: ; 8133730 movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x10] -@0813374A: +_0813374A: pop {r0} bx r0 .pool @@ -568415,18 +568415,18 @@ dp15_compare_attacker_defender_levels: ; 8133754 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 .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] @@ -568443,10 +568443,10 @@ dp15_compare_attacker_defender_levels: ; 8133754 ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bhi @081337FA - b @08133820 + bhi _081337FA + b _08133820 .pool -@081337A8: +_081337A8: ldr r3, =0x02024084 ldr r0, =0x0203ab3c ldrb r0, [r0] @@ -568463,10 +568463,10 @@ dp15_compare_attacker_defender_levels: ; 8133754 ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bcc @081337FA - b @08133820 + bcc _081337FA + b _08133820 .pool -@081337D8: +_081337D8: ldr r3, =0x02024084 ldr r0, =0x0203ab3c ldrb r0, [r0] @@ -568483,8 +568483,8 @@ dp15_compare_attacker_defender_levels: ; 8133754 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 @@ -568496,12 +568496,12 @@ dp15_compare_attacker_defender_levels: ; 8133754 lsls r0, 24 orrs r1, r0 str r1, [r5] - b @08133824 + b _08133824 .pool -@08133820: +_08133820: adds r0, r4, 0x6 str r0, [r5] -@08133824: +_08133824: pop {r4,r5} pop {r0} bx r0 @@ -568520,7 +568520,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] @@ -568534,14 +568534,14 @@ tai5C_unk: ; 813382C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08133874 + b _08133874 .pool -@0813386C: +_0813386C: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08133874: +_08133874: pop {r0} bx r0 .pool @@ -568560,7 +568560,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] @@ -568574,14 +568574,14 @@ tai5D_unk: ; 813387C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081338C4 + b _081338C4 .pool -@081338BC: +_081338BC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@081338C4: +_081338C4: pop {r0} bx r0 .pool @@ -568599,7 +568599,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] @@ -568613,14 +568613,14 @@ tai5E_unk: ; 81338CC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08133914 + b _08133914 .pool -@0813390C: +_0813390C: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08133914: +_08133914: pop {r0} bx r0 .pool @@ -568643,7 +568643,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] @@ -568656,13 +568656,13 @@ tai61_unk: ; 813391C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08133966 + b _08133966 .pool -@08133960: +_08133960: ldr r0, [r4] adds r0, 0x6 str r0, [r4] -@08133966: +_08133966: pop {r4} pop {r0} bx r0 @@ -568719,11 +568719,11 @@ 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 .pool -@081339D4: +_081339D4: subs r0, 0x1 strb r0, [r1] ldr r2, =0x0203ab38 @@ -568737,7 +568737,7 @@ b_mc_stack_pop_cursor: ; 81339B8 ldr r0, [r1] str r0, [r2] movs r0, 0x1 -@081339EE: +_081339EE: pop {r1} bx r1 .pool @@ -568758,7 +568758,7 @@ sub_81339F8: ; 81339F8 strb r2, [r1] movs r4, 0 ldr r6, =gUnknown_085B09E4 -@08133A12: +_08133A12: movs r0, 0xB muls r0, r4 adds r0, 0x5 @@ -568782,7 +568782,7 @@ sub_81339F8: ; 81339F8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @08133A12 + bls _08133A12 pop {r4-r6} pop {r0} bx r0 @@ -568838,17 +568838,17 @@ 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 .pool -@08133AF0: +_08133AF0: ldrb r1, [r1] lsls r1, 5 ldr r0, =gUnknown_085A5C09 @@ -568856,16 +568856,16 @@ sub_8133A78: ; 8133A78 movs r0, 0x1 movs r2, 0 bl GetStringWidth -@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 @@ -568885,11 +568885,11 @@ sub_8133A78: ; 8133A78 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 @@ -568904,9 +568904,9 @@ sub_8133A78: ; 8133A78 ldr r2, =gUnknown_085E8D38 movs r3, 0x8 bl Print - b @08133B94 + b _08133B94 .pool -@08133B70: +_08133B70: ldrb r0, [r7, 0x6] ldrb r2, [r1] lsls r2, 5 @@ -568924,12 +568924,12 @@ sub_8133A78: ; 8133A78 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, =gUnknown_085EB7EA lsls r1, r5, 4 @@ -568973,17 +568973,17 @@ 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 .pool -@08133C14: +_08133C14: ldr r0, =0x020375e0 strh r2, [r0] -@08133C18: +_08133C18: ldrb r0, [r4, 0x6] movs r1, 0 bl sub_8198070 @@ -569018,25 +569018,25 @@ 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 .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 @@ -569062,7 +569062,7 @@ sub_8133C48: ; 8133C48 ldrb r1, [r0] adds r0, r7, 0 bl sub_8133BE4 -@08133CCA: +_08133CCA: pop {r4-r7} pop {r0} bx r0 @@ -569087,26 +569087,26 @@ 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 .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 @@ -569131,7 +569131,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 @@ -569139,7 +569139,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 @@ -569148,7 +569148,7 @@ sub_8133D2C: ; 8133D2C bl sub_8127250 movs r0, 0x1 strh r0, [r6] -@08133D72: +_08133D72: pop {r4-r6} pop {r0} bx r0 @@ -569175,7 +569175,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] @@ -569196,14 +569196,14 @@ sub_8133DA0: ; 8133DA0 lsls r1, 5 adds r1, r4 bl CopyString - b @08133E04 + b _08133E04 .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 @@ -569299,9 +569299,9 @@ sub_8133EDC: ; 8133EDC lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x3 - bls @08133EE8 + bls _08133EE8 movs r1, 0 -@08133EE8: +_08133EE8: ldr r0, =gUnknown_085B1DF8 lsls r1, 1 adds r1, r0 @@ -569655,7 +569655,7 @@ sub_813425C: ; 813425C movs r0, 0x1 ands r0, r3 cmp r0, 0 - beq @081342F8 + beq _081342F8 bl sub_8134604 ldr r0, =gUnknown_085B1F40 ldr r1, =gUnknown_085B1DEC @@ -569697,29 +569697,29 @@ sub_813425C: ; 813425C strh r0, [r6, 0xA] ldr r0, =sub_8134340 str r0, [r6] - b @08134334 + b _08134334 .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 str r0, [r6] - b @08134334 + b _08134334 .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 @@ -569729,7 +569729,7 @@ sub_813425C: ; 813425C strh r1, [r0, 0x8] ldr r1, =sub_8134640 str r1, [r0] -@08134334: +_08134334: pop {r4-r7} pop {r0} bx r0 @@ -569758,18 +569758,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 str r0, [r2] -@0813437E: +_0813437E: pop {r0} bx r0 .pool @@ -569830,19 +569830,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 @@ -569855,9 +569855,9 @@ sub_8134400: ; 8134400 ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 - b @0813449A + b _0813449A .pool -@08134450: +_08134450: movs r0, 0x5 bl audio_play ldr r0, =0x03005e00 @@ -569890,7 +569890,7 @@ sub_8134400: ; 8134400 bl RemoveObjectAndFreeTiles ldr r0, =sub_81344AC str r0, [r5] -@0813449A: +_0813449A: pop {r4-r6} pop {r0} bx r0 @@ -570215,17 +570215,17 @@ 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 StartObjectImageAnimIfDifferent - b @08134770 + b _08134770 .pool -@08134768: +_08134768: adds r0, r3, 0 movs r1, 0 bl StartObjectImageAnimIfDifferent -@08134770: +_08134770: pop {r0} bx r0 thumb_func_end sub_813473C @@ -570238,34 +570238,34 @@ sub_8134774: ; 8134774 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 @@ -570350,7 +570350,7 @@ LoadWallClockGraphics: ; 81347C8 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@0813486C: +_0813486C: strh r6, [r2] mov r0, sp str r0, [r1] @@ -570360,7 +570360,7 @@ LoadWallClockGraphics: ; 81347C8 adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @0813486C + bhi _0813486C strh r6, [r2] mov r2, sp str r2, [r1] @@ -570405,19 +570405,19 @@ LoadWallClockGraphics: ; 81347C8 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne @081348FC + bne _081348FC ldr r0, =gUnknown_08DCC01C movs r1, 0 movs r2, 0x20 bl gpu_pal_apply - b @08134906 + b _08134906 .pool -@081348FC: +_081348FC: ldr r0, =gUnknown_08DCC03C movs r1, 0 movs r2, 0x20 bl gpu_pal_apply -@08134906: +_08134906: bl sub_8098C64 movs r1, 0xE0 movs r2, 0x20 @@ -570669,19 +570669,19 @@ Cb2_ViewWallClock: ; 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 .pool -@08134B9C: +_08134B9C: movs r1, 0x5A mov r10, r1 movs r2, 0x87 str r2, [sp, 0xC] -@08134BA4: +_08134BA4: ldr r0, =gUnknown_085B2250 movs r1, 0x78 movs r2, 0x50 @@ -570811,7 +570811,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 @@ -570819,7 +570819,7 @@ sub_8134CB8: ; 8134CB8 adds r1, r0 ldr r0, =sub_8134CE8 str r0, [r1] -@08134CD8: +_08134CD8: pop {r0} bx r0 .pool @@ -570841,15 +570841,15 @@ 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 .pool -@08134D1C: +_08134D1C: movs r2, 0xE ldrsh r1, [r5, r2] lsls r0, r1, 1 @@ -570881,41 +570881,41 @@ sub_8134CE8: ; 8134CE8 adds r1, r3, 0 ands r1, r0 cmp r1, 0 - beq @08134D70 + beq _08134D70 ldr r0, =sub_8134DC4 str r0, [r5] - b @08134DBE + b _08134DBE .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 @@ -570925,10 +570925,10 @@ sub_8134CE8: ; 8134CE8 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 @@ -570989,19 +570989,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 @@ -571010,9 +571010,9 @@ c3_80BF560: ; 8134E30 lsls r1, 3 adds r1, r0 ldr r0, =sub_8134EA4 - b @08134E94 + b _08134E94 .pool -@08134E74: +_08134E74: movs r0, 0x5 bl audio_play movs r0, 0 @@ -571026,9 +571026,9 @@ c3_80BF560: ; 8134E30 lsls r1, 3 adds r1, r0 ldr r0, =sub_8134CE8 -@08134E94: +_08134E94: str r0, [r1] -@08134E96: +_08134E96: pop {r4} pop {r0} bx r0 @@ -571075,12 +571075,12 @@ c2_080111BC: ; 8134EE8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08134F02 + bne _08134F02 bl FreeAllWindowBuffers ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 -@08134F02: +_08134F02: pop {r0} bx r0 .pool @@ -571096,7 +571096,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 @@ -571104,7 +571104,7 @@ sub_8134F10: ; 8134F10 adds r1, r0 ldr r0, =sub_8134F40 str r0, [r1] -@08134F30: +_08134F30: pop {r0} bx r0 .pool @@ -571122,7 +571122,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 @@ -571130,7 +571130,7 @@ sub_8134F40: ; 8134F40 adds r1, r0 ldr r0, =sub_8134F78 str r0, [r1] -@08134F66: +_08134F66: pop {r4} pop {r0} bx r0 @@ -571173,11 +571173,11 @@ sub_8134FB0: ; 8134FB0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08134FC6 + bne _08134FC6 ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 -@08134FC6: +_08134FC6: pop {r0} bx r0 .pool @@ -571190,22 +571190,22 @@ sub_8134FD4: ; 8134FD4 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 @@ -571224,35 +571224,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} @@ -571267,11 +571267,11 @@ sub_813504C: ; 813504C 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 @@ -571281,30 +571281,30 @@ sub_813504C: ; 813504C 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 .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 @@ -571314,29 +571314,29 @@ sub_813504C: ; 813504C 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 .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} @@ -571357,32 +571357,32 @@ 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 .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 @@ -571434,13 +571434,13 @@ sub_8135130: ; 8135130 movs r0, 0x2 ldrsb r0, [r5, r0] cmp r0, 0xB - bgt @081351A0 + bgt _081351A0 movs r0, 0 - b @081351A2 + b _081351A2 .pool -@081351A0: +_081351A0: movs r0, 0x1 -@081351A2: +_081351A2: strh r0, [r6, 0x12] pop {r4-r6} pop {r0} @@ -571466,9 +571466,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 @@ -571476,9 +571476,9 @@ sub_81351AC: ; 81351AC 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 @@ -571503,19 +571503,19 @@ sub_81351AC: ; 81351AC 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 @@ -571544,9 +571544,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 @@ -571554,9 +571554,9 @@ sub_8135244: ; 8135244 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 @@ -571581,19 +571581,19 @@ sub_8135244: ; 8135244 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 @@ -571617,45 +571617,45 @@ 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 .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 @@ -571664,10 +571664,10 @@ sub_81352DC: ; 81352DC 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] @@ -571678,10 +571678,10 @@ sub_81352DC: ; 81352DC 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} @@ -571704,45 +571704,45 @@ 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 .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 @@ -571751,10 +571751,10 @@ sub_8135380: ; 8135380 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] @@ -571765,10 +571765,10 @@ sub_8135380: ; 8135380 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} @@ -571802,16 +571802,16 @@ 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 .pool -@08135470: +_08135470: movs r0, 0 -@08135472: +_08135472: pop {r4,r5} pop {r1} bx r1 @@ -571853,17 +571853,17 @@ task08_080C9820: ; 813549C bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive lsls r0, 24 cmp r0, 0 - beq @081354D2 + beq _081354D2 adds r0, r4, 0 bl FieldObjectClearAnimIfSpecialAnimFinished 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 FieldEffectStart ldr r0, =0x03005e00 @@ -571872,9 +571872,9 @@ task08_080C9820: ; 813549C lsls r1, 3 adds r1, r0 ldr r0, =sub_8135578 - b @0813551C + b _0813551C .pool -@08135504: +_08135504: bl sub_808C114 adds r0, r4, 0 movs r1, 0x39 @@ -571885,9 +571885,9 @@ task08_080C9820: ; 813549C lsls r1, 3 adds r1, r0 ldr r0, =sub_813552C -@0813551C: +_0813551C: str r0, [r1] -@0813551E: +_0813551E: pop {r4-r6} pop {r0} bx r0 @@ -571910,7 +571910,7 @@ sub_813552C: ; 813552C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08135560 + bne _08135560 movs r0, 0x3B bl FieldEffectStart ldr r0, =0x03005e00 @@ -571920,7 +571920,7 @@ sub_813552C: ; 813552C adds r1, r0 ldr r0, =sub_8135578 str r0, [r1] -@08135560: +_08135560: pop {r4} pop {r0} bx r0 @@ -571937,32 +571937,32 @@ sub_8135578: ; 8135578 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @081355FC + bne _081355FC bl player_get_direction_lower_nybble 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 @@ -571993,7 +571993,7 @@ sub_8135578: ; 8135578 adds r0, r1 ldr r1, =sub_813561C str r1, [r0] -@081355FC: +_081355FC: pop {r4-r7} pop {r0} bx r0 @@ -572033,7 +572033,7 @@ sub_8135654: ; 8135654 bl sub_81797DC lsls r0, 24 cmp r0, 0 - beq @0813568C + beq _0813568C ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 @@ -572044,27 +572044,27 @@ sub_8135654: ; 8135654 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_8179834 - b @081356A8 + b _081356A8 .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 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_81356C4 -@081356A8: +_081356A8: str r0, [r1] movs r0, 0x1 -@081356AC: +_081356AC: pop {r4} pop {r1} bx r1 @@ -572128,10 +572128,10 @@ sub_813572C: ; 813572C 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 str r0, [r1] @@ -572139,7 +572139,7 @@ sub_813572C: ; 813572C ldr r0, =hm2_dig str r0, [r1] movs r0, 0x1 -@0813574C: +_0813574C: pop {r1} bx r1 .pool @@ -572179,10 +572179,10 @@ sub_8135780: ; 8135780 bl sub_81795E8 lsls r0, 24 cmp r0, 0 - bne @081357AC + bne _081357AC movs r0, 0x1 bl SetPlayerAvatarTransitionFlags -@081357AC: +_081357AC: movs r0, 0 pop {r1} bx r1 @@ -572198,10 +572198,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 movs r1, 0x8 bl AddTask @@ -572213,7 +572213,7 @@ sub_81357BC: ; 81357BC lsls r1, 3 adds r1, r2 strh r4, [r1, 0x8] -@081357EE: +_081357EE: pop {r4} pop {r0} bx r0 @@ -572254,18 +572254,18 @@ 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 .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, =gUnknown_085B269B @@ -572273,9 +572273,9 @@ sub_81357FC: ; 81357FC ldr r4, =0x00000808 adds r1, r5, r4 movs r0, 0x2 - b @081358D2 + b _081358D2 .pool -@08135888: +_08135888: ldr r1, =0x00000804 adds r0, r5, r1 ldr r1, =gUnknown_085B269D @@ -572283,9 +572283,9 @@ sub_81357FC: ; 81357FC ldr r4, =0x00000808 adds r0, r5, r4 strb r2, [r0] - b @081358D4 + b _081358D4 .pool -@081358A4: +_081358A4: ldr r0, =0x00000804 adds r1, r5, r0 ldr r0, =gUnknown_085B269F @@ -572293,9 +572293,9 @@ sub_81357FC: ; 81357FC ldr r4, =0x00000808 adds r1, r5, r4 movs r0, 0x2 - b @081358D2 + b _081358D2 .pool -@081358C0: +_081358C0: ldr r0, =0x0203ab50 ldr r1, [r0] ldr r0, =0x00000804 @@ -572305,9 +572305,9 @@ sub_81357FC: ; 81357FC ldr r4, =0x00000808 adds r1, r4 movs r0, 0x3 -@081358D2: +_081358D2: strb r0, [r1] -@081358D4: +_081358D4: ldr r0, =sub_813594C bl SetMainCallback2 pop {r4-r6} @@ -572363,23 +572363,23 @@ sub_8135938: ; 8135938 thumb_func_start sub_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 @@ -572394,52 +572394,52 @@ 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 .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 .pool -@08135A08: +_08135A08: bl ResetObjectPaletteAllocator - b @08135B9E -@08135A0E: + b _08135B9E +_08135A0E: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] @@ -572450,25 +572450,25 @@ sub_8135978: ; 8135978 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @08135BA6 + b _08135BA6 .pool -@08135A30: +_08135A30: bl ResetAllObjectData - 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 .pool -@08135A54: +_08135A54: bl sub_8135BDC ldr r0, =0x0203ab50 ldr r0, [r0] @@ -572476,27 +572476,27 @@ sub_8135978: ; 8135978 adds r0, r1 movs r1, 0 strh r1, [r0] - b @08135B9E + b _08135B9E .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 .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 @@ -572510,18 +572510,18 @@ sub_8135978: ; 8135978 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @08135BA6 + b _08135BA6 .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 .pool -@08135ADC: +_08135ADC: ldr r0, =0x0203ab48 ldrh r0, [r0, 0x4] ldr r1, =0x00001005 @@ -572530,23 +572530,23 @@ sub_8135978: ; 8135978 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @08135BA6 + b _08135BA6 .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 .pool -@08135B14: +_08135B14: bl sub_81363BC - b @08135B9E -@08135B1A: + b _08135B9E +_08135B1A: ldr r0, =sub_81365C8 movs r1, 0 bl AddTask @@ -572570,12 +572570,12 @@ sub_8135978: ; 8135978 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @08135BA6 + b _08135BA6 .pool -@08135B64: +_08135B64: bl sub_8135DAC - b @08135B9E -@08135B6A: + b _08135B9E +_08135B6A: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -572585,9 +572585,9 @@ sub_8135978: ; 8135978 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @08135BA6 + b _08135BA6 .pool -@08135B84: +_08135B84: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -572600,28 +572600,28 @@ sub_8135978: ; 8135978 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 .pool -@08135BB8: +_08135BB8: ldr r0, =sub_8135938 bl SetVBlankCallback ldr r0, =sub_813591C bl SetMainCallback2 movs r0, 0x1 - b @08135BD2 + b _08135BD2 .pool -@08135BD0: +_08135BD0: movs r0, 0 -@08135BD2: +_08135BD2: add sp, 0x4 pop {r4} pop {r1} @@ -572674,22 +572674,22 @@ 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 .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, =gUnknown_08D9B2B4 movs r0, 0 @@ -572698,48 +572698,48 @@ sub_8135C38: ; 8135C38 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @08135CDE + b _08135CDE .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, =gUnknown_08D9B7C8 ldr r4, =0x0203ab50 ldr r1, [r4] bl LZDecompressWram ldr r1, [r4] - b @08135CE2 + b _08135CE2 .pool -@08135CBC: +_08135CBC: ldr r0, =gUnknown_08D9B470 movs r1, 0 movs r2, 0xC0 bl decompress_palette - b @08135CDE + b _08135CDE .pool -@08135CCC: +_08135CCC: ldr r0, =gUnknown_085B26F4 bl LoadCompressedObjectPic - b @08135CDE + b _08135CDE .pool -@08135CD8: +_08135CD8: ldr r0, =gUnknown_085B26FC bl LoadCompressedObjectPalette -@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 .pool -@08135CFC: +_08135CFC: bl sub_8122328 ldr r0, =0x0203ab50 ldr r0, [r0] @@ -572748,11 +572748,11 @@ sub_8135C38: ; 8135C38 movs r1, 0 strh r1, [r0] movs r0, 0x1 - b @08135D1A + b _08135D1A .pool -@08135D18: +_08135D18: movs r0, 0 -@08135D1A: +_08135D1A: add sp, 0x4 pop {r4} pop {r1} @@ -572778,7 +572778,7 @@ sub_8135D24: ; 8135D24 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -@08135D50: +_08135D50: adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -572786,7 +572786,7 @@ sub_8135D24: ; 8135D24 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 @@ -572857,14 +572857,14 @@ sub_8135DAC: ; 8135DAC movs r2, 0 bl sub_8135D7C movs r4, 0 -@08135DFE: +_08135DFE: adds r0, r4, 0 bl PutWindowTilemap adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls @08135DFE + bls _08135DFE pop {r4} pop {r0} bx r0 @@ -572882,9 +572882,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 @@ -572912,8 +572912,8 @@ sub_8135E2C: ; 8135E2C 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 @@ -573019,7 +573019,7 @@ sub_8135F70: ; 8135F70 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - beq @08135F9C + beq _08135F9C movs r0, 0x5 bl audio_play ldr r2, =0x02020630 @@ -573035,17 +573035,17 @@ sub_8135F70: ; 8135F70 adds r0, r2 ldr r1, =sub_8136470 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 @@ -573065,7 +573065,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 @@ -573080,7 +573080,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 @@ -573089,20 +573089,20 @@ sub_8135FCC: ; 8135FCC 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 .pool -@0813602C: +_0813602C: movs r0, 0xF strh r0, [r6] strh r0, [r6, 0x2] -@08136032: +_08136032: adds r0, r5, 0 movs r1, 0x3 bl __udivsi3 @@ -573133,7 +573133,7 @@ sub_8135FCC: ; 8135FCC lsls r0, r7, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls @08136002 + bls _08136002 ldr r4, =0x02021cc4 mov r0, r8 bl sub_8136EDC @@ -573148,15 +573148,15 @@ sub_8135FCC: ; 8135FCC adds r1, r4, 0 movs r2, 0x4 bl sub_8135D7C - b @081360F8 + b _081360F8 .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 @@ -573188,11 +573188,11 @@ sub_8135FCC: ; 8135FCC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls @081360AA + bls _081360AA movs r0, 0x7 movs r1, 0x2 bl CopyWindowToVram -@081360F8: +_081360F8: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r0, 0x2 @@ -573237,26 +573237,26 @@ sub_8136140: ; 8136140 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 @@ -573270,18 +573270,18 @@ sub_8136140: ; 8136140 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 @@ -573301,7 +573301,7 @@ sub_81361B0: ; 81361B0 ldr r1, =0x00000848 adds r6, r0, r1 cmp r4, r5 - beq @08136246 + beq _08136246 movs r0, 0x8 bl Alloc adds r7, r0, 0 @@ -573312,15 +573312,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 @@ -573332,17 +573332,17 @@ sub_81361B0: ; 81361B0 lsls r3, 16 asrs r0, r3, 16 cmp r0, r4 - blt @081361E8 - b @08136234 + blt _081361E8 + b _08136234 .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 @@ -573356,8 +573356,8 @@ sub_81361B0: ; 81361B0 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] @@ -573366,7 +573366,7 @@ sub_81361B0: ; 81361B0 str r1, [r2, 0x4] adds r0, r7, 0 bl Free -@08136246: +_08136246: pop {r4-r7} pop {r0} bx r0 @@ -573395,7 +573395,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 @@ -573403,19 +573403,19 @@ sub_813625C: ; 813625C 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 @@ -573426,18 +573426,18 @@ sub_813625C: ; 813625C 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 .pool -@081362D0: +_081362D0: ldr r1, =0x0000080b adds r0, r1 strb r2, [r0] -@081362D6: +_081362D6: pop {r4,r5} pop {r0} bx r0 @@ -573452,7 +573452,7 @@ sub_81362E0: ; 81362E0 adds r3, r0, 0 ldr r4, =0x0203ab50 cmp r1, 0 - beq @08136308 + beq _08136308 ldrh r0, [r3, 0x6] ldr r1, [r4] ldr r5, =0x0000080b @@ -573463,10 +573463,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] @@ -573476,17 +573476,17 @@ sub_81362E0: ; 81362E0 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 .pool -@08136338: +_08136338: subs r0, 0x1 strh r0, [r3, 0x4] -@0813633C: +_0813633C: pop {r4,r5} pop {r0} bx r0 @@ -573499,12 +573499,12 @@ sub_8136344: ; 8136344 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] @@ -573516,9 +573516,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] @@ -573531,7 +573531,7 @@ sub_8136344: ; 8136344 ldrh r0, [r3, 0x4] subs r0, 0x4 cmp r4, r0 - bge @081363A4 + bge _081363A4 ldrh r2, [r5, 0x6] ldr r1, [r6] ldr r7, =0x0000080b @@ -573542,8 +573542,8 @@ sub_8136344: ; 8136344 adds r1, r0 ldrb r1, [r1] cmp r2, r1 - bne @08136374 -@081363A4: + bne _08136374 +_081363A4: pop {r4-r7} pop {r0} bx r0 @@ -573560,7 +573560,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] @@ -573583,7 +573583,7 @@ sub_81363BC: ; 81363BC ldr r2, =0x00000e7c adds r1, r2 strb r0, [r1] -@081363FC: +_081363FC: add sp, 0x10 pop {r4} pop {r0} @@ -573600,14 +573600,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 @@ -573645,18 +573645,18 @@ sub_8136470: ; 8136470 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 @@ -573671,9 +573671,9 @@ sub_8136470: ; 8136470 movs r0, 0x1 strh r0, [r4, 0x2E] strh r5, [r4, 0x30] - b @081364E0 + b _081364E0 .pool -@081364B4: +_081364B4: ldrh r0, [r4, 0x30] adds r0, 0x1 movs r2, 0 @@ -573681,7 +573681,7 @@ sub_8136470: ; 8136470 lsls r0, 16 asrs r0, 16 cmp r0, 0xB - ble @081364E0 + ble _081364E0 ldrb r1, [r4, 0x1] movs r0, 0x4 negs r0, r0 @@ -573695,7 +573695,7 @@ sub_8136470: ; 8136470 bl rotscale_free_entry ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@081364E0: +_081364E0: pop {r4,r5} pop {r0} bx r0 @@ -573745,7 +573745,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 @@ -573755,11 +573755,11 @@ sub_8136524: ; 8136524 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bhi @0813655A + bhi _0813655A ldr r1, =0x03005dac ldr r0, =sub_80AF168 str r0, [r1] -@0813655A: +_0813655A: ldrb r0, [r2] ldr r4, =0x0203ab4e subs r2, r4, 0x2 @@ -573774,22 +573774,22 @@ sub_8136524: ; 8136524 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq @081365A4 + beq _081365A4 bl SetMainCallback2 - b @081365AC + b _081365AC .pool -@081365A4: +_081365A4: subs r0, r4, 0x6 ldr r0, [r0] bl SetMainCallback2 -@081365AC: +_081365AC: bl FreeAllWindowBuffers ldr r0, =0x0203ab50 ldr r0, [r0] bl Free adds r0, r5, 0 bl remove_task -@081365BE: +_081365BE: pop {r4-r6} pop {r0} bx r0 @@ -573818,16 +573818,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 @@ -573836,7 +573836,7 @@ sub_81365C8: ; 81365C8 lsrs r0, 16 mov r9, r0 cmp r0, 0 - beq @08136688 + beq _08136688 ldrb r0, [r6] ldr r4, =0x0203ab4e subs r2, r4, 0x2 @@ -573853,7 +573853,7 @@ sub_81365C8: ; 81365C8 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq @08136708 + beq _08136708 movs r0, 0x5 bl audio_play ldrh r0, [r4, 0x4] @@ -573873,9 +573873,9 @@ sub_81365C8: ; 81365C8 add r0, r8 ldr r1, =sub_813671C str r1, [r0] - b @08136708 + b _08136708 .pool -@08136688: +_08136688: ldr r5, =0x0203ab48 ldrh r2, [r5, 0x4] mov r8, r2 @@ -573888,24 +573888,24 @@ sub_81365C8: ; 81365C8 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 .pool -@081366D0: +_081366D0: movs r0, 0x5 bl audio_play ldr r0, =0x020375f0 @@ -573917,16 +573917,16 @@ sub_81365C8: ; 81365C8 strh r1, [r0] adds r0, r7, 0 bl sub_81364EC - b @08136708 + b _08136708 .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 @@ -573955,24 +573955,24 @@ 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 .pool -@0813676C: +_0813676C: ldr r6, =0x0203ab48 ldrh r4, [r6, 0x6] ldrh r5, [r6, 0x4] @@ -573985,13 +573985,13 @@ sub_813671C: ; 813671C 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 @@ -574000,23 +574000,23 @@ sub_813671C: ; 813671C 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 .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 @@ -574038,13 +574038,13 @@ sub_813671C: ; 813671C 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 .pool -@08136810: +_08136810: movs r0, 0x5 bl audio_play ldr r0, =0x030022c0 @@ -574052,25 +574052,25 @@ sub_813671C: ; 813671C 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 .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 @@ -574109,28 +574109,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] @@ -574150,7 +574150,7 @@ sub_8136854: ; 8136854 bl sub_81223FC movs r4, 0 lsls r5, r7, 2 -@081368E6: +_081368E6: adds r0, r4, 0 movs r1, 0x5 bl sub_8136110 @@ -574158,7 +574158,7 @@ sub_8136854: ; 8136854 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x8 - bls @081368E6 + bls _081368E6 ldr r0, =0x0203ab48 ldrh r0, [r0, 0x4] ldr r1, =0x00001005 @@ -574191,13 +574191,13 @@ sub_8136938: ; 8136938 adds r0, r1 ldrb r0, [r0] cmp r0, 0x3 - bne @08136968 + bne _08136968 movs r0, 0x8 - b @0813696A + b _0813696A .pool -@08136968: +_08136968: movs r0, 0x9 -@0813696A: +_0813696A: strh r0, [r6, 0x2] bl sub_8136418 ldrb r0, [r6, 0x2] @@ -574251,23 +574251,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, =gUnknown_085B2668 @@ -574284,7 +574284,7 @@ sub_81369E0: ; 81369E0 ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -@08136A3C: +_08136A3C: pop {r4-r6} pop {r0} bx r0 @@ -574460,7 +574460,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 @@ -574499,7 +574499,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 @@ -574580,18 +574580,18 @@ sub_8136C8C: ; 8136C8C lsls r4, 16 asrs r4, 16 cmp r4, 0 - bne @08136D10 + bne _08136D10 adds r0, 0x1 - b @08136D1A + b _08136D1A .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 @@ -574754,14 +574754,14 @@ sub_8136E20: ; 8136E20 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 @@ -574776,7 +574776,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 @@ -574786,12 +574786,12 @@ sub_8136EA4: ; 8136EA4 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} @@ -574806,9 +574806,9 @@ sub_8136EDC: ; 8136EDC 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 @@ -574820,26 +574820,26 @@ sub_8136EF4: ; 8136EF4 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 .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 @@ -574854,7 +574854,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 @@ -574866,11 +574866,11 @@ sub_8136F2C: ; 8136F2C str r0, [r2] str r1, [r2, 0x4] movs r0, 0x1 - b @08136F62 + b _08136F62 .pool -@08136F60: +_08136F60: movs r0, 0 -@08136F62: +_08136F62: pop {r4} pop {r1} bx r1 @@ -574889,15 +574889,15 @@ 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 .pool -@08136F94: +_08136F94: movs r0, 0 -@08136F96: +_08136F96: pop {r1} bx r1 thumb_func_end sub_8136F68 @@ -574909,42 +574909,42 @@ sub_8136F9C: ; 8136F9C 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 @@ -574964,7 +574964,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 @@ -574974,7 +574974,7 @@ sub_8136FE4: ; 8136FE4 lsls r0, 16 asrs r1, r0, 16 cmp r1, 0 - ble @0813702A + ble _0813702A adds r0, r7, r4 add r0, r9 ldrb r0, [r0] @@ -574986,10 +574986,10 @@ sub_8136FE4: ; 8136FE4 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} @@ -575028,7 +575028,7 @@ sub_8137068: ; 8137068 lsrs r5, r0, 24 movs r4, 0 ldr r7, =gUnknown_085B262C -@08137074: +_08137074: lsls r1, r4, 3 ldr r0, =gUnknown_085B2720 adds r1, r0 @@ -575036,7 +575036,7 @@ sub_8137068: ; 8137068 bl sub_8136FE4 lsls r0, 16 cmp r0, 0 - ble @081370A0 + ble _081370A0 adds r0, r4, 0x1 lsls r0, 2 adds r0, r7 @@ -575044,16 +575044,16 @@ sub_8137068: ; 8137068 adds r0, r6, 0 bl CopyString movs r0, 0x1 - b @081370AC + b _081370AC .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 @@ -575065,7 +575065,7 @@ sub_81370B4: ; 81370B4 adds r5, r0, 0 movs r7, 0 movs r6, 0 -@081370BC: +_081370BC: adds r1, r7, 0x1 lsls r1, 24 lsrs r1, 24 @@ -575081,16 +575081,16 @@ sub_81370B4: ; 81370B4 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} @@ -575104,7 +575104,7 @@ sub_81370FC: ; 81370FC bl sub_81798D0 lsls r0, 24 cmp r0, 0 - beq @08137134 + beq _08137134 ldr r4, =0x020375f0 bl brm_get_pokemon_selection lsls r0, 24 @@ -575115,31 +575115,31 @@ sub_81370FC: ; 81370FC str r0, [r1] ldr r1, =0x0203ceec ldr r0, =sub_8179918 - b @08137152 + b _08137152 .pool -@08137134: +_08137134: ldr r0, =0x02037318 ldrb r0, [r0, 0x15] cmp r0, 0x1 - bne @08137170 + bne _08137170 ldr r0, =0x00000888 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @08137170 + bne _08137170 ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] ldr r1, =0x0203ceec ldr r0, =hm2_flash -@08137152: +_08137152: str r0, [r1] movs r0, 0x1 - b @08137172 + b _08137172 .pool -@08137170: +_08137170: movs r0, 0 -@08137172: +_08137172: pop {r4} pop {r1} bx r1 @@ -575292,11 +575292,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 SetMainCallback2 -@081372D2: +_081372D2: add sp, 0x8 pop {r4} pop {r0} @@ -575317,27 +575317,27 @@ sub_8137304: ; 8137304 ldr r4, =gUnknown_085B27C8 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 .pool -@08137348: +_08137348: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -575345,10 +575345,10 @@ sub_8137304: ; 8137304 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 @@ -575365,21 +575365,21 @@ sub_8137360: ; 8137360 ldr r1, =gUnknown_085B27C8 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 .pool -@08137390: +_08137390: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -575387,10 +575387,10 @@ sub_8137360: ; 8137360 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 @@ -575407,21 +575407,21 @@ fade_type_for_given_maplight_pair: ; 81373A8 ldr r1, =gUnknown_085B27C8 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 .pool -@081373D8: +_081373D8: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -575429,10 +575429,10 @@ fade_type_for_given_maplight_pair: ; 81373A8 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 @@ -575539,18 +575539,18 @@ sub_81374C4: ; 81374C4 movs r0, 0x52 bl SetGpuReg cmp r4, 0x10 - bhi @081374F8 + bhi _081374F8 ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] - b @08137500 + b _08137500 .pool -@081374F8: +_081374F8: movs r0, 0 strh r0, [r5, 0xC] ldr r0, =sub_813750C str r0, [r5] -@08137500: +_08137500: pop {r4,r5} pop {r0} bx r0 @@ -575573,7 +575573,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 @@ -575585,9 +575585,9 @@ sub_813750C: ; 813750C lsrs r2, 16 movs r1, 0xE0 bl gpu_pal_apply - b @08137566 + b _08137566 .pool -@08137554: +_08137554: ldr r0, =gUnknown_085B2850 movs r1, 0 movs r2, 0x20 @@ -575596,7 +575596,7 @@ sub_813750C: ; 813750C str r0, [r4] movs r0, 0x8 strh r0, [r4, 0xC] -@08137566: +_08137566: pop {r4} pop {r0} bx r0 @@ -575617,16 +575617,16 @@ 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 .pool -@08137598: +_08137598: ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 -@081375A0: +_081375A0: pop {r0} bx r0 .pool @@ -575727,7 +575727,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] @@ -575740,9 +575740,9 @@ sub_8137678: ; 8137678 lsrs r2, 16 movs r1, 0xE0 bl gpu_pal_apply - b @081376C8 + b _081376C8 .pool -@081376B4: +_081376B4: ldr r1, =0x00001010 movs r0, 0x52 bl SetGpuReg @@ -575751,7 +575751,7 @@ sub_8137678: ; 8137678 bl SetGpuReg ldr r0, =sub_81376DC str r0, [r4] -@081376C8: +_081376C8: pop {r4} pop {r0} bx r0 @@ -575780,13 +575780,13 @@ sub_81376DC: ; 81376DC movs r0, 0x52 bl SetGpuReg cmp r4, 0 - beq @08137714 + beq _08137714 ldrh r0, [r5, 0xA] adds r0, 0x1 strh r0, [r5, 0xA] - b @08137726 + b _08137726 .pool -@08137714: +_08137714: ldr r0, =gUnknown_085B2870 movs r1, 0 movs r2, 0x20 @@ -575794,7 +575794,7 @@ sub_81376DC: ; 81376DC ldr r0, =0x030022c0 ldr r0, [r0, 0x8] bl SetMainCallback2 -@08137726: +_08137726: pop {r4,r5} pop {r0} bx r0 @@ -575814,22 +575814,22 @@ 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 .pool -@08137760: +_08137760: ldr r1, =0x0203bce4 movs r0, 0 strb r0, [r1] adds r0, r4, 0 bl FlagSet -@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] @@ -575841,27 +575841,27 @@ sub_8137734: ; 8137734 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 .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 @@ -575874,17 +575874,17 @@ sub_8137734: ; 8137734 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] @@ -575896,13 +575896,13 @@ sub_8137734: ; 8137734 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 @@ -575910,24 +575910,24 @@ sub_8137734: ; 8137734 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 @@ -575936,7 +575936,7 @@ sub_8137734: ; 8137734 adds r0, r1 movs r1, 0x43 bl sub_80EE4DC -@0813785A: +_0813785A: ldr r0, =sub_8173694 bl SetMainCallback2 movs r0, 0 @@ -576024,10 +576024,10 @@ sub_8137904: ; 8137904 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 @@ -576035,8 +576035,8 @@ sub_8137904: ; 8137904 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} @@ -576051,7 +576051,7 @@ sub_813793C: ; 813793C bl sub_8137890 lsrs r6, r0, 16 movs r5, 0 -@08137946: +_08137946: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -576061,23 +576061,23 @@ sub_813793C: ; 813793C 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 .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 @@ -576092,7 +576092,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 GameFreakRTC_CalcLocalDateTime ldr r1, =gUnknown_085B2B44 ldr r0, =0x03005cf8 @@ -576102,15 +576102,15 @@ sub_8137988: ; 8137988 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @081379C8 + beq _081379C8 ldr r0, =0x0000089a bl FlagSet - b @081379CE + b _081379CE .pool -@081379C8: +_081379C8: ldr r0, =0x0000089a bl FlagReset -@081379CE: +_081379CE: pop {r0} bx r0 .pool @@ -576124,11 +576124,11 @@ sub_81379D8: ; 81379D8 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 @@ -576185,23 +576185,23 @@ sub_8137A4C: ; 8137A4C 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 .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 @@ -576218,121 +576218,121 @@ sub_8137A98: ; 8137A98 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, =gUnknown_082A5DAB - b @08137C06 + b _08137C06 .pool -@08137AB0: +_08137AB0: cmp r0, 0x1D - bhi @08137ABC + bhi _08137ABC ldr r0, =gUnknown_082A5DF1 - b @08137C06 + b _08137C06 .pool -@08137ABC: +_08137ABC: cmp r0, 0x27 - bhi @08137AC8 + bhi _08137AC8 ldr r0, =gUnknown_082A5E34 - b @08137C06 + b _08137C06 .pool -@08137AC8: +_08137AC8: cmp r0, 0x31 - bhi @08137AD4 + bhi _08137AD4 ldr r0, =gUnknown_082A5E83 - b @08137C06 + b _08137C06 .pool -@08137AD4: +_08137AD4: cmp r0, 0x3B - bhi @08137AE0 + bhi _08137AE0 ldr r0, =gUnknown_082A5EB9 - b @08137C06 + b _08137C06 .pool -@08137AE0: +_08137AE0: cmp r0, 0x45 - bhi @08137AEC + bhi _08137AEC ldr r0, =gUnknown_082A5EF4 - b @08137C06 + b _08137C06 .pool -@08137AEC: +_08137AEC: cmp r0, 0x4F - bhi @08137AF8 + bhi _08137AF8 ldr r0, =gUnknown_082A5F39 - b @08137C06 + b _08137C06 .pool -@08137AF8: +_08137AF8: cmp r0, 0x59 - bhi @08137B04 + bhi _08137B04 ldr r0, =gUnknown_082A5F82 - b @08137C06 + b _08137C06 .pool -@08137B04: +_08137B04: cmp r0, 0x63 - bhi @08137B10 + bhi _08137B10 ldr r0, =gUnknown_082A5FB9 - b @08137C06 + b _08137C06 .pool -@08137B10: +_08137B10: cmp r0, 0x6D - bhi @08137B1C + bhi _08137B1C ldr r0, =gUnknown_082A6018 - b @08137C06 + b _08137C06 .pool -@08137B1C: +_08137B1C: cmp r0, 0x77 - bhi @08137B28 + bhi _08137B28 ldr r0, =gUnknown_082A6061 - b @08137C06 + b _08137C06 .pool -@08137B28: +_08137B28: cmp r0, 0x81 - bhi @08137B34 + bhi _08137B34 ldr r0, =gUnknown_082A609C - b @08137C06 + b _08137C06 .pool -@08137B34: +_08137B34: cmp r0, 0x8B - bhi @08137B40 + bhi _08137B40 ldr r0, =gUnknown_082A60D5 - b @08137C06 + b _08137C06 .pool -@08137B40: +_08137B40: cmp r0, 0x95 - bhi @08137B4C + bhi _08137B4C ldr r0, =gUnknown_082A6124 - b @08137C06 + b _08137C06 .pool -@08137B4C: +_08137B4C: cmp r0, 0x9F - bhi @08137B58 + bhi _08137B58 ldr r0, =gUnknown_082A616F - b @08137C06 + b _08137C06 .pool -@08137B58: +_08137B58: cmp r0, 0xA9 - bhi @08137B64 + bhi _08137B64 ldr r0, =gUnknown_082A61D6 - b @08137C06 + b _08137C06 .pool -@08137B64: +_08137B64: cmp r0, 0xB3 - bhi @08137B70 + bhi _08137B70 ldr r0, =gUnknown_082A623A - b @08137C06 + b _08137C06 .pool -@08137B70: +_08137B70: cmp r0, 0xBD - bhi @08137B7C + bhi _08137B7C ldr r0, =gUnknown_082A6287 - b @08137C06 + b _08137C06 .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 @@ -576341,7 +576341,7 @@ sub_8137A98: ; 8137A98 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne @08137BEA + bne _08137BEA movs r0, 0xCD lsls r0, 1 bl SpeciesToNationalPokedexNum @@ -576351,12 +576351,12 @@ sub_8137A98: ; 8137A98 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - bne @08137BEA - b @08137C04 + bne _08137BEA + b _08137C04 .pool -@08137BB8: +_08137BB8: cmp r0, 0xC9 - bne @08137BF8 + bne _08137BF8 ldr r0, =0x00000199 bl SpeciesToNationalPokedexNum lsls r0, 16 @@ -576365,7 +576365,7 @@ sub_8137A98: ; 8137A98 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq @08137C04 + beq _08137C04 movs r0, 0xCD lsls r0, 1 bl SpeciesToNationalPokedexNum @@ -576375,21 +576375,21 @@ sub_8137A98: ; 8137A98 bl pokedex_flag_operation lsls r0, 24 cmp r0, 0 - beq @08137C04 -@08137BEA: + beq _08137C04 +_08137BEA: ldr r0, =gUnknown_082A62C9 - b @08137C06 + b _08137C06 .pool -@08137BF8: +_08137BF8: cmp r0, 0xCA - beq @08137C04 -@08137BFC: + beq _08137C04 +_08137BFC: ldr r0, =gUnknown_082A5D6C - b @08137C06 + b _08137C06 .pool -@08137C04: +_08137C04: ldr r0, =gUnknown_082A6312 -@08137C06: +_08137C06: pop {r1} bx r1 .pool @@ -576465,10 +576465,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 .pool @@ -576536,20 +576536,20 @@ sp0E3_walkrun_bitfield_interpretation: ; 8137D34 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @08137D46 + beq _08137D46 movs r0, 0x1 - b @08137D58 -@08137D46: + b _08137D58 +_08137D46: movs r0, 0x2 bl TestPlayerAvatarFlags 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 @@ -576561,7 +576561,7 @@ sub_8137D5C: ; 8137D5C 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 @@ -576571,16 +576571,16 @@ sub_8137D5C: ; 8137D5C ldr r1, =gUnknown_085EB5EE adds r0, r4, 0 bl AppendString - b @08137D90 + b _08137D90 .pool -@08137D88: +_08137D88: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB5CF bl CopyString -@08137D90: +_08137D90: ldr r0, =0x00000e0f cmp r7, r0 - bhi @08137DF0 + bhi _08137DF0 ldr r4, =0x02021dc4 adds r0, r7, 0 movs r1, 0x3C @@ -576608,69 +576608,69 @@ sub_8137D5C: ; 8137D5C ldr r1, =gUnknown_085EB5E5 adds r0, r4, 0 bl AppendString - b @08137DF8 + b _08137DF8 .pool -@08137DF0: +_08137DF0: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085EB5DA bl CopyString -@08137DF8: +_08137DF8: movs r4, 0 cmp r6, 0 - bne @08137E0C + bne _08137E0C movs r4, 0x5 - b @08137E2A + b _08137E2A .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} @@ -576721,10 +576721,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 @@ -576735,7 +576735,7 @@ sub_8137E9C: ; 8137E9C ldr r0, =0x00004027 mov r1, r8 bl VarSet -@08137EE6: +_08137EE6: pop {r3} mov r8, r3 pop {r4-r7} @@ -576757,7 +576757,7 @@ sub_8137EFC: ; 8137EFC lsls r0, 16 adds r4, r0 cmp r4, 0 - beq @08137F3C + beq _08137F3C ldr r0, =0x00004027 bl VarGet adds r1, r0, 0 @@ -576766,11 +576766,11 @@ sub_8137EFC: ; 8137EFC adds r0, r4, 0 bl sub_8137D5C movs r0, 0x1 - b @08137F3E + b _08137F3E .pool -@08137F3C: +_08137F3C: movs r0, 0 -@08137F3E: +_08137F3E: pop {r4} pop {r1} bx r1 @@ -576783,27 +576783,27 @@ sub_8137F44: ; 8137F44 ldrh r1, [r0] ldr r0, =0x00000c1d cmp r1, r0 - beq @08137F7C + beq _08137F7C ldr r4, =0x000040a9 adds r0, r4, 0 bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq @08137F6E + beq _08137F6E adds r0, r4, 0 bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bne @08137F7C -@08137F6E: + bne _08137F7C +_08137F6E: adds r0, r4, 0 movs r1, 0 bl VarSet movs r0, 0 bl sav1_set_battle_music_maybe -@08137F7C: +_08137F7C: pop {r4} pop {r0} bx r0 @@ -576843,7 +576843,7 @@ sub_8137FC0: ; 8137FC0 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08137FE6 + beq _08137FE6 ldr r0, =0x0000404a bl GetVarPointer ldrh r1, [r0] @@ -576852,14 +576852,14 @@ 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 .pool -@08137FF4: +_08137FF4: movs r0, 0x1 -@08137FF6: +_08137FF6: pop {r4} pop {r1} bx r1 @@ -576882,94 +576882,94 @@ 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 .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} @@ -576984,16 +576984,16 @@ is_tile_that_overrides_player_control: ; 81380D8 bl FlagGet 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 GetVarPointer ldrh r1, [r0] @@ -577002,14 +577002,14 @@ is_tile_that_overrides_player_control: ; 81380D8 lsls r1, 16 lsrs r1, 16 cmp r1, 0xF9 - bhi @08138118 -@0813810A: + bhi _08138118 +_0813810A: movs r0, 0 - b @0813811A + b _0813811A .pool -@08138118: +_08138118: movs r0, 0x1 -@0813811A: +_0813811A: pop {r1} bx r1 thumb_func_end is_tile_that_overrides_player_control @@ -577021,16 +577021,16 @@ sub_8138120: ; 8138120 bl FlagGet 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 GetVarPointer ldrh r1, [r0] @@ -577039,14 +577039,14 @@ sub_8138120: ; 8138120 lsls r1, 16 lsrs r1, 16 cmp r1, 0x9 - bhi @08138160 -@08138152: + bhi _08138160 +_08138152: movs r0, 0 - b @08138162 + b _08138162 .pool -@08138160: +_08138160: movs r0, 0x1 -@08138162: +_08138162: pop {r1} bx r1 thumb_func_end sub_8138120 @@ -577058,16 +577058,16 @@ sub_8138168: ; 8138168 bl FlagGet 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 GetVarPointer ldrh r1, [r0] @@ -577076,14 +577076,14 @@ sub_8138168: ; 8138168 lsls r1, 16 lsrs r1, 16 cmp r1, 0x9 - bhi @081381A8 -@0813819A: + bhi _081381A8 +_0813819A: movs r0, 0 - b @081381AA + b _081381AA .pool -@081381A8: +_081381A8: movs r0, 0x1 -@081381AA: +_081381AA: pop {r1} bx r1 thumb_func_end sub_8138168 @@ -577095,16 +577095,16 @@ sub_81381B0: ; 81381B0 bl FlagGet 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 GetVarPointer ldrh r1, [r0] @@ -577113,14 +577113,14 @@ sub_81381B0: ; 81381B0 lsls r1, 16 lsrs r1, 16 cmp r1, 0xF9 - bhi @081381F0 -@081381E2: + bhi _081381F0 +_081381E2: movs r0, 0 - b @081381F2 + b _081381F2 .pool -@081381F0: +_081381F0: movs r0, 0x1 -@081381F2: +_081381F2: pop {r1} bx r1 thumb_func_end sub_81381B0 @@ -577132,16 +577132,16 @@ sub_81381F8: ; 81381F8 bl FlagGet 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 GetVarPointer ldrh r1, [r0] @@ -577150,14 +577150,14 @@ sub_81381F8: ; 81381F8 lsls r1, 16 lsrs r1, 16 cmp r1, 0xF9 - bhi @08138238 -@0813822A: + bhi _08138238 +_0813822A: movs r0, 0 - b @0813823A + b _0813823A .pool -@08138238: +_08138238: movs r0, 0x1 -@0813823A: +_0813823A: pop {r1} bx r1 thumb_func_end sub_81381F8 @@ -577176,12 +577176,12 @@ sub_8138240: ; 8138240 lsrs r5, r0, 24 movs r4, 0 cmp r4, r5 - bcs @0813828A + bcs _0813828A ldr r0, =gUnknown_0858D144 mov r8, r0 -@08138262: +_08138262: cmp r7, r4 - beq @08138280 + beq _08138280 lsls r0, r6, 2 add r0, r8 ldr r0, [r0] @@ -577194,13 +577194,13 @@ sub_8138240: ; 8138240 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 @@ -577240,28 +577240,28 @@ SpawnLinkPartnerFieldObject: ; 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 .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 .pool -@08138310: +_08138310: movs r7, 0x1 ldr r0, =0x03005d8c ldr r0, [r0] @@ -577269,22 +577269,22 @@ SpawnLinkPartnerFieldObject: ; 81382A0 mov r9, r1 ldrh r0, [r0, 0x2] subs r0, 0x1 - b @0813834A + b _0813834A .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 .pool -@0813833C: +_0813833C: movs r7, 0x3 ldr r0, =0x03005d8c ldr r0, [r0] @@ -577292,17 +577292,17 @@ SpawnLinkPartnerFieldObject: ; 81382A0 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 .pool -@08138358: +_08138358: cmp r10, r6 - beq @0813840A + beq _0813840A ldr r0, =0x020229e8 lsls r2, r6, 3 subs r1, r2, r6 @@ -577311,34 +577311,34 @@ SpawnLinkPartnerFieldObject: ; 81382A0 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 .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 @@ -577390,17 +577390,17 @@ SpawnLinkPartnerFieldObject: ; 81382A0 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 @@ -577429,12 +577429,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] @@ -577444,7 +577444,7 @@ sub_813842C: ; 813842C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x10 - beq @081384E6 + beq _081384E6 ldr r1, =0x02037350 lsls r0, r2, 3 adds r0, r2 @@ -577463,45 +577463,45 @@ sub_813842C: ; 813842C 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 .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, =gFieldObjectPalette33 - b @081384C6 + b _081384C6 .pool -@081384BC: +_081384BC: ldr r0, =gFieldObjectPalette34 - b @081384C6 + b _081384C6 .pool -@081384C4: +_081384C4: ldr r0, =gFieldObjectPalette8 -@081384C6: +_081384C6: movs r2, 0x80 lsls r2, 1 adds r1, r3, r2 movs r2, 0x20 bl gpu_pal_apply - b @081384E6 + b _081384E6 .pool -@081384D8: +_081384D8: ldr r0, =gFieldObjectPalette17 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 @@ -577513,32 +577513,32 @@ sub_81384F0: ; 81384F0 push {r4,r5,lr} movs r4, 0 ldr r5, =gUnknown_085B2B68 -@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 MapGridSetMetatileIdAt - b @0813852A + b _0813852A .pool -@0813851C: +_0813851C: lsls r1, r4, 2 adds r1, r5 ldrb r0, [r1] ldrb r1, [r1, 0x1] ldr r2, =0x00000205 bl MapGridSetMetatileIdAt -@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 @@ -577549,210 +577549,210 @@ sub_81384F0: ; 81384F0 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 MapGridGetMetatileIdAt 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 .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 .pool -@0813865C: +_0813865C: movs r2, 0x8E lsls r2, 2 - b @08138720 -@08138662: + b _08138720 +_08138662: ldr r2, =0x00000239 - b @08138720 + b _08138720 .pool -@0813866C: +_0813866C: movs r2, 0x88 lsls r2, 2 - b @08138720 -@08138672: + b _08138720 +_08138672: ldr r2, =0x00000221 - b @08138720 + b _08138720 .pool -@0813867C: +_0813867C: ldr r2, =0x00000e28 - b @08138720 + b _08138720 .pool -@08138684: +_08138684: ldr r2, =0x00000e29 - b @08138720 + b _08138720 .pool -@0813868C: +_0813868C: ldr r2, =0x00000232 - b @08138720 + b _08138720 .pool -@08138694: +_08138694: ldr r2, =0x00000233 - b @08138720 + b _08138720 .pool -@0813869C: +_0813869C: ldr r2, =0x0000023a - b @08138720 + b _08138720 .pool -@081386A4: +_081386A4: ldr r2, =0x0000023b - b @08138720 + b _08138720 .pool -@081386AC: +_081386AC: ldr r2, =0x00000222 - b @08138720 + b _08138720 .pool -@081386B4: +_081386B4: ldr r2, =0x00000223 - b @08138720 + b _08138720 .pool -@081386BC: +_081386BC: ldr r2, =0x00000e2a - b @08138720 + b _08138720 .pool -@081386C4: +_081386C4: ldr r2, =0x00000e2b - b @08138720 + b _08138720 .pool -@081386CC: +_081386CC: ldr r2, =0x00000e42 - b @08138720 + b _08138720 .pool -@081386D4: +_081386D4: ldr r2, =0x0000021a - b @08138720 + b _08138720 .pool -@081386DC: +_081386DC: ldr r2, =0x00000e43 - b @08138720 + b _08138720 .pool -@081386E4: +_081386E4: ldr r2, =0x0000021a - b @08138720 + b _08138720 .pool -@081386EC: +_081386EC: movs r2, 0xE4 lsls r2, 4 - b @08138720 -@081386F2: + b _08138720 +_081386F2: subs r1, r5, 0x1 adds r0, r4, 0 bl MapGridGetMetatileIdAt movs r1, 0x90 lsls r1, 2 cmp r0, r1 - bne @0813870C + bne _0813870C ldr r2, =0x00000e48 - b @08138720 + b _08138720 .pool -@0813870C: +_0813870C: ldr r2, =0x00000e49 - b @08138720 + b _08138720 .pool -@08138714: +_08138714: ldr r2, =0x00000e41 - b @08138720 + b _08138720 .pool -@0813871C: +_0813871C: movs r2, 0xE5 lsls r2, 4 -@08138720: +_08138720: adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt - b @08138734 -@0813872A: + b _08138734 +_0813872A: ldr r2, =0x00000251 adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt -@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 @@ -577764,7 +577764,7 @@ sub_8138750: ; 8138750 push {r4-r6,lr} ldr r4, =gUnknown_085B2B68 movs r5, 0x3 -@08138756: +_08138756: ldrb r0, [r4] ldrb r1, [r4, 0x1] ldr r2, =0x00000206 @@ -577772,142 +577772,142 @@ sub_8138750: ; 8138750 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 MapGridGetMetatileIdAt 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 .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 .pool -@08138870: +_08138870: movs r2, 0x8E lsls r2, 2 - b @081388B2 -@08138876: + b _081388B2 +_08138876: ldr r2, =0x00000239 - b @081388B2 + b _081388B2 .pool -@08138880: +_08138880: ldr r2, =0x00000232 - b @081388B2 + b _081388B2 .pool -@08138888: +_08138888: ldr r2, =0x00000233 - b @081388B2 + b _081388B2 .pool -@08138890: +_08138890: ldr r2, =0x0000023a - b @081388B2 + b _081388B2 .pool -@08138898: +_08138898: ldr r2, =0x0000023b - b @081388B2 + b _081388B2 .pool -@081388A0: +_081388A0: ldr r2, =0x00000e42 - b @081388B2 + b _081388B2 .pool -@081388A8: +_081388A8: ldr r2, =0x00000e43 - b @081388B2 + b _081388B2 .pool -@081388B0: +_081388B0: ldr r2, =0x0000021a -@081388B2: +_081388B2: adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt - b @081388CA + b _081388CA .pool -@081388C0: +_081388C0: ldr r2, =0x00000251 adds r0, r4, 0 adds r1, r5, 0 bl MapGridSetMetatileIdAt -@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 @@ -577945,7 +577945,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, =gUnknown_085B2B7E @@ -577961,16 +577961,16 @@ 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 .pool -@0813896C: +_0813896C: adds r0, r2, 0x1 strb r0, [r4] -@08138970: +_08138970: pop {r4-r6} pop {r0} bx r0 @@ -577990,24 +577990,24 @@ 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 .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 @@ -578016,8 +578016,8 @@ sub_8138978: ; 8138978 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 @@ -578026,8 +578026,8 @@ sub_8138978: ; 8138978 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 @@ -578036,16 +578036,16 @@ sub_8138978: ; 8138978 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 @@ -578054,37 +578054,37 @@ sub_8138978: ; 8138978 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 @@ -578097,7 +578097,7 @@ sub_8138978: ; 8138978 orrs r1, r0 lsls r1, 16 mov r8, r1 -@08138A5E: +_08138A5E: lsls r1, r6, 1 mov r3, sp adds r5, r3, r1 @@ -578121,8 +578121,8 @@ sub_8138978: ; 8138978 lsls r0, 24 lsrs r6, r0, 24 cmp r6, r7 - bcc @08138A5E -@08138A92: + bcc _08138A5E +_08138A92: bl DrawWholeMapView add sp, 0x10 pop {r3,r4} @@ -578195,17 +578195,17 @@ sub_8138B10: ; 8138B10 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne @08138B34 + bne _08138B34 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB5F9 bl CopyString - b @08138B3C + b _08138B3C .pool -@08138B34: +_08138B34: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB601 bl CopyString -@08138B3C: +_08138B3C: pop {r0} bx r0 .pool @@ -578218,17 +578218,17 @@ sub_8138B48: ; 8138B48 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne @08138B6C + bne _08138B6C ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB60E bl CopyString - b @08138B74 + b _08138B74 .pool -@08138B6C: +_08138B6C: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EB60A bl CopyString -@08138B74: +_08138B74: pop {r0} bx r0 .pool @@ -578249,7 +578249,7 @@ sub_8138B8C: ; 8138B8C ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - beq @08138BB0 + beq _08138BB0 movs r2, 0x1 negs r2, r2 movs r0, 0x4 @@ -578258,9 +578258,9 @@ sub_8138B8C: ; 8138B8C movs r1, 0 movs r3, 0x6 bl warp1_set - b @08138BC2 + b _08138BC2 .pool -@08138BB0: +_08138BB0: movs r2, 0x1 negs r2, r2 movs r0, 0x4 @@ -578269,7 +578269,7 @@ sub_8138B8C: ; 8138B8C movs r1, 0x1 movs r3, 0x6 bl warp1_set -@08138BC2: +_08138BC2: add sp, 0x4 pop {r0} bx r0 @@ -578298,9 +578298,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 .pool @@ -578320,53 +578320,53 @@ sub_8138C04: ; 8138C04 movs r1, 0x20 bl pokemon_getattr cmp r0, 0xFF - bne @08138C2C + bne _08138C2C movs r0, 0x6 - b @08138C7E + b _08138C7E .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 @@ -578401,7 +578401,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 @@ -578418,7 +578418,7 @@ sp0D9_ComputerRelated: ; 8138CA4 strh r2, [r1, 0xC] strh r2, [r1, 0xE] strh r2, [r1, 0x10] -@08138CD8: +_08138CD8: pop {r4} pop {r0} bx r0 @@ -578438,10 +578438,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 .pool @@ -578456,34 +578456,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_lower_nybble 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 @@ -578502,10 +578502,10 @@ sub_8138D10: ; 8138D10 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] @@ -578524,45 +578524,45 @@ 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 .pool -@08138DAC: +_08138DAC: cmp r0, 0x1 - bne @08138DB8 + bne _08138DB8 ldr r3, =0x0000025a - b @08138DE6 + b _08138DE6 .pool -@08138DB8: +_08138DB8: cmp r0, 0x2 - bne @08138DE6 + bne _08138DE6 ldr r3, =0x00000259 - b @08138DE6 + b _08138DE6 .pool -@08138DC4: +_08138DC4: ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne @08138DD4 + bne _08138DD4 movs r3, 0x5 - b @08138DE6 + b _08138DE6 .pool -@08138DD4: +_08138DD4: cmp r0, 0x1 - bne @08138DE0 + bne _08138DE0 ldr r3, =0x0000027f - b @08138DE6 + b _08138DE6 .pool -@08138DE0: +_08138DE0: cmp r0, 0x2 - bne @08138DE6 + bne _08138DE6 ldr r3, =0x0000027e -@08138DE6: +_08138DE6: ldr r0, =0x03005d8c ldr r2, [r0] movs r5, 0 @@ -578608,45 +578608,45 @@ 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 .pool -@08138E70: +_08138E70: cmp r0, 0x1 - bne @08138E7C + bne _08138E7C ldr r4, =0x0000025a - b @08138E82 + b _08138E82 .pool -@08138E7C: +_08138E7C: cmp r0, 0x2 - bne @08138E82 + bne _08138E82 ldr r4, =0x00000259 -@08138E82: +_08138E82: ldr r0, =0x03005d8c ldr r2, [r0] movs r1, 0 @@ -578683,7 +578683,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 @@ -578700,7 +578700,7 @@ sub_8138EC0: ; 8138EC0 strh r2, [r1, 0xC] strh r2, [r1, 0xE] strh r2, [r1, 0x10] -@08138EF4: +_08138EF4: pop {r4} pop {r0} bx r0 @@ -578720,10 +578720,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 .pool @@ -578736,13 +578736,13 @@ sub_8138F2C: ; 8138F2C 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 @@ -578751,9 +578751,9 @@ sub_8138F2C: ; 8138F2C movs r0, 0x12 movs r1, 0x9 bl MapGridSetMetatileIdAt - b @08138F7A + b _08138F7A .pool -@08138F64: +_08138F64: ldr r2, =0x00000e58 movs r0, 0x12 movs r1, 0x8 @@ -578763,7 +578763,7 @@ sub_8138F2C: ; 8138F2C movs r0, 0x12 movs r1, 0x9 bl MapGridSetMetatileIdAt -@08138F7A: +_08138F7A: bl DrawWholeMapView ldrh r0, [r4, 0x10] movs r1, 0x1 @@ -578775,10 +578775,10 @@ sub_8138F2C: ; 8138F2C 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] @@ -578842,13 +578842,13 @@ sub_8139004: ; 8139004 movs r1, 0x16 bl pokemon_getattr cmp r0, 0xC7 - bls @08139028 + bls _08139028 movs r0, 0x1 - b @0813902A + b _0813902A .pool -@08139028: +_08139028: movs r0, 0 -@0813902A: +_0813902A: pop {r1} bx r1 thumb_func_end sub_8139004 @@ -578866,13 +578866,13 @@ sub_8139030: ; 8139030 movs r1, 0x17 bl pokemon_getattr cmp r0, 0xC7 - bls @08139054 + bls _08139054 movs r0, 0x1 - b @08139056 + b _08139056 .pool -@08139054: +_08139054: movs r0, 0 -@08139056: +_08139056: pop {r1} bx r1 thumb_func_end sub_8139030 @@ -578890,13 +578890,13 @@ sub_813905C: ; 813905C movs r1, 0x18 bl pokemon_getattr cmp r0, 0xC7 - bls @08139080 + bls _08139080 movs r0, 0x1 - b @08139082 + b _08139082 .pool -@08139080: +_08139080: movs r0, 0 -@08139082: +_08139082: pop {r1} bx r1 thumb_func_end sub_813905C @@ -578914,13 +578914,13 @@ sub_8139088: ; 8139088 movs r1, 0x21 bl pokemon_getattr cmp r0, 0xC7 - bls @081390AC + bls _081390AC movs r0, 0x1 - b @081390AE + b _081390AE .pool -@081390AC: +_081390AC: movs r0, 0 -@081390AE: +_081390AE: pop {r1} bx r1 thumb_func_end sub_8139088 @@ -578938,13 +578938,13 @@ sub_81390B4: ; 81390B4 movs r1, 0x2F bl pokemon_getattr cmp r0, 0xC7 - bls @081390D8 + bls _081390D8 movs r0, 0x1 - b @081390DA + b _081390DA .pool -@081390D8: +_081390D8: movs r0, 0 -@081390DA: +_081390DA: pop {r1} bx r1 thumb_func_end sub_81390B4 @@ -578954,7 +578954,7 @@ sub_81390E0: ; 81390E0 push {r4-r6,lr} movs r5, 0 ldr r6, =gBaseStats -@081390E6: +_081390E6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -578964,12 +578964,12 @@ sub_81390E0: ; 81390E0 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 @@ -578981,24 +578981,24 @@ sub_81390E0: ; 81390E0 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 .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} @@ -579149,13 +579149,13 @@ sub_8139248: ; 8139248 bl sub_80EF038 lsls r0, 24 cmp r0, 0 - bne @08139294 + bne _08139294 ldr r4, =gUnknown_085B2B94 - b @08139296 + b _08139296 .pool -@08139294: +_08139294: ldr r4, =gUnknown_085B2BA0 -@08139296: +_08139296: adds r0, r5, 0 movs r1, 0xC bl __umodsi3 @@ -579176,13 +579176,13 @@ sub_81392AC: ; 81392AC bl FlagGet lsls r0, 24 cmp r0, 0 - beq @081392CC + beq _081392CC movs r0, 0x1 - b @081392CE + b _081392CE .pool -@081392CC: +_081392CC: movs r0, 0 -@081392CE: +_081392CE: pop {r1} bx r1 thumb_func_end sub_81392AC @@ -579197,13 +579197,13 @@ sub_81392D4: ; 81392D4 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @081392F0 + beq _081392F0 movs r0, 0x1 - b @081392F2 + b _081392F2 .pool -@081392F0: +_081392F0: movs r0, 0 -@081392F2: +_081392F2: pop {r1} bx r1 thumb_func_end sub_81392D4 @@ -579217,13 +579217,13 @@ sub_81392F8: ; 81392F8 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08139318 + beq _08139318 movs r0, 0x1 - b @0813931A + b _0813931A .pool -@08139318: +_08139318: movs r0, 0 -@0813931A: +_0813931A: pop {r1} bx r1 thumb_func_end sub_81392F8 @@ -579237,13 +579237,13 @@ sub_8139320: ; 8139320 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08139340 + beq _08139340 movs r0, 0x1 - b @08139342 + b _08139342 .pool -@08139340: +_08139340: movs r0, 0 -@08139342: +_08139342: pop {r1} bx r1 thumb_func_end sub_8139320 @@ -579295,11 +579295,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} @@ -579321,13 +579321,13 @@ sub_81393C8: ; 81393C8 lsls r0, 16 ldr r1, =0x01fd0000 cmp r0, r1 - bhi @081393F4 + bhi _081393F4 movs r0, 0 - b @081393F6 + b _081393F6 .pool -@081393F4: +_081393F4: movs r0, 0x1 -@081393F6: +_081393F6: pop {r1} bx r1 thumb_func_end sub_81393C8 @@ -579339,40 +579339,40 @@ sub_81393FC: ; 81393FC bl FlagGet 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 FlagGet lsls r0, 24 cmp r0, 0 - beq @08139434 + beq _08139434 ldr r0, =0x0000409a movs r1, 0x4 - b @08139446 + b _08139446 .pool -@08139434: +_08139434: movs r0, 0xE9 lsls r0, 2 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08139454 + beq _08139454 ldr r0, =0x0000409a movs r1, 0x5 -@08139446: +_08139446: bl VarSet movs r0, 0x1 - b @08139456 + b _08139456 .pool -@08139454: +_08139454: movs r0, 0 -@08139456: +_08139456: pop {r1} bx r1 thumb_func_end sub_81393FC @@ -579453,8 +579453,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 @@ -579463,19 +579463,19 @@ sub_81394D8: ; 81394D8 movs r2, 0 bl pokemon_getattr cmp r0, r6 - bne @0813951C + bne _0813951C movs r0, 0x1 - b @08139528 + b _08139528 .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 @@ -579499,13 +579499,13 @@ sub_8139540: ; 8139540 bl sub_806DD7C lsls r0, 24 cmp r0, 0 - beq @08139558 + beq _08139558 movs r0, 0x1 - b @0813955A + b _0813955A .pool -@08139558: +_08139558: movs r0, 0 -@0813955A: +_0813955A: pop {r1} bx r1 thumb_func_end sub_8139540 @@ -579565,7 +579565,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 @@ -579584,11 +579584,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 InstallCameraPanAheadCallback -@08139614: +_08139614: pop {r4,r5} pop {r0} bx r0 @@ -579628,10 +579628,10 @@ 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 @@ -579646,10 +579646,10 @@ 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 @@ -579662,8 +579662,8 @@ sub_8139688: ; 8139688 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 @@ -579676,25 +579676,25 @@ sub_8139688: ; 8139688 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 .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 @@ -579737,25 +579737,25 @@ sub_813970C: ; 813970C ldrsh r0, [r2, r1] subs r0, r3 cmp r0, 0x6 - ble @08139734 + ble _08139734 movs r0, 0 - b @0813974C + b _0813974C .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 @@ -579787,7 +579787,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 @@ -579800,14 +579800,14 @@ sub_8139770: ; 8139770 adds r1, r4, 0 bl CompareString cmp r0, 0 - beq @081397BC -@081397A6: + beq _081397BC +_081397A6: movs r0, 0x1 - b @081397BE + b _081397BE .pool -@081397BC: +_081397BC: movs r0, 0 -@081397BE: +_081397BE: pop {r4-r6} pop {r1} bx r1 @@ -579820,41 +579820,41 @@ sub_81397C4: ; 81397C4 ldrh r1, [r2] ldr r0, =0x0000270f cmp r1, r0 - bls @081397E0 + bls _081397E0 movs r0, 0 bl sub_80EF340 - b @08139862 + b _08139862 .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 .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 .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 @@ -579865,9 +579865,9 @@ sub_81397C4: ; 81397C4 adds r1, r5, 0 movs r2, 0 bl ConvertIntToDecimalString - b @08139862 + b _08139862 .pool -@0813983C: +_0813983C: ldr r4, =0x02021cc4 movs r0, 0xA1 strb r0, [r4] @@ -579885,7 +579885,7 @@ sub_81397C4: ; 81397C4 adds r1, r5, 0 movs r2, 0 bl ConvertIntToDecimalString -@08139862: +_08139862: pop {r4,r5} pop {r0} bx r0 @@ -579898,42 +579898,42 @@ sub_813986C: ; 813986C 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 .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 @@ -579949,11 +579949,11 @@ sub_81398C0: ; 81398C0 lsls r0, 16 lsrs r0, 16 cmp r0, 0x39 - bls @081398E0 + bls _081398E0 movs r0, 0 - b @081398FC + b _081398FC .pool -@081398E0: +_081398E0: ldr r4, =0x02021dc4 ldrh r0, [r1] bl sub_81B6CFC @@ -579966,7 +579966,7 @@ sub_81398C0: ; 81398C0 adds r0, r4, 0 bl CopyString movs r0, 0x1 -@081398FC: +_081398FC: pop {r4} pop {r1} bx r1 @@ -579981,8 +579981,8 @@ sub_813990C: ; 813990C 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 @@ -579990,19 +579990,19 @@ sub_813990C: ; 813990C movs r1, 0x4 bl pokemon_getattr cmp r0, 0x1 - bne @08139938 + bne _08139938 movs r0, 0x1 - b @08139944 + b _08139944 .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 @@ -580016,19 +580016,19 @@ in_multi_battle_room_with_var_condition: ; 813994C ldrh r1, [r0, 0x4] ldr r0, =0x00000f1a cmp r1, r0 - bne @08139978 + bne _08139978 ldr r0, =0x000040ce bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - bne @08139978 + bne _08139978 movs r0, 0x1 - b @0813997A + b _0813997A .pool -@08139978: +_08139978: movs r0, 0 -@0813997A: +_0813997A: pop {r1} bx r1 thumb_func_end in_multi_battle_room_with_var_condition @@ -580055,39 +580055,39 @@ 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 .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 VarSet pop {r0} @@ -580109,52 +580109,52 @@ 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 .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} @@ -580184,23 +580184,23 @@ 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 .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, =gUnknown_085B2C18 adds r0, r5, r0 ldrb r0, [r0] @@ -580238,7 +580238,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 @@ -580255,14 +580255,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 InstallCameraPanAheadCallback -@08139B54: +_08139B54: pop {r4,r5} pop {r0} bx r0 @@ -580371,7 +580371,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 @@ -580390,7 +580390,7 @@ sub_8139C2C: ; 8139C2C adds r0, r6, r0 ldrb r0, [r0] strh r0, [r1, 0xE] -@08139C6C: +_08139C6C: pop {r4-r6} pop {r0} bx r0 @@ -580417,18 +580417,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, =gUnknown_085B2BF4 mov r10, r2 -@08139CBA: +_08139CBA: movs r5, 0 adds r7, r1, 0x7 lsls r0, r1, 1 @@ -580437,7 +580437,7 @@ sub_8139C80: ; 8139C80 adds r0, r1 lsls r0, 1 mov r9, r0 -@08139CCA: +_08139CCA: adds r4, r5, 0 adds r4, 0x8 movs r1, 0 @@ -580460,19 +580460,19 @@ sub_8139C80: ; 8139C80 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 .pool -@08139D10: +_08139D10: movs r1, 0 ldr r0, =gUnknown_085B2C06 mov r10, r0 -@08139D16: +_08139D16: movs r5, 0 adds r7, r1, 0x7 lsls r0, r1, 1 @@ -580481,7 +580481,7 @@ sub_8139C80: ; 8139C80 adds r0, r1 lsls r0, 1 mov r9, r0 -@08139D26: +_08139D26: adds r4, r5, 0 adds r4, 0x8 movs r1, 0 @@ -580504,13 +580504,13 @@ sub_8139C80: ; 8139C80 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 DrawWholeMapView movs r0, 0 strh r0, [r6, 0x2] @@ -580519,10 +580519,10 @@ sub_8139C80: ; 8139C80 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] @@ -580585,7 +580585,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] @@ -580596,7 +580596,7 @@ sub_8139D98: ; 8139D98 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @08139E00 + bls _08139E00 ldr r2, =0x020375e4 movs r0, 0 strh r0, [r2] @@ -580606,7 +580606,7 @@ sub_8139D98: ; 8139D98 movs r4, 0x1 adds r6, r2, 0 adds r7, r1, 0 -@08139E28: +_08139E28: ldrh r0, [r6] lsls r0, 2 mov r2, sp @@ -580616,30 +580616,30 @@ sub_8139D98: ; 8139D98 ldr r1, [r1] ldr r0, [r5] cmp r1, r0 - bcs @08139E54 + bcs _08139E54 strh r4, [r6] - b @08139E6C + b _08139E6C .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} @@ -580663,25 +580663,25 @@ 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 .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 @@ -580695,13 +580695,13 @@ sub_8139ED0: ; 8139ED0 ldrh r1, [r0, 0x4] ldr r0, =0x00003c1a cmp r1, r0 - beq @08139EEC + beq _08139EEC movs r0, 0x1 - b @08139EEE + b _08139EEE .pool -@08139EEC: +_08139EEC: movs r0, 0 -@08139EEE: +_08139EEE: pop {r1} bx r1 thumb_func_end sub_8139ED0 @@ -580737,29 +580737,29 @@ 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 mov pc, r1 .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 @@ -580772,56 +580772,56 @@ sub_8139F20: ; 8139F20 ldrh r0, [r3] ldrh r2, [r1] cmp r0, r2 - bcs @0813A028 - b @0813A038 + bcs _0813A028 + b _0813A038 .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 .pool -@08139FB4: +_08139FB4: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000de2 adds r2, r0, r1 ldr r3, =0x00000de4 - b @08139F9E + b _08139F9E .pool -@08139FCC: +_08139FCC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000dc8 adds r2, r0, r1 ldr r3, =0x00000dca - b @08139F9E + b _08139F9E .pool -@08139FE4: +_08139FE4: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000dda adds r2, r0, r1 ldr r3, =0x00000ddc - b @08139F9E + b _08139F9E .pool -@08139FFC: +_08139FFC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e04 adds r2, r0, r1 ldr r3, =0x00000e06 - b @08139F9E + b _08139F9E .pool -@0813A014: +_0813A014: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e1a @@ -580831,14 +580831,14 @@ sub_8139F20: ; 8139F20 ldrh r0, [r2] ldrh r3, [r1] cmp r0, r3 - bcc @0813A038 -@0813A028: + bcc _0813A038 +_0813A028: adds r4, r0, 0 - b @0813A03A + b _0813A03A .pool -@0813A038: +_0813A038: ldrh r4, [r1] -@0813A03A: +_0813A03A: movs r2, 0 ldr r5, =gUnknown_085B2CC8 lsls r0, r6, 1 @@ -580847,20 +580847,20 @@ sub_8139F20: ; 8139F20 adds r3, r0, 0 ldr r7, =gUnknown_085B2C50 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 @@ -580888,27 +580888,27 @@ sub_813A080: ; 813A080 lsls r0, 30 lsrs r4, r0, 30 cmp r5, 0x2 - bne @0813A0D8 + bne _0813A0D8 movs r0, 0xA9 lsls r0, 1 bl FlagGet 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 .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 @@ -580923,23 +580923,23 @@ sub_813A080: ; 813A080 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 @@ -580964,39 +580964,39 @@ 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 .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] @@ -581008,8 +581008,8 @@ sub_813A128: ; 813A128 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] @@ -581019,8 +581019,8 @@ sub_813A128: ; 813A128 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] @@ -581033,8 +581033,8 @@ sub_813A128: ; 813A128 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] @@ -581046,8 +581046,8 @@ sub_813A128: ; 813A128 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] @@ -581060,8 +581060,8 @@ sub_813A128: ; 813A128 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] @@ -581074,8 +581074,8 @@ sub_813A128: ; 813A128 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] @@ -581086,13 +581086,13 @@ sub_813A128: ; 813A128 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] @@ -581105,8 +581105,8 @@ sub_813A128: ; 813A128 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] @@ -581119,8 +581119,8 @@ sub_813A128: ; 813A128 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] @@ -581133,8 +581133,8 @@ sub_813A128: ; 813A128 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] @@ -581145,20 +581145,20 @@ sub_813A128: ; 813A128 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 @@ -581207,9 +581207,9 @@ sub_813A2DC: ; 813A2DC add r1, sp, 0x18 mov r8, r1 cmp r3, r0 - bge @0813A36A + bge _0813A36A ldr r5, =gUnknown_085B2CF0 -@0813A33A: +_0813A33A: lsls r1, r4, 2 ldr r0, =0x020375e0 ldrh r0, [r0] @@ -581232,8 +581232,8 @@ sub_813A2DC: ; 813A2DC 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] @@ -581243,15 +581243,15 @@ sub_813A2DC: ; 813A2DC 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] @@ -581352,7 +581352,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 @@ -581388,7 +581388,7 @@ sub_813A46C: ; 813A46C mov r0, sp ldrh r0, [r0] strh r0, [r5] -@0813A4D4: +_0813A4D4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -581414,21 +581414,21 @@ 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 .pool -@0813A51C: +_0813A51C: ldr r1, =0x020375f0 movs r0, 0x7F strh r0, [r1] movs r0, 0x5 bl audio_play - b @0813A54C + b _0813A54C .pool -@0813A530: +_0813A530: ldr r0, =0x020375f0 strh r4, [r0] movs r0, 0x5 @@ -581436,24 +581436,24 @@ sub_813A4EC: ; 813A4EC 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 .pool -@0813A558: +_0813A558: adds r0, r5, 0 bl sub_813A738 ldr r0, =sub_813A600 str r0, [r6] bl script_env_2_enable_and_set_ctx_running -@0813A566: +_0813A566: pop {r4-r6} pop {r0} bx r0 @@ -581534,14 +581534,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 str r0, [r1] -@0813A624: +_0813A624: pop {r0} bx r0 .pool @@ -581555,11 +581555,11 @@ sub_813A630: ; 813A630 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 .pool -@0813A64C: +_0813A64C: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -581568,7 +581568,7 @@ sub_813A630: ; 813A630 ldrh r0, [r1, 0x14] adds r0, 0x1 strh r0, [r1, 0x14] -@0813A65C: +_0813A65C: pop {r0} bx r0 .pool @@ -581618,7 +581618,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] @@ -581669,7 +581669,7 @@ sub_813A694: ; 813A694 lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] -@0813A724: +_0813A724: add sp, 0x10 pop {r4,r5} pop {r0} @@ -581692,12 +581692,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 .pool @@ -581715,33 +581715,33 @@ sub_813A76C: ; 813A76C 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 VarSet - b @0813A7A8 + b _0813A7A8 .pool -@0813A79C: +_0813A79C: subs r0, r5, r4 lsls r0, 16 lsrs r0, 16 movs r1, 0x69 bl VarSet -@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 @@ -581753,10 +581753,10 @@ sub_813A7B8: ; 813A7B8 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 @@ -581861,7 +581861,7 @@ sub_813A878: ; 813A878 lsls r0, 16 lsrs r0, 16 cmp r0, 0x1 - bne @0813A8F0 + bne _0813A8F0 ldr r1, =gUnknown_085B3104 lsls r0, r6, 1 adds r0, r1 @@ -581869,20 +581869,20 @@ 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 VarSet - b @0813A8F0 + b _0813A8F0 .pool -@0813A8E8: +_0813A8E8: adds r0, r4, 0 movs r1, 0x3 bl VarSet -@0813A8F0: +_0813A8F0: pop {r3} mov r8, r3 pop {r4-r7} @@ -581974,13 +581974,13 @@ sub_813A9A4: ; 813A9A4 ldrh r2, [r1] ldrh r0, [r0] cmp r2, r0 - bcs @0813A9C8 + bcs _0813A9C8 movs r0, 0 - b @0813A9CA + b _0813A9CA .pool -@0813A9C8: +_0813A9C8: subs r0, r2, r0 -@0813A9CA: +_0813A9CA: strh r0, [r1] pop {r0} bx r0 @@ -581999,13 +581999,13 @@ sub_813A9D0: ; 813A9D0 adds r1, r0 ldr r0, =0x0000270f cmp r1, r0 - ble @0813A9FC + ble _0813A9FC strh r0, [r2] - b @0813A9FE + b _0813A9FE .pool -@0813A9FC: +_0813A9FC: strh r1, [r2] -@0813A9FE: +_0813A9FE: pop {r0} bx r0 thumb_func_end sub_813A9D0 @@ -582067,9 +582067,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 @@ -582080,20 +582080,20 @@ sub_813AA60: ; 813AA60 movs r3, 0 bl FillWindowPixelRect 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 .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, =gUnknown_085B3170 lsls r0, r5, 2 adds r0, r1 @@ -582115,10 +582115,10 @@ sub_813AA60: ; 813AA60 ldrh r5, [r1] ldr r0, =0x0000ffff cmp r5, r0 - beq @0813AB18 - b @0813AB2C + beq _0813AB18 + b _0813AB2C .pool -@0813AAE8: +_0813AAE8: ldr r1, =gUnknown_085B319C lsls r0, r5, 2 adds r0, r1 @@ -582141,13 +582141,13 @@ sub_813AA60: ; 813AA60 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 .pool -@0813AB2C: +_0813AB2C: ldr r4, =0x0000157c adds r0, r4, 0 bl FreeObjectTilesByTag @@ -582163,9 +582163,9 @@ sub_813AA60: ; 813AA60 bl AddDecorationIconObject ldr r1, =0x0203ab6c strb r0, [r1] - b @0813ABC2 + b _0813ABC2 .pool -@0813AB5C: +_0813AB5C: ldr r1, =gUnknown_085B31B4 lsls r0, r5, 2 adds r0, r1 @@ -582187,9 +582187,9 @@ sub_813AA60: ; 813AA60 adds r0, r1 ldrh r0, [r0] bl sub_813ABD4 - b @0813ABC2 + b _0813ABC2 .pool -@0813AB94: +_0813AB94: ldr r1, =gUnknown_085B31D0 lsls r0, r5, 2 adds r0, r1 @@ -582211,7 +582211,7 @@ sub_813AA60: ; 813AA60 adds r0, r1 ldrh r0, [r0] bl sub_813ABD4 -@0813ABC2: +_0813ABC2: add sp, 0x10 pop {r4,r5} pop {r0} @@ -582239,7 +582239,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 @@ -582265,7 +582265,7 @@ sub_813ABD4: ; 813ABD4 adds r0, r3 movs r1, 0x5C strh r1, [r0, 0x22] -@0813AC32: +_0813AC32: pop {r4,r5} pop {r0} bx r0 @@ -582280,11 +582280,11 @@ sub_813AC44: ; 813AC44 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 @@ -582292,11 +582292,11 @@ sub_813AC44: ; 813AC44 ldr r1, =0x02020630 adds r0, r1 bl RemoveObjectAndFreeResources -@0813AC6A: +_0813AC6A: ldr r1, =0x0203ab6c movs r0, 0x40 strb r0, [r1] -@0813AC70: +_0813AC70: pop {r0} bx r0 .pool @@ -582308,7 +582308,7 @@ sub_813AC7C: ; 813AC7C ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq @0813ACB8 + beq _0813ACB8 ldr r0, =0x02021cc4 ldr r2, =gUnknown_085B320C ldr r1, =0x020375e0 @@ -582321,9 +582321,9 @@ sub_813AC7C: ; 813AC7C ldr r2, =gMoveNames adds r1, r2 bl CopyString - b @0813ACD2 + b _0813ACD2 .pool -@0813ACB8: +_0813ACB8: ldr r0, =0x02021cc4 ldr r2, =gUnknown_085B31F8 ldr r1, =0x020375e0 @@ -582336,7 +582336,7 @@ sub_813AC7C: ; 813AC7C ldr r2, =gMoveNames adds r1, r2 bl CopyString -@0813ACD2: +_0813ACD2: pop {r0} bx r0 .pool @@ -582354,11 +582354,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, =gUnknown_085B3220 bl AddWindow @@ -582366,11 +582366,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 @@ -582391,7 +582391,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 @@ -582403,7 +582403,7 @@ sub_813AD34: ; 813AD34 movs r3, 0 bl FillWindowPixelRect cmp r6, 0xA - bne @0813AD90 + bne _0813AD90 ldrb r0, [r4] ldr r2, =gUnknown_085B3254 lsls r1, r5, 2 @@ -582417,9 +582417,9 @@ sub_813AD34: ; 813AD34 movs r1, 0x1 movs r3, 0 bl Print - b @0813ADAC + b _0813ADAC .pool -@0813AD90: +_0813AD90: ldrb r0, [r4] ldr r2, =gUnknown_085B3228 lsls r1, r7, 2 @@ -582433,7 +582433,7 @@ sub_813AD34: ; 813AD34 movs r1, 0x1 movs r3, 0 bl Print -@0813ADAC: +_0813ADAC: add sp, 0xC pop {r4-r7} pop {r0} @@ -582468,7 +582468,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 @@ -582492,7 +582492,7 @@ sub_813ADD4: ; 813ADD4 ldr r0, =gUnknown_085B2CF0 mov r8, r0 movs r4, 0 -@0813AE1E: +_0813AE1E: ldrh r0, [r6, 0x22] lsls r0, 24 lsrs r0, 24 @@ -582521,7 +582521,7 @@ sub_813ADD4: ; 813ADD4 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls @0813AE1E + bls _0813AE1E ldrh r0, [r6, 0x22] lsls r0, 24 lsrs r0, 24 @@ -582546,7 +582546,7 @@ sub_813ADD4: ; 813ADD4 lsrs r0, 24 movs r1, 0x3 bl CopyWindowToVram -@0813AE90: +_0813AE90: add sp, 0x18 pop {r3,r4} mov r8, r3 @@ -582573,50 +582573,50 @@ 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, =gUnknown_0861500C ldr r0, =gUnknown_085B320C 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 .pool -@0813AF0C: +_0813AF0C: ldr r0, =0x020375e2 strh r2, [r0] - b @0813AF38 + b _0813AF38 .pool -@0813AF18: +_0813AF18: movs r2, 0 lsls r1, 1 ldr r3, =gUnknown_0861500C ldr r0, =gUnknown_085B31F8 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 @@ -582631,7 +582631,7 @@ sub_813AF48: ; 813AF48 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0xFF - beq @0813AFB6 + beq _0813AFB6 lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -582671,7 +582671,7 @@ sub_813AF48: ; 813AF48 bl RemoveWindow adds r0, r5, 0 bl remove_task -@0813AFB6: +_0813AFB6: pop {r4,r5} pop {r0} bx r0 @@ -582701,12 +582701,12 @@ 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 .pool -@0813B004: +_0813B004: ldr r0, =0x00004035 mov r8, r0 bl VarGet @@ -582721,13 +582721,13 @@ task_deoxys_sound: ; 813AFDC movs r1, 0 bl VarSet cmp r5, 0 - beq @0813B05C + beq _0813B05C ldr r0, =gUnknown_085B33F6 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 @@ -582736,24 +582736,24 @@ task_deoxys_sound: ; 813AFDC ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] - b @0813B070 + b _0813B070 .pool -@0813B05C: +_0813B05C: cmp r5, 0xA - bne @0813B080 + bne _0813B080 ldr r0, =0x000008d4 bl FlagSet 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 .pool -@0813B080: +_0813B080: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -582768,7 +582768,7 @@ task_deoxys_sound: ; 813AFDC strh r0, [r1] adds r0, r7, 0 bl remove_task -@0813B0A2: +_0813B0A2: pop {r3} mov r8, r3 pop {r4-r7} @@ -582798,16 +582798,16 @@ sub_813B0B4: ; 813B0B4 mov r3, sp bl TryGetFieldObjectIdByLocalIdAndMap cmp r4, 0 - bne @0813B0F0 + bne _0813B0F0 movs r0, 0xC4 bl audio_play - b @0813B0F8 + b _0813B0F8 .pool -@0813B0F0: +_0813B0F0: movs r0, 0x82 lsls r0, 1 bl audio_play -@0813B0F8: +_0813B0F8: ldr r0, =sub_813B160 movs r1, 0x8 bl AddTask @@ -582829,13 +582829,13 @@ sub_813B0B4: ; 813B0B4 str r0, [r3, 0x10] adds r5, r2, 0 cmp r4, 0 - bne @0813B138 + bne _0813B138 movs r0, 0x3C - b @0813B13A + b _0813B13A .pool -@0813B138: +_0813B138: movs r0, 0x5 -@0813B13A: +_0813B13A: str r0, [r3, 0x14] movs r0, 0x42 bl FieldEffectStart @@ -582863,11 +582863,11 @@ sub_813B160: ; 813B160 bl FieldEffectActiveListContains 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 @@ -582886,22 +582886,22 @@ 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 VarSet - b @0813B1C8 + b _0813B1C8 .pool -@0813B1C0: +_0813B1C0: adds r0, r4, 0 adds r1, r2, 0 bl VarSet -@0813B1C8: +_0813B1C8: pop {r4} pop {r0} bx r0 @@ -582955,7 +582955,7 @@ sub_813B21C: ; 813B21C bl FlagGet lsls r0, 24 cmp r0, 0 - bne @0813B258 + bne _0813B258 bl get_preferred_box adds r4, r0, 0 lsls r4, 24 @@ -582965,15 +582965,15 @@ sub_813B21C: ; 813B21C lsls r0, 16 lsrs r0, 16 cmp r4, r0 - beq @0813B258 + beq _0813B258 adds r0, r5, 0 bl FlagSet movs r0, 0x1 - b @0813B25A + b _0813B25A .pool -@0813B258: +_0813B258: movs r0, 0 -@0813B25A: +_0813B25A: pop {r4,r5} pop {r1} bx r1 @@ -582990,11 +582990,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 @@ -583003,39 +583003,39 @@ sub_813B260: ; 813B260 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 FlagReset -@0813B2A6: +_0813B2A6: ldr r0, =0x00004036 lsrs r1, r7, 16 bl VarSet bl sub_813B21C lsls r0, 24 lsrs r0, 24 - b @0813B2DC + b _0813B2DC .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 @@ -583056,38 +583056,38 @@ sub_813B2E4: ; 813B2E4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0813B340 + beq _0813B340 ldr r0, =0x000001bf bl FlagGet 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 VarSet - b @0813B36A + b _0813B36A .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 VarSet - b @0813B36A + b _0813B36A .pool -@0813B354: +_0813B354: bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 @@ -583097,7 +583097,7 @@ sub_813B2E4: ; 813B2E4 adds r1, r4, 0 adds r1, 0x9 bl VarSet -@0813B36A: +_0813B36A: pop {r4} pop {r0} bx r0 @@ -583120,13 +583120,13 @@ sub_813B374: ; 813B374 movs r2, 0 bl GetMapName cmp r4, 0x8 - bls @0813B3A8 + bls _0813B3A8 movs r0, 0x1 - b @0813B3AA + b _0813B3AA .pool -@0813B3A8: +_0813B3A8: movs r0, 0 -@0813B3AA: +_0813B3AA: pop {r4} pop {r1} bx r1 @@ -583145,13 +583145,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 VarSet @@ -583160,41 +583160,41 @@ 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 .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 .pool -@0813B444: +_0813B444: ldr r3, [r3] movs r2, 0x5 ldrsb r2, [r3, r2] @@ -583203,27 +583203,27 @@ sub_813B3B0: ; 813B3B0 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 .pool -@0813B468: +_0813B468: ldr r0, =0x00004037 movs r1, 0 - b @0813B478 + b _0813B478 .pool -@0813B474: +_0813B474: adds r0, r5, 0 adds r1, r4, 0 -@0813B478: +_0813B478: bl VarSet -@0813B47C: +_0813B47C: movs r0, 0 -@0813B47E: +_0813B47E: pop {r4-r6} pop {r1} bx r1 @@ -583250,32 +583250,32 @@ 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 .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 @@ -583288,7 +583288,7 @@ sub_813B4E0: ; 813B4E0 ldrh r0, [r0] bl sub_81D15CC cmp r0, 0 - blt @0813B50C + blt _0813B50C movs r1, 0xAE lsls r1, 1 adds r0, r1 @@ -583298,13 +583298,13 @@ sub_813B4E0: ; 813B4E0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0813B50C + bne _0813B50C movs r0, 0x1 - b @0813B50E + b _0813B50E .pool -@0813B50C: +_0813B50C: movs r0, 0 -@0813B50E: +_0813B50E: pop {r1} bx r1 thumb_func_end sub_813B4E0 @@ -583316,13 +583316,13 @@ sub_813B514: ; 813B514 bl VarGet lsls r0, 16 cmp r0, 0 - beq @0813B52C + beq _0813B52C movs r0, 0x1 - b @0813B52E + b _0813B52E .pool -@0813B52C: +_0813B52C: movs r0, 0 -@0813B52E: +_0813B52E: pop {r1} bx r1 thumb_func_end sub_813B514 @@ -583339,11 +583339,11 @@ sub_813B534: ; 813B534 ldr r0, =0x03003124 ldrb r0, [r0] cmp r0, 0 - bne @0813B552 + bne _0813B552 ldr r0, =sub_80B3AF8 movs r1, 0x5 bl AddTask -@0813B552: +_0813B552: pop {r0} bx r0 .pool @@ -583373,73 +583373,73 @@ 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 .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 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 .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 .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 @@ -583452,84 +583452,84 @@ sub_813B57C: ; 813B57C 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 .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 .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 .pool -@0813B6A8: +_0813B6A8: ldr r1, =0x020375f0 movs r0, 0 -@0813B6AC: +_0813B6AC: strh r0, [r1] - b @0813B790 + b _0813B790 .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 .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 @@ -583538,52 +583538,52 @@ sub_813B57C: ; 813B57C ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @0813B7C6 + b _0813B7C6 .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, =gUnknown_0824979B bl box_related_two__3 - b @0813B790 + b _0813B790 .pool -@0813B74C: +_0813B74C: ldr r0, =0x020375f0 ldrh r0, [r0] cmp r0, 0x3 - bne @0813B790 + bne _0813B790 ldr r0, =gUnknown_0824979B bl box_related_two__3 - b @0813B790 + b _0813B790 .pool -@0813B764: +_0813B764: movs r0, 0 bl IsTextPrinterActive 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 @@ -583592,15 +583592,15 @@ sub_813B57C: ; 813B57C ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @0813B7C6 + b _0813B7C6 .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] @@ -583608,7 +583608,7 @@ sub_813B57C: ; 813B57C 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 @@ -583621,19 +583621,19 @@ sub_813B7D8: ; 813B7D8 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne @0813B7F8 + bne _0813B7F8 ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music movs r0, 0 movs r1, 0x1 bl sub_81D6720 - b @0813B802 + b _0813B802 .pool -@0813B7F8: +_0813B7F8: ldr r2, =c2_exit_to_overworld_1_continue_scripts_restart_music movs r0, 0x1 movs r1, 0 bl sub_81D6720 -@0813B802: +_0813B802: pop {r0} bx r0 .pool @@ -583671,7 +583671,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] @@ -583679,17 +583679,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 @@ -583749,15 +583749,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 @@ -583782,12 +583782,12 @@ _fwalk: ; 813B8B0 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 DrawWholeMapView ldrh r0, [r5, 0x6] adds r0, 0x1 @@ -583795,11 +583795,11 @@ _fwalk: ; 813B8B0 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 @@ -583845,10 +583845,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 .pool @@ -583872,25 +583872,25 @@ 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 .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 @@ -583918,7 +583918,7 @@ sub_813BA30: ; 813BA30 bl sub_813BF44 lsls r0, 24 cmp r0, 0 - beq @0813BA52 + beq _0813BA52 bl sub_813BCE8 ldr r0, =0x03005d8c ldr r1, [r0] @@ -583929,7 +583929,7 @@ sub_813BA30: ; 813BA30 lsls r2, 5 adds r1, r2 strh r0, [r1] -@0813BA52: +_0813BA52: pop {r0} bx r0 .pool @@ -583947,7 +583947,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] @@ -583972,7 +583972,7 @@ sub_813BA60: ; 813BA60 ldr r0, =0x00004095 movs r1, 0x1 bl VarSet -@0813BAB6: +_0813BAB6: pop {r4} pop {r0} bx r0 @@ -583989,7 +583989,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 @@ -584002,12 +584002,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 @@ -584015,9 +584015,9 @@ sub_813BADC: ; 813BADC ldr r1, =0x0000ff80 ands r1, r2 strh r1, [r0] - b @0813BB58 + b _0813BB58 .pool -@0813BB3C: +_0813BB3C: ldr r2, [r4] adds r2, r5 ldrh r1, [r2] @@ -584026,12 +584026,12 @@ sub_813BADC: ; 813BADC movs r1, 0x14 orrs r0, r1 strh r0, [r2] - b @0813BB58 + b _0813BB58 .pool -@0813BB54: +_0813BB54: adds r0, r2, r0 strh r0, [r3] -@0813BB58: +_0813BB58: ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x0000141e @@ -584054,7 +584054,7 @@ sub_813BB74: ; 813BB74 ldr r7, =0x03005d8c ldr r2, =0x0000141e movs r6, 0x1 -@0813BB82: +_0813BB82: ldr r0, [r7] adds r0, r2 ldrh r1, [r0] @@ -584064,7 +584064,7 @@ sub_813BB74: ; 813BB74 asrs r1, r4 ands r1, r6 cmp r1, 0 - bne @0813BBC8 + bne _0813BBC8 adds r3, r5, 0 str r2, [sp] str r3, [sp, 0x4] @@ -584074,7 +584074,7 @@ sub_813BB74: ; 813BB74 ldr r2, [sp] ldr r3, [sp, 0x4] cmp r1, 0 - beq @0813BBC8 + beq _0813BBC8 ldr r0, [r7] adds r0, r2 adds r1, r6, 0 @@ -584082,14 +584082,14 @@ sub_813BB74: ; 813BB74 ldrh r2, [r0] orrs r1, r2 strh r1, [r0] - b @0813BBEA + b _0813BBEA .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 @@ -584102,7 +584102,7 @@ sub_813BB74: ; 813BB74 ldrh r1, [r2] orrs r0, r1 strh r0, [r2] -@0813BBEA: +_0813BBEA: adds r0, r3, 0 add sp, 0x8 pop {r4-r7} @@ -584124,10 +584124,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 @@ -584135,15 +584135,15 @@ sub_813BC00: ; 813BC00 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 @@ -584154,19 +584154,19 @@ sub_813BC00: ; 813BC00 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 @@ -584180,14 +584180,14 @@ sub_813BC00: ; 813BC00 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 @@ -584209,23 +584209,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} @@ -584242,11 +584242,11 @@ 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 .pool -@0813BD04: +_0813BD04: ldr r0, [r6] ldrh r1, [r0, 0xE] ldr r4, =0x03005d8c @@ -584257,7 +584257,7 @@ sub_813BCE8: ; 813BCE8 ldrh r0, [r0] subs r1, r0 cmp r1, 0xB - ble @0813BD58 + ble _0813BD58 bl sub_813BC00 ldr r0, [r4] movs r1, 0xA1 @@ -584269,12 +584269,12 @@ sub_813BCE8: ; 813BCE8 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] @@ -584283,12 +584283,12 @@ sub_813BCE8: ; 813BCE8 lsls r2, 5 adds r1, r2 strh r0, [r1] - b @0813BD58 + b _0813BD58 .pool -@0813BD54: +_0813BD54: cmp r5, 0x8 - bne @0813BD04 -@0813BD58: + bne _0813BD04 +_0813BD58: pop {r4-r6} pop {r0} bx r0 @@ -584343,43 +584343,43 @@ 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 .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 @@ -584403,60 +584403,60 @@ 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 .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, =gUnknown_085EAD14 bl CopyString - b @0813BF04 + b _0813BF04 .pool -@0813BE84: +_0813BE84: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD1B bl CopyString - b @0813BF04 + b _0813BF04 .pool -@0813BE98: +_0813BE98: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD22 bl CopyString - b @0813BF04 + b _0813BF04 .pool -@0813BEAC: +_0813BEAC: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD29 bl CopyString - b @0813BF04 + b _0813BF04 .pool -@0813BEC0: +_0813BEC0: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD30 bl CopyString - b @0813BF04 + b _0813BF04 .pool -@0813BED4: +_0813BED4: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EAD0C bl CopyString - b @0813BF04 + b _0813BF04 .pool -@0813BEE8: +_0813BEE8: ldr r4, =0x02021cc4 adds r0, r4, 0 movs r2, 0x7 @@ -584469,7 +584469,7 @@ sub_813BE30: ; 813BE30 ldrb r1, [r0] adds r0, r4, 0 bl StopMusicWhileStringIsPrinted -@0813BF04: +_0813BF04: pop {r4-r6} pop {r0} bx r0 @@ -584484,18 +584484,18 @@ sub_813BF10: ; 813BF10 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 .pool -@0813BF3C: +_0813BF3C: bl sub_813BC00 -@0813BF40: +_0813BF40: pop {r0} bx r0 thumb_func_end sub_813BF10 @@ -584572,13 +584572,13 @@ 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 @@ -584612,25 +584612,25 @@ sub_813C008: ; 813C008 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 CompareString_LimitN 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 @@ -584646,11 +584646,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] @@ -584662,7 +584662,7 @@ sub_813C03C: ; 813C03C mov r9, r4 add r1, r9 mov r8, r1 -@0813C06A: +_0813C06A: ldr r0, [sp, 0x14] str r3, [sp, 0x10] bl sub_813BFF8 @@ -584671,7 +584671,7 @@ sub_813C03C: ; 813C03C 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} @@ -584697,15 +584697,15 @@ sub_813C03C: ; 813C03C 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 @@ -584721,17 +584721,17 @@ 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] @@ -584739,11 +584739,11 @@ sub_813C0D0: ; 813C0D0 lsrs r0, 16 ldr r1, =0x0000270f cmp r0, r1 - bls @0813C12A + bls _0813C12A strh r1, [r2, 0xA] - b @0813C12A + b _0813C12A .pool -@0813C100: +_0813C100: ldrh r0, [r2, 0xC] adds r0, 0x1 strh r0, [r2, 0xC] @@ -584751,11 +584751,11 @@ sub_813C0D0: ; 813C0D0 lsrs r0, 16 ldr r1, =0x0000270f cmp r0, r1 - bls @0813C12A + bls _0813C12A strh r1, [r2, 0xC] - b @0813C12A + b _0813C12A .pool -@0813C118: +_0813C118: ldrh r0, [r2, 0xE] adds r0, 0x1 strh r0, [r2, 0xE] @@ -584763,9 +584763,9 @@ sub_813C0D0: ; 813C0D0 lsrs r0, 16 ldr r1, =0x0000270f cmp r0, r1 - bls @0813C12A + bls _0813C12A strh r1, [r2, 0xE] -@0813C12A: +_0813C12A: pop {r0} bx r0 .pool @@ -584775,33 +584775,33 @@ sub_813C0D0: ; 813C0D0 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 @@ -584834,7 +584834,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 @@ -584855,7 +584855,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 @@ -584899,9 +584899,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 .pool @@ -584921,9 +584921,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 .pool @@ -584936,24 +584936,24 @@ sub_813C264: ; 813C264 ldr r0, =0x0202433a ldrb r0, [r0] cmp r0, 0x1 - beq @0813C27C + beq _0813C27C cmp r0, 0x2 - beq @0813C28A - b @0813C298 + beq _0813C28A + b _0813C298 .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 @@ -584966,7 +584966,7 @@ sub_813C2A0: ; 813C2A0 adds r4, r0, 0 bl InUnionRoom cmp r0, 0x1 - beq @0813C2DA + beq _0813C2DA adds r0, r4, 0 bl sub_813C264 ldr r0, =0x03005d8c @@ -584987,7 +584987,7 @@ sub_813C2A0: ; 813C2A0 lsrs r4, 24 str r4, [sp] bl sub_813C170 -@0813C2DA: +_0813C2DA: add sp, 0x4 pop {r4} pop {r0} @@ -585063,10 +585063,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] @@ -585109,9 +585109,9 @@ sub_813C384: ; 813C384 adds r2, r5, 0 movs r3, 0xB0 bl Print - b @0813C4A8 + b _0813C4A8 .pool -@0813C40C: +_0813C40C: ldr r0, =0x02021cc4 movs r1, 0x8 bl RepeatStringTerminator @@ -585180,7 +585180,7 @@ sub_813C384: ; 813C384 ldr r2, =0x02021cc4 movs r3, 0xB0 bl Print -@0813C4A8: +_0813C4A8: add sp, 0xC pop {r3} mov r8, r3 @@ -585249,7 +585249,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 @@ -585264,7 +585264,7 @@ sub_813C4BC: ; 813C4BC adds r5, 0x10 adds r4, 0x1 cmp r4, 0x4 - ble @0813C540 + ble _0813C540 ldr r4, =0x0203ab74 ldrb r0, [r4] bl PutWindowTilemap @@ -585306,7 +585306,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 @@ -585314,7 +585314,7 @@ sub_813C5BC: ; 813C5BC adds r1, r0 ldr r0, =sub_813C5EC str r0, [r1] -@0813C5DC: +_0813C5DC: pop {r0} bx r0 .pool @@ -585335,17 +585335,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 str r0, [r4] -@0813C61A: +_0813C61A: pop {r4} pop {r0} bx r0 @@ -585390,7 +585390,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 bl SetMainCallback2 ldr r0, =0x0203ab78 @@ -585401,7 +585401,7 @@ sub_813C664: ; 813C664 bl FreeAllWindowBuffers adds r0, r4, 0 bl remove_task -@0813C694: +_0813C694: pop {r4} pop {r0} bx r0 @@ -585450,7 +585450,7 @@ sub_813C6D4: ; 813C6D4 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@0813C6FA: +_0813C6FA: strh r6, [r2] mov r0, sp str r0, [r1] @@ -585460,7 +585460,7 @@ sub_813C6D4: ; 813C6D4 adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @0813C6FA + bhi _0813C6FA strh r6, [r2] mov r2, sp str r2, [r1] @@ -585703,34 +585703,34 @@ 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 .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 @@ -585746,9 +585746,9 @@ sub_813C91C: ; 813C91C movs r0, 0x3 bl SetBgTilemap bl sub_813C828 - b @0813CA00 + b _0813CA00 .pool -@0813C9A8: +_0813C9A8: movs r0, 0x3 bl sub_813C890 movs r0, 0 @@ -585756,27 +585756,27 @@ sub_813C91C: ; 813C91C movs r1, 0xF0 movs r2, 0x20 bl gpu_pal_apply - b @0813CA00 -@0813C9BE: + b _0813CA00 +_0813C9BE: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0813CA3C + beq _0813CA3C movs r0, 0 bl ShowBg movs r0, 0x3 bl ShowBg movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @0813CA00 -@0813C9DE: + b _0813CA00 +_0813C9DE: ldr r0, =gUnknown_085B3D6C bl InitWindows bl DeactivateAllTextPrinters - b @0813CA00 + b _0813CA00 .pool -@0813C9F0: +_0813C9F0: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -585784,7 +585784,7 @@ sub_813C91C: ; 813C91C movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@0813CA00: +_0813CA00: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -585792,9 +585792,9 @@ sub_813C91C: ; 813C91C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0813CA3C + b _0813CA3C .pool -@0813CA14: +_0813CA14: bl sub_813C880 ldr r0, =sub_813C8D8 bl SetVBlankCallback @@ -585810,7 +585810,7 @@ sub_813C91C: ; 813C91C adds r0, r1 movs r1, 0 strb r1, [r0] -@0813CA3C: +_0813CA3C: add sp, 0x4 pop {r4} pop {r0} @@ -585842,31 +585842,31 @@ 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 .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 .pool -@0813CAB4: +_0813CAB4: bl sub_813CF0C - b @0813CB24 -@0813CABA: + b _0813CB24 +_0813CABA: ldr r1, =gUnknown_085B3DB4 movs r0, 0 str r0, [sp] @@ -585884,30 +585884,30 @@ sub_813CA68: ; 813CA68 movs r0, 0x2 movs r3, 0 bl LoadBgTilemap - b @0813CB24 + b _0813CB24 .pool -@0813CAEC: +_0813CAEC: bl free_temp_tile_data_buffers_if_possible lsls r0, 24 cmp r0, 0 - bne @0813CB34 + bne _0813CB34 ldr r0, =gUnknown_085B3D94 ldr r1, =0x02037854 ldr r2, =0x04000008 bl CpuSet - b @0813CB24 + b _0813CB24 .pool -@0813CB10: +_0813CB10: ldr r1, =0xfffff800 movs r0, 0x2 movs r2, 0 bl ChangeBgY - b @0813CB24 + b _0813CB24 .pool -@0813CB20: +_0813CB20: movs r0, 0 - b @0813CB36 -@0813CB24: + b _0813CB36 +_0813CB24: ldr r0, =0x0203ab7c ldr r1, [r0] movs r0, 0x8A @@ -585916,9 +585916,9 @@ sub_813CA68: ; 813CA68 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] -@0813CB34: +_0813CB34: movs r0, 0x1 -@0813CB36: +_0813CB36: add sp, 0x4 pop {r1} bx r1 @@ -585948,18 +585948,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 @@ -585971,30 +585971,30 @@ sub_813CB40: ; 813CB40 strh r4, [r0] movs r6, 0 ldr r1, =gUnknown_085B3EE8 -@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, =gUnknown_085B3EF0 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 @@ -586003,29 +586003,29 @@ sub_813CB40: ; 813CB40 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 .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 @@ -586035,7 +586035,7 @@ sub_813CB40: ; 813CB40 adds r1, r5 ldrh r1, [r1] bl sub_813CD64 -@0813CC2E: +_0813CC2E: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -586046,14 +586046,14 @@ sub_813CB40: ; 813CB40 adds r0, r4 ldrh r0, [r0] cmp r0, r9 - bne @0813CBC0 -@0813CC44: + bne _0813CBC0 +_0813CC44: movs r6, 0 ldr r1, =gWildMonHeaders ldrb r0, [r1] cmp r0, 0xFF - beq @0813CCF8 -@0813CC4E: + beq _0813CCF8 +_0813CC4E: lsls r4, r6, 2 adds r0, r4, r6 lsls r0, 2 @@ -586063,26 +586063,26 @@ sub_813CB40: ; 813CB40 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 .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, =gWildMonHeaders adds r1, r4, r6 lsls r1, 2 @@ -586090,7 +586090,7 @@ sub_813CB40: ; 813CB40 ldrb r0, [r1] ldrb r1, [r1, 0x1] bl sub_813CD64 -@0813CC9C: +_0813CC9C: adds r0, r6, 0x1 lsls r0, 16 lsrs r6, r0, 16 @@ -586101,10 +586101,10 @@ sub_813CB40: ; 813CB40 adds r0, r1 ldrb r0, [r0] cmp r0, 0xFF - bne @0813CC4E - b @0813CCF8 + bne _0813CC4E + b _0813CCF8 .pool -@0813CCB8: +_0813CCB8: ldr r2, [r5] movs r3, 0x89 lsls r3, 1 @@ -586112,7 +586112,7 @@ sub_813CB40: ; 813CB40 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 @@ -586130,13 +586130,13 @@ sub_813CB40: ; 813CB40 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 @@ -586159,7 +586159,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] @@ -586187,7 +586187,7 @@ sub_813CD04: ; 813CD04 ldrh r0, [r3] adds r0, 0x1 strh r0, [r3] -@0813CD58: +_0813CD58: pop {r4,r5} pop {r0} bx r0 @@ -586208,7 +586208,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 @@ -586217,42 +586217,42 @@ sub_813CD64: ; 813CD64 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xD4 - bhi @0813CE22 + bhi _0813CE22 movs r3, 0 ldr r0, =gUnknown_085B3EEA -@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, =gUnknown_085B3EFC 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 FlagGet 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] @@ -586262,30 +586262,30 @@ sub_813CD64: ; 813CD64 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 @@ -586295,7 +586295,7 @@ sub_813CD64: ; 813CD64 ldrh r0, [r2] adds r0, 0x1 strh r0, [r2] -@0813CE22: +_0813CE22: pop {r4-r7} pop {r0} bx r0 @@ -586327,7 +586327,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 @@ -586341,43 +586341,43 @@ 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 .pool -@0813CECC: +_0813CECC: movs r0, 0x1 -@0813CECE: +_0813CECE: pop {r4,r5} pop {r1} bx r1 @@ -586391,28 +586391,28 @@ sub_813CED4: ; 813CED4 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 @@ -586433,7 +586433,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 @@ -586443,7 +586443,7 @@ sub_813CF0C: ; 813CF0C lsls r0, 16 lsrs r4, r0, 16 cmp r4, r3 - bls @0813CF26 + bls _0813CF26 movs r4, 0 ldr r0, [r2] movs r1, 0x88 @@ -586451,18 +586451,18 @@ sub_813CF0C: ; 813CF0C 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] @@ -586475,7 +586475,7 @@ sub_813CF0C: ; 813CF0C lsrs r0, 16 ldrh r1, [r1, 0x12] cmp r0, r1 - bne @0813CF84 + bne _0813CF84 lsls r0, r5, 1 movs r7, 0x8B lsls r7, 1 @@ -586483,7 +586483,7 @@ sub_813CF0C: ; 813CF0C adds r1, r0 ldr r0, =0x0000ffff strh r0, [r1] -@0813CF84: +_0813CF84: adds r0, r5, 0x1 lsls r0, 16 lsrs r5, r0, 16 @@ -586491,12 +586491,12 @@ sub_813CF0C: ; 813CF0C 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 @@ -586506,8 +586506,8 @@ sub_813CF0C: ; 813CF0C adds r0, r2 ldrh r0, [r0] cmp r4, r0 - bcc @0813CF4C -@0813CFB2: + bcc _0813CF4C +_0813CFB2: movs r5, 0 movs r6, 0 ldr r7, =0x0203ab7c @@ -586515,11 +586515,11 @@ sub_813CF0C: ; 813CF0C 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 @@ -586529,23 +586529,23 @@ sub_813CF0C: ; 813CF0C 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 @@ -586553,13 +586553,13 @@ sub_813CF0C: ; 813CF0C 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 @@ -586569,13 +586569,13 @@ sub_813CF0C: ; 813CF0C 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 @@ -586585,15 +586585,15 @@ sub_813CF0C: ; 813CF0C 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 @@ -586603,15 +586603,15 @@ sub_813CF0C: ; 813CF0C 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 @@ -586621,15 +586621,15 @@ sub_813CF0C: ; 813CF0C 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 @@ -586639,15 +586639,15 @@ sub_813CF0C: ; 813CF0C 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 @@ -586657,11 +586657,11 @@ sub_813CF0C: ; 813CF0C 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 @@ -586669,16 +586669,16 @@ sub_813CF0C: ; 813CF0C 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 @@ -586691,7 +586691,7 @@ sub_813CF0C: ; 813CF0C ldr r7, =0x0000a010 ldr r1, =0x0000ffcf mov r8, r1 -@0813D108: +_0813D108: ldr r0, [r6] lsls r3, r4, 1 adds r0, r5 @@ -586699,21 +586699,21 @@ sub_813CF0C: ; 813CF0C ldrh r1, [r2] adds r0, r1, 0 cmp r0, r12 - bne @0813D130 + bne _0813D130 strh r7, [r2] - b @0813D198 + b _0813D198 .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 @@ -586721,11 +586721,11 @@ sub_813CF0C: ; 813CF0C 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 @@ -586733,11 +586733,11 @@ sub_813CF0C: ; 813CF0C 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 @@ -586745,11 +586745,11 @@ sub_813CF0C: ; 813CF0C 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 @@ -586760,13 +586760,13 @@ sub_813CF0C: ; 813CF0C 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 @@ -586789,26 +586789,26 @@ 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 .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 @@ -586854,12 +586854,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 @@ -586869,15 +586869,15 @@ 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 .pool -@0813D2A4: +_0813D2A4: ldr r1, =0x0000061c adds r0, r2, r1 -@0813D2A8: +_0813D2A8: ldrh r1, [r0] adds r1, 0x4 movs r2, 0x7F @@ -586917,24 +586917,24 @@ sub_813D25C: ; 813D25C 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 .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] @@ -586943,7 +586943,7 @@ sub_813D25C: ; 813D25C lsls r0, 16 lsrs r0, 16 cmp r0, 0xC - bls @0813D3C6 + bls _0813D3C6 movs r0, 0 strh r0, [r1] ldr r3, =0x0000061f @@ -586958,14 +586958,14 @@ sub_813D25C: ; 813D25C 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 @@ -586994,14 +586994,14 @@ sub_813D25C: ; 813D25C 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] @@ -587010,13 +587010,13 @@ sub_813D25C: ; 813D25C 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} @@ -587076,30 +587076,30 @@ 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 .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 ResetAllObjectData bl ResetObjectPaletteAllocator movs r0, 0x3 @@ -587108,8 +587108,8 @@ sub_813D42C: ; 813D42C bl HideBg movs r0, 0 bl HideBg - b @0813D584 -@0813D4A8: + b _0813D584 +_0813D4A8: movs r0, 0x3 movs r1, 0x1 movs r2, 0x3 @@ -587124,26 +587124,26 @@ sub_813D42C: ; 813D42C movs r1, 0 movs r2, 0x10 bl RepeatChar - b @0813D584 + b _0813D584 .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 @@ -587156,18 +587156,18 @@ sub_813D42C: ; 813D42C negs r1, r1 movs r0, 0 bl sub_8123824 - b @0813D584 + b _0813D584 .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 @@ -587175,8 +587175,8 @@ sub_813D42C: ; 813D42C movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @0813D584 -@0813D544: + b _0813D584 +_0813D544: ldr r1, =0x00003f41 movs r0, 0x50 bl SetGpuReg @@ -587189,9 +587189,9 @@ sub_813D42C: ; 813D42C lsls r1, 5 movs r0, 0 bl SetGpuRegBits - b @0813D584 + b _0813D584 .pool -@0813D56C: +_0813D56C: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -587200,9 +587200,9 @@ sub_813D42C: ; 813D42C str r1, [r0] movs r1, 0 strh r1, [r0, 0x8] - b @0813D594 + b _0813D594 .pool -@0813D584: +_0813D584: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -587211,7 +587211,7 @@ sub_813D42C: ; 813D42C ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@0813D594: +_0813D594: add sp, 0x4 pop {r4} pop {r0} @@ -587234,19 +587234,19 @@ 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 .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 @@ -587254,50 +587254,50 @@ sub_813D5A0: ; 813D5A0 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 .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 .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 .pool -@0813D640: +_0813D640: movs r0, 0x15 negs r0, r0 movs r1, 0 @@ -587305,8 +587305,8 @@ sub_813D5A0: ; 813D5A0 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @0813D698 -@0813D652: + b _0813D698 +_0813D652: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -587314,7 +587314,7 @@ sub_813D5A0: ; 813D5A0 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - bne @0813D6A8 + bne _0813D6A8 bl sub_813D824 ldr r4, =0x0203ab7c ldr r0, [r4] @@ -587331,9 +587331,9 @@ sub_813D5A0: ; 813D5A0 ldr r0, [r4] bl Free str r7, [r4] - b @0813D6A8 + b _0813D6A8 .pool -@0813D698: +_0813D698: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -587342,7 +587342,7 @@ sub_813D5A0: ; 813D5A0 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@0813D6A8: +_0813D6A8: add sp, 0x4 pop {r4-r7} pop {r0} @@ -587388,7 +587388,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 @@ -587397,7 +587397,7 @@ sub_813D6D0: ; 813D6D0 ldr r6, =gRegionMapEntries ldr r1, =0x030011fe mov r8, r1 -@0813D710: +_0813D710: mov r2, r10 ldr r1, [r2] movs r3, 0 @@ -587459,7 +587459,7 @@ sub_813D6D0: ; 813D6D0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @0813D7BE + beq _0813D7BE ldr r0, =0x02020630 lsls r2, r1, 4 adds r2, r1 @@ -587484,7 +587484,7 @@ sub_813D6D0: ; 813D6D0 adds r3, r0 adds r3, r1 str r2, [r3] -@0813D7BE: +_0813D7BE: ldrh r0, [r7] adds r0, 0x1 strh r0, [r7] @@ -587497,8 +587497,8 @@ sub_813D6D0: ; 813D6D0 adds r0, r2 ldrh r0, [r0] cmp r1, r0 - blt @0813D710 -@0813D7D8: + blt _0813D710 +_0813D7D8: ldr r0, =0x0203ab7c ldr r0, [r0] ldr r1, =0x03001204 @@ -587532,9 +587532,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 @@ -587552,14 +587552,14 @@ sub_813D824: ; 813D824 adds r0, r1 ldrh r0, [r0] cmp r4, r0 - bcc @0813D846 -@0813D86C: + bcc _0813D846 +_0813D86C: movs r0, 0x3 bl FreeObjectTilesByTag movs r0, 0x3 bl FreeObjectPaletteByTag movs r4, 0 -@0813D87A: +_0813D87A: ldr r0, =0x0203ab7c ldr r0, [r0] lsls r1, r4, 2 @@ -587569,14 +587569,14 @@ sub_813D824: ; 813D824 adds r0, r1 ldr r0, [r0] cmp r0, 0 - beq @0813D892 + beq _0813D892 bl RemoveObjectAndFreeTiles -@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 @@ -587616,13 +587616,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 @@ -587632,13 +587632,13 @@ sub_813D8E8: ; 813D8E8 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x2 - bls @0813D904 - b @0813D9A4 + bls _0813D904 + b _0813D9A4 .pool -@0813D920: +_0813D920: movs r4, 0 ldr r5, =0x02020630 -@0813D924: +_0813D924: lsls r1, r4, 21 movs r6, 0xA0 lsls r6, 16 @@ -587651,7 +587651,7 @@ sub_813D8E8: ; 813D8E8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @0813D988 + beq _0813D988 lsls r3, r0, 4 adds r3, r0 lsls r3, 2 @@ -587677,9 +587677,9 @@ sub_813D8E8: ; 813D8E8 adds r0, r2 adds r0, r1 str r3, [r0] - b @0813D99A + b _0813D99A .pool -@0813D988: +_0813D988: ldr r0, =0x0203ab7c ldr r1, [r0] lsls r0, r4, 2 @@ -587689,13 +587689,13 @@ sub_813D8E8: ; 813D8E8 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 @@ -587726,12 +587726,12 @@ 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 .pool -@0813D9E8: +_0813D9E8: movs r0, 0x1 negs r0, r0 str r7, [sp] @@ -587742,14 +587742,14 @@ sub_813D9C0: ; 813D9C0 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 @@ -587766,7 +587766,7 @@ sub_813D9C0: ; 813D9C0 adds r2, r5, 0 adds r3, r6, 0 bl evolution_cutscene -@0813DA30: +_0813DA30: add sp, 0x4 pop {r4-r7} pop {r0} @@ -588294,26 +588294,26 @@ 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 .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 SetGpuReg @@ -588346,9 +588346,9 @@ sub_813DF70: ; 813DF70 strh r0, [r2] ldr r0, =0x02022e22 strh r1, [r0] - b @0813E180 + b _0813E180 .pool -@0813E050: +_0813E050: bl sub_80A1A74 ldr r0, =nullsub_83 bl SetHBlankCallback @@ -588358,12 +588358,12 @@ sub_813DF70: ; 813DF70 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @0813E188 + b _0813E188 .pool -@0813E078: +_0813E078: bl sub_807F19C - b @0813E180 -@0813E07E: + b _0813E180 +_0813E07E: movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -588380,9 +588380,9 @@ sub_813DF70: ; 813DF70 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @0813E188 + b _0813E188 .pool -@0813E0A8: +_0813E0A8: adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr @@ -588408,9 +588408,9 @@ sub_813DF70: ; 813DF70 lsls r1, 1 movs r2, 0x20 bl decompress_palette - b @0813E180 + b _0813E180 .pool -@0813E0F0: +_0813E0F0: adds r0, r6, 0 movs r1, 0x1 bl sub_806A068 @@ -588450,35 +588450,35 @@ sub_813DF70: ; 813DF70 adds r0, 0x1 strb r0, [r1] bl sub_807B154 - b @0813E1C8 + b _0813E1C8 .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 .pool -@0813E198: +_0813E198: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -588497,7 +588497,7 @@ sub_813DF70: ; 813DF70 lsls r1, 5 movs r0, 0 bl SetGpuReg -@0813E1C8: +_0813E1C8: add sp, 0xC pop {r4-r6} pop {r0} @@ -588725,15 +588725,15 @@ evovle_mon_internal_maybe: ; 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 @@ -588783,7 +588783,7 @@ evovle_mon_internal_maybe: ; 813E3DC ldr r0, [sp, 0x8] mov r8, r0 adds r5, r6, 0 -@0813E484: +_0813E484: ldrb r1, [r5] movs r0, 0x64 muls r0, r1 @@ -588794,10 +588794,10 @@ evovle_mon_internal_maybe: ; 813E3DC 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 @@ -588808,7 +588808,7 @@ evovle_mon_internal_maybe: ; 813E3DC bl pokemon_setattr adds r4, 0x1 cmp r4, 0x4F - ble @0813E4A0 + ble _0813E4A0 ldr r4, =0x020244e9 ldrb r0, [r4] muls r0, r6 @@ -588851,24 +588851,24 @@ evovle_mon_internal_maybe: ; 813E3DC 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, =gUnknown_085B58C4 mov r0, r9 movs r1, 0x2 bl pokemon_setattr -@0813E546: +_0813E546: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -588906,11 +588906,11 @@ evovle_mon_maybe: ; 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 @@ -588919,13 +588919,13 @@ evovle_mon_maybe: ; 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] @@ -588935,9 +588935,9 @@ evovle_mon_maybe: ; 813E570 adds r0, r5 strh r2, [r0, 0x18] bl sub_8140134 - bl @0813F1A4 + bl _0813F1A4 .pool -@0813E5F0: +_0813E5F0: lsls r1, r7, 2 adds r0, r1, r7 lsls r0, 3 @@ -588946,41 +588946,41 @@ evovle_mon_maybe: ; 813E570 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 .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 @@ -589018,17 +589018,17 @@ evovle_mon_maybe: ; 813E570 bl ShowBg movs r0, 0x3 bl ShowBg - bl @0813F1A4 + bl _0813F1A4 .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, =gUnknown_085CC990 adds r0, r4, 0 @@ -589041,16 +589041,16 @@ evovle_mon_maybe: ; 813E570 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b @0813EC52 + b _0813EC52 .pool -@0813E714: +_0813E714: movs r0, 0 bl IsTextPrinterActive 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] @@ -589059,17 +589059,17 @@ evovle_mon_maybe: ; 813E570 adds r4, r3, r7 lsls r4, 3 adds r4, r1 - b @0813EB90 + b _0813EB90 .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 @@ -589078,16 +589078,16 @@ evovle_mon_maybe: ; 813E570 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b @0813EC52 + b _0813EC52 .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 @@ -589104,17 +589104,17 @@ evovle_mon_maybe: ; 813E570 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - bl @0813F1A4 + bl _0813F1A4 .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 @@ -589126,9 +589126,9 @@ evovle_mon_maybe: ; 813E570 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b @0813EC52 + b _0813EC52 .pool -@0813E7E8: +_0813E7E8: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -589137,9 +589137,9 @@ evovle_mon_maybe: ; 813E570 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 @@ -589153,9 +589153,9 @@ evovle_mon_maybe: ; 813E570 strb r0, [r1, 0x3] bl sub_817BFB4 strb r0, [r4, 0x2] - bl @0813F1A4 + bl _0813F1A4 .pool -@0813E828: +_0813E828: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -589164,9 +589164,9 @@ evovle_mon_maybe: ; 813E570 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] @@ -589177,9 +589177,9 @@ evovle_mon_maybe: ; 813E570 adds r1, r0, r7 lsls r1, 3 adds r1, r5 - b @0813EC52 + b _0813EC52 .pool -@0813E860: +_0813E860: ldr r2, =0x0203ab80 ldr r1, [r2] ldrb r0, [r1, 0x3] @@ -589187,9 +589187,9 @@ evovle_mon_maybe: ; 813E570 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] @@ -589201,16 +589201,16 @@ evovle_mon_maybe: ; 813E570 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 .pool -@0813E8A4: +_0813E8A4: bl sub_817C068 ldr r1, =0x02024332 strb r0, [r1, 0x2] @@ -589219,9 +589219,9 @@ evovle_mon_maybe: ; 813E570 adds r1, r3, r7 lsls r1, 3 adds r1, r0 - b @0813EC52 + b _0813EC52 .pool -@0813E8C0: +_0813E8C0: ldr r6, =0x02024332 ldrb r0, [r6, 0x2] lsls r1, r0, 2 @@ -589230,9 +589230,9 @@ evovle_mon_maybe: ; 813E570 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 @@ -589240,9 +589240,9 @@ evovle_mon_maybe: ; 813E570 ldrh r0, [r4, 0xC] bl sub_817C144 strb r0, [r6, 0x2] - b @0813EB96 + b _0813EB96 .pool -@0813E8EC: +_0813E8EC: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -589251,24 +589251,24 @@ evovle_mon_maybe: ; 813E570 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 .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 @@ -589289,17 +589289,17 @@ evovle_mon_maybe: ; 813E570 adds r1, r3, r7 lsls r1, 3 adds r1, r0 - b @0813EC52 + b _0813EC52 .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] @@ -589308,15 +589308,15 @@ evovle_mon_maybe: ; 813E570 lsls r4, 3 adds r4, r5 ldrh r1, [r4, 0xC] - b @0813EB92 + b _0813EB92 .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, =gUnknown_085CC9A6 adds r0, r4, 0 @@ -589359,16 +589359,16 @@ evovle_mon_maybe: ; 813E570 bl pokedex_flag_operation movs r0, 0xE bl sav12_xor_increment - b @0813F1A4 + b _0813F1A4 .pool -@0813EA1C: +_0813EA1C: movs r0, 0 bl IsTextPrinterActive 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 @@ -589380,19 +589380,19 @@ evovle_mon_maybe: ; 813E570 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 @@ -589408,22 +589408,22 @@ evovle_mon_maybe: ; 813E570 bl CopyString_Limit10 ldr r0, =0x0000ffff cmp r6, r0 - bne @0813EA94 + bne _0813EA94 movs r0, 0x16 strh r0, [r4, 0x8] - b @0813F1A4 + b _0813F1A4 .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 .pool -@0813EAA8: +_0813EAA8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -589436,9 +589436,9 @@ evovle_mon_maybe: ; 813E570 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b @0813EC52 + b _0813EC52 .pool -@0813EAC8: +_0813EAC8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r2, 0x80 @@ -589447,9 +589447,9 @@ evovle_mon_maybe: ; 813E570 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 @@ -589458,18 +589458,18 @@ evovle_mon_maybe: ; 813E570 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 evovle_mon_internal_maybe -@0813EB06: +_0813EB06: adds r0, r7, 0 bl remove_task bl sub_805F094 @@ -589481,9 +589481,9 @@ evovle_mon_maybe: ; 813E570 ldr r0, =0x030061e8 ldr r0, [r0] bl SetMainCallback2 - b @0813F1A4 + b _0813F1A4 .pool -@0813EB34: +_0813EB34: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -589492,9 +589492,9 @@ evovle_mon_maybe: ; 813E570 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 @@ -589507,17 +589507,17 @@ evovle_mon_maybe: ; 813E570 adds r1, r2, r7 lsls r1, 3 adds r1, r5 - b @0813EC52 + b _0813EC52 .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] @@ -589525,25 +589525,25 @@ evovle_mon_maybe: ; 813E570 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 .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 @@ -589552,17 +589552,17 @@ evovle_mon_maybe: ; 813E570 movs r3, 0x1A ldrsh r0, [r1, r3] cmp r0, 0 - beq @0813EBE4 + beq _0813EBE4 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085CC9EE bl ExpandStringRefs - b @0813EBEC + b _0813EBEC .pool -@0813EBE4: +_0813EBE4: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085CC9D3 bl ExpandStringRefs -@0813EBEC: +_0813EBEC: ldr r0, =0x02021fc4 movs r1, 0 bl battle_show_message_maybe @@ -589573,22 +589573,22 @@ evovle_mon_maybe: ; 813E570 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x1A] - b @0813F16E + b _0813F16E .pool -@0813EC10: +_0813EC10: movs r0, 0 bl IsTextPrinterActive 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 @@ -589605,26 +589605,26 @@ evovle_mon_maybe: ; 813E570 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 .pool -@0813EC6C: +_0813EC6C: movs r0, 0 bl IsTextPrinterActive 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 @@ -589635,14 +589635,14 @@ evovle_mon_maybe: ; 813E570 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 .pool -@0813ECA8: +_0813ECA8: mov r3, r8 adds r0, r3, r7 lsls r0, 3 @@ -589650,44 +589650,44 @@ evovle_mon_maybe: ; 813E570 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 .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 IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x10] @@ -589702,22 +589702,22 @@ evovle_mon_maybe: ; 813E570 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813F1A2 + b _0813F1A2 .pool -@0813ED48: +_0813ED48: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x14] bl get_battle_strings_ @@ -589731,18 +589731,18 @@ evovle_mon_maybe: ; 813E570 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813F1A2 + b _0813F1A2 .pool -@0813ED90: +_0813ED90: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x18] bl get_battle_strings_ @@ -589761,21 +589761,21 @@ evovle_mon_maybe: ; 813E570 ldrh r0, [r1, 0x14] adds r0, 0x1 strh r0, [r1, 0x14] -@0813EDCE: +_0813EDCE: movs r0, 0 bl IsTextPrinterActive 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 @@ -589798,19 +589798,19 @@ evovle_mon_maybe: ; 813E570 strb r2, [r0, 0x1] movs r0, 0 bl sub_8056B74 - b @0813F1A4 + b _0813F1A4 .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] @@ -589818,17 +589818,17 @@ evovle_mon_maybe: ; 813E570 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] @@ -589836,14 +589836,14 @@ evovle_mon_maybe: ; 813E570 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 @@ -589855,7 +589855,7 @@ evovle_mon_maybe: ; 813E570 ldr r0, =0x02024332 ldrb r2, [r0, 0x1] cmp r2, 0 - beq @0813EECC + beq _0813EECC ldr r0, =0x03005e00 mov r2, r8 adds r1, r2, r7 @@ -589863,9 +589863,9 @@ evovle_mon_maybe: ; 813E570 adds r1, r0 ldrh r0, [r1, 0x18] strh r0, [r1, 0x14] - b @0813EEF2 + b _0813EEF2 .pool -@0813EECC: +_0813EECC: ldr r0, =0x03005e00 mov r3, r8 adds r1, r3, r7 @@ -589876,7 +589876,7 @@ evovle_mon_maybe: ; 813E570 lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne @0813EEF2 + bne _0813EEF2 movs r0, 0x1 negs r0, r0 str r2, [sp] @@ -589884,15 +589884,15 @@ evovle_mon_maybe: ; 813E570 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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 @@ -589909,17 +589909,17 @@ evovle_mon_maybe: ; 813E570 adds r0, r1 ldrh r1, [r0, 0x18] strh r1, [r0, 0x14] - b @0813F1A4 + b _0813F1A4 .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 FreeAllWindowBuffers ldr r0, =0x020244ec ldr r1, =0x03005e00 @@ -589941,37 +589941,37 @@ evovle_mon_maybe: ; 813E570 ldrh r0, [r5, 0x14] adds r0, 0x1 strh r0, [r5, 0x14] - b @0813F1A4 + b _0813F1A4 .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 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 .pool -@0813EFC8: +_0813EFC8: adds r1, r6, 0 adds r1, 0xD mov r0, r9 @@ -589981,7 +589981,7 @@ evovle_mon_maybe: ; 813E570 adds r0, r4, 0 bl sub_806E804 cmp r0, 0 - beq @0813F014 + beq _0813F014 ldr r0, =gUnknown_085CC270 ldr r3, =0x000004cc adds r0, r3 @@ -589997,9 +589997,9 @@ evovle_mon_maybe: ; 813E570 adds r0, r1 movs r1, 0xC strh r1, [r0, 0x14] - b @0813F1A4 + b _0813F1A4 .pool -@0813F014: +_0813F014: ldr r1, =0x02022f68 movs r0, 0xFD strb r0, [r1] @@ -590027,9 +590027,9 @@ evovle_mon_maybe: ; 813E570 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813F1A2 + b _0813F1A2 .pool -@0813F05C: +_0813F05C: ldr r0, =gUnknown_085CC270 movs r1, 0xCF lsls r1, 2 @@ -590046,22 +590046,22 @@ evovle_mon_maybe: ; 813E570 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813F1A2 + b _0813F1A2 .pool -@0813F090: +_0813F090: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x1C] bl get_battle_strings_ @@ -590075,18 +590075,18 @@ evovle_mon_maybe: ; 813E570 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813F1A2 + b _0813F1A2 .pool -@0813F0D8: +_0813F0D8: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 movs r1, 0xD0 lsls r1, 2 @@ -590103,9 +590103,9 @@ evovle_mon_maybe: ; 813E570 adds r0, r1 movs r1, 0x14 strh r1, [r0, 0x8] - b @0813F1A4 + b _0813F1A4 .pool -@0813F120: +_0813F120: ldr r0, =gUnknown_085CC270 ldr r0, [r0, 0x20] bl get_battle_strings_ @@ -590123,9 +590123,9 @@ evovle_mon_maybe: ; 813E570 strh r2, [r0, 0x18] movs r1, 0x3 strh r1, [r0, 0x14] - b @0813F1A4 + b _0813F1A4 .pool -@0813F154: +_0813F154: ldr r0, =gUnknown_085CC270 ldr r0, [r0, 0x24] bl get_battle_strings_ @@ -590137,30 +590137,30 @@ evovle_mon_maybe: ; 813E570 adds r0, r2, r7 lsls r0, 3 adds r0, r1 -@0813F16E: +_0813F16E: movs r1, 0xF strh r1, [r0, 0x8] - b @0813F1A4 + b _0813F1A4 .pool -@0813F180: +_0813F180: movs r0, 0 bl IsTextPrinterActive 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 @@ -590196,39 +590196,39 @@ 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 .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, =gUnknown_085CC990 adds r0, r4, 0 @@ -590242,16 +590242,16 @@ sub_813F1B8: ; 813F1B8 adds r0, r7 lsls r0, 3 adds r0, r1 - b @0813F6B4 + b _0813F6B4 .pool -@0813F284: +_0813F284: movs r0, 0 bl IsTextPrinterActive 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 @@ -590260,15 +590260,15 @@ sub_813F1B8: ; 813F1B8 ldrh r0, [r4, 0xA] movs r1, 0 bl cry_related - b @0813F6F2 + b _0813F6F2 .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 @@ -590279,16 +590279,16 @@ sub_813F1B8: ; 813F1B8 adds r0, r7 lsls r0, 3 adds r0, r1 - b @0813F6B4 + b _0813F6B4 .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 @@ -590302,17 +590302,17 @@ sub_813F1B8: ; 813F1B8 str r5, [sp] movs r0, 0x1C movs r1, 0x4 - b @0813F9C8 + b _0813F9C8 .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 @@ -590342,9 +590342,9 @@ sub_813F1B8: ; 813F1B8 ldr r1, =0x00000603 movs r0, 0xE bl SetGpuReg - bl @0813FCC4 + bl _0813FCC4 .pool -@0813F380: +_0813F380: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -590353,9 +590353,9 @@ sub_813F1B8: ; 813F1B8 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 @@ -590369,9 +590369,9 @@ sub_813F1B8: ; 813F1B8 strb r0, [r1, 0x3] bl sub_817BFB4 strb r0, [r4, 0x2] - bl @0813FCC4 + bl _0813FCC4 .pool -@0813F3C0: +_0813F3C0: ldr r4, =0x02024332 ldrb r0, [r4, 0x2] lsls r1, r0, 2 @@ -590380,18 +590380,18 @@ sub_813F1B8: ; 813F1B8 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 .pool -@0813F3F0: +_0813F3F0: ldr r2, =0x0203ab80 ldr r1, [r2] ldrb r0, [r1, 0x3] @@ -590399,9 +590399,9 @@ sub_813F1B8: ; 813F1B8 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] @@ -590413,12 +590413,12 @@ sub_813F1B8: ; 813F1B8 adds r0, r5 ldrb r0, [r0, 0x4] cmp r0, 0 - beq @0813F420 - bl @0813FCC4 -@0813F420: - b @0813F6AC + beq _0813F420 + bl _0813FCC4 +_0813F420: + b _0813F6AC .pool -@0813F42C: +_0813F42C: bl sub_817C068 ldr r1, =0x02024332 strb r0, [r1, 0x2] @@ -590427,9 +590427,9 @@ sub_813F1B8: ; 813F1B8 adds r0, r7 lsls r0, 3 adds r0, r1 - b @0813F6B4 + b _0813F6B4 .pool -@0813F448: +_0813F448: ldr r6, =0x02024332 ldrb r0, [r6, 0x2] lsls r1, r0, 2 @@ -590438,9 +590438,9 @@ sub_813F1B8: ; 813F1B8 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 @@ -590448,9 +590448,9 @@ sub_813F1B8: ; 813F1B8 ldrh r0, [r4, 0xC] bl sub_817C280 strb r0, [r6, 0x2] - b @0813F6F2 + b _0813F6F2 .pool -@0813F474: +_0813F474: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -590459,20 +590459,20 @@ sub_813F1B8: ; 813F1B8 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 .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 @@ -590491,15 +590491,15 @@ sub_813F1B8: ; 813F1B8 adds r1, 0x4 movs r2, 0x60 bl memcpy - b @0813F6F2 + b _0813F6F2 .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, =gUnknown_085CC9A6 adds r0, r4, 0 @@ -590543,23 +590543,23 @@ sub_813F1B8: ; 813F1B8 bl pokedex_flag_operation movs r0, 0xE bl sav12_xor_increment - b @0813FCC4 + b _0813FCC4 .pool -@0813F570: +_0813F570: movs r0, 0 bl IsTextPrinterActive 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 @@ -590572,11 +590572,11 @@ sub_813F1B8: ; 813F1B8 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 @@ -590592,22 +590592,22 @@ sub_813F1B8: ; 813F1B8 bl CopyString_Limit10 ldr r0, =0x0000ffff cmp r6, r0 - bne @0813F5E8 + bne _0813F5E8 movs r0, 0x14 strh r0, [r5, 0x8] - b @0813FCC4 + b _0813FCC4 .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 .pool -@0813F5FC: +_0813F5FC: ldr r0, =0x00000179 bl song_play_for_text ldr r1, =gUnknown_085EF6D2 @@ -590619,17 +590619,17 @@ sub_813F1B8: ; 813F1B8 adds r1, r2, r7 lsls r1, 3 adds r1, r0 - b @0813F78C + b _0813F78C .pool -@0813F624: +_0813F624: movs r0, 0 bl IsTextPrinterActive 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 @@ -590645,9 +590645,9 @@ sub_813F1B8: ; 813F1B8 ldr r0, =0x030061e8 ldr r0, [r0] bl SetMainCallback2 - b @0813FCC4 + b _0813FCC4 .pool -@0813F668: +_0813F668: ldr r0, =0x02024332 ldrb r1, [r0, 0x2] lsls r0, r1, 2 @@ -590656,9 +590656,9 @@ sub_813F1B8: ; 813F1B8 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 @@ -590681,26 +590681,26 @@ sub_813F1B8: ; 813F1B8 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@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 .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] @@ -590710,21 +590710,21 @@ sub_813F1B8: ; 813F1B8 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 .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, =gUnknown_085CC9EE adds r0, r4, 0 @@ -590740,22 +590740,22 @@ sub_813F1B8: ; 813F1B8 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x1A] - b @0813FC8C + b _0813FC8C .pool -@0813F748: +_0813F748: movs r0, 0 bl IsTextPrinterActive 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 @@ -590773,27 +590773,27 @@ sub_813F1B8: ; 813F1B8 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 .pool -@0813F7A4: +_0813F7A4: movs r0, 0 bl IsTextPrinterActive 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 @@ -590804,14 +590804,14 @@ sub_813F1B8: ; 813F1B8 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 .pool -@0813F7E4: +_0813F7E4: lsls r1, r7, 2 adds r0, r1, r7 lsls r0, 3 @@ -590820,43 +590820,43 @@ sub_813F1B8: ; 813F1B8 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 .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 IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x10] @@ -590872,22 +590872,22 @@ sub_813F1B8: ; 813F1B8 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813FCC2 + b _0813FCC2 .pool -@0813F884: +_0813F884: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x14] bl get_battle_strings_ @@ -590902,18 +590902,18 @@ sub_813F1B8: ; 813F1B8 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813FCC2 + b _0813FCC2 .pool -@0813F8CC: +_0813F8CC: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x18] bl get_battle_strings_ @@ -590933,21 +590933,21 @@ sub_813F1B8: ; 813F1B8 ldrh r0, [r1, 0x14] adds r0, 0x1 strh r0, [r1, 0x14] -@0813F90C: +_0813F90C: movs r0, 0 bl IsTextPrinterActive 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 @@ -590969,26 +590969,26 @@ sub_813F1B8: ; 813F1B8 movs r2, 0 strh r0, [r1, 0x14] strb r2, [r3, 0x1] - b @0813FCC4 + b _0813FCC4 .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, =gUnknown_085CC270 @@ -591011,20 +591011,20 @@ sub_813F1B8: ; 813F1B8 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 pal_fade_maybe - b @0813FCC4 + b _0813FCC4 .pool -@0813F9E4: +_0813F9E4: ldr r1, =0x02024332 movs r0, 0x1 strb r0, [r1, 0x1] @@ -591045,23 +591045,23 @@ sub_813F1B8: ; 813F1B8 adds r0, r1 ldrh r1, [r0, 0x18] strh r1, [r0, 0x14] - b @0813FCC4 + b _0813FCC4 .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 GetBgTilemap bl Free @@ -591092,38 +591092,38 @@ sub_813F1B8: ; 813F1B8 ldrh r0, [r5, 0x14] adds r0, 0x1 strh r0, [r5, 0x14] - b @0813FCC4 + b _0813FCC4 .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 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 .pool -@0813FAEC: +_0813FAEC: adds r1, r6, 0 adds r1, 0xD mov r0, r9 @@ -591133,7 +591133,7 @@ sub_813F1B8: ; 813F1B8 adds r0, r4, 0 bl sub_806E804 cmp r0, 0 - beq @0813FB3C + beq _0813FB3C ldr r0, =gUnknown_085CC270 ldr r1, =0x000004cc adds r0, r1 @@ -591150,9 +591150,9 @@ sub_813F1B8: ; 813F1B8 adds r0, r1 movs r1, 0xB strh r1, [r0, 0x14] - b @0813FCC4 + b _0813FCC4 .pool -@0813FB3C: +_0813FB3C: ldr r1, =0x02022f68 movs r0, 0xFD strb r0, [r1] @@ -591190,22 +591190,22 @@ sub_813F1B8: ; 813F1B8 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813FCC2 + b _0813FCC2 .pool -@0813FBA4: +_0813FBA4: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 ldr r0, [r0, 0x1C] bl get_battle_strings_ @@ -591220,18 +591220,18 @@ sub_813F1B8: ; 813F1B8 adds r1, r0 ldrh r0, [r1, 0x14] adds r0, 0x1 - b @0813FCC2 + b _0813FCC2 .pool -@0813FBEC: +_0813FBEC: movs r0, 0 bl IsTextPrinterActive 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, =gUnknown_085CC270 movs r1, 0xD0 lsls r1, 2 @@ -591249,9 +591249,9 @@ sub_813F1B8: ; 813F1B8 adds r0, r1 movs r1, 0x12 strh r1, [r0, 0x8] - b @0813FCC4 + b _0813FCC4 .pool -@0813FC38: +_0813FC38: ldr r0, =gUnknown_085CC270 ldr r0, [r0, 0x20] bl get_battle_strings_ @@ -591270,9 +591270,9 @@ sub_813F1B8: ; 813F1B8 strh r2, [r0, 0x18] movs r1, 0x3 strh r1, [r0, 0x14] - b @0813FCC4 + b _0813FCC4 .pool -@0813FC70: +_0813FC70: ldr r0, =gUnknown_085CC270 ldr r0, [r0, 0x24] bl get_battle_strings_ @@ -591285,30 +591285,30 @@ sub_813F1B8: ; 813F1B8 adds r0, r2, r7 lsls r0, 3 adds r0, r1 -@0813FC8C: +_0813FC8C: movs r1, 0xD strh r1, [r0, 0x8] - b @0813FCC4 + b _0813FCC4 .pool -@0813FCA0: +_0813FCA0: movs r0, 0 bl IsTextPrinterActive 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 @@ -591425,14 +591425,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] @@ -591446,14 +591446,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] @@ -591466,20 +591466,20 @@ 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 .pool -@0813FE74: +_0813FE74: ldr r0, =0x0203ab84 lsls r1, 5 ldr r0, [r0] @@ -591490,16 +591490,16 @@ sub_813FDEC: ; 813FDEC 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 @@ -591517,16 +591517,16 @@ 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 .pool -@0813FED0: +_0813FED0: ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -591534,7 +591534,7 @@ sub_813FEA4: ; 813FEA4 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0xC] -@0813FEDE: +_0813FEDE: pop {r4} pop {r0} bx r0 @@ -591561,15 +591561,15 @@ 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 .pool -@0813FF28: +_0813FF28: ldr r7, =0x02022e20 ldr r6, =0x02022e22 -@0813FF2C: +_0813FF2C: lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -591613,7 +591613,7 @@ sub_813FEE8: ; 813FEE8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @0813FFA6 + bne _0813FFA6 adds r0, r5, 0 bl remove_task mov r0, r8 @@ -591625,7 +591625,7 @@ sub_813FEE8: ; 813FEE8 adds r0, r2, 0 strh r0, [r7] strh r4, [r6] -@0813FFA6: +_0813FFA6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -591642,14 +591642,14 @@ sub_813FFC0: ; 813FFC0 movs r1, 0 ldr r5, =gUnknown_085B5884 ldr r7, =gUnknown_085B58D9 -@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 @@ -591659,10 +591659,10 @@ sub_813FFC0: ; 813FFC0 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 @@ -591682,15 +591682,15 @@ 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 .pool -@08140028: +_08140028: movs r6, 0x1 movs r4, 0x3 -@0814002C: +_0814002C: ldr r0, =gUnknown_085B51E4 movs r1, 0xA0 movs r2, 0x20 @@ -591717,7 +591717,7 @@ sub_8140000: ; 8140000 adds r0, r4, 0 bl CopyBgTilemapBufferToVram cmp r5, 0 - bne @081400C4 + bne _081400C4 ldr r1, =0x00000442 movs r0, 0x50 bl SetGpuReg @@ -591740,9 +591740,9 @@ sub_8140000: ; 8140000 bl ShowBg movs r0, 0x2 bl ShowBg - b @081400DE + b _081400DE .pool -@081400C4: +_081400C4: ldr r1, =0x00000842 movs r0, 0x50 bl SetGpuReg @@ -591753,7 +591753,7 @@ sub_8140000: ; 8140000 lsls r1, 5 movs r0, 0 bl SetGpuReg -@081400DE: +_081400DE: ldr r0, =sub_813FDEC movs r1, 0x5 bl AddTask @@ -591774,7 +591774,7 @@ sub_8140100: ; 8140100 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @0814011E + beq _0814011E ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -591782,7 +591782,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 @@ -591800,17 +591800,17 @@ sub_8140134: ; 8140134 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @08140148 + beq _08140148 bl remove_task -@08140148: +_08140148: ldr r0, =sub_813FEE8 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 @@ -591899,13 +591899,13 @@ sub_8140208: ; 8140208 ldr r1, [r1] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @08140230 + beq _08140230 movs r0, 0 - b @08140232 + b _08140232 .pool -@08140230: +_08140230: movs r0, 0x1 -@08140232: +_08140232: pop {r1} bx r1 thumb_func_end sub_8140208 @@ -591922,10 +591922,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 .pool @@ -591953,16 +591953,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 SetGpuReg -@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 @@ -591974,21 +591974,21 @@ sub_8140264: ; 8140264 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 .pool -@081402EC: +_081402EC: movs r0, 0 movs r1, 0x1 movs r2, 0 @@ -592008,9 +592008,9 @@ sub_8140264: ; 8140264 ldr r0, [r1, 0x8] movs r0, 0x2 strh r0, [r2, 0x28] - b @08140374 + b _08140374 .pool -@08140324: +_08140324: ldr r1, =0x040000d4 movs r2, 0xCF lsls r2, 2 @@ -592021,9 +592021,9 @@ sub_8140264: ; 8140264 ldr r0, =0x800001a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] - b @08140374 + b _08140374 .pool -@08140348: +_08140348: movs r0, 0 movs r1, 0x1 movs r2, 0x2 @@ -592044,7 +592044,7 @@ sub_8140264: ; 8140264 ldr r1, [r4] movs r0, 0 strh r0, [r1, 0x28] -@08140374: +_08140374: add sp, 0x4 pop {r4} pop {r0} @@ -592164,13 +592164,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, =gUnknown_085B6348 ldrb r0, [r1, 0x4] @@ -592209,19 +592209,19 @@ sub_8140470: ; 8140470 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 .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] @@ -592240,7 +592240,7 @@ sub_8140470: ; 8140470 adds r0, 0xB8 bl sub_8151678 movs r4, 0 -@0814054E: +_0814054E: ldr r5, =0x0203ab88 ldr r0, [r5] adds r0, 0xB8 @@ -592253,9 +592253,9 @@ sub_8140470: ; 8140470 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 @@ -592266,28 +592266,28 @@ sub_8140470: ; 8140470 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 .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 GameFreakRTC_CalcLocalDateTime add sp, 0x8 pop {r4-r6} @@ -592305,35 +592305,35 @@ 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 .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 DeactivateAllTextPrinters movs r1, 0x90 @@ -592343,15 +592343,15 @@ sub_81405CC: ; 81405CC ldr r1, =0x0000060a movs r0, 0x52 bl SetGpuReg - b @081407F8 + b _081407F8 .pool -@08140650: +_08140650: bl sub_80A1A74 bl ResetAllObjectData bl clear_tasks bl reset_temp_tile_data_buffers - b @081407F8 -@08140662: + b _081407F8 +_08140662: ldr r0, =gUnknown_085B5BFC movs r2, 0xE0 lsls r2, 1 @@ -592370,24 +592370,24 @@ sub_81405CC: ; 81405CC movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @081407F8 + b _081407F8 .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, =gUnknown_085B5FA0 movs r0, 0x2 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer - b @081407F8 + b _081407F8 .pool -@081406C0: +_081406C0: movs r0, 0 bl sub_8142C0C bl sub_81439C8 @@ -592396,8 +592396,8 @@ sub_81405CC: ; 81405CC bl sub_8142CD0 bl sub_8142F7C bl sub_81431E4 - b @081407F8 -@081406E0: + b _081407F8 +_081406E0: bl CallObjectCallbacks bl PrepareSpritesForOamLoad bl GetCoins @@ -592435,9 +592435,9 @@ sub_81405CC: ; 81405CC strh r0, [r1] ldr r0, =0x02021bbe strh r5, [r0] - b @081407F8 + b _081407F8 .pool -@08140750: +_08140750: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -592452,8 +592452,8 @@ sub_81405CC: ; 81405CC bl ShowBg movs r0, 0x2 bl ShowBg - b @081407F8 -@0814077A: + b _081407F8 +_0814077A: movs r0, 0x1 bl EnableInterrupts ldr r0, =sub_8140264 @@ -592495,9 +592495,9 @@ sub_81405CC: ; 81405CC strb r0, [r1] ldr r0, =sub_8140238 bl SetMainCallback2 - b @08140806 + b _08140806 .pool -@081407F8: +_081407F8: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -592505,7 +592505,7 @@ sub_81405CC: ; 81405CC ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@08140806: +_08140806: add sp, 0xC pop {r4,r5} pop {r0} @@ -592530,7 +592530,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] @@ -592543,14 +592543,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] @@ -592565,18 +592565,18 @@ sub_8140814: ; 8140814 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] @@ -592600,7 +592600,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 @@ -592627,7 +592627,7 @@ sub_81408A8: ; 81408A8 adds r0, r4, 0 movs r3, 0x3 bl sub_8141F7C -@081408FE: +_081408FE: pop {r4,r5} pop {r0} bx r0 @@ -592720,34 +592720,34 @@ 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 .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 @@ -592761,9 +592761,9 @@ sub_81409B8: ; 81409B8 movs r2, 0xE movs r3, 0x7 bl sub_8152008 - b @08140B4E + b _08140B4E .pool -@08140A3C: +_08140A3C: lsls r0, r4, 1 adds r0, r4 adds r0, 0xE @@ -592797,9 +592797,9 @@ sub_81409B8: ; 81409B8 mov r2, r8 movs r3, 0x7 bl sub_8152058 - b @08140B4E + b _08140B4E .pool -@08140A90: +_08140A90: subs r0, r4, 0x1 movs r1, 0x5 bl __divsi3 @@ -592836,9 +592836,9 @@ sub_81409B8: ; 81409B8 movs r2, 0xE adds r3, r7, 0 bl sub_8152058 - b @08140B4E + b _08140B4E .pool -@08140AE8: +_08140AE8: adds r0, r4, 0 movs r1, 0x5 bl __umodsi3 @@ -592886,7 +592886,7 @@ sub_81409B8: ; 81409B8 mov r2, r8 adds r3, r7, 0 bl sub_8152058 -@08140B4E: +_08140B4E: add sp, 0x8 pop {r3} mov r8, r3 @@ -592959,7 +592959,7 @@ sub_8140BD0: ; 8140BD0 movs r0, 0x20 ands r0, r2 cmp r0, 0 - beq @08140C30 + beq _08140C30 movs r3, 0xB ldr r5, =gUnknown_085B6154 adds r0, r5, 0 @@ -592970,10 +592970,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 @@ -592981,7 +592981,7 @@ sub_8140BD0: ; 8140BD0 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 @@ -592991,10 +592991,10 @@ sub_8140BD0: ; 8140BD0 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08140BFE - b @08140C6E + bne _08140BFE + b _08140C6E .pool -@08140C30: +_08140C30: movs r3, 0x6 ldr r5, =gUnknown_085B6154 adds r0, r5, 0 @@ -593005,10 +593005,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 -@08140C4A: +_08140C4A: lsls r0, r3, 16 movs r1, 0x80 lsls r1, 9 @@ -593016,7 +593016,7 @@ sub_8140BD0: ; 8140BD0 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 @@ -593026,8 +593026,8 @@ sub_8140BD0: ; 8140BD0 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 @@ -593068,9 +593068,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 @@ -593082,13 +593082,13 @@ 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 .pool -@08140CF4: +_08140CF4: cmp r5, 0x3 - bgt @08140D1C + bgt _08140D1C movs r1, 0 ldrsh r0, [r4, r1] movs r1, 0x5 @@ -593104,9 +593104,9 @@ sub_8140CA8: ; 8140CA8 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] @@ -593121,29 +593121,29 @@ sub_8140CA8: ; 8140CA8 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 @@ -593169,7 +593169,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 @@ -593181,14 +593181,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 @@ -593200,14 +593200,14 @@ sub_8140D6C: ; 8140D6C 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 @@ -593219,14 +593219,14 @@ sub_8140D6C: ; 8140D6C 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 @@ -593238,13 +593238,13 @@ sub_8140D6C: ; 8140D6C 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 @@ -593294,7 +593294,7 @@ sub_8140D6C: ; 8140D6C movs r2, 0x8 add r2, r12 mov r10, r2 -@08140E8C: +_08140E8C: ldr r0, =0x0203ab88 ldr r5, [r0] adds r0, r4, 0 @@ -593329,7 +593329,7 @@ sub_8140D6C: ; 8140D6C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @08140E8C + bls _08140E8C ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 @@ -593340,7 +593340,7 @@ sub_8140D6C: ; 8140D6C lsls r0, 16 lsrs r0, 16 cmp r0, 0x3 - bhi @08140F3A + bhi _08140F3A ldr r2, =gUnknown_085B6154 movs r0, 0x10 ldrsh r1, [r1, r0] @@ -593353,7 +593353,7 @@ sub_8140D6C: ; 8140D6C ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08140F3A + bne _08140F3A subs r0, r3, 0x1 lsls r0, 24 lsrs r0, 24 @@ -593382,7 +593382,7 @@ sub_8140D6C: ; 8140D6C ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] -@08140F3A: +_08140F3A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -593405,17 +593405,17 @@ 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 .pool -@08140F90: +_08140F90: adds r1, 0x23 movs r0, 0 strb r0, [r1] -@08140F96: +_08140F96: ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, 0x21 @@ -593481,10 +593481,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 @@ -593510,33 +593510,33 @@ 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 .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 @@ -593545,13 +593545,13 @@ sub_8141040: ; 8141040 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, =gUnknown_085B6154 @@ -593571,17 +593571,17 @@ sub_8141040: ; 8141040 ldr r0, [r0] ands r1, r0 cmp r1, 0 - beq @081410E8 + beq _081410E8 movs r0, 0x16 bl audio_play - b @081410F2 + b _081410F2 .pool -@081410E8: +_081410E8: movs r0, 0x5F bl m4aSongNumStart ldr r0, =sub_8140FC4 str r0, [r4] -@081410F2: +_081410F2: pop {r4,r5} pop {r0} bx r0 @@ -593603,16 +593603,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] @@ -593621,7 +593621,7 @@ sub_81410FC: ; 81410FC lsls r0, 16 asrs r0, 16 cmp r0, 0x68 - bne @08141180 + bne _08141180 ldr r2, =0x02020630 adds r0, r1, 0 adds r0, 0x55 @@ -593633,9 +593633,9 @@ sub_81410FC: ; 81410FC adds r0, r2 ldr r1, =DummyObjectCallback str r1, [r0] - b @08141180 + b _08141180 .pool -@08141168: +_08141168: movs r0, 0x1 movs r1, 0xFF bl sub_8142E70 @@ -593646,7 +593646,7 @@ sub_81410FC: ; 81410FC str r0, [r4] movs r0, 0 strh r0, [r4, 0xA] -@08141180: +_08141180: pop {r4} pop {r0} bx r0 @@ -593665,30 +593665,30 @@ 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 .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, =gUnknown_085B6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -593696,13 +593696,13 @@ sub_814118C: ; 814118C adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 1 - b @0814133A + b _0814133A .pool -@081411E4: +_081411E4: movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne @08141200 + bne _08141200 ldr r0, =gUnknown_085B6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -593710,32 +593710,32 @@ sub_814118C: ; 814118C adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 1 - b @0814133A + b _0814133A .pool -@08141200: +_08141200: ldr r0, =gUnknown_085B6348 ldrb r1, [r3, 0x4] lsls r1, 30 lsrs r1, 25 adds r1, r0 ldrb r0, [r1, 0x2] - b @0814133A + b _0814133A .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, =gUnknown_085B6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -593743,15 +593743,15 @@ sub_814118C: ; 814118C adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 1 - b @0814133A + b _0814133A .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, =gUnknown_085B6348 ldrb r1, [r3, 0x4] lsls r1, 30 @@ -593759,9 +593759,9 @@ sub_814118C: ; 814118C adds r1, r0 ldrb r0, [r1, 0x2] lsrs r0, 2 - b @0814133A + b _0814133A .pool -@08141268: +_08141268: ldr r1, =gUnknown_085B6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -593770,25 +593770,25 @@ sub_814118C: ; 814118C adds r0, r1 ldrb r0, [r0, 0x2] lsrs r0, 1 - b @0814133A + b _0814133A .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 .pool -@081412A0: +_081412A0: ldr r1, =gUnknown_085B6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -593797,15 +593797,15 @@ sub_814118C: ; 814118C adds r0, r1 ldrb r0, [r0, 0x2] lsrs r0, 1 - b @0814133A + b _0814133A .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, =gUnknown_085B6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -593814,9 +593814,9 @@ sub_814118C: ; 814118C adds r0, r1 ldrb r0, [r0, 0x2] lsrs r0, 1 - b @0814133A + b _0814133A .pool -@081412DC: +_081412DC: ldr r1, =gUnknown_085B6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -593824,16 +593824,16 @@ sub_814118C: ; 814118C lsrs r0, 25 adds r0, r1 ldrb r0, [r0, 0x2] - b @0814133A + b _0814133A .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, =gUnknown_085B6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -593841,9 +593841,9 @@ sub_814118C: ; 814118C lsrs r0, 25 adds r0, r1 ldrb r0, [r0, 0x2] - b @0814133A + b _0814133A .pool -@08141314: +_08141314: ldr r1, =gUnknown_085B6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -593851,9 +593851,9 @@ sub_814118C: ; 814118C lsrs r0, 25 adds r0, r1 ldrb r0, [r0, 0x1] - b @0814133A + b _0814133A .pool -@08141328: +_08141328: ldr r1, =gUnknown_085B6348 ldr r0, [r5] ldrb r0, [r0, 0x4] @@ -593863,7 +593863,7 @@ sub_814118C: ; 814118C ldrb r0, [r0, 0x1] lsls r0, 25 lsrs r0, 24 -@0814133A: +_0814133A: pop {r4,r5} pop {r1} bx r1 @@ -593931,21 +593931,21 @@ 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 .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] @@ -593966,10 +593966,10 @@ sub_8141344: ; 8141344 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 @@ -594001,10 +594001,10 @@ sub_8141344: ; 8141344 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 @@ -594020,11 +594020,11 @@ sub_8141344: ; 8141344 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 @@ -594041,11 +594041,11 @@ sub_8141344: ; 8141344 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 @@ -594066,11 +594066,11 @@ sub_8141344: ; 8141344 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 @@ -594163,16 +594163,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 @@ -594183,9 +594183,9 @@ sub_81415D4: ; 81415D4 negs r0, r0 ands r0, r1 strb r0, [r2, 0x3] - b @081416C6 + b _081416C6 .pool -@08141614: +_08141614: ldr r2, =0x03005e00 lsls r1, r4, 2 adds r0, r1, r4 @@ -594195,7 +594195,7 @@ sub_81415D4: ; 81415D4 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] @@ -594215,13 +594215,13 @@ sub_81415D4: ; 81415D4 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 @@ -594229,22 +594229,22 @@ sub_81415D4: ; 81415D4 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 .pool -@08141690: +_08141690: ldr r0, =0x0203ab88 ldr r1, [r0] ldrb r0, [r1, 0x1A] @@ -594269,7 +594269,7 @@ sub_81415D4: ; 81415D4 strh r0, [r4, 0xA] ldr r0, =sub_81416D4 str r0, [r4] -@081416C6: +_081416C6: pop {r4-r7} pop {r0} bx r0 @@ -594291,16 +594291,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] @@ -594309,7 +594309,7 @@ sub_81416D4: ; 81416D4 lsls r0, 16 asrs r0, 16 cmp r0, 0x68 - bne @08141768 + bne _08141768 ldr r2, =0x02020630 adds r0, r1, 0 adds r0, 0x55 @@ -594321,9 +594321,9 @@ sub_81416D4: ; 81416D4 adds r0, r2 ldr r1, =sub_814390C str r1, [r0] - b @08141768 + b _08141768 .pool -@08141740: +_08141740: ldrh r0, [r4, 0x20] lsls r0, 24 lsrs r0, 24 @@ -594331,12 +594331,12 @@ sub_81416D4: ; 81416D4 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 @@ -594345,7 +594345,7 @@ sub_81416D4: ; 81416D4 adds r1, r0 ldr r0, =sub_8141778 str r0, [r1] -@08141768: +_08141768: pop {r4,r5} pop {r0} bx r0 @@ -594368,32 +594368,32 @@ 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 .pool -@081417CC: +_081417CC: ldrh r1, [r4, 0x20] lsls r1, 24 lsrs r1, 24 @@ -594405,14 +594405,14 @@ sub_8141778: ; 8141778 lsrs r1, 24 movs r0, 0 bl sub_8143038 - b @081417F4 -@081417E8: + b _081417F4 +_081417E8: ldr r1, =sub_814189C adds r0, r2, 0 movs r2, 0x1E movs r3, 0 bl sub_8141F7C -@081417F4: +_081417F4: pop {r4} pop {r0} bx r0 @@ -594432,15 +594432,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] @@ -594449,25 +594449,25 @@ 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 ldr r2, =0x0000ffff adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C - b @08141888 + b _08141888 .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 @@ -594479,7 +594479,7 @@ sub_8141800: ; 8141800 adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C -@08141888: +_08141888: pop {r4,r5} pop {r0} bx r0 @@ -594500,15 +594500,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 @@ -594517,9 +594517,9 @@ sub_814189C: ; 814189C bl sub_81973FC ldrb r0, [r4] ldr r2, =gUnknown_082A5BD7 - b @08141902 + b _08141902 .pool -@081418EC: +_081418EC: movs r0, 0xC3 lsls r0, 1 bl fanfare_play @@ -594529,7 +594529,7 @@ sub_814189C: ; 814189C bl sub_81973FC ldrb r0, [r4] ldr r2, =gUnknown_082A5BCB -@08141902: +_08141902: movs r1, 0x1 str r1, [sp] movs r1, 0xFF @@ -594542,9 +594542,9 @@ sub_814189C: ; 814189C ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram - b @08141958 + b _08141958 .pool -@08141928: +_08141928: movs r0, 0x20 bl m4aSongNumStart ldr r4, =0x0203ab8c @@ -594565,7 +594565,7 @@ sub_814189C: ; 814189C ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram -@08141958: +_08141958: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -594595,14 +594595,14 @@ 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 .pool -@081419AC: +_081419AC: ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] @@ -594614,24 +594614,24 @@ sub_8141984: ; 8141984 ldrsh r1, [r4, r2] ldr r0, =0x0000270e cmp r1, r0 - ble @081419D0 + ble _081419D0 strh r5, [r4, 0xA] - b @081419E6 + b _081419E6 .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 @@ -594640,13 +594640,13 @@ sub_8141984: ; 8141984 movs r2, 0xA ldrsh r0, [r1, r2] cmp r0, 0 - bne @08141A04 + bne _08141A04 ldr r1, =sub_8141AC0 ldr r2, =0x0000ffff adds r0, r6, 0 movs r3, 0x3 bl sub_8141F7C -@08141A04: +_08141A04: pop {r4-r6} pop {r0} bx r0 @@ -594836,7 +594836,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 @@ -594866,7 +594866,7 @@ sub_8141B58: ; 8141B58 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @08141BB0 + bls _08141BB0 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -594876,11 +594876,11 @@ sub_8141B58: ; 8141B58 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 @@ -594900,14 +594900,14 @@ sub_8141B58: ; 8141B58 movs r1, 0x3 bl CopyWindowToVram ldr r1, =dp01t_12_3_battle_menu - b @08141C8E + b _08141C8E .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 @@ -594927,19 +594927,19 @@ sub_8141B58: ; 8141B58 movs r1, 0x3 bl CopyWindowToVram ldr r1, =sub_8140914 -@08141C8E: +_08141C8E: ldr r2, =0x0000ffff adds r0, r6, 0 movs r3, 0x3 bl sub_8141F7C - b @08141CF2 + b _08141CF2 .pool -@08141CB0: +_08141CB0: ldr r0, =sub_8140914 str r0, [r2] - b @08141CF2 + b _08141CF2 .pool -@08141CBC: +_08141CBC: ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 @@ -594963,7 +594963,7 @@ sub_8141B58: ; 8141B58 movs r2, 0x3C movs r3, 0x3 bl sub_8141F7C -@08141CF2: +_08141CF2: add sp, 0xC pop {r3} mov r8, r3 @@ -594998,7 +594998,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 @@ -595016,7 +595016,7 @@ dp01t_12_3_battle_menu: ; 8141D0C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xB - bls @08141D44 + bls _08141D44 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -595026,7 +595026,7 @@ dp01t_12_3_battle_menu: ; 8141D0C ldrsh r1, [r2, r0] ldr r0, =0x0000270f cmp r1, r0 - bne @08141DD4 + bne _08141DD4 ldr r4, =0x0203ab8c ldrb r0, [r4] movs r1, 0 @@ -595050,12 +595050,12 @@ dp01t_12_3_battle_menu: ; 8141D0C adds r0, r5, 0 movs r3, 0x3 bl sub_8141F7C - b @08141DD8 + b _08141DD8 .pool -@08141DD4: +_08141DD4: ldr r0, =sub_8140914 str r0, [r2] -@08141DD8: +_08141DD8: add sp, 0xC pop {r4-r7} pop {r0} @@ -595090,15 +595090,15 @@ 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 .pool -@08141E38: +_08141E38: ldr r1, =0x020375e0 movs r0, 0 -@08141E3C: +_08141E3C: strh r0, [r1] bl GetCoins lsls r0, 16 @@ -595134,7 +595134,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 @@ -595163,7 +595163,7 @@ sub_8141E7C: ; 8141E7C bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@08141EDE: +_08141EDE: pop {r4,r5} pop {r0} bx r0 @@ -595182,7 +595182,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 @@ -595190,8 +595190,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 @@ -595205,10 +595205,10 @@ sub_8141EF8: ; 8141EF8 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 @@ -595218,17 +595218,17 @@ sub_8141EF8: ; 8141EF8 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 @@ -595259,9 +595259,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] @@ -595269,21 +595269,21 @@ sub_8141F7C: ; 8141F7C 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 .pool -@08141FD8: +_08141FD8: ldr r0, [r2] adds r0, 0xAA strh r7, [r0] -@08141FDE: +_08141FDE: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -595331,7 +595331,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 @@ -595340,7 +595340,7 @@ sub_8141FF4: ; 8141FF4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @08142036 + bls _08142036 ldr r2, [r3] ldrb r1, [r2, 0x1A] movs r0, 0x10 @@ -595368,7 +595368,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 @@ -595377,11 +595377,11 @@ sub_8142070: ; 8142070 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 @@ -595390,11 +595390,11 @@ sub_8142070: ; 8142070 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 @@ -595403,7 +595403,7 @@ sub_8142070: ; 8142070 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x2 - bls @081420AE + bls _081420AE movs r0, 0x1 movs r1, 0xFF bl sub_8143038 @@ -595436,11 +595436,11 @@ 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 .pool -@0814210C: +_0814210C: ldr r6, =0x0203ab88 ldr r3, [r6] ldr r1, =0x03005e00 @@ -595469,79 +595469,79 @@ sub_81420D0: ; 81420D0 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, =gUnknown_085B62E8 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 @@ -595564,63 +595564,63 @@ 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 .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 @@ -595638,16 +595638,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 @@ -595655,13 +595655,13 @@ sub_8142284: ; 8142284 ldr r1, =0x0203ab88 mov r12, r1 cmp r4, r2 - bge @081422E8 + bge _081422E8 ldr r0, [r1] ldr r3, =gUnknown_085B6154 ldr r5, [r0, 0x8] adds r6, r3, 0 adds r6, 0x8 -@081422C4: +_081422C4: lsls r0, r4, 2 adds r0, r4 lsls r1, r0, 2 @@ -595669,19 +595669,19 @@ sub_8142284: ; 8142284 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 @@ -595691,9 +595691,9 @@ sub_8142284: ; 8142284 str r3, [sp, 0x18] adds r1, r3, 0 bl sub_8151A48 - b @081424E2 + b _081424E2 .pool -@0814230C: +_0814230C: mov r0, sp ldr r1, =gUnknown_085B63F0 ldm r1!, {r2,r4,r5} @@ -595706,10 +595706,10 @@ sub_8142284: ; 8142284 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 @@ -595725,51 +595725,51 @@ sub_8142284: ; 8142284 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 .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 .pool -@0814237C: +_0814237C: ldr r3, =0x02020630 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x43 - b @081423C0 + b _081423C0 .pool -@08142390: +_08142390: ldr r3, =0x02020630 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x44 - b @081423C0 + b _081423C0 .pool -@081423A4: +_081423A4: ldr r3, =0x02020630 ldr r2, =0x0203ab88 ldr r0, [r2] adds r0, 0x45 - b @081423C0 + b _081423C0 .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 @@ -595780,10 +595780,10 @@ sub_8142284: ; 8142284 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, =gUnknown_085B6154 @@ -595797,7 +595797,7 @@ sub_8142284: ; 8142284 ands r1, r0 str r2, [sp, 0x1C] cmp r1, 0 - bne @081424E2 + bne _081424E2 adds r0, r7, 0 movs r1, 0x5 bl __udivsi3 @@ -595818,15 +595818,15 @@ sub_8142284: ; 8142284 adds r0, r1, 0 movs r1, 0xD bl sub_815168C - b @081424C4 + b _081424C4 .pool -@08142430: +_08142430: movs r4, 0 lsls r5, r7, 2 str r5, [sp, 0x1C] ldr r0, =gUnknown_085B6154 mov r10, r0 -@0814243A: +_0814243A: lsls r0, r4, 2 adds r0, r4 adds r0, r7, r0 @@ -595845,7 +595845,7 @@ sub_8142284: ; 8142284 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @081424B0 + bne _081424B0 adds r0, r3, 0 movs r1, 0x5 bl __udivsi3 @@ -595872,12 +595872,12 @@ sub_8142284: ; 8142284 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 @@ -595885,18 +595885,18 @@ sub_8142284: ; 8142284 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 @@ -595911,7 +595911,7 @@ sub_8142284: ; 8142284 str r2, [sp, 0x18] adds r1, r2, 0 bl sub_8151A48 -@081424E2: +_081424E2: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -595954,32 +595954,32 @@ 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 .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 @@ -595988,10 +595988,10 @@ sub_81424FC: ; 81424FC 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] @@ -596005,9 +596005,9 @@ sub_81424FC: ; 81424FC 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 @@ -596016,10 +596016,10 @@ sub_81424FC: ; 81424FC 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] @@ -596031,14 +596031,14 @@ sub_81424FC: ; 81424FC 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] @@ -596046,9 +596046,9 @@ sub_81424FC: ; 81424FC 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] @@ -596058,7 +596058,7 @@ sub_81424FC: ; 81424FC mov r9, r1 subs r2, 0x4 str r2, [sp, 0x20] -@08142628: +_08142628: mov r1, r9 ldrb r0, [r1] add r0, r10 @@ -596089,14 +596089,14 @@ sub_81424FC: ; 81424FC 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 @@ -596186,8 +596186,8 @@ sub_81424FC: ; 81424FC 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 @@ -596195,9 +596195,9 @@ sub_81424FC: ; 81424FC 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 @@ -596220,9 +596220,9 @@ sub_8142758: ; 8142758 movs r2, 0x5 bl memcpy cmp r4, 0x13 - bls @08142770 + bls _08142770 movs r4, 0 -@08142770: +_08142770: ldr r3, =gUnknown_085B6154 lsls r0, r4, 2 adds r0, r4 @@ -596232,18 +596232,18 @@ sub_8142758: ; 8142758 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 .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 @@ -596256,12 +596256,12 @@ sub_8142758: ; 8142758 adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0x3 - bhi @08142808 + bhi _08142808 ldrb r0, [r1] adds r0, 0x1 - b @081427DC + b _081427DC .pool -@081427C4: +_081427C4: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -596271,15 +596271,15 @@ sub_8142758: ; 8142758 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 .pool -@081427E8: +_081427E8: ldr r0, =0x0203ab88 ldr r1, [r0] adds r0, r3, 0 @@ -596289,14 +596289,14 @@ sub_8142758: ; 8142758 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @08142808 + bne _08142808 mov r0, sp ldrb r0, [r0, 0x4] - b @0814280A + b _0814280A .pool -@08142808: +_08142808: movs r0, 0 -@0814280A: +_0814280A: add sp, 0x8 pop {r4} pop {r1} @@ -596405,14 +596405,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 bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@08142908: +_08142908: pop {r4} pop {r0} bx r0 @@ -596499,7 +596499,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] @@ -596510,7 +596510,7 @@ sub_81429A0: ; 81429A0 bl script_env_2_disable adds r0, r4, 0 bl remove_task -@081429DE: +_081429DE: pop {r4} pop {r0} bx r0 @@ -596528,7 +596528,7 @@ sub_81429F0: ; 81429F0 movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq @08142A60 + beq _08142A60 ldr r2, =gUnknown_085B6344 ldr r0, =0x020375e0 ldrh r1, [r0] @@ -596570,7 +596570,7 @@ sub_81429F0: ; 81429F0 adds r0, r1 ldr r1, =sub_81428C4 str r1, [r0] -@08142A60: +_08142A60: add sp, 0xC pop {r4-r6} pop {r0} @@ -596614,17 +596614,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 @@ -596642,9 +596642,9 @@ sub_8142A88: ; 8142A88 bl CopyWindowToVram ldr r0, =sub_81429F0 str r0, [r6] - b @08142BB0 + b _08142BB0 .pool -@08142B28: +_08142B28: ldr r4, =0x02021fc4 ldr r1, =gUnknown_082A5B12 adds r0, r4, 0 @@ -596672,9 +596672,9 @@ sub_8142A88: ; 8142A88 adds r0, r1 ldr r1, =sub_81428C4 str r1, [r0] - b @08142BB0 + b _08142BB0 .pool -@08142B78: +_08142B78: ldr r5, =0x02021fc4 ldr r1, =gUnknown_082A5B4E adds r0, r5, 0 @@ -596699,7 +596699,7 @@ sub_8142A88: ; 8142A88 str r0, [r6] strh r4, [r6, 0x22] strh r4, [r6, 0x8] -@08142BB0: +_08142BB0: add sp, 0xC pop {r3} mov r8, r3 @@ -596743,7 +596743,7 @@ sub_8142C0C: ; 8142C0C push {lr} lsls r0, 24 cmp r0, 0 - bne @08142C44 + bne _08142C44 bl ResetObjectPaletteAllocator ldr r0, =gUnknown_085B7384 bl LoadTaggedObjectPalettes @@ -596753,9 +596753,9 @@ sub_8142C0C: ; 8142C0C bl LoadCompressedObjectPic ldr r0, =gUnknown_085B7A40 bl LoadCompressedObjectPic - b @08142C5A + b _08142C5A .pool -@08142C44: +_08142C44: movs r0, 0xE bl FreeObjectTilesByTag movs r0, 0xD @@ -596763,7 +596763,7 @@ sub_8142C0C: ; 8142C0C movs r0, 0xC bl FreeObjectTilesByTag bl ResetObjectPaletteAllocator -@08142C5A: +_08142C5A: pop {r0} bx r0 thumb_func_end sub_8142C0C @@ -596811,11 +596811,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} @@ -596857,14 +596857,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 @@ -596899,22 +596899,22 @@ sub_8142CD0: ; 8142CD0 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 @@ -596946,10 +596946,10 @@ sub_8142CD0: ; 8142CD0 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 @@ -596981,7 +596981,7 @@ sub_8142CD0: ; 8142CD0 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls @08142DCC + bls _08142DCC add sp, 0x8 pop {r3} mov r8, r3 @@ -596995,7 +596995,7 @@ sub_8142CD0: ; 8142CD0 sub_8142E3C: ; 8142E3C push {r4,lr} movs r4, 0 -@08142E40: +_08142E40: ldr r0, =0x0203ab88 ldr r0, [r0] adds r0, r4 @@ -597011,7 +597011,7 @@ sub_8142E3C: ; 8142E3C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xB - bls @08142E40 + bls _08142E40 pop {r4} pop {r0} bx r0 @@ -597030,14 +597030,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 @@ -597054,10 +597054,10 @@ sub_8142E70: ; 8142E70 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x12 - bls @08142E92 - b @08142F66 + bls _08142E92 + b _08142F66 .pool -@08142EC0: +_08142EC0: movs r4, 0 ldr r0, =0x0203ab88 mov r9, r0 @@ -597067,7 +597067,7 @@ sub_8142E70: ; 8142E70 ldr r5, =0x02020630 movs r6, 0x5 negs r6, r6 -@08142ED2: +_08142ED2: mov r0, r9 ldr r2, [r0] lsls r3, r4, 3 @@ -597077,11 +597077,11 @@ sub_8142E70: ; 8142E70 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] @@ -597094,9 +597094,9 @@ sub_8142E70: ; 8142E70 movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b @08142F2C + b _08142F2C .pool -@08142F14: +_08142F14: adds r0, r2, r4 adds r0, 0x59 ldrb r0, [r0] @@ -597109,19 +597109,19 @@ sub_8142E70: ; 8142E70 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 @@ -597139,8 +597139,8 @@ sub_8142E70: ; 8142E70 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 @@ -597160,7 +597160,7 @@ sub_8142F7C: ; 8142F7C ldr r4, =0x02020630 movs r0, 0x4 mov r8, r0 -@08142F8C: +_08142F8C: ldr r0, =gUnknown_085B7928 movs r1, 0x74 movs r2, 0x14 @@ -597231,7 +597231,7 @@ sub_8142F7C: ; 8142F7C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x5 - bls @08142F8C + bls _08142F8C pop {r3} mov r8, r3 pop {r4-r7} @@ -597253,11 +597253,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 @@ -597274,10 +597274,10 @@ sub_8143038: ; 8143038 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x5 - bls @08143056 - b @08143142 + bls _08143056 + b _08143142 .pool -@08143084: +_08143084: ldr r0, =0x0203ab88 mov r8, r0 ldr r7, =0x02020630 @@ -597286,7 +597286,7 @@ sub_8143038: ; 8143038 movs r0, 0x5 negs r0, r0 mov r10, r0 -@08143094: +_08143094: mov r0, r8 ldr r1, [r0] adds r0, r1, 0 @@ -597294,10 +597294,10 @@ sub_8143038: ; 8143038 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] @@ -597310,9 +597310,9 @@ sub_8143038: ; 8143038 movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b @08143138 + b _08143138 .pool -@081430D0: +_081430D0: adds r5, r6, 0 adds r5, 0x31 adds r0, r1, 0 @@ -597365,13 +597365,13 @@ sub_8143038: ; 8143038 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 @@ -597387,7 +597387,7 @@ sub_8143150: ; 8143150 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @08143180 + bne _08143180 ldr r2, =0x02020630 ldr r0, =0x0203ab88 ldr r0, [r0] @@ -597402,9 +597402,9 @@ sub_8143150: ; 8143150 movs r2, 0x4 orrs r1, r2 strb r1, [r0] - b @081431D0 + b _081431D0 .pool -@08143180: +_08143180: ldr r4, =0x02020630 ldr r3, =0x0203ab88 ldr r0, [r3] @@ -597445,7 +597445,7 @@ sub_8143150: ; 8143150 adds r0, 0x2 lsls r0, 3 strh r0, [r1, 0x22] -@081431D0: +_081431D0: pop {r4,r5} pop {r0} bx r0 @@ -597474,11 +597474,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 @@ -597512,11 +597512,11 @@ sub_81431E4: ; 81431E4 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} @@ -597538,12 +597538,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 @@ -597569,9 +597569,9 @@ sub_8143280: ; 8143280 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 @@ -597579,9 +597579,9 @@ sub_8143280: ; 8143280 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] @@ -597605,7 +597605,7 @@ sub_8143314: ; 8143314 movs r5, 0 ldr r7, =0x0201c000 mov r6, sp -@08143322: +_08143322: ldr r0, =gUnknown_085B7750 lsls r4, r5, 3 adds r4, r0 @@ -597631,7 +597631,7 @@ sub_8143314: ; 8143314 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls @08143322 + bls _08143322 ldr r0, =gUnknown_085B77E4 movs r1, 0xD0 movs r2, 0x10 @@ -597656,7 +597656,7 @@ sub_8143314: ; 8143314 strb r1, [r0] movs r5, 0 adds r7, r3, 0 -@0814338C: +_0814338C: lsls r1, r5, 19 movs r0, 0xC4 lsls r0, 16 @@ -597702,7 +597702,7 @@ sub_8143314: ; 8143314 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x3 - bls @0814338C + bls _0814338C ldr r0, =gUnknown_085B7814 movs r1, 0x78 movs r2, 0x44 @@ -597727,7 +597727,7 @@ sub_8143314: ; 8143314 movs r5, 0 adds r4, r2, 0 adds r7, r3, 0 -@0814341C: +_0814341C: lsls r1, r5, 20 movs r2, 0xC0 lsls r2, 16 @@ -597775,7 +597775,7 @@ sub_8143314: ; 8143314 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls @0814341C + bls _0814341C ldr r0, =gUnknown_085B7844 movs r1, 0x98 movs r2, 0x60 @@ -597849,7 +597849,7 @@ sub_8143514: ; 8143514 mov r9, r1 ldr r0, =0x0203ab88 mov r10, r0 -@08143534: +_08143534: adds r0, r7, 0 mov r1, r8 bl __udivsi3 @@ -597873,12 +597873,12 @@ sub_8143514: ; 8143514 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 @@ -597926,7 +597926,7 @@ sub_8143514: ; 8143514 orrs r0, r2 strh r0, [r3, 0x4] movs r4, 0x1 -@081435CC: +_081435CC: adds r0, r7, 0 mov r1, r8 bl __umodsi3 @@ -597942,7 +597942,7 @@ sub_8143514: ; 8143514 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls @08143534 + bls _08143534 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -597964,9 +597964,9 @@ sub_8143614: ; 8143614 movs r2, 0x5 bl memcpy cmp r4, 0x13 - bls @0814362C + bls _0814362C movs r4, 0 -@0814362C: +_0814362C: ldr r3, =gUnknown_085B6154 lsls r0, r4, 2 adds r0, r4 @@ -597976,18 +597976,18 @@ sub_8143614: ; 8143614 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 .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 @@ -598000,12 +598000,12 @@ sub_8143614: ; 8143614 adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0x3 - bhi @081436C4 + bhi _081436C4 ldrb r0, [r1] adds r0, 0x1 - b @08143698 + b _08143698 .pool -@08143680: +_08143680: subs r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -598015,15 +598015,15 @@ sub_8143614: ; 8143614 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 .pool -@081436A4: +_081436A4: ldr r0, =0x0203ab88 ldr r1, [r0] adds r0, r3, 0 @@ -598033,14 +598033,14 @@ sub_8143614: ; 8143614 ldr r0, [r0] ands r1, r0 cmp r1, 0 - bne @081436C4 + bne _081436C4 mov r0, sp ldrb r0, [r0, 0x4] - b @081436C6 + b _081436C6 .pool -@081436C4: +_081436C4: movs r0, 0 -@081436C6: +_081436C6: add sp, 0x8 pop {r4} pop {r1} @@ -598102,29 +598102,29 @@ 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 .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 @@ -598135,7 +598135,7 @@ sub_814372C: ; 814372C adds r7, 0x8 ldr r2, =0xfffffc00 mov r8, r2 -@08143790: +_08143790: ldr r0, [r6] adds r3, r4, 0 adds r3, 0x1A @@ -598179,16 +598179,16 @@ sub_814372C: ; 814372C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @08143790 - b @081438F4 + bls _08143790 + b _081438F4 .pool -@081437FC: +_081437FC: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x58 - b @0814386A + b _0814386A .pool -@08143808: +_08143808: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x58 @@ -598206,15 +598206,15 @@ sub_814372C: ; 814372C lsls r0, r6, 2 adds r0, r1 ldrh r1, [r0, 0x8] - b @08143886 + b _08143886 .pool -@08143830: +_08143830: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x57 - b @0814386A + b _0814386A .pool -@0814383C: +_0814383C: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x57 @@ -598232,13 +598232,13 @@ sub_814372C: ; 814372C lsls r0, r6, 2 adds r0, r1 ldrh r1, [r0, 0x8] - b @08143886 + b _08143886 .pool -@08143864: +_08143864: ldr r2, =0x02020630 ldr r0, [r5] adds r0, 0x56 -@0814386A: +_0814386A: ldrb r1, [r0] lsls r0, r1, 4 adds r0, r1 @@ -598253,7 +598253,7 @@ sub_814372C: ; 814372C lsls r0, r6, 2 adds r0, r1 ldrh r1, [r0, 0x4] -@08143886: +_08143886: ldrh r4, [r4] adds r1, r4 ldr r2, =0x000003ff @@ -598264,9 +598264,9 @@ sub_814372C: ; 814372C ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] - b @081438F4 + b _081438F4 .pool -@081438A8: +_081438A8: movs r4, 0 lsls r7, r6, 2 ldr r6, =0x02020630 @@ -598275,7 +598275,7 @@ sub_814372C: ; 814372C mov r12, r0 ldr r2, =0xfffffc00 mov r8, r2 -@081438B8: +_081438B8: ldr r0, [r5] adds r0, r4 adds r0, 0x56 @@ -598305,8 +598305,8 @@ sub_814372C: ; 814372C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @081438B8 -@081438F4: + bls _081438B8 +_081438F4: pop {r3} mov r8, r3 pop {r4-r7} @@ -598408,7 +598408,7 @@ sub_81439C8: ; 81439C8 movs r4, 0 ldr r5, =0x0203ab88 ldr r6, =0x02020630 -@081439D0: +_081439D0: movs r3, 0x39 subs r3, r4 lsls r3, 24 @@ -598426,7 +598426,7 @@ sub_81439C8: ; 81439C8 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 @@ -598450,12 +598450,12 @@ sub_81439C8: ; 81439C8 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 @@ -598482,7 +598482,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 @@ -598502,7 +598502,7 @@ sub_8143A40: ; 8143A40 movs r1, 0 adds r2, r5, 0x1 adds r3, r6, 0x1 -@08143A8C: +_08143A8C: lsls r0, r1, 1 adds r0, r4 add r0, r9 @@ -598512,13 +598512,13 @@ sub_8143A40: ; 8143A40 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 @@ -598542,7 +598542,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 @@ -598551,16 +598551,16 @@ 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 .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} @@ -598603,25 +598603,25 @@ 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 @@ -598655,24 +598655,24 @@ 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 .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 @@ -598719,7 +598719,7 @@ sub_8143B84: ; 8143B84 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] @@ -598733,7 +598733,7 @@ sub_8143B84: ; 8143B84 asrs r2, 24 adds r1, r4, 0 bl MPlayPanpotControl -@08143C74: +_08143C74: pop {r3} mov r8, r3 pop {r4-r7} @@ -598755,11 +598755,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 @@ -598804,30 +598804,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 @@ -598841,10 +598841,10 @@ sub_8143CFC: ; 8143CFC ldr r0, [r4] bl __lesf2 cmp r0, 0 - bgt @08143DF8 - b @08143D8C + bgt _08143DF8 + b _08143D8C .pool -@08143D6C: +_08143D6C: ldr r7, =0x0203ab88 ldr r6, [r7] adds r4, r6, 0 @@ -598858,8 +598858,8 @@ sub_8143CFC: ; 8143CFC ldr r0, [r4] bl __gesf2 cmp r0, 0 - blt @08143DF8 -@08143D8C: + blt _08143DF8 +_08143D8C: adds r1, r6, 0 adds r1, 0x7D movs r0, 0xFF @@ -598909,7 +598909,7 @@ sub_8143CFC: ; 8143CFC subs r1, 0xC ldr r0, =0xbf800000 str r0, [r1] -@08143DF8: +_08143DF8: pop {r4-r7} pop {r0} bx r0 @@ -598928,17 +598928,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 @@ -598974,13 +598974,13 @@ sub_8143E14: ; 8143E14 adds r1, r0, 0 mov r0, r9 bl __divsf3 - b @08143EFC + b _08143EFC .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 @@ -599017,7 +599017,7 @@ sub_8143E14: ; 8143E14 mov r0, r9 bl __divsf3 bl __negsf2 -@08143EFC: +_08143EFC: adds r2, r0, 0 mov r0, r8 ldr r6, [r0] @@ -599078,7 +599078,7 @@ sub_8143E14: ; 8143E14 ldr r0, =sub_8143CFC str r0, [r7, 0x1C] strh r2, [r7, 0x32] -@08143F80: +_08143F80: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -599111,10 +599111,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 @@ -599159,7 +599159,7 @@ sub_8143FA4: ; 8143FA4 movs r1, 0x40 orrs r0, r1 strb r0, [r2, 0x3] -@0814403E: +_0814403E: pop {r4,r5} pop {r0} bx r0 @@ -599176,14 +599176,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] @@ -599196,17 +599196,17 @@ sub_8144050: ; 8144050 adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne @0814411E + bne _0814411E strh r4, [r3, 0x26] - b @0814411E + b _0814411E .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] @@ -599221,23 +599221,23 @@ sub_8144050: ; 8144050 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 .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] @@ -599266,7 +599266,7 @@ sub_8144050: ; 8144050 str r0, [r3, 0x1C] movs r0, 0x3D bl m4aSongNumStart -@0814411E: +_0814411E: pop {r4} pop {r0} bx r0 @@ -599281,29 +599281,29 @@ sub_8144128: ; 8144128 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 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x32] -@0814415C: +_0814415C: pop {r4} pop {r0} bx r0 @@ -599321,20 +599321,20 @@ 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 - b @0814419C + b _0814419C .pool -@08144194: +_08144194: adds r0, r4, 0 bl sub_81448B8 ldr r0, =sub_8144128 -@0814419C: +_0814419C: str r0, [r4, 0x1C] pop {r4} pop {r0} @@ -599353,7 +599353,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 @@ -599361,15 +599361,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 @@ -599409,9 +599409,9 @@ prev_quest_read_x24_hm_usage: ; 81441A8 str r0, [r5, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange - b @0814425C + b _0814425C .pool -@08144244: +_08144244: adds r0, r5, 0 adds r0, 0x2C ldrb r1, [r0] @@ -599422,7 +599422,7 @@ prev_quest_read_x24_hm_usage: ; 81441A8 bl m4aSongNumStart adds r0, r5, 0 bl sub_8144A24 -@0814425C: +_0814425C: pop {r4,r5} pop {r0} bx r0 @@ -599452,7 +599452,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 @@ -599491,9 +599491,9 @@ sub_8144264: ; 8144264 str r0, [r6, 0x1C] movs r0, 0x47 bl m4aSongNumStartOrChange - b @081443F8 + b _081443F8 .pool -@081442FC: +_081442FC: movs r0, 0x38 bl m4aSongNumStart bl GenerateRandomNumber @@ -599502,7 +599502,7 @@ sub_8144264: ; 8144264 ands r1, r0 mov r8, r1 cmp r1, 0 - beq @08144340 + beq _08144340 ldr r4, [r4] adds r1, r4, 0 adds r1, 0x8C @@ -599520,9 +599520,9 @@ sub_8144264: ; 8144264 adds r1, 0x7F strb r0, [r1] ldr r5, =gUnknown_085B6348 - b @08144378 + b _08144378 .pool -@08144340: +_08144340: ldr r7, [r4] adds r4, r7, 0 adds r4, 0x8C @@ -599549,7 +599549,7 @@ sub_8144264: ; 8144264 adds r0, r7, 0 adds r0, 0x7F strb r4, [r0] -@08144378: +_08144378: ldr r0, =gUnknown_085B62E4 lsls r1, r2, 3 adds r0, 0x4 @@ -599560,7 +599560,7 @@ sub_8144264: ; 8144264 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] @@ -599569,22 +599569,22 @@ sub_8144264: ; 8144264 adds r0, r5 ldrb r0, [r0, 0x2] strh r0, [r6, 0x32] - b @081443E8 + b _081443E8 .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 @@ -599592,19 +599592,19 @@ sub_8144264: ; 8144264 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 .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 @@ -599613,7 +599613,7 @@ sub_8144264: ; 8144264 str r0, [r6, 0x1C] movs r0, 0x5 strh r0, [r6, 0x30] -@081443F8: +_081443F8: pop {r3} mov r8, r3 pop {r4-r7} @@ -599637,14 +599637,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 @@ -599665,11 +599665,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] @@ -599688,9 +599688,9 @@ sub_8144410: ; 8144410 strh r0, [r6, 0x30] ldr r0, =sub_8144264 str r0, [r6, 0x1C] - b @081444FA + b _081444FA .pool -@081444BC: +_081444BC: ldr r4, [r4] adds r7, r4, 0 adds r7, 0x90 @@ -599699,14 +599699,14 @@ sub_8144410: ; 8144410 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 @@ -599717,7 +599717,7 @@ sub_8144410: ; 8144410 bl __divdf3 bl __truncdfsf2 str r0, [r4] -@081444FA: +_081444FA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -599742,7 +599742,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 @@ -599754,11 +599754,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 @@ -599775,11 +599775,11 @@ sub_8144514: ; 8144514 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 @@ -599803,7 +599803,7 @@ sub_8144514: ; 8144514 strh r0, [r6, 0x30] ldr r0, =sub_8144410 str r0, [r6, 0x1C] -@081445B8: +_081445B8: pop {r3} mov r8, r3 pop {r4-r7} @@ -599826,7 +599826,7 @@ sub_81445D8: ; 81445D8 ldr r1, =0x42700000 bl __gtsf2 cmp r0, 0 - bgt @0814468A + bgt _0814468A movs r0, 0x5D bl m4aSongNumStartOrChange ldr r5, [r4] @@ -599841,11 +599841,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 @@ -599867,11 +599867,11 @@ sub_81445D8: ; 81445D8 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 @@ -599894,7 +599894,7 @@ sub_81445D8: ; 81445D8 strh r0, [r6, 0x30] ldr r0, =sub_8144514 str r0, [r6, 0x1C] -@0814468A: +_0814468A: pop {r3} mov r8, r3 pop {r4-r7} @@ -600006,7 +600006,7 @@ sub_81446DC: ; 81446DC ldr r0, =gUnknown_085B6348 mov r12, r0 mov r10, r5 -@0814477C: +_0814477C: ldr r0, [r5] adds r3, r7, 0 adds r3, 0x37 @@ -600126,7 +600126,7 @@ sub_81446DC: ; 81446DC lsrs r7, r0, 24 ldr r2, =0x02020630 cmp r7, 0x2 - bls @0814477C + bls _0814477C mov r3, r10 ldr r0, [r3] adds r0, 0x74 @@ -600261,7 +600261,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 @@ -600313,7 +600313,7 @@ sub_81448B8: ; 81448B8 lsrs r0, 24 mov r8, r0 cmp r0, 0x1 - bls @08144992 + bls _08144992 str r7, [r4, 0x38] add sp, 0x8 pop {r3,r4} @@ -600407,16 +600407,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 @@ -600425,27 +600425,27 @@ sub_8144A24: ; 8144A24 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 .pool -@08144B1C: +_08144B1C: movs r0, 0x1 strh r0, [r7, 0x2E] ldr r0, =0x0203ab88 @@ -600457,9 +600457,9 @@ sub_8144A24: ; 8144A24 movs r1, 0x1 orrs r0, r1 strb r0, [r2, 0x3] - b @08144AEC + b _08144AEC .pool -@08144B38: +_08144B38: lsrs r0, r5, 1 strh r0, [r7, 0x2E] ldr r0, =0x0203ab88 @@ -600472,21 +600472,21 @@ sub_8144A24: ; 8144A24 ands r0, r2 orrs r0, r1 strb r0, [r3, 0x3] - b @08144AEC + b _08144AEC .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 @@ -600503,29 +600503,29 @@ sub_8144A24: ; 8144A24 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 .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, =gUnknown_085B6160 mov r10, r1 -@08144BBC: +_08144BBC: ldr r3, [r4] lsls r0, r6, 3 ldr r1, =gUnknown_085B62E8 @@ -600534,7 +600534,7 @@ sub_8144A24: ; 8144A24 ldr r2, [r0] ands r1, r2 cmp r1, 0 - bne @08144C02 + bne _08144C02 mov r0, r9 adds r1, r0, 0x1 lsls r1, 24 @@ -600544,7 +600544,7 @@ sub_8144A24: ; 8144A24 strb r5, [r0] ldr r0, [sp, 0xC] cmp r0, 0 - bne @08144C02 + bne _08144C02 ldrb r1, [r3, 0x1A] lsls r1, 28 lsrs r1, 28 @@ -600559,9 +600559,9 @@ sub_8144A24: ; 8144A24 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 @@ -600571,8 +600571,8 @@ sub_8144A24: ; 8144A24 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 @@ -600581,26 +600581,26 @@ sub_8144A24: ; 8144A24 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 .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 str r1, [r7, 0x1C] @@ -600627,7 +600627,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] @@ -600636,18 +600636,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 RemoveObjectAndFreeTiles ldr r1, [r4] @@ -600657,7 +600657,7 @@ sub_8144C70: ; 8144C70 ldr r0, =gUnknown_085B7B1A ldrh r0, [r0] strh r0, [r1, 0x34] -@08144CC0: +_08144CC0: pop {r4} pop {r0} bx r0 @@ -600681,11 +600681,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] @@ -600706,14 +600706,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] @@ -600727,9 +600727,9 @@ sub_8144CD0: ; 8144CD0 ands r0, r2 orrs r0, r1 strb r0, [r3] - b @08144D7E + b _08144D7E .pool -@08144D54: +_08144D54: ldr r1, =0x02021bbe movs r0, 0 strh r0, [r1] @@ -600750,7 +600750,7 @@ sub_8144CD0: ; 8144CD0 strb r1, [r0] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@08144D7E: +_08144D7E: add sp, 0x18 pop {r4} pop {r0} @@ -600789,14 +600789,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 @@ -600841,7 +600841,7 @@ sub_8144D94: ; 8144D94 str r1, [r0] movs r0, 0xD6 bl m4aSongNumStart -@08144E3E: +_08144E3E: pop {r4,r5} pop {r0} bx r0 @@ -600855,14 +600855,14 @@ sub_8144E60: ; 8144E60 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, =gUnknown_085B6348 @@ -600871,9 +600871,9 @@ sub_8144E60: ; 8144E60 lsrs r0, 25 adds r0, r1 ldrh r0, [r0, 0x8] - b @08144EA6 + b _08144EA6 .pool -@08144E94: +_08144E94: movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =gUnknown_085B6348 @@ -600883,9 +600883,9 @@ sub_8144E60: ; 8144E60 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] @@ -600906,9 +600906,9 @@ sub_8144E60: ; 8144E60 ldr r0, =gUnknown_085B7B1A ldrh r0, [r0] strh r0, [r1, 0x34] - b @08144F7C + b _08144F7C .pool -@08144EE4: +_08144EE4: ldr r5, =0x0203ab88 ldr r3, [r5] ldr r2, =gUnknown_085B7B1A @@ -600923,16 +600923,16 @@ sub_8144E60: ; 8144E60 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, =gUnknown_085B6348 @@ -600941,9 +600941,9 @@ sub_8144E60: ; 8144E60 lsrs r0, 25 adds r0, r1 ldrh r0, [r0, 0xA] - b @08144F42 + b _08144F42 .pool -@08144F30: +_08144F30: movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =gUnknown_085B6348 @@ -600953,9 +600953,9 @@ sub_8144E60: ; 8144E60 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] @@ -600983,7 +600983,7 @@ sub_8144E60: ; 8144E60 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3C] -@08144F7C: +_08144F7C: pop {r4,r5} pop {r0} bx r0 @@ -601017,11 +601017,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, =DummyObjectCallback str r0, [r4, 0x1C] adds r2, r4, 0 @@ -601060,7 +601060,7 @@ sub_8144FB0: ; 8144FB0 lsls r0, 2 adds r0, r5 bl RemoveObjectAndFreeTiles -@0814501C: +_0814501C: pop {r4,r5} pop {r0} bx r0 @@ -601075,7 +601075,7 @@ sub_8145030: ; 8145030 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] @@ -601083,19 +601083,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 @@ -601104,23 +601104,23 @@ sub_8145030: ; 8145030 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 @@ -601146,7 +601146,7 @@ sub_8145030: ; 8145030 movs r1, 0x7F ands r1, r2 strb r1, [r0] -@081450C6: +_081450C6: pop {r4} pop {r0} bx r0 @@ -601173,7 +601173,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] @@ -601190,7 +601190,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 @@ -601210,12 +601210,12 @@ sub_81450D8: ; 81450D8 adds r1, r5, 0 adds r2, r4, 0 bl MPlayPanpotControl - b @08145208 + b _08145208 .pool -@0814516C: +_0814516C: lsls r0, r1, 16 cmp r0, 0 - blt @081451BC + blt _081451BC ldr r0, =0x0203ab88 ldr r0, [r0] ldr r0, [r0, 0x38] @@ -601250,9 +601250,9 @@ sub_81450D8: ; 81450D8 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] - b @08145208 + b _08145208 .pool -@081451BC: +_081451BC: movs r0, 0x5E bl m4aSongNumStartOrChange ldr r0, =0x0203ab88 @@ -601261,20 +601261,20 @@ sub_81450D8: ; 81450D8 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 .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] @@ -601288,7 +601288,7 @@ sub_81450D8: ; 81450D8 strh r0, [r4, 0x30] ldr r0, =sub_8145030 str r0, [r4, 0x1C] -@08145208: +_08145208: add sp, 0x14 pop {r4,r5} pop {r0} @@ -601310,7 +601310,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] @@ -601343,12 +601343,12 @@ sub_8145218: ; 8145218 ands r0, r3 orrs r0, r1 strb r0, [r2] - b @08145288 + b _08145288 .pool -@08145284: +_08145284: ldr r0, =sub_8144F94 str r0, [r4, 0x1C] -@08145288: +_08145288: add sp, 0x4 pop {r4} pop {r0} @@ -601366,7 +601366,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, =gUnknown_085B6348 @@ -601377,7 +601377,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] @@ -601386,9 +601386,9 @@ sub_8145294: ; 8145294 lsls r0, 2 adds r0, r2 movs r3, 0x34 - b @08145306 + b _08145306 .pool -@081452DC: +_081452DC: movs r0, 0x34 ldrsh r2, [r1, r0] ldr r1, =gUnknown_085B6348 @@ -601401,7 +601401,7 @@ sub_8145294: ; 8145294 lsls r1, 1 adds r0, r1 cmp r2, r0 - bne @0814533E + bne _0814533E ldr r2, =0x02020630 movs r0, 0x3A ldrsh r1, [r4, r0] @@ -601410,7 +601410,7 @@ sub_8145294: ; 8145294 lsls r0, 2 adds r0, r2 movs r3, 0x2E -@08145306: +_08145306: strh r3, [r0, 0x30] movs r0, 0x36 ldrsh r1, [r4, r0] @@ -601438,7 +601438,7 @@ sub_8145294: ; 8145294 str r1, [r0] movs r0, 0x2B bl m4aSongNumStart -@0814533E: +_0814533E: pop {r4} pop {r0} bx r0 @@ -601458,22 +601458,22 @@ 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 .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 AllocZeroed str r0, [r5] @@ -601482,7 +601482,7 @@ sub_8145354: ; 8145354 movs r1, 0x7 bl GetWindowAttribute str r0, [r4] -@0814539E: +_0814539E: ldr r1, [r5] ldrh r0, [r6] movs r2, 0 @@ -601508,7 +601508,7 @@ sub_8145354: ; 8145354 movs r2, 0x1 bl sub_8145824 movs r4, 0 -@081453D2: +_081453D2: adds r0, r7, 0 ldr r1, =gUnknown_085B8C10 movs r2, 0x20 @@ -601518,19 +601518,19 @@ sub_8145354: ; 8145354 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xDF - bls @081453D2 - b @08145420 + bls _081453D2 + b _08145420 .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 @@ -601541,15 +601541,15 @@ sub_8145354: ; 8145354 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 .pool -@08145434: +_08145434: adds r0, r7, 0 bl sub_8145814 ldr r0, =gUnknown_085B8BF0 @@ -601559,7 +601559,7 @@ sub_8145354: ; 8145354 bl gpu_pal_apply movs r0, 0x1 mov r8, r0 -@0814544A: +_0814544A: mov r0, r8 pop {r3} mov r8, r3 @@ -601583,57 +601583,57 @@ 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 .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 .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] @@ -601666,7 +601666,7 @@ sub_814545C: ; 814545C ldrb r0, [r1, 0x10] adds r0, 0x1 strb r0, [r1, 0x10] -@0814552A: +_0814552A: pop {r4,r5} pop {r0} bx r0 @@ -601682,33 +601682,33 @@ 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 .pool -@0814557C: +_0814557C: adds r0, r5, 0 bl sub_8145588 -@08145582: +_08145582: pop {r4-r6} pop {r0} bx r0 @@ -601739,11 +601739,11 @@ sub_81455A8: ; 81455A8 movs r0, 0 ldrsb r0, [r3, r0] cmp r0, 0x1 - bgt @081455C0 + bgt _081455C0 ldr r0, =0x030066d0 - b @081455D8 + b _081455D8 .pool -@081455C0: +_081455C0: ldr r2, =0x03006380 ldrb r1, [r2, 0xB] movs r0, 0 @@ -601756,13 +601756,13 @@ sub_81455A8: ; 81455A8 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 @@ -601776,7 +601776,7 @@ sub_81455A8: ; 81455A8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls @081455E2 + bls _081455E2 pop {r4} pop {r0} bx r0 @@ -601841,7 +601841,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 @@ -601854,7 +601854,7 @@ sub_8145648: ; 8145648 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @0814567E + bls _0814567E pop {r4-r6} pop {r0} bx r0 @@ -601878,40 +601878,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 @@ -601938,7 +601938,7 @@ sub_81456A8: ; 81456A8 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] @@ -601947,37 +601947,37 @@ sub_81456A8: ; 81456A8 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 gUnknown_085B8C30 -@08145774: .4byte 0x0203ab94 -@08145778: .4byte gUnknown_085B8770 -@0814577C: .4byte gUnknown_085B8C32 -@08145780: +_08145764: .4byte 0x40920000 +_08145768: .4byte 0x00000000 +_0814576C: .4byte 0x0203ab90 +_08145770: .4byte gUnknown_085B8C30 +_08145774: .4byte 0x0203ab94 +_08145778: .4byte gUnknown_085B8770 +_0814577C: .4byte gUnknown_085B8C32 +_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 @@ -602002,7 +602002,7 @@ sub_81456A8: ; 81456A8 movs r1, 0xF ands r0, r1 add r0, r10 - ldr r1, @0814580C + ldr r1, _0814580C adds r0, r1 ldrb r1, [r4] ldrb r0, [r0] @@ -602011,13 +602011,13 @@ sub_81456A8: ; 81456A8 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] @@ -602031,10 +602031,10 @@ sub_81456A8: ; 81456A8 pop {r0} bx r0 .align 2, 0 -@08145804: .4byte 0x0203ab94 -@08145808: .4byte gUnknown_085B8770 -@0814580C: .4byte gUnknown_085B8C32 -@08145810: .4byte 0x0203ab90 +_08145804: .4byte 0x0203ab94 +_08145808: .4byte gUnknown_085B8770 +_0814580C: .4byte gUnknown_085B8C32 +_08145810: .4byte 0x0203ab90 thumb_func_end sub_81456A8 thumb_func_start sub_8145814 @@ -602057,7 +602057,7 @@ sub_8145824: ; 8145824 lsrs r4, r1, 16 lsls r2, 24 cmp r2, 0 - bne @08145848 + bne _08145848 movs r1, 0 bl GetWindowAttribute lsls r0, 24 @@ -602066,7 +602066,7 @@ sub_8145824: ; 8145824 asrs r1, 8 movs r2, 0 bl ChangeBgX -@08145848: +_08145848: pop {r4} pop {r0} bx r0 @@ -602085,20 +602085,20 @@ 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 .pool -@08145874: +_08145874: ldr r5, =0x0203ab98 ldr r0, [r5] cmp r0, 0 - bne @08145884 + bne _08145884 movs r0, 0x8 bl AllocZeroed str r0, [r5] -@08145884: +_08145884: ldr r1, =gUnknown_085B8438 adds r0, r7, 0 movs r2, 0 @@ -602112,9 +602112,9 @@ sub_8145850: ; 8145850 ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b @081458F8 + b _081458F8 .pool -@081458B0: +_081458B0: ldr r0, =gUnknown_085B8C80 bl LoadObjectPics ldr r0, =gUnknown_085B8C90 @@ -602148,7 +602148,7 @@ sub_8145850: ; 8145850 strb r4, [r0, 0x2] movs r0, 0x1 mov r8, r0 -@081458F8: +_081458F8: mov r0, r8 pop {r3} mov r8, r3 @@ -602228,77 +602228,77 @@ 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 .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] @@ -602308,9 +602308,9 @@ sub_814596C: ; 814596C 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] @@ -602321,10 +602321,10 @@ sub_814596C: ; 814596C movs r0, 0x1 ldrsb r0, [r2, r0] cmp r1, r0 - ble @08145A82 - b @08145A7A + ble _08145A82 + b _08145A7A .pool -@08145A64: +_08145A64: ldrb r0, [r2, 0x2] subs r0, r5, r0 strb r0, [r2] @@ -602335,13 +602335,13 @@ sub_814596C: ; 814596C 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 @@ -602396,9 +602396,9 @@ sub_814596C: ; 814596C 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 @@ -602407,9 +602407,9 @@ sub_814596C: ; 814596C 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 @@ -602433,9 +602433,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] @@ -602598,30 +602598,30 @@ AddCoins: ; 8145C80 lsrs r1, r0, 16 ldr r0, =0x0000270e cmp r1, r0 - bls @08145C9C + bls _08145C9C movs r0, 0 - b @08145CC0 + b _08145CC0 .pool -@08145C9C: +_08145C9C: adds r0, r1, r4 cmp r1, r0 - ble @08145CAC + ble _08145CAC ldr r0, =0x0000270f - b @08145CBA + b _08145CBA .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 SetCoins movs r0, 0x1 -@08145CC0: +_08145CC0: pop {r4} pop {r1} bx r1 @@ -602638,16 +602638,16 @@ SubtractCoins: ; 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 SetCoins movs r0, 0x1 -@08145CEE: +_08145CEE: pop {r4} pop {r1} bx r1 @@ -602665,39 +602665,39 @@ 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 .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 FlagGet 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 @@ -602715,16 +602715,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 @@ -602732,30 +602732,30 @@ sub_8145D48: ; 8145D48 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 .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, =gUnknown_085B91B8 -@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 @@ -602763,10 +602763,10 @@ sub_8145D48: ; 8145D48 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 @@ -602781,10 +602781,10 @@ hm_prepare_rocksmash: ; 8145DC4 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 @@ -602797,7 +602797,7 @@ hm_prepare_rocksmash: ; 8145DC4 ldr r0, =sub_8145E0C str r0, [r1] movs r0, 0x1 -@08145DF2: +_08145DF2: pop {r4} pop {r1} bx r1 @@ -602864,30 +602864,30 @@ sub_8145E84: ; 8145E84 ldr r4, =0x0300120b ldrb r0, [r4] cmp r0, 0 - beq @08145E98 + beq _08145E98 cmp r0, 0x1 - beq @08145EAC - b @08145EC0 + beq _08145EAC + b _08145EC0 .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 .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 bl SetMainCallback2 -@08145EC0: +_08145EC0: bl run_active_tasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad @@ -602949,11 +602949,11 @@ sub_8145F20: ; 8145F20 movs r1, 0x26 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08145F4C + bne _08145F4C movs r0, 0 - b @08145F60 + b _08145F60 .pool -@08145F4C: +_08145F4C: adds r0, r2, 0 bl remove_task ldr r4, =0x0203aba0 @@ -602962,7 +602962,7 @@ sub_8145F20: ; 8145F20 movs r0, 0 str r0, [r4] movs r0, 0x1 -@08145F60: +_08145F60: pop {r4} pop {r1} bx r1 @@ -603007,7 +603007,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 @@ -603017,7 +603017,7 @@ sub_8145FA8: ; 8145FA8 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08145FBA + bne _08145FBA pop {r4,r5} pop {r0} bx r0 @@ -603040,20 +603040,20 @@ 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 .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 @@ -603073,16 +603073,16 @@ sub_8146030: ; 8146030 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @08146054 + beq _08146054 movs r0, 0 - b @0814605C + b _0814605C .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 @@ -603126,10 +603126,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} @@ -603153,7 +603153,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 @@ -603163,16 +603163,16 @@ sub_81460BC: ; 81460BC movs r2, 0x3 movs r3, 0x2 bl sub_8149D78 - b @08146104 + b _08146104 .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} @@ -603190,7 +603190,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 @@ -603200,7 +603200,7 @@ sub_814610C: ; 814610C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814611E + bne _0814611E pop {r4,r5} pop {r0} bx r0 @@ -603241,11 +603241,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] @@ -603254,7 +603254,7 @@ sub_8146178: ; 8146178 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne @081461B0 + bne _081461B0 movs r1, 0x1 negs r1, r1 str r2, [sp] @@ -603262,7 +603262,7 @@ sub_8146178: ; 8146178 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@081461B0: +_081461B0: ldrh r1, [r4, 0xC] movs r0, 0xF ands r0, r1 @@ -603273,11 +603273,11 @@ sub_8146178: ; 8146178 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} @@ -603293,13 +603293,13 @@ sub_81461D8: ; 81461D8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081461F4 + bne _081461F4 ldr r0, =sub_814610C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -@081461F4: +_081461F4: movs r0, 0 pop {r1} bx r1 @@ -603317,7 +603317,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 @@ -603327,7 +603327,7 @@ sub_8146204: ; 8146204 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08146216 + bne _08146216 pop {r4,r5} pop {r0} bx r0 @@ -603411,13 +603411,13 @@ sub_81462A8: ; 81462A8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081462FA + bne _081462FA ldr r0, =sub_8146204 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 @@ -603439,7 +603439,7 @@ sub_8146320: ; 8146320 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq @08146344 + beq _08146344 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -603450,7 +603450,7 @@ sub_8146320: ; 8146320 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -@08146344: +_08146344: pop {r0} bx r0 .pool @@ -603488,7 +603488,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 @@ -603498,7 +603498,7 @@ sub_8146384: ; 8146384 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08146396 + bne _08146396 pop {r4,r5} pop {r0} bx r0 @@ -603567,7 +603567,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 @@ -603588,19 +603588,19 @@ sub_8146420: ; 8146420 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 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 @@ -603621,7 +603621,7 @@ sub_81464B0: ; 81464B0 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq @081464D4 + beq _081464D4 ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -603632,7 +603632,7 @@ sub_81464B0: ; 81464B0 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -@081464D4: +_081464D4: pop {r0} bx r0 .pool @@ -603670,7 +603670,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 @@ -603680,7 +603680,7 @@ sub_8146514: ; 8146514 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08146526 + bne _08146526 pop {r4,r5} pop {r0} bx r0 @@ -603698,7 +603698,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 @@ -603708,7 +603708,7 @@ sub_814654C: ; 814654C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814655E + bne _0814655E pop {r4,r5} pop {r0} bx r0 @@ -603726,7 +603726,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 @@ -603736,7 +603736,7 @@ sub_8146584: ; 8146584 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08146596 + bne _08146596 pop {r4,r5} pop {r0} bx r0 @@ -603754,7 +603754,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 @@ -603764,7 +603764,7 @@ sub_81465BC: ; 81465BC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081465CE + bne _081465CE pop {r4,r5} pop {r0} bx r0 @@ -603782,7 +603782,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 @@ -603792,7 +603792,7 @@ sub_81465F4: ; 81465F4 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08146606 + bne _08146606 pop {r4,r5} pop {r0} bx r0 @@ -603810,7 +603810,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 @@ -603820,7 +603820,7 @@ sub_814662C: ; 814662C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814663E + bne _0814663E pop {r4,r5} pop {r0} bx r0 @@ -603838,7 +603838,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 @@ -603848,7 +603848,7 @@ sub_8146664: ; 8146664 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08146676 + bne _08146676 pop {r4,r5} pop {r0} bx r0 @@ -603890,12 +603890,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 bl SetVBlankCallback pop {r4} @@ -604066,11 +604066,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 @@ -604086,14 +604086,14 @@ sub_8146854: ; 8146854 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 @@ -604345,7 +604345,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 @@ -604360,20 +604360,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} @@ -604392,7 +604392,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 @@ -604403,14 +604403,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] @@ -604418,7 +604418,7 @@ sub_8146B24: ; 8146B24 strh r0, [r4, 0xA] movs r0, 0x1E strh r0, [r4, 0x18] -@08146B6E: +_08146B6E: movs r0, 0 pop {r4,r5} pop {r1} @@ -604458,7 +604458,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 @@ -604475,7 +604475,7 @@ sub_8146BA8: ; 8146BA8 lsls r0, 24 lsrs r0, 24 bl remove_task -@08146BDE: +_08146BDE: movs r0, 0 pop {r4} pop {r1} @@ -604498,19 +604498,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 @@ -604520,11 +604520,11 @@ sub_8146BF8: ; 8146BF8 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] @@ -604572,19 +604572,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 @@ -604594,11 +604594,11 @@ sub_8146C8C: ; 8146C8C 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] @@ -604663,7 +604663,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] @@ -604672,7 +604672,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 @@ -604695,11 +604695,11 @@ 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 @@ -604737,11 +604737,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 @@ -604762,16 +604762,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 @@ -604779,9 +604779,9 @@ sub_8146DF8: ; 8146DF8 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] @@ -604791,7 +604791,7 @@ sub_8146DF8: ; 8146DF8 movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne @08146E90 + bne _08146E90 movs r0, 0 bl SetVBlankCallback ldr r1, =0x040000b0 @@ -604810,26 +604810,26 @@ sub_8146DF8: ; 8146DF8 lsls r0, 24 lsrs r0, 24 bl remove_task - b @08146EB0 + b _08146EB0 .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 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} @@ -604855,7 +604855,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] @@ -604866,7 +604866,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] @@ -604933,7 +604933,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 @@ -604943,7 +604943,7 @@ sub_8146F94: ; 8146F94 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08146FA6 + bne _08146FA6 pop {r4,r5} pop {r0} bx r0 @@ -605005,7 +605005,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 @@ -605035,7 +605035,7 @@ sub_8147018: ; 8147018 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] @@ -605056,14 +605056,14 @@ sub_81470A4: ; 81470A4 bl FieldEffectActiveListContains lsls r0, 24 cmp r0, 0 - bne @081470C4 + bne _081470C4 bl sub_8149F84 ldr r0, =sub_8146F94 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -@081470C4: +_081470C4: movs r0, 0 pop {r1} bx r1 @@ -605131,17 +605131,17 @@ 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 .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] @@ -605154,7 +605154,7 @@ sub_814713C: ; 814713C movs r3, 0x32 ldrsh r0, [r4, r3] cmp r5, r0 - beq @081471CE + beq _081471CE strh r2, [r4, 0x32] ldr r0, =0x04000008 ldrh r2, [r0] @@ -605192,7 +605192,7 @@ sub_814713C: ; 814713C lsls r1, 1 adds r1, r2 strh r3, [r1] -@081471CE: +_081471CE: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r0, 1 @@ -605206,11 +605206,11 @@ sub_814713C: ; 814713C movs r1, 0x87 lsls r1, 17 cmp r0, r1 - bls @081471F2 + bls _081471F2 adds r0, r4, 0 movs r1, 0x2D bl FieldEffectStop -@081471F2: +_081471F2: add sp, 0x4 pop {r4-r6} pop {r0} @@ -605229,7 +605229,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 @@ -605239,7 +605239,7 @@ sub_8147204: ; 8147204 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08147216 + bne _08147216 pop {r4,r5} pop {r0} bx r0 @@ -605265,7 +605265,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] @@ -605273,7 +605273,7 @@ sub_814723C: ; 814723C lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls @08147262 + bls _08147262 ldr r0, =sub_8147688 bl SetVBlankCallback ldr r0, =0x0203aba0 @@ -605315,7 +605315,7 @@ sub_81472A4: ; 81472A4 movs r2, 0x50 bl sub_814A1AC ldr r5, =0x02038c28 -@081472D4: +_081472D4: ldr r4, =0x0203aba0 ldr r0, [r4] movs r7, 0x2A @@ -605335,7 +605335,7 @@ sub_81472A4: ; 81472A4 bl sub_814A228 lsls r0, 24 cmp r0, 0 - beq @081472D4 + beq _081472D4 ldr r1, [r4] ldrh r0, [r1, 0x2C] adds r0, 0x10 @@ -605343,13 +605343,13 @@ sub_81472A4: ; 81472A4 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 @@ -605395,7 +605395,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] @@ -605405,10 +605405,10 @@ sub_8147334: ; 8147334 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] @@ -605422,16 +605422,16 @@ sub_8147334: ; 8147334 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 .pool -@081473C0: +_081473C0: ldr r1, [r7] ldrh r0, [r1, 0x2E] adds r0, 0x8 @@ -605439,22 +605439,22 @@ sub_8147334: ; 8147334 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 @@ -605468,8 +605468,8 @@ sub_8147334: ; 8147334 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] @@ -605511,7 +605511,7 @@ sub_8147428: ; 8147428 movs r2, 0x50 bl sub_814A1AC ldr r5, =0x02038c28 -@08147456: +_08147456: ldr r4, =0x0203aba0 ldr r0, [r4] movs r1, 0x2A @@ -605529,20 +605529,20 @@ sub_8147428: ; 8147428 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 @@ -605591,7 +605591,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 @@ -605605,10 +605605,10 @@ sub_81474B0: ; 81474B0 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 @@ -605618,16 +605618,16 @@ sub_81474B0: ; 81474B0 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 .pool -@08147540: +_08147540: mov r0, r8 ldr r2, [r0] ldrh r0, [r2, 0x2E] @@ -605636,22 +605636,22 @@ sub_81474B0: ; 81474B0 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 @@ -605665,8 +605665,8 @@ sub_81474B0: ; 81474B0 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] @@ -605708,7 +605708,7 @@ sub_81475B0: ; 81475B0 movs r2, 0x50 bl sub_814A1AC ldr r6, =0x02038c28 -@081475DC: +_081475DC: movs r2, 0x78 ldr r5, =0x0203aba0 ldr r3, [r5] @@ -605716,10 +605716,10 @@ sub_81475B0: ; 81475B0 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 @@ -605736,7 +605736,7 @@ sub_81475B0: ; 81475B0 bl sub_814A228 lsls r0, 24 cmp r0, 0 - beq @081475DC + beq _081475DC ldr r0, [r5] ldrh r1, [r0, 0x2C] adds r1, 0x10 @@ -605744,11 +605744,11 @@ sub_81475B0: ; 81475B0 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 @@ -605805,7 +605805,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] @@ -605816,7 +605816,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] @@ -605856,7 +605856,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 @@ -605866,7 +605866,7 @@ sub_8147718: ; 8147718 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814772A + bne _0814772A pop {r4,r5} pop {r0} bx r0 @@ -605882,7 +605882,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] @@ -605892,7 +605892,7 @@ sub_8147750: ; 8147750 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9F - bls @08147762 + bls _08147762 ldr r0, =sub_8147888 bl SetVBlankCallback ldr r0, =sub_81478C0 @@ -605936,15 +605936,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 @@ -605964,14 +605964,14 @@ sub_81477A8: ; 81477A8 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] @@ -605983,23 +605983,23 @@ sub_81477A8: ; 81477A8 str r2, [sp] movs r3, 0x10 bl pal_fade_maybe -@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 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] @@ -606024,7 +606024,7 @@ sub_8147888: ; 8147888 ldr r0, [r0] ldrb r0, [r0] cmp r0, 0 - beq @081478AC + beq _081478AC ldr r1, =0x040000d4 ldr r0, =0x02038c28 str r0, [r1] @@ -606035,7 +606035,7 @@ sub_8147888: ; 8147888 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -@081478AC: +_081478AC: pop {r0} bx r0 .pool @@ -606073,7 +606073,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 @@ -606083,7 +606083,7 @@ sub_81478EC: ; 81478EC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081478FE + bne _081478FE pop {r4,r5} pop {r0} bx r0 @@ -606109,7 +606109,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] @@ -606117,7 +606117,7 @@ sub_8147924: ; 8147924 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9F - bls @0814794A + bls _0814794A ldr r0, =sub_8147A58 bl SetVBlankCallback ldrh r0, [r4, 0x8] @@ -606152,7 +606152,7 @@ sub_814797C: ; 814797C movs r6, 0 movs r0, 0x1 mov r8, r0 -@081479A4: +_081479A4: adds r0, r5, 0 movs r1, 0x28 bl sine @@ -606161,15 +606161,15 @@ sub_814797C: ; 814797C 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 @@ -606177,10 +606177,10 @@ sub_814797C: ; 814797C 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 @@ -606189,14 +606189,14 @@ sub_814797C: ; 814797C 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] @@ -606255,7 +606255,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] @@ -606266,7 +606266,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] @@ -606391,7 +606391,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 @@ -606401,7 +606401,7 @@ sub_8147B84: ; 8147B84 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08147B96 + bne _08147B96 pop {r4,r5} pop {r0} bx r0 @@ -606433,7 +606433,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] @@ -606441,7 +606441,7 @@ sub_8147BBC: ; 8147BBC lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9F - bls @08147BF0 + bls _08147BF0 ldr r0, =sub_81480CC bl SetVBlankCallback ldrh r0, [r4, 0x8] @@ -606494,11 +606494,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 @@ -606513,14 +606513,14 @@ sub_8147C24: ; 8147C24 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 EnableInterrupts ldr r0, =sub_81481E0 @@ -606554,7 +606554,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 @@ -606563,15 +606563,15 @@ sub_8147CE4: ; 8147CE4 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 @@ -606582,10 +606582,10 @@ sub_8147CE4: ; 8147CE4 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 @@ -606594,15 +606594,15 @@ sub_8147CE4: ; 8147CE4 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 @@ -606617,8 +606617,8 @@ sub_8147CE4: ; 8147CE4 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] @@ -606628,24 +606628,24 @@ sub_8147CE4: ; 8147CE4 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] @@ -606677,14 +606677,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 @@ -606741,14 +606741,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} @@ -606777,7 +606777,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 @@ -606825,7 +606825,7 @@ sub_8147E88: ; 8147E88 strh r0, [r1, 0xE] ldr r0, =sub_8148160 bl SetVBlankCallback -@08147F1C: +_08147F1C: movs r0, 0 pop {r3} mov r8, r3 @@ -606857,17 +606857,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] @@ -606875,15 +606875,15 @@ sub_8147F40: ; 8147F40 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 @@ -606896,21 +606896,21 @@ sub_8147F40: ; 8147F40 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 @@ -606919,16 +606919,16 @@ sub_8147F40: ; 8147F40 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] @@ -606991,11 +606991,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 @@ -607053,7 +607053,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] @@ -607064,7 +607064,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] @@ -607109,7 +607109,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] @@ -607120,7 +607120,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] @@ -607144,19 +607144,19 @@ sub_81481E0: ; 81481E0 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 .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 @@ -607327,7 +607327,7 @@ sub_8148380: ; 8148380 push {r4,r5,lr} adds r4, r0, 0 ldr r5, =gUnknown_085C8C24 -@08148386: +_08148386: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r0, 2 @@ -607337,7 +607337,7 @@ sub_8148380: ; 8148380 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08148386 + bne _08148386 pop {r4,r5} pop {r0} bx r0 @@ -607398,22 +607398,22 @@ 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 @@ -607432,7 +607432,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] @@ -607440,7 +607440,7 @@ sub_814842C: ; 814842C strh r0, [r2, 0x32] movs r0, 0x1 strh r0, [r2, 0x3A] -@08148452: +_08148452: movs r0, 0 pop {r1} bx r1 @@ -607462,11 +607462,11 @@ 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 @@ -607528,7 +607528,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 @@ -607538,7 +607538,7 @@ sub_81484D0: ; 81484D0 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081484E2 + bne _081484E2 pop {r4,r5} pop {r0} bx r0 @@ -607570,7 +607570,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] @@ -607585,7 +607585,7 @@ sub_8148508: ; 8148508 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x9F - bls @0814853A + bls _0814853A movs r0, 0x2 bl EnableInterrupts movs r0, 0x4 @@ -607626,27 +607626,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 @@ -607654,7 +607654,7 @@ sub_8148590: ; 8148590 adds r1, r7 mov r12, r1 mov r6, r8 -@081485E8: +_081485E8: lsls r0, r5, 1 adds r2, r0, r7 mov r1, r12 @@ -607662,7 +607662,7 @@ sub_8148590: ; 8148590 movs r0, 0x1 ands r0, r5 cmp r0, 0 - beq @08148618 + beq _08148618 ldr r1, [r6] ldrh r0, [r3, 0xA] ldrh r1, [r1, 0x14] @@ -607671,9 +607671,9 @@ sub_8148590: ; 8148590 ldrh r1, [r3, 0xA] movs r0, 0xF0 subs r0, r1 - b @0814862A + b _0814862A .pool -@08148618: +_08148618: ldr r0, [r6] ldrh r0, [r0, 0x14] ldrh r1, [r3, 0xA] @@ -607683,21 +607683,21 @@ sub_8148590: ; 8148590 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] @@ -607764,7 +607764,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] @@ -607775,7 +607775,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 @@ -607795,7 +607795,7 @@ sub_8148728: ; 8148728 ldr r2, =0x04000006 ldrh r0, [r2] cmp r0, 0x9F - bhi @0814874E + bhi _0814874E ldr r1, =0x02038c28 ldrh r0, [r2] lsls r0, 1 @@ -607810,7 +607810,7 @@ sub_8148728: ; 8148728 strh r1, [r0] adds r0, 0x4 strh r1, [r0] -@0814874E: +_0814874E: pop {r0} bx r0 .pool @@ -607827,7 +607827,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 @@ -607837,7 +607837,7 @@ sub_8148760: ; 8148760 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08148772 + bne _08148772 pop {r4,r5} pop {r0} bx r0 @@ -607870,7 +607870,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 @@ -607914,7 +607914,7 @@ sub_8148798: ; 8148798 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] @@ -607969,9 +607969,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 @@ -607979,12 +607979,12 @@ sub_8148864: ; 8148864 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 @@ -608000,12 +608000,12 @@ sub_8148864: ; 8148864 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 @@ -608017,7 +608017,7 @@ sub_8148864: ; 8148864 adds r1, r0 ldrh r2, [r4] cmp r2, 0xEF - bls @08148920 + bls _08148920 movs r1, 0xF0 strh r1, [r4] ldr r0, [sp, 0x8] @@ -608025,27 +608025,27 @@ sub_8148864: ; 8148864 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] - b @08148940 + b _08148940 .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 @@ -608064,30 +608064,30 @@ sub_8148864: ; 8148864 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 @@ -608104,12 +608104,12 @@ sub_8148864: ; 8148864 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 @@ -608121,7 +608121,7 @@ sub_8148864: ; 8148864 adds r1, r0 ldrh r2, [r4] cmp r2, 0xEF - bls @081489F8 + bls _081489F8 movs r1, 0xF0 strh r1, [r4] ldr r0, [sp, 0x8] @@ -608129,27 +608129,27 @@ sub_8148864: ; 8148864 lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x8] - b @08148A18 + b _08148A18 .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 @@ -608169,19 +608169,19 @@ sub_8148864: ; 8148864 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 @@ -608190,43 +608190,43 @@ sub_8148864: ; 8148864 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] @@ -608253,27 +608253,27 @@ sub_8148AD4: ; 8148AD4 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} @@ -608317,7 +608317,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 @@ -608327,7 +608327,7 @@ sub_8148B54: ; 8148B54 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08148B66 + bne _08148B66 pop {r4,r5} pop {r0} bx r0 @@ -608345,7 +608345,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 @@ -608355,7 +608355,7 @@ sub_8148B8C: ; 8148B8C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08148B9E + bne _08148B9E pop {r4,r5} pop {r0} bx r0 @@ -608383,12 +608383,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 bl SetVBlankCallback @@ -608414,7 +608414,7 @@ sub_8148C28: ; 8148C28 movs r1, 0x16 ldrsh r0, [r4, r1] cmp r0, 0x1 - bne @08148C6C + bne _08148C6C ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -608432,9 +608432,9 @@ sub_8148C28: ; 8148C28 lsls r0, 24 lsrs r0, 24 bl remove_task - b @08148CDE + b _08148CDE .pool -@08148C6C: +_08148C6C: ldr r5, =0x0203aba0 ldr r1, [r5] ldrb r0, [r1] @@ -608445,29 +608445,29 @@ sub_8148C28: ; 8148C28 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] @@ -608477,19 +608477,19 @@ sub_8148C28: ; 8148C28 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 .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} @@ -608509,13 +608509,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, =gUnknown_085C8C80 movs r2, 0x14 ldrsh r0, [r4, r2] @@ -608543,12 +608543,12 @@ sub_8148CE8: ; 8148CE8 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 @@ -608574,20 +608574,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] @@ -608597,7 +608597,7 @@ sub_8148D6C: ; 8148D6C movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0xA0 - bne @08148DD6 + bne _08148DD6 ldr r1, =0x040000b0 ldrh r2, [r1, 0xA] ldr r0, =0x0000c5ff @@ -608614,24 +608614,24 @@ sub_8148D6C: ; 8148D6C 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 .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 @@ -608644,21 +608644,21 @@ sub_8148D6C: ; 8148D6C 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] @@ -608683,7 +608683,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 @@ -608693,7 +608693,7 @@ sub_8148E54: ; 8148E54 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08148E66 + bne _08148E66 pop {r4,r5} pop {r0} bx r0 @@ -608794,10 +608794,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, =gUnknown_085C8D38 lsrs r0, r5, 1 lsls r0, 2 @@ -608812,13 +608812,13 @@ sub_8148F4C: ; 8148F4C 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 @@ -608826,14 +608826,14 @@ sub_8148F4C: ; 8148F4C 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 @@ -608849,23 +608849,23 @@ sub_8148F4C: ; 8148F4C 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} @@ -608919,7 +608919,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] @@ -608932,42 +608932,42 @@ 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 .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 @@ -608976,19 +608976,19 @@ sub_8149048: ; 8149048 movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne @081490D8 -@081490CE: + bne _081490D8 +_081490CE: movs r0, 0 - b @08149138 + b _08149138 .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] @@ -608996,7 +608996,7 @@ sub_8149048: ; 8149048 strh r0, [r2, 0x2] movs r0, 0x4 strb r0, [r2] -@081490F4: +_081490F4: ldrb r0, [r2, 0x4] lsls r0, 1 adds r0, r3 @@ -609005,36 +609005,36 @@ sub_8149048: ; 8149048 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 @@ -609051,7 +609051,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 @@ -609061,7 +609061,7 @@ sub_8149140: ; 8149140 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08149152 + bne _08149152 pop {r4,r5} pop {r0} bx r0 @@ -609113,7 +609113,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 @@ -609128,20 +609128,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} @@ -609160,7 +609160,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 @@ -609171,14 +609171,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] @@ -609186,7 +609186,7 @@ sub_8149224: ; 8149224 strh r0, [r4, 0xA] movs r0, 0x1E strh r0, [r4, 0x18] -@0814926E: +_0814926E: movs r0, 0 pop {r4,r5} pop {r1} @@ -609205,7 +609205,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 @@ -609215,7 +609215,7 @@ sub_814927C: ; 814927C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814928E + bne _0814928E pop {r4,r5} pop {r0} bx r0 @@ -609266,7 +609266,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] @@ -609276,7 +609276,7 @@ sub_81492B4: ; 81492B4 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9F - bls @08149316 + bls _08149316 ldr r0, =sub_8149508 bl SetVBlankCallback movs r0, 0 @@ -609319,13 +609319,13 @@ sub_8149388: ; 8149388 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 @@ -609335,20 +609335,20 @@ sub_8149388: ; 8149388 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} @@ -609368,7 +609368,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] @@ -609378,7 +609378,7 @@ sub_81493D8: ; 81493D8 movs r1, 0x2 movs r3, 0x10 bl pal_fade_maybe -@08149402: +_08149402: movs r0, 0 add sp, 0x4 pop {r1} @@ -609395,7 +609395,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 @@ -609403,7 +609403,7 @@ sub_8149410: ; 8149410 ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] -@0814942E: +_0814942E: movs r0, 0 pop {r1} bx r1 @@ -609443,7 +609443,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 @@ -609454,14 +609454,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 @@ -609476,7 +609476,7 @@ sub_814946C: ; 814946C ldr r5, =sub_8146F68 ldr r3, =0x020393a8 movs r2, 0 -@081494C4: +_081494C4: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -609484,7 +609484,7 @@ sub_814946C: ; 814946C lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls @081494C4 + bls _081494C4 adds r0, r5, 0 bl SetVBlankCallback ldrh r0, [r4, 0x8] @@ -609497,7 +609497,7 @@ sub_814946C: ; 814946C strh r2, [r4, 0x16] movs r0, 0 bl ResetGpuRegBits -@081494F0: +_081494F0: movs r0, 0 pop {r4,r5} pop {r1} @@ -609524,18 +609524,18 @@ sub_8149508: ; 8149508 movs r1, 0x20 ldrsh r0, [r0, r1] cmp r0, 0 - bne @08149548 + bne _08149548 ldr r2, =0x02038c28 - b @08149554 + b _08149554 .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 @@ -609559,7 +609559,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 @@ -609569,7 +609569,7 @@ sub_8149578: ; 8149578 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814958A + bne _0814958A pop {r4,r5} pop {r0} bx r0 @@ -609598,7 +609598,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] @@ -609611,7 +609611,7 @@ sub_81495B0: ; 81495B0 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls @081495DC + bls _081495DC movs r0, 0x2 bl EnableInterrupts ldr r0, =sub_8149840 @@ -609639,7 +609639,7 @@ sub_8149628: ; 8149628 bl memcpy movs r5, 0 movs r4, 0 -@0814963C: +_0814963C: ldr r0, =sub_8149864 bl obj_add_empty_with_callback lsls r0, 24 @@ -609668,7 +609668,7 @@ sub_8149628: ; 8149628 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] @@ -609696,7 +609696,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 @@ -609705,7 +609705,7 @@ sub_814969C: ; 814969C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@081496C6: +_081496C6: movs r0, 0 pop {r4} pop {r1} @@ -609767,14 +609767,14 @@ sub_8149740: ; 8149740 lsls r0, 16 lsrs r0, 16 cmp r0, 0x10 - bls @08149766 + bls _08149766 bl sub_8149F84 ldr r0, =sub_8149578 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -@08149766: +_08149766: movs r0, 0 pop {r1} bx r1 @@ -609811,7 +609811,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] @@ -609822,7 +609822,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 @@ -609890,21 +609890,21 @@ sub_8149864: ; 8149864 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 .pool -@08149890: +_08149890: movs r2, 0x22 ldrsh r1, [r3, r2] lsls r1, 1 @@ -609915,7 +609915,7 @@ sub_8149864: ; 8149864 adds r0, r2 adds r5, r1, r0 movs r4, 0 -@081498A4: +_081498A4: lsls r1, r4, 1 adds r2, r1, r6 ldrh r0, [r3, 0x2E] @@ -609931,21 +609931,21 @@ sub_8149864: ; 8149864 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] @@ -609954,57 +609954,57 @@ sub_8149864: ; 8149864 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 RemoveObjectAndFreeTiles -@0814994C: +_0814994C: pop {r4-r6} pop {r0} bx r0 @@ -610022,7 +610022,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 @@ -610032,7 +610032,7 @@ sub_814995C: ; 814995C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814996E + bne _0814996E pop {r4,r5} pop {r0} bx r0 @@ -610083,7 +610083,7 @@ sub_81499E8: ; 81499E8 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne @08149A2A + bne _08149A2A mov r0, sp bl sub_8149F40 movs r0, 0x3 @@ -610102,13 +610102,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] @@ -610128,14 +610128,14 @@ sub_8149A40: ; 8149A40 strh r1, [r0, 0xA] lsls r1, 16 cmp r1, 0 - bne @08149A60 + bne _08149A60 bl sub_8149F84 ldr r0, =sub_814995C bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task -@08149A60: +_08149A60: movs r0, 0 pop {r1} bx r1 @@ -610153,7 +610153,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 @@ -610163,7 +610163,7 @@ sub_8149A6C: ; 8149A6C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08149A7E + bne _08149A7E pop {r4,r5} pop {r0} bx r0 @@ -610188,7 +610188,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] @@ -610196,7 +610196,7 @@ sub_8149AA4: ; 8149AA4 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x9F - bls @08149AC8 + bls _08149AC8 movs r0, 0xF0 lsls r0, 3 adds r1, r4, r0 @@ -610292,7 +610292,7 @@ sub_8149B84: ; 8149B84 movs r7, 0 ldr r0, =0x02038c28 mov r9, r0 -@08149BA0: +_08149BA0: ldr r1, =0x02038c28 ldr r0, =0x0203aba0 ldr r2, [r0] @@ -610307,35 +610307,35 @@ sub_8149B84: ; 8149B84 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 .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 @@ -610349,13 +610349,13 @@ sub_8149B84: ; 8149B84 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 .pool -@08149C1C: +_08149C1C: adds r0, r4, 0 adds r0, 0x24 movs r1, 0x1 @@ -610372,8 +610372,8 @@ sub_8149B84: ; 8149B84 mov r8, r4 asrs r0, 16 cmp r0, 0xF - ble @08149BA0 -@08149C40: + ble _08149BA0 +_08149C40: ldr r0, =0x0203aba0 ldr r1, [r0] ldrb r0, [r1] @@ -610400,7 +610400,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 @@ -610418,9 +610418,9 @@ sub_8149C60: ; 8149C60 lsrs r0, 24 bl remove_task movs r0, 0 - b @08149CC4 + b _08149CC4 .pool -@08149CAC: +_08149CAC: ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] @@ -610433,7 +610433,7 @@ sub_8149C60: ; 8149C60 ldrh r0, [r0] strh r0, [r2, 0xE] movs r0, 0x1 -@08149CC4: +_08149CC4: pop {r1} bx r1 .pool @@ -610448,13 +610448,13 @@ 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 @@ -610477,7 +610477,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] @@ -610488,7 +610488,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] @@ -610575,13 +610575,13 @@ sub_8149DDC: ; 8149DDC lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @08149DF4 + beq _08149DF4 movs r0, 0 - b @08149DF6 + b _08149DF6 .pool -@08149DF4: +_08149DF4: movs r0, 0x1 -@08149DF6: +_08149DF6: pop {r1} bx r1 thumb_func_end sub_8149DDC @@ -610597,7 +610597,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 @@ -610607,7 +610607,7 @@ sub_8149DFC: ; 8149DFC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @08149E0E + bne _08149E0E pop {r4,r5} pop {r0} bx r0 @@ -610622,13 +610622,13 @@ sub_8149E34: ; 8149E34 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] @@ -610638,26 +610638,26 @@ sub_8149E34: ; 8149E34 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} @@ -610673,13 +610673,13 @@ sub_8149E90: ; 8149E90 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] @@ -610688,38 +610688,38 @@ sub_8149E90: ; 8149E90 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 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task - b @08149EFE + b _08149EFE .pool -@08149EF8: +_08149EF8: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] strh r1, [r4, 0x8] -@08149EFE: +_08149EFE: movs r0, 0 pop {r4} pop {r1} @@ -610828,7 +610828,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 @@ -610836,7 +610836,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 @@ -610859,8 +610859,8 @@ sub_8149F98: ; 8149F98 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 @@ -610900,7 +610900,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 @@ -610935,28 +610935,28 @@ sub_814A014: ; 814A014 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 @@ -610987,24 +610987,24 @@ sub_814A014: ; 814A014 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 @@ -611014,14 +611014,14 @@ sub_814A014: ; 814A014 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 @@ -611031,13 +611031,13 @@ sub_814A014: ; 814A014 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 @@ -611048,15 +611048,15 @@ sub_814A014: ; 814A014 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 @@ -611066,8 +611066,8 @@ sub_814A014: ; 814A014 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 @@ -611075,9 +611075,9 @@ sub_814A014: ; 814A014 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 @@ -611125,14 +611125,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 @@ -611141,14 +611141,14 @@ sub_814A1AC: ; 814A1AC 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} @@ -611179,7 +611179,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 @@ -611192,13 +611192,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 @@ -611211,83 +611211,83 @@ sub_814A228: ; 814A228 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 @@ -611375,7 +611375,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 @@ -611385,7 +611385,7 @@ sub_814A3BC: ; 814A3BC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814A3CE + bne _0814A3CE pop {r4,r5} pop {r0} bx r0 @@ -611403,7 +611403,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 @@ -611413,7 +611413,7 @@ sub_814A3F4: ; 814A3F4 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814A406 + bne _0814A406 pop {r4,r5} pop {r0} bx r0 @@ -611515,7 +611515,7 @@ sub_814A500: ; 814A500 ldr r6, =sub_814A684 ldr r4, =0x020393a8 ldr r3, =0x0203aba0 -@0814A50C: +_0814A50C: lsls r1, r2, 1 adds r1, r4 ldr r0, [r3] @@ -611525,7 +611525,7 @@ sub_814A500: ; 814A500 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9F - bls @0814A50C + bls _0814A50C adds r0, r6, 0 bl SetVBlankCallback ldr r0, =sub_814A6CC @@ -611570,56 +611570,56 @@ 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 .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 @@ -611639,14 +611639,14 @@ sub_814A550: ; 814A550 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] @@ -611657,23 +611657,23 @@ sub_814A550: ; 814A550 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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 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] @@ -611707,7 +611707,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] @@ -611718,7 +611718,7 @@ sub_814A684: ; 814A684 ldr r0, =0x800000a0 str r0, [r1, 0x8] ldr r0, [r1, 0x8] -@0814A6B4: +_0814A6B4: pop {r0} bx r0 .pool @@ -611752,7 +611752,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 @@ -611762,7 +611762,7 @@ sub_814A6F0: ; 814A6F0 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814A702 + bne _0814A702 pop {r4,r5} pop {r0} bx r0 @@ -611780,7 +611780,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 @@ -611790,7 +611790,7 @@ sub_814A728: ; 814A728 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814A73A + bne _0814A73A pop {r4,r5} pop {r0} bx r0 @@ -611808,7 +611808,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 @@ -611818,7 +611818,7 @@ sub_814A760: ; 814A760 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @0814A772 + bne _0814A772 pop {r4,r5} pop {r0} bx r0 @@ -611925,7 +611925,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] @@ -611935,11 +611935,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} @@ -611964,28 +611964,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] @@ -611995,29 +611995,29 @@ sub_814A898: ; 814A898 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFE - bls @0814A8DC - b @0814A94C + bls _0814A8DC + b _0814A94C .pool -@0814A8FC: +_0814A8FC: ldr r0, =0xffff7fff movs r1, 0x10 movs r2, 0 bl sub_80A2A20 ldr r0, =gUnknown_085C86F4 - b @0814A91E + b _0814A91E .pool -@0814A914: +_0814A914: ldr r0, =gUnknown_085C87F4 - b @0814A91E + b _0814A91E .pool -@0814A91C: +_0814A91C: ldr r0, =gUnknown_085C88A4 -@0814A91E: +_0814A91E: ldr r1, [sp, 0xC] bl LZ77UnCompVram - b @0814A94C + b _0814A94C .pool -@0814A92C: +_0814A92C: movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -612031,14 +612031,14 @@ sub_814A898: ; 814A898 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} @@ -612167,11 +612167,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} @@ -612219,7 +612219,7 @@ sub_814AAB8: ; 814AAB8 movs r6, 0 strh r0, [r7, 0xE] cmp r0, 0 - beq @0814AB2C + beq _0814AB2C ldr r0, =gUnknown_085C8928 mov r8, r0 movs r4, 0x4 @@ -612258,13 +612258,13 @@ sub_814AAB8: ; 814AAB8 movs r2, 0 movs r3, 0 bl CopyRectToBgTilemapBufferRect - b @0814AB78 + b _0814AB78 .pool -@0814AB2C: +_0814AB2C: movs r1, 0xC ldrsh r0, [r7, r1] cmp r0, 0 - ble @0814AB72 + ble _0814AB72 ldr r1, =gUnknown_085C9A30 subs r0, 0x1 adds r0, r1 @@ -612293,19 +612293,19 @@ sub_814AAB8: ; 814AAB8 movs r1, 0x1 adds r2, r4, 0 bl FillBgTilemapBufferRect -@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 CopyBgTilemapBufferToVram movs r0, 0 @@ -612365,7 +612365,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 @@ -612382,7 +612382,7 @@ sub_814ABE4: ; 814ABE4 ldrh r1, [r4] adds r0, r1 strh r0, [r4] -@0814AC24: +_0814AC24: pop {r4-r6} pop {r0} bx r0 @@ -612438,18 +612438,18 @@ 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 .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 @@ -612458,9 +612458,9 @@ sub_814AC38: ; 814AC38 movs r0, 0x1 strh r0, [r1, 0x8] strh r0, [r1, 0xA] - b @0814AD2E + b _0814AD2E .pool -@0814ACE4: +_0814ACE4: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -612470,9 +612470,9 @@ sub_814AC38: ; 814AC38 strh r1, [r0, 0x8] movs r1, 0x1 negs r1, r1 - b @0814AD2C + b _0814AD2C .pool -@0814AD00: +_0814AD00: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -612481,9 +612481,9 @@ sub_814AC38: ; 814AC38 movs r1, 0x1 strh r1, [r0, 0x8] ldr r1, =0x0000ffff - b @0814AD2C + b _0814AD2C .pool -@0814AD1C: +_0814AD1C: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -612492,9 +612492,9 @@ sub_814AC38: ; 814AC38 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] @@ -612546,11 +612546,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} @@ -612611,7 +612611,7 @@ sub_814ADD8: ; 814ADD8 lsls r0, 16 asrs r0, 16 cmp r0, 0x3F - ble @0814AE2E + ble _0814AE2E ldr r0, =sub_814ABE4 bl get_task_id_by_function lsls r0, 24 @@ -612620,7 +612620,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} @@ -612707,24 +612707,24 @@ 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, =gUnknown_085C9A94 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @0814AF18 + b _0814AF18 .pool -@0814AF14: +_0814AF14: bl dp01_tbl4_exec_completed -@0814AF18: +_0814AF18: pop {r0} bx r0 thumb_func_end bx_exec_buffer_A_ch0_tbl4 @@ -612746,9 +612746,9 @@ sub_814AF1C: ; 814AF1C ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0814AF40 + bne _0814AF40 bl dp01_tbl4_exec_completed -@0814AF40: +_0814AF40: pop {r0} bx r0 .pool @@ -612772,7 +612772,7 @@ sub_814AF54: ; 814AF54 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0814AFA4 + bne _0814AFA4 movs r0, 0 bl nullsub_25 ldrb r0, [r4] @@ -612792,7 +612792,7 @@ sub_814AF54: ; 814AF54 adds r0, r6 bl RemoveObjectAndFreeTiles bl dp01_tbl4_exec_completed -@0814AFA4: +_0814AFA4: pop {r4-r6} pop {r0} bx r0 @@ -612817,7 +612817,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] @@ -612828,7 +612828,7 @@ sub_814AFBC: ; 814AFBC movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl4_exec_completed -@0814AFF4: +_0814AFF4: pop {r4} pop {r0} bx r0 @@ -612842,18 +612842,18 @@ sub_814B004: ; 814B004 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 @@ -612868,10 +612868,10 @@ sub_814B004: ; 814B004 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0814B094 - b @0814B092 + bne _0814B094 + b _0814B092 .pool -@0814B05C: +_0814B05C: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -612887,7 +612887,7 @@ sub_814B004: ; 814B004 ldr r2, [r0] ldr r0, =DummyObjectCallback cmp r2, r0 - bne @0814B094 + bne _0814B094 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -612898,18 +612898,18 @@ sub_814B004: ; 814B004 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 @@ -612927,7 +612927,7 @@ sub_814B004: ; 814B004 adds r0, r1 ldr r1, =sub_814AFBC str r1, [r0] -@0814B0C6: +_0814B0C6: pop {r4-r6} pop {r0} bx r0 @@ -612956,9 +612956,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 @@ -612974,9 +612974,9 @@ sub_814B0E8: ; 814B0E8 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 @@ -612992,7 +612992,7 @@ sub_814B0E8: ; 814B0E8 ldr r3, [r0] ldr r0, =DummyObjectCallback cmp r3, r0 - bne @0814B252 + bne _0814B252 ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] @@ -613002,14 +613002,14 @@ sub_814B0E8: ; 814B0E8 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] @@ -613022,13 +613022,13 @@ sub_814B0E8: ; 814B0E8 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 @@ -613065,7 +613065,7 @@ sub_814B0E8: ; 814B0E8 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@0814B1F0: +_0814B1F0: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -613111,7 +613111,7 @@ sub_814B0E8: ; 814B0E8 adds r0, r1 ldr r1, =sub_814B004 str r1, [r0] -@0814B252: +_0814B252: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -613140,13 +613140,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 .pool @@ -613175,15 +613175,15 @@ 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 .pool -@0814B318: +_0814B318: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -613195,7 +613195,7 @@ bx_t4_healthbar_update: ; 814B2D0 adds r0, r2 bl sub_805E990 bl dp01_tbl4_exec_completed -@0814B332: +_0814B332: pop {r4-r6} pop {r0} bx r0 @@ -613221,7 +613221,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 @@ -613260,7 +613260,7 @@ sub_814B340: ; 814B340 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl4_exec_completed -@0814B3BC: +_0814B3BC: pop {r4-r6} pop {r0} bx r0 @@ -613283,7 +613283,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] @@ -613307,7 +613307,7 @@ sub_814B3DC: ; 814B3DC ldrb r0, [r0] bl sub_8072984 bl dp01_tbl4_exec_completed -@0814B430: +_0814B430: pop {r4-r6} pop {r0} bx r0 @@ -613321,9 +613321,9 @@ bx_t4_button_a: ; 814B44C bl IsTextPrinterActive 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 @@ -613344,7 +613344,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] @@ -613357,14 +613357,14 @@ dp01t_0F_4_move_anim: ; 814B464 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl4_exec_completed - b @0814B4DA + b _0814B4DA .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] @@ -613378,11 +613378,11 @@ dp01t_0F_4_move_anim: ; 814B464 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 @@ -613405,7 +613405,7 @@ sub_814B4E0: ; 814B4E0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0814B532 + bne _0814B532 adds r0, r3, 0 bl sub_805E408 ldr r0, =0x020244d0 @@ -613418,19 +613418,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 str r0, [r1] -@0814B532: +_0814B532: pop {r4} pop {r0} bx r0 @@ -613453,7 +613453,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 @@ -613466,9 +613466,9 @@ sub_814B554: ; 814B554 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0814B590 + bne _0814B590 bl dp01_tbl4_exec_completed -@0814B590: +_0814B590: pop {r0} bx r0 .pool @@ -613492,7 +613492,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 @@ -613562,7 +613562,7 @@ sub_814B5A8: ; 814B5A8 adds r0, r1 ldr r1, =sub_814B4E0 str r1, [r0] -@0814B664: +_0814B664: pop {r3} mov r8, r3 pop {r4-r7} @@ -613587,7 +613587,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] @@ -613597,7 +613597,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] @@ -613612,7 +613612,7 @@ sub_814B69C: ; 814B69C ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0814B714 + bne _0814B714 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -613623,7 +613623,7 @@ sub_814B69C: ; 814B69C movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @0814B714 + bne _0814B714 adds r0, r3, r5 bl RemoveObjectAndFreeTiles ldr r1, =0x03005d60 @@ -613632,7 +613632,7 @@ sub_814B69C: ; 814B69C adds r0, r1 ldr r1, =sub_814B5A8 str r1, [r0] -@0814B714: +_0814B714: pop {r4-r6} pop {r0} bx r0 @@ -613655,7 +613655,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] @@ -613669,9 +613669,9 @@ dp01_tbl4_exec_completed: ; 814B740 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @0814B7A6 + b _0814B7A6 .pool -@0814B794: +_0814B794: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -613681,7 +613681,7 @@ dp01_tbl4_exec_completed: ; 814B740 ldr r0, [r2] bics r0, r1 str r0, [r2] -@0814B7A6: +_0814B7A6: add sp, 0x4 pop {r4} pop {r0} @@ -613705,9 +613705,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 .pool @@ -613729,9 +613729,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 .pool @@ -613750,7 +613750,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 @@ -613758,28 +613758,28 @@ dp01t_00_4_getattr: ; 814B818 mov r1, sp bl dp01_getattr_by_ch1_for_player_pokemon__ adds r6, r0, 0 - b @0814B872 + b _0814B872 .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 @@ -613812,78 +613812,78 @@ 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 .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 @@ -613920,7 +613920,7 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@0814BA08: +_0814BA08: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -613936,7 +613936,7 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @0814BA08 + ble _0814BA08 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -614114,33 +614114,33 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C 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 .pool -@0814BBE0: +_0814BBE0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b @0814BF5A + b _0814BF5A .pool -@0814BBF0: +_0814BBF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b @0814BF5A + b _0814BF5A .pool -@0814BC00: +_0814BC00: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -614152,7 +614152,7 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -@0814BC16: +_0814BC16: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -614170,7 +614170,7 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @0814BC16 + ble _0814BC16 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -614181,17 +614181,17 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C 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 .pool -@0814BC68: +_0814BC68: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -614202,16 +614202,16 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @0814BF5A + b _0814BF5A .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 @@ -614221,7 +614221,7 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @0814BC90 + ble _0814BC90 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -614231,9 +614231,9 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @0814C022 + b _0814C022 .pool -@0814BCC0: +_0814BCC0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -614244,23 +614244,23 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @0814C01A + b _0814C01A .pool -@0814BCDC: +_0814BCDC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b @0814BCF6 + b _0814BCF6 .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] @@ -614275,105 +614275,105 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @0814C022 + b _0814C022 .pool -@0814BD1C: +_0814BD1C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b @0814C01A + b _0814C01A .pool -@0814BD2C: +_0814BD2C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b @0814C01A + b _0814C01A .pool -@0814BD3C: +_0814BD3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b @0814C01A + b _0814C01A .pool -@0814BD4C: +_0814BD4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b @0814C01A + b _0814C01A .pool -@0814BD5C: +_0814BD5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b @0814C01A + b _0814C01A .pool -@0814BD6C: +_0814BD6C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b @0814C01A + b _0814C01A .pool -@0814BD7C: +_0814BD7C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b @0814C01A + b _0814C01A .pool -@0814BD8C: +_0814BD8C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b @0814C01A + b _0814C01A .pool -@0814BD9C: +_0814BD9C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b @0814C01A + b _0814C01A .pool -@0814BDAC: +_0814BDAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b @0814C01A + b _0814C01A .pool -@0814BDBC: +_0814BDBC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b @0814C01A + b _0814C01A .pool -@0814BDCC: +_0814BDCC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b @0814C01A + b _0814C01A .pool -@0814BDDC: +_0814BDDC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -614404,79 +614404,79 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @0814C022 + b _0814C022 .pool -@0814BE2C: +_0814BE2C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b @0814C01A + b _0814C01A .pool -@0814BE3C: +_0814BE3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b @0814C01A + b _0814C01A .pool -@0814BE4C: +_0814BE4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b @0814C01A + b _0814C01A .pool -@0814BE5C: +_0814BE5C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b @0814C01A + b _0814C01A .pool -@0814BE6C: +_0814BE6C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b @0814C01A + b _0814C01A .pool -@0814BE7C: +_0814BE7C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b @0814C01A + b _0814C01A .pool -@0814BE8C: +_0814BE8C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b @0814BEB6 + b _0814BEB6 .pool -@0814BE9C: +_0814BE9C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b @0814BF5A + b _0814BF5A .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] @@ -614493,71 +614493,71 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @0814C022 + b _0814C022 .pool -@0814BEE0: +_0814BEE0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b @0814C01A + b _0814C01A .pool -@0814BEF0: +_0814BEF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b @0814BF5A + b _0814BF5A .pool -@0814BF00: +_0814BF00: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b @0814BF5A + b _0814BF5A .pool -@0814BF10: +_0814BF10: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b @0814BF5A + b _0814BF5A .pool -@0814BF20: +_0814BF20: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b @0814BF5A + b _0814BF5A .pool -@0814BF30: +_0814BF30: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b @0814BF5A + b _0814BF5A .pool -@0814BF40: +_0814BF40: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b @0814BF5A + b _0814BF5A .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 @@ -614565,99 +614565,99 @@ dp01_getattr_by_ch1_for_player_pokemon__: ; 814B88C lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @0814C022 + b _0814C022 .pool -@0814BF70: +_0814BF70: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b @0814C01A + b _0814C01A .pool -@0814BF80: +_0814BF80: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b @0814C01A + b _0814C01A .pool -@0814BF90: +_0814BF90: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b @0814C01A + b _0814C01A .pool -@0814BFA0: +_0814BFA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b @0814C01A + b _0814C01A .pool -@0814BFB0: +_0814BFB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b @0814C01A + b _0814C01A .pool -@0814BFC0: +_0814BFC0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b @0814C01A + b _0814C01A .pool -@0814BFD0: +_0814BFD0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b @0814C01A + b _0814C01A .pool -@0814BFE0: +_0814BFE0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b @0814C01A + b _0814C01A .pool -@0814BFF0: +_0814BFF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b @0814C01A + b _0814C01A .pool -@0814C000: +_0814C000: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b @0814C01A + b _0814C01A .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} @@ -614689,32 +614689,32 @@ 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 .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} @@ -614742,78 +614742,78 @@ 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 .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 @@ -614863,7 +614863,7 @@ sub_814C09C: ; 814C09C adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -@0814C236: +_0814C236: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -614880,7 +614880,7 @@ sub_814C09C: ; 814C09C add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @0814C236 + ble _0814C236 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -614992,9 +614992,9 @@ sub_814C09C: ; 814C09C movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C368: +_0814C368: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615005,9 +615005,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0xB bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C388: +_0814C388: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615018,9 +615018,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0xC bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C3A8: +_0814C3A8: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -615034,7 +615034,7 @@ sub_814C09C: ; 814C09C adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -@0814C3C2: +_0814C3C2: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -615051,7 +615051,7 @@ sub_814C09C: ; 814C09C add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @0814C3C2 + ble _0814C3C2 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615059,9 +615059,9 @@ sub_814C09C: ; 814C09C movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C400: +_0814C400: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615074,9 +615074,9 @@ sub_814C09C: ; 814C09C adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @0814C4A4 + b _0814C4A4 .pool -@0814C428: +_0814C428: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -615117,9 +615117,9 @@ sub_814C09C: ; 814C09C adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C48C: +_0814C48C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615132,13 +615132,13 @@ sub_814C09C: ; 814C09C 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 .pool -@0814C4BC: +_0814C4BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615149,9 +615149,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C4DC: +_0814C4DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615162,9 +615162,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C4FC: +_0814C4FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615175,9 +615175,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C51C: +_0814C51C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615188,9 +615188,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C53C: +_0814C53C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615201,9 +615201,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C55C: +_0814C55C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615214,9 +615214,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C57C: +_0814C57C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615227,9 +615227,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C59C: +_0814C59C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615240,9 +615240,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C5BC: +_0814C5BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615253,9 +615253,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C5DC: +_0814C5DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615266,9 +615266,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C5FC: +_0814C5FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615279,9 +615279,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C61C: +_0814C61C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615292,9 +615292,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C63C: +_0814C63C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615305,9 +615305,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C65C: +_0814C65C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615318,9 +615318,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C67C: +_0814C67C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -615366,9 +615366,9 @@ sub_814C09C: ; 814C09C adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b @0814C79C + b _0814C79C .pool -@0814C6EC: +_0814C6EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615379,9 +615379,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C70C: +_0814C70C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615392,9 +615392,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C72C: +_0814C72C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615405,9 +615405,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C74C: +_0814C74C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615418,9 +615418,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C76C: +_0814C76C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615431,9 +615431,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C78C: +_0814C78C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615442,12 +615442,12 @@ sub_814C09C: ; 814C09C ldrb r2, [r1] lsls r2, 9 adds r2, r7 -@0814C79C: +_0814C79C: movs r1, 0x2C bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C7AC: +_0814C7AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615458,9 +615458,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C7CC: +_0814C7CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615471,9 +615471,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C7EC: +_0814C7EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615484,9 +615484,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C80C: +_0814C80C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615497,9 +615497,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C82C: +_0814C82C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615510,9 +615510,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C84C: +_0814C84C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615523,9 +615523,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C86C: +_0814C86C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615536,9 +615536,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C88C: +_0814C88C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615549,9 +615549,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C8AC: +_0814C8AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615562,9 +615562,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C8CC: +_0814C8CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615575,9 +615575,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C8EC: +_0814C8EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615588,9 +615588,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C90C: +_0814C90C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615601,9 +615601,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C92C: +_0814C92C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615614,9 +615614,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C94C: +_0814C94C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615627,9 +615627,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C96C: +_0814C96C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615640,9 +615640,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C98C: +_0814C98C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615653,9 +615653,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C9AC: +_0814C9AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615666,9 +615666,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C9CC: +_0814C9CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615679,9 +615679,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814C9EC: +_0814C9EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615692,9 +615692,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814CA0C: +_0814CA0C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615705,9 +615705,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814CA2C: +_0814CA2C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615718,9 +615718,9 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b @0814CA62 + b _0814CA62 .pool -@0814CA4C: +_0814CA4C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -615731,7 +615731,7 @@ sub_814C09C: ; 814C09C adds r2, r7 movs r1, 0x36 bl pokemon_setattr -@0814CA62: +_0814CA62: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -615779,11 +615779,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 @@ -615800,8 +615800,8 @@ sub_814CA98: ; 814CA98 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} @@ -616146,7 +616146,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] @@ -616161,9 +616161,9 @@ sub_814CE14: ; 814CE14 adds r0, r1 ldr r1, =sub_814CEA4 str r1, [r0] - b @0814CE92 + b _0814CE92 .pool -@0814CE5C: +_0814CE5C: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -616187,7 +616187,7 @@ sub_814CE14: ; 814CE14 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl4_exec_completed -@0814CE92: +_0814CE92: pop {r4-r6} pop {r0} bx r0 @@ -616208,12 +616208,12 @@ 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 .pool -@0814CECC: +_0814CECC: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -616221,12 +616221,12 @@ sub_814CEA4: ; 814CEA4 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] @@ -616236,15 +616236,15 @@ sub_814CEA4: ; 814CEA4 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 @@ -616257,7 +616257,7 @@ sub_814CEA4: ; 814CEA4 adds r0, r1 ldr r1, =sub_814B3DC str r1, [r0] -@0814CF22: +_0814CF22: pop {r4-r6} pop {r0} bx r0 @@ -616274,7 +616274,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 @@ -616282,13 +616282,13 @@ sub_814CF30: ; 814CF30 ands r1, r0 movs r7, 0x20 cmp r1, 0 - beq @0814CF62 + beq _0814CF62 movs r7, 0x5A - b @0814CF62 + b _0814CF62 .pool -@0814CF60: +_0814CF60: movs r7, 0x50 -@0814CF62: +_0814CF62: ldr r5, =0x02024064 ldrb r0, [r5] bl sub_806D864 @@ -616300,7 +616300,7 @@ sub_814CF30: ; 814CF30 movs r4, 0xFF ldrb r0, [r1] cmp r0, 0x4 - beq @0814CF94 + beq _0814CF94 ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -616311,8 +616311,8 @@ sub_814CF30: ; 814CF30 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 @@ -616321,9 +616321,9 @@ sub_814CF30: ; 814CF30 adds r1, r6 ldrb r0, [r1, 0x13] adds r4, r0, 0x2 - b @0814D002 + b _0814D002 .pool -@0814CFB0: +_0814CFB0: ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -616334,7 +616334,7 @@ sub_814CF30: ; 814CF30 adds r0, r4, 0 ands r0, r1 cmp r0, 0x2 - beq @0814CFDE + beq _0814CFDE ldrb r0, [r5] bl sub_806D864 lsls r1, r0, 3 @@ -616344,8 +616344,8 @@ sub_814CF30: ; 814CF30 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 @@ -616354,8 +616354,8 @@ sub_814CF30: ; 814CF30 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 @@ -616363,7 +616363,7 @@ sub_814CF30: ; 814CF30 lsls r1, 2 adds r1, r6 ldrb r4, [r1, 0x13] -@0814D002: +_0814D002: ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -616552,7 +616552,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 @@ -616560,12 +616560,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] @@ -616576,16 +616576,16 @@ sub_814D19C: ; 814D19C ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b @0814D266 + b _0814D266 .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] @@ -616636,7 +616636,7 @@ sub_814D19C: ; 814D19C adds r0, r1 ldr r1, =sub_814B340 str r1, [r0] -@0814D266: +_0814D266: pop {r4-r6} pop {r0} bx r0 @@ -616685,9 +616685,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] @@ -616791,11 +616791,11 @@ sub_814D2B8: ; 814D2B8 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq @0814D3CC + beq _0814D3CC bl dp01_tbl4_exec_completed - b @0814D3F4 + b _0814D3F4 .pool -@0814D3CC: +_0814D3CC: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r5] @@ -616815,7 +616815,7 @@ sub_814D2B8: ; 814D2B8 ldr r2, [r7] adds r0, r6, 0 bl sub_817E0FC -@0814D3F4: +_0814D3F4: pop {r3} mov r8, r3 pop {r4-r7} @@ -616858,20 +616858,20 @@ 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 .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 @@ -616879,7 +616879,7 @@ bx_move_anim_4: ; 814D40C movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne @0814D490 + bne _0814D490 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -616888,7 +616888,7 @@ bx_move_anim_4: ; 814D40C adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -@0814D490: +_0814D490: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -616898,13 +616898,13 @@ bx_move_anim_4: ; 814D40C 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 @@ -616918,15 +616918,15 @@ bx_move_anim_4: ; 814D40C 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] @@ -616938,10 +616938,10 @@ bx_move_anim_4: ; 814D40C 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 @@ -616956,7 +616956,7 @@ bx_move_anim_4: ; 814D40C negs r0, r0 ands r0, r2 strb r0, [r1] -@0814D51C: +_0814D51C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -616968,16 +616968,16 @@ bx_move_anim_4: ; 814D40C adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @0814D580 + b _0814D580 .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 @@ -616998,7 +616998,7 @@ bx_move_anim_4: ; 814D40C adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl4_exec_completed -@0814D580: +_0814D580: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -617122,7 +617122,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 @@ -617152,9 +617152,9 @@ sub_814D63C: ; 814D63C str r7, [sp] mov r2, r8 bl sub_807294C - b @0814D6F6 + b _0814D6F6 .pool -@0814D6CC: +_0814D6CC: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -617174,7 +617174,7 @@ sub_814D63C: ; 814D63C str r7, [sp] movs r3, 0 bl sub_807294C -@0814D6F6: +_0814D6F6: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -617208,7 +617208,7 @@ sub_814D738: ; 814D738 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @0814D78C + bne _0814D78C ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -617242,7 +617242,7 @@ sub_814D738: ; 814D738 adds r0, r1 ldr r1, =sub_814B7B8 str r1, [r0] -@0814D78C: +_0814D78C: pop {r4} pop {r0} bx r0 @@ -617257,7 +617257,7 @@ sub_814D7B0: ; 814D7B0 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @0814D800 + bne _0814D800 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -617289,7 +617289,7 @@ sub_814D7B0: ; 814D7B0 adds r0, r1 ldr r1, =sub_814B7B8 str r1, [r0] -@0814D800: +_0814D800: pop {r4,r5} pop {r0} bx r0 @@ -617460,11 +617460,11 @@ 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 .pool -@0814D94C: +_0814D94C: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -617485,7 +617485,7 @@ dp01t_29_4_blink: ; 814D918 adds r0, r1 ldr r1, =dp01t_0F_4_move_anim str r1, [r0] -@0814D976: +_0814D976: pop {r4} pop {r0} bx r0 @@ -617509,9 +617509,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 @@ -617544,7 +617544,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 @@ -617557,9 +617557,9 @@ sub_814D9D8: ; 814D9D8 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @0814DA28 + b _0814DA28 .pool -@0814DA14: +_0814DA14: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -617569,7 +617569,7 @@ sub_814D9D8: ; 814D9D8 lsls r1, 8 orrs r0, r1 bl fanfare_play -@0814DA28: +_0814DA28: bl dp01_tbl4_exec_completed pop {r4,r5} pop {r0} @@ -617717,7 +617717,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 @@ -617728,8 +617728,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 @@ -617738,9 +617738,9 @@ sub_814DAA8: ; 814DAA8 adds r1, r4 ldrb r0, [r1, 0x13] adds r0, 0x2 - b @0814DC06 + b _0814DC06 .pool -@0814DBB4: +_0814DBB4: ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -617751,7 +617751,7 @@ sub_814DAA8: ; 814DAA8 adds r0, r5, 0 ands r0, r1 cmp r0, 0x2 - beq @0814DBE2 + beq _0814DBE2 ldrb r0, [r6] bl sub_806D864 lsls r1, r0, 3 @@ -617761,8 +617761,8 @@ sub_814DAA8: ; 814DAA8 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 @@ -617771,8 +617771,8 @@ sub_814DAA8: ; 814DAA8 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 @@ -617780,7 +617780,7 @@ sub_814DAA8: ; 814DAA8 lsls r1, 2 adds r1, r4 ldrb r0, [r1, 0x13] -@0814DC06: +_0814DC06: ldr r1, =gTrainerBackPicPaletteTable lsls r0, 3 adds r0, r1 @@ -617830,7 +617830,7 @@ sub_814DAA8: ; 814DAA8 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0814DC80 + beq _0814DC80 ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -617840,7 +617840,7 @@ sub_814DAA8: ; 814DAA8 adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@0814DC80: +_0814DC80: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -617877,12 +617877,12 @@ 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 .pool -@0814DCF8: +_0814DCF8: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -617891,14 +617891,14 @@ sub_814DCCC: ; 814DCCC 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 @@ -617912,9 +617912,9 @@ sub_814DCCC: ; 814DCCC ldrb r0, [r7] movs r1, 0 bl sub_814CC98 - b @0814DD9C + b _0814DD9C .pool -@0814DD48: +_0814DD48: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -617954,7 +617954,7 @@ sub_814DCCC: ; 814DCCC ldrb r0, [r7] eors r0, r6 strb r0, [r7] -@0814DD9C: +_0814DD9C: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -617966,7 +617966,7 @@ sub_814DCCC: ; 814DCCC strb r3, [r2] mov r0, r8 bl remove_task -@0814DDB4: +_0814DDB4: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -617987,16 +617987,16 @@ 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 .pool -@0814DE08: +_0814DE08: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -618039,7 +618039,7 @@ sub_814DDD8: ; 814DDD8 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @0814DE70 + beq _0814DE70 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -618048,14 +618048,14 @@ sub_814DDD8: ; 814DDD8 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 str r0, [r1] -@0814DE7C: +_0814DE7C: pop {r4-r6} pop {r0} bx r0 @@ -618080,7 +618080,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] @@ -618091,7 +618091,7 @@ sub_814DE9C: ; 814DE9C movs r1, 0 strb r1, [r0, 0x5] bl dp01_tbl4_exec_completed -@0814DED4: +_0814DED4: pop {r4} pop {r0} bx r0 @@ -618114,7 +618114,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 @@ -618125,7 +618125,7 @@ sub_814DEE4: ; 814DEE4 adds r0, r2 ldr r1, =sub_8073C30 str r1, [r0] -@0814DF16: +_0814DF16: bl dp01_tbl4_exec_completed pop {r0} bx r0 @@ -618148,7 +618148,7 @@ sub_814DF40: ; 814DF40 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq @0814DF86 + beq _0814DF86 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -618175,7 +618175,7 @@ sub_814DF40: ; 814DF40 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -@0814DF86: +_0814DF86: bl dp01_tbl4_exec_completed pop {r4} pop {r0} @@ -618192,7 +618192,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 @@ -618214,21 +618214,21 @@ 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 .pool -@0814DFF0: +_0814DFF0: ldr r0, =0x03005d60 ldrb r1, [r5] lsls r1, 2 adds r1, r0 ldr r0, =sub_814B7E8 str r0, [r1] -@0814DFFC: +_0814DFFC: adds r0, r6, 0 bl sub_817E32C -@0814E002: +_0814E002: add sp, 0x4 pop {r4-r6} pop {r0} @@ -618366,7 +618366,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 @@ -618375,14 +618375,14 @@ battle_pick_message: ; 814E0C4 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] @@ -618404,385 +618404,385 @@ battle_pick_message: ; 814E0C4 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 .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, =gUnknown_085CBBCD cmp r2, 0 - bne @0814E200 - b @0814E6D8 -@0814E200: + bne _0814E200 + b _0814E6D8 +_0814E200: ldr r7, =gUnknown_085CD318 - b @0814E6D8 + b _0814E6D8 .pool -@0814E214: +_0814E214: ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 cmp r1, r0 - bne @0814E22C + bne _0814E22C ldr r7, =gUnknown_085CBB9C - b @0814E6D8 + b _0814E6D8 .pool -@0814E22C: +_0814E22C: movs r0, 0x80 lsls r0, 17 ands r2, r0 ldr r7, =gUnknown_085CBBB9 cmp r2, 0 - bne @0814E23A - b @0814E6D8 -@0814E23A: + bne _0814E23A + b _0814E6D8 +_0814E23A: ldr r7, =gUnknown_085CD301 - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CBB9C cmp r2, 0 - bne @0814E260 - b @0814E6D8 -@0814E260: + bne _0814E260 + b _0814E6D8 +_0814E260: ldr r7, =gUnknown_085CCE17 - b @0814E6D8 + b _0814E6D8 .pool -@0814E26C: +_0814E26C: movs r0, 0x80 lsls r0, 6 ands r0, r2 cmp r0, 0 - beq @0814E280 + beq _0814E280 ldr r7, =gUnknown_085CBB5A - b @0814E6D8 + b _0814E6D8 .pool -@0814E280: +_0814E280: movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq @0814E290 + beq _0814E290 ldr r7, =gUnknown_085CBB82 - b @0814E6D8 + b _0814E6D8 .pool -@0814E290: +_0814E290: movs r0, 0x80 lsls r0, 2 ands r2, r0 ldr r7, =gUnknown_085CBB47 cmp r2, 0 - bne @0814E29E - b @0814E6D8 -@0814E29E: + bne _0814E29E + b _0814E6D8 +_0814E29E: ldr r7, =gUnknown_085CBB6D - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CCE38 - b @0814E6D8 + b _0814E6D8 .pool -@0814E2DC: +_0814E2DC: movs r0, 0x80 lsls r0, 8 ands r0, r1 cmp r0, 0 - beq @0814E2F0 + beq _0814E2F0 ldr r7, =gUnknown_085CBC96 - b @0814E6D8 + b _0814E6D8 .pool -@0814E2F0: +_0814E2F0: movs r0, 0x40 ands r1, r0 ldr r7, =gUnknown_085CBC96 cmp r1, 0 - bne @0814E2FC - b @0814E6D8 -@0814E2FC: + bne _0814E2FC + b _0814E6D8 +_0814E2FC: ldr r7, =gUnknown_085CBCE5 - b @0814E6D8 + b _0814E6D8 .pool -@0814E308: +_0814E308: ldr r7, =gUnknown_085CBC8E - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CCDDE - b @0814E6D8 + b _0814E6D8 .pool -@0814E33C: +_0814E33C: movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @0814E34C + beq _0814E34C ldr r7, =gUnknown_085CBC4E - b @0814E6D8 + b _0814E6D8 .pool -@0814E34C: +_0814E34C: ldr r0, =0x02000002 ands r1, r0 ldr r7, =gUnknown_085CBBFA cmp r1, 0 - bne @0814E358 - b @0814E6D8 -@0814E358: + bne _0814E358 + b _0814E6D8 +_0814E358: ldr r7, =gUnknown_085CBC37 - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CBC27 cmp r1, r0 - beq @0814E380 - b @0814E6D8 -@0814E380: + beq _0814E380 + b _0814E6D8 +_0814E380: ldr r7, =gUnknown_085CBBE7 - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CBCFD - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CBD1B - b @0814E6D8 + b _0814E6D8 .pool -@0814E3D8: +_0814E3D8: ldr r7, =gUnknown_085CBD3D cmp r2, 0x2 - beq @0814E3E0 - b @0814E6D8 -@0814E3E0: + beq _0814E3E0 + b _0814E6D8 +_0814E3E0: ldr r7, =gUnknown_085CBD2A - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CBD65 cmp r0, 0 - bne @0814E414 - b @0814E6D8 -@0814E414: + bne _0814E414 + b _0814E6D8 +_0814E414: ldr r7, =gUnknown_085CBD75 - b @0814E6D8 + b _0814E6D8 .pool -@0814E428: +_0814E428: ldr r7, =gUnknown_085CBD52 - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CBCA5 - b @0814E6D8 + b _0814E6D8 .pool -@0814E468: +_0814E468: cmp r2, 0x1 - bne @0814E474 + bne _0814E474 ldr r7, =gUnknown_085CBCAD - b @0814E6D8 + b _0814E6D8 .pool -@0814E474: +_0814E474: ldr r7, =gUnknown_085CBCC7 cmp r2, 0x2 - beq @0814E47C - b @0814E6D8 -@0814E47C: + beq _0814E47C + b _0814E6D8 +_0814E47C: ldr r7, =gUnknown_085CBCB8 - b @0814E6D8 + b _0814E6D8 .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 .pool -@0814E4AC: +_0814E4AC: movs r0, 0x40 ands r1, r0 cmp r1, 0 - beq @0814E4BC + beq _0814E4BC ldr r7, =gUnknown_085CBC7E - b @0814E6D8 + b _0814E6D8 .pool -@0814E4BC: +_0814E4BC: ldr r0, =0x02038bca ldrh r1, [r0] movs r0, 0xC0 lsls r0, 4 ldr r7, =gUnknown_085CBC6E cmp r1, r0 - beq @0814E4CC - b @0814E6D8 -@0814E4CC: + beq _0814E4CC + b _0814E6D8 +_0814E4CC: ldr r7, =gUnknown_085CBC14 - b @0814E6D8 + b _0814E6D8 .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, =gUnknown_085CCE04 cmp r0, 0x1 - beq @0814E4F2 - b @0814E6D8 -@0814E4F2: - b @0814E4CC + beq _0814E4F2 + b _0814E6D8 +_0814E4F2: + b _0814E4CC .pool -@0814E4F8: +_0814E4F8: mov r0, r10 bl sub_814F8F8 ldr r0, =0x0203aba8 @@ -618791,7 +618791,7 @@ battle_pick_message: ; 814E0C4 movs r0, 0xB1 lsls r0, 1 cmp r1, r0 - bls @0814E534 + bls _0814E534 ldr r0, =0x02022f68 ldr r1, =0x0202449c ldr r1, [r1] @@ -618802,9 +618802,9 @@ battle_pick_message: ; 814E0C4 ldr r2, =gUnknown_085CCBBC adds r1, r2 bl CopyString - b @0814E544 + b _0814E544 .pool -@0814E534: +_0814E534: ldr r0, =0x02022f68 ldrh r2, [r2] movs r1, 0xD @@ -618812,19 +618812,19 @@ battle_pick_message: ; 814E0C4 ldr r2, =gMoveNames adds r1, r2 bl CopyString -@0814E544: +_0814E544: ldr r0, =0x02022f68 bl sub_814F950 ldr r7, =gUnknown_085CBDAC - b @0814E6D8 + b _0814E6D8 .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] @@ -618834,171 +618834,171 @@ battle_pick_message: ; 814E0C4 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, =gUnknown_085CB4CA - b @0814E6D8 + b _0814E6D8 .pool -@0814E5A4: +_0814E5A4: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x40 ands r0, r1 ldr r7, =gUnknown_085CB5D2 cmp r0, 0 - bne @0814E5B4 - b @0814E6D8 -@0814E5B4: + bne _0814E5B4 + b _0814E6D8 +_0814E5B4: ldr r7, =gUnknown_085CB5DF - b @0814E6D8 + b _0814E6D8 .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 .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, =gUnknown_085CB538 cmp r1, 0 - beq @0814E6D8 + beq _0814E6D8 ldr r7, =gUnknown_085CCE53 - b @0814E6D8 + b _0814E6D8 .pool -@0814E628: +_0814E628: ldr r7, =gUnknown_085CB567 - b @0814E6D8 + b _0814E6D8 .pool -@0814E630: +_0814E630: ldr r7, =gUnknown_085CB5A6 - b @0814E6D8 + b _0814E6D8 .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 .pool -@0814E660: +_0814E660: cmp r0, 0x3 - beq @0814E678 - b @0814E6D8 -@0814E666: + beq _0814E678 + b _0814E6D8 +_0814E666: ldr r7, =gUnknown_085CBA2E - b @0814E6D8 + b _0814E6D8 .pool -@0814E670: +_0814E670: ldr r7, =gUnknown_085CD24C - b @0814E6D8 + b _0814E6D8 .pool -@0814E678: +_0814E678: ldr r7, =gUnknown_085CD267 - b @0814E6D8 + b _0814E6D8 .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 .pool -@0814E698: +_0814E698: cmp r0, 0x3 - beq @0814E6B0 - b @0814E6D8 -@0814E69E: + beq _0814E6B0 + b _0814E6D8 +_0814E69E: ldr r7, =gUnknown_085CB524 - b @0814E6D8 + b _0814E6D8 .pool -@0814E6A8: +_0814E6A8: ldr r7, =gUnknown_085CB54F - b @0814E6D8 + b _0814E6D8 .pool -@0814E6B0: +_0814E6B0: ldr r7, =gUnknown_085CB581 - b @0814E6D8 + b _0814E6D8 .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 .pool -@0814E6CC: +_0814E6CC: ldr r1, =gUnknown_085CC270 adds r0, r6, 0 subs r0, 0xC lsls r0, 2 adds r0, r1 ldr r7, [r0] -@0814E6D8: +_0814E6D8: adds r0, r7, 0 bl get_battle_strings_ -@0814E6DE: +_0814E6DE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -619030,43 +619030,43 @@ sub_814E700: ; 814E700 bl memcpy mov r2, sp movs r3, 0 - b @0814E728 + b _0814E728 .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, =gUnknown_0831BCA8 -@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 .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} @@ -619090,149 +619090,149 @@ get_battle_strings: ; 814E764 lsls r1, 18 ands r0, r1 cmp r0, 0 - beq @0814E794 + beq _0814E794 ldr r0, =0x0203c7b4 ldrb r7, [r0] - b @0814E79C + b _0814E79C .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 .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 .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 .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 .pool -@0814E904: +_0814E904: adds r4, r1, 0 - bl @0814F5C0 -@0814E90A: + bl _0814F5C0 +_0814E90A: ldr r4, =0x02021cc4 - bl @0814F5C0 + bl _0814F5C0 .pool -@0814E914: +_0814E914: ldr r4, =0x02021dc4 - bl @0814F5C0 + bl _0814F5C0 .pool -@0814E920: +_0814E920: ldr r4, =0x02021ec4 - bl @0814F5C0 + bl _0814F5C0 .pool -@0814E92C: +_0814E92C: movs r0, 0 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -619249,9 +619249,9 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .pool -@0814E960: +_0814E960: movs r0, 0x1 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -619268,9 +619268,9 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .pool -@0814E994: +_0814E994: movs r0, 0x2 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -619287,9 +619287,9 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .pool -@0814E9C8: +_0814E9C8: movs r0, 0x3 bl battle_get_side_with_given_state ldr r1, =0x0202406e @@ -619306,9 +619306,9 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .pool -@0814E9FC: +_0814E9FC: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -619328,9 +619328,9 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .pool -@0814EA38: +_0814EA38: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -619352,9 +619352,9 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .pool -@0814EA78: +_0814EA78: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -619376,9 +619376,9 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .pool -@0814EAB8: +_0814EAB8: ldr r2, =0x0202406e ldr r1, =0x020229e8 lsls r0, r7, 3 @@ -619400,37 +619400,37 @@ get_battle_strings: ; 814E764 bl pokemon_getattr mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .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, =gUnknown_085CBD85 cmp r1, 0 - beq @0814EB36 + beq _0814EB36 ldr r4, =gUnknown_085CBD8B - b @0814EB36 + b _0814EB36 .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 @@ -619449,9 +619449,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814EB9E + b _0814EB9E .pool -@0814EB74: +_0814EB74: ldrb r0, [r2] bl battle_get_per_side_status adds r1, r0, 0 @@ -619470,18 +619470,18 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814EB9E: +_0814EB9E: mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .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 @@ -619501,9 +619501,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814EC24 + b _0814EC24 .pool -@0814EBF8: +_0814EBF8: ldrb r0, [r4] bl battle_get_per_side_status adds r1, r0, 0 @@ -619523,27 +619523,27 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814EC24: +_0814EC24: mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .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, =gUnknown_085CBD85 cmp r1, 0 - beq @0814EC56 + beq _0814EC56 ldr r4, =gUnknown_085CBD8B -@0814EC56: +_0814EC56: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -619551,8 +619551,8 @@ get_battle_strings: ; 814E764 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] @@ -619561,8 +619561,8 @@ get_battle_strings: ; 814E764 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 @@ -619573,9 +619573,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814ECC2 + b _0814ECC2 .pool -@0814ECA8: +_0814ECA8: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -619588,27 +619588,27 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814ECC2: +_0814ECC2: mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .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, =gUnknown_085CBD85 cmp r1, 0 - beq @0814ECF2 + beq _0814ECF2 ldr r4, =gUnknown_085CBD8B -@0814ECF2: +_0814ECF2: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -619616,8 +619616,8 @@ get_battle_strings: ; 814E764 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] @@ -619626,8 +619626,8 @@ get_battle_strings: ; 814E764 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 @@ -619638,9 +619638,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814ED5E + b _0814ED5E .pool -@0814ED44: +_0814ED44: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -619653,27 +619653,27 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814ED5E: +_0814ED5E: mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .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, =gUnknown_085CBD85 cmp r1, 0 - beq @0814ED8E + beq _0814ED8E ldr r4, =gUnknown_085CBD8B -@0814ED8E: +_0814ED8E: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -619681,8 +619681,8 @@ get_battle_strings: ; 814E764 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] @@ -619691,8 +619691,8 @@ get_battle_strings: ; 814E764 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 @@ -619703,9 +619703,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814EDFA + b _0814EDFA .pool -@0814EDE0: +_0814EDE0: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -619718,27 +619718,27 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814EDFA: +_0814EDFA: mov r0, sp bl GetStringEnd_Limit7 - bl @0814F5BE + bl _0814F5BE .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, =gUnknown_085CBD85 cmp r1, 0 - beq @0814EE2A + beq _0814EE2A ldr r4, =gUnknown_085CBD8B -@0814EE2A: +_0814EE2A: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -619746,8 +619746,8 @@ get_battle_strings: ; 814E764 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] @@ -619756,8 +619756,8 @@ get_battle_strings: ; 814E764 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 @@ -619768,9 +619768,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814EE96 + b _0814EE96 .pool -@0814EE7C: +_0814EE7C: ldr r1, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -619783,27 +619783,27 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814EE96: +_0814EE96: mov r0, sp bl GetStringEnd_Limit7 - b @0814F5BE + b _0814F5BE .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, =gUnknown_085CBD85 cmp r1, 0 - beq @0814EEC6 + beq _0814EEC6 ldr r4, =gUnknown_085CBD8B -@0814EEC6: +_0814EEC6: ldrb r1, [r4] adds r0, r1, 0 ldr r3, =0x0202406e @@ -619811,8 +619811,8 @@ get_battle_strings: ; 814E764 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] @@ -619821,8 +619821,8 @@ get_battle_strings: ; 814E764 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 @@ -619833,9 +619833,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814EF32 + b _0814EF32 .pool -@0814EF18: +_0814EF18: ldr r1, =0x0202406e ldrb r0, [r5, 0x17] lsls r0, 1 @@ -619848,31 +619848,31 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814EF32: +_0814EF32: mov r0, sp bl GetStringEnd_Limit7 - b @0814F5BE + b _0814F5BE .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 .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 @@ -619881,53 +619881,53 @@ get_battle_strings: ; 814E764 adds r0, r1 ldr r1, =gUnknown_085CCBBC adds r4, r0, r1 - b @0814F5C0 + b _0814F5C0 .pool -@0814EF88: +_0814EF88: ldrh r1, [r2, 0x2] -@0814EF8A: +_0814EF8A: movs r0, 0xD muls r1, r0 ldr r0, =gMoveNames adds r4, r1, r0 - b @0814F5C0 + b _0814F5C0 .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 .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 @@ -619939,9 +619939,9 @@ get_battle_strings: ; 814E764 ldr r1, =gUnknown_085CC0AD mov r0, sp bl AppendString - b @0814F5BE + b _0814F5BE .pool -@0814F014: +_0814F014: ldr r2, =0x020229e8 ldr r0, =0x02024474 adds r0, 0x25 @@ -619954,7 +619954,7 @@ get_battle_strings: ; 814E764 ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 - bne @0814F05C + bne _0814F05C lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -619965,115 +619965,115 @@ get_battle_strings: ; 814E764 ldr r1, =gUnknown_085CC0AD mov r0, sp bl AppendString - b @0814F5BE + b _0814F5BE .pool -@0814F05C: +_0814F05C: ldr r4, =gUnknown_085CC0A0 - b @0814F5C0 + b _0814F5C0 .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 .pool -@0814F080: +_0814F080: ldr r0, =0x0202420a - b @0814F0C0 + b _0814F0C0 .pool -@0814F088: +_0814F088: ldr r1, =0x0203aba4 ldr r0, =0x0202420b - b @0814F0BC + b _0814F0BC .pool -@0814F098: +_0814F098: ldr r1, =0x0203aba4 ldr r0, =0x0202420c - b @0814F0BC + b _0814F0BC .pool -@0814F0A8: +_0814F0A8: ldr r1, =0x0203aba4 ldr r0, =0x02024474 ldrb r0, [r0, 0x17] - b @0814F0BE + b _0814F0BE .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, =gAbilityNames adds r4, r1, r0 - b @0814F5C0 + b _0814F5C0 .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 .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 .pool -@0814F10C: +_0814F10C: ldr r0, =0x000003fe cmp r2, r0 - bne @0814F11C + bne _0814F11C bl sub_81A4D00 - b @0814F59C + b _0814F59C .pool -@0814F11C: +_0814F11C: ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq @0814F12C + beq _0814F12C ldrh r0, [r3] - b @0814F598 + b _0814F598 .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, =gTrainers ldrh r1, [r3] lsls r0, r1, 2 @@ -620082,20 +620082,20 @@ get_battle_strings: ; 814E764 adds r0, r2 ldrb r1, [r0, 0x1] movs r0, 0xD - b @0814F5A2 + b _0814F5A2 .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] @@ -620105,7 +620105,7 @@ get_battle_strings: ; 814E764 strb r1, [r0] adds r2, 0x1 cmp r2, 0x6 - ble @0814F178 + ble _0814F178 mov r3, sp adds r1, r3, r2 movs r0, 0xFF @@ -620115,73 +620115,73 @@ get_battle_strings: ; 814E764 ldrb r1, [r0, 0xD] mov r0, sp bl StopMusicWhileStringIsPrinted - b @0814F5BE + b _0814F5BE .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 .pool -@0814F1C4: +_0814F1C4: ldr r0, =0x000003fe cmp r2, r0 - bne @0814F1D8 + bne _0814F1D8 mov r0, sp bl sub_81A4D50 - b @0814F5BE + b _0814F5BE .pool -@0814F1D8: +_0814F1D8: ldr r0, =0x003f0100 ands r0, r1 cmp r0, 0 - beq @0814F1E8 + beq _0814F1E8 ldrh r1, [r3] - b @0814F5B8 + b _0814F5B8 .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, =gTrainers + 0x4 ; name offset adds r4, r1, r0 - b @0814F5C0 + b _0814F5C0 .pool -@0814F220: +_0814F220: lsls r0, r7, 3 subs r0, r7 lsls r0, 2 ldr r1, =0x020229f0 adds r4, r0, r1 - b @0814F5C0 + b _0814F5C0 .pool -@0814F230: +_0814F230: ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 @@ -620189,9 +620189,9 @@ get_battle_strings: ; 814E764 adds r0, r4 ldrh r1, [r0, 0x18] movs r0, 0x2 - b @0814F266 + b _0814F266 .pool -@0814F244: +_0814F244: ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 @@ -620199,9 +620199,9 @@ get_battle_strings: ; 814E764 adds r0, r4 ldrh r1, [r0, 0x18] movs r0, 0x1 - b @0814F266 + b _0814F266 .pool -@0814F258: +_0814F258: ldr r4, =0x020229e8 lsls r0, r7, 3 subs r0, r7 @@ -620209,7 +620209,7 @@ get_battle_strings: ; 814E764 adds r0, r4 ldrh r1, [r0, 0x18] movs r0, 0x3 -@0814F266: +_0814F266: eors r0, r1 bl sub_806D864 lsls r1, r0, 3 @@ -620217,108 +620217,108 @@ get_battle_strings: ; 814E764 lsls r1, 2 adds r4, 0x8 adds r4, r1, r4 - b @0814F5C0 + b _0814F5C0 .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 .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 .pool -@0814F2B4: +_0814F2B4: ldr r0, =0x03005d90 ldr r4, [r0] - b @0814F5C0 + b _0814F5C0 .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 .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 .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 .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 .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, =gUnknown_085CBD85 cmp r1, 0 - beq @0814F34E + beq _0814F34E ldr r4, =gUnknown_085CBD8B -@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] @@ -620327,8 +620327,8 @@ get_battle_strings: ; 814E764 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] @@ -620338,9 +620338,9 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814F3B4 + b _0814F3B4 .pool -@0814F39C: +_0814F39C: ldr r0, =0x0202449c ldr r0, [r0] adds r0, 0x52 @@ -620352,99 +620352,99 @@ get_battle_strings: ; 814E764 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814F3B4: +_0814F3B4: mov r0, sp bl GetStringEnd_Limit7 - b @0814F5BE + b _0814F5BE .pool -@0814F3C4: +_0814F3C4: ldr r0, =0x000008ab bl FlagGet lsls r0, 24 ldr r4, =gUnknown_085CC015 cmp r0, 0 - bne @0814F3D4 - b @0814F5C0 -@0814F3D4: + bne _0814F3D4 + b _0814F5C0 +_0814F3D4: ldr r4, =gUnknown_085CC01F - b @0814F5C0 + b _0814F5C0 .pool -@0814F3E4: +_0814F3E4: ldr r0, =0x0202420b - b @0814F3EE + b _0814F3EE .pool -@0814F3EC: +_0814F3EC: ldr r0, =0x0202420c -@0814F3EE: +_0814F3EE: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r4, =gUnknown_085CBD9A cmp r0, 0 - beq @0814F3FE - b @0814F5C0 -@0814F3FE: + beq _0814F3FE + b _0814F5C0 +_0814F3FE: ldr r4, =gUnknown_085CBD9E - b @0814F5C0 + b _0814F5C0 .pool -@0814F410: +_0814F410: ldr r0, =0x0202420b - b @0814F41A + b _0814F41A .pool -@0814F418: +_0814F418: ldr r0, =0x0202420c -@0814F41A: +_0814F41A: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r4, =gUnknown_085CBD91 cmp r0, 0 - beq @0814F42A - b @0814F5C0 -@0814F42A: + beq _0814F42A + b _0814F5C0 +_0814F42A: ldr r4, =gUnknown_085CBD95 - b @0814F5C0 + b _0814F5C0 .pool -@0814F43C: +_0814F43C: ldr r0, =0x0202420b - b @0814F446 + b _0814F446 .pool -@0814F444: +_0814F444: ldr r0, =0x0202420c -@0814F446: +_0814F446: ldrb r0, [r0] bl battle_side_get_owner lsls r0, 24 ldr r4, =gUnknown_085CBDA3 cmp r0, 0 - beq @0814F456 - b @0814F5C0 -@0814F456: + beq _0814F456 + b _0814F5C0 +_0814F456: ldr r4, =gUnknown_085CBDA7 - b @0814F5C0 + b _0814F5C0 .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 .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 .pool -@0814F49C: +_0814F49C: ldr r2, =gTrainers ldr r0, =0x02038bcc ldrh r1, [r0] @@ -620454,31 +620454,31 @@ get_battle_strings: ; 814E764 adds r0, r2 ldrb r1, [r0, 0x1] movs r0, 0xD - b @0814F5A2 + b _0814F5A2 .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 .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 .pool -@0814F4F0: +_0814F4F0: ldr r0, =0x02038bcc ldrh r1, [r0] lsls r0, r1, 2 @@ -620486,93 +620486,93 @@ get_battle_strings: ; 814E764 lsls r0, 3 ldr r1, =gTrainers + 0x4 ; name offset adds r4, r0, r1 - b @0814F5C0 + b _0814F5C0 .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 .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 .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 .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 .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, =gTrainerClassNames adds r4, r1, r0 - b @0814F5C0 + b _0814F5C0 .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 @@ -620580,8 +620580,8 @@ get_battle_strings: ; 814E764 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] @@ -620590,19 +620590,19 @@ get_battle_strings: ; 814E764 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 @@ -620613,24 +620613,24 @@ get_battle_strings: ; 814E764 movs r0, 0x9 strb r0, [r1] adds r6, 0x1 - b @0814F61C + b _0814F61C .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 @@ -620662,36 +620662,36 @@ 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 .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] @@ -620702,31 +620702,31 @@ sub_814F648: ; 814F648 lsls r1, 2 adds r1, r0 ldr r1, [r1] - b @0814F8BE + b _0814F8BE .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] @@ -620738,10 +620738,10 @@ sub_814F648: ; 814F648 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 @@ -620751,8 +620751,8 @@ sub_814F648: ; 814F648 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] @@ -620762,22 +620762,22 @@ sub_814F648: ; 814F648 muls r1, r0 ldr r0, =gMoveNames adds r1, r0 - b @0814F8BE + b _0814F8BE .pool -@0814F734: +_0814F734: adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r1, r0, 3 subs r1, r0 ldr r0, =gTypeNames - b @0814F846 + b _0814F846 .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 @@ -620786,25 +620786,25 @@ sub_814F648: ; 814F648 movs r1, 0x2 mov r2, sp bl pokemon_getattr - b @0814F7A4 + b _0814F7A4 .pool -@0814F768: +_0814F768: ldr r0, =0x02022fec ldr r0, [r0] movs r1, 0x8 ands r0, r1 cmp r0, 0 - beq @0814F788 + beq _0814F788 ldr r1, =gUnknown_085CBD8B adds r0, r6, 0 bl AppendString - b @0814F790 + b _0814F790 .pool -@0814F788: +_0814F788: ldr r1, =gUnknown_085CBD85 adds r0, r6, 0 bl AppendString -@0814F790: +_0814F790: adds r0, r5, r7 ldrb r1, [r0, 0x2] movs r0, 0x64 @@ -620814,24 +620814,24 @@ sub_814F648: ; 814F648 movs r1, 0x2 mov r2, sp bl pokemon_getattr -@0814F7A4: +_0814F7A4: mov r0, sp bl GetStringEnd_Limit7 adds r0, r6, 0 mov r1, sp bl AppendString - b @0814F8DE + b _0814F8DE .pool -@0814F7BC: +_0814F7BC: ldr r1, =gUnknown_085CBE00 adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 adds r0, r1 ldr r1, [r0] - b @0814F848 + b _0814F848 .pool -@0814F7D0: +_0814F7D0: adds r0, r5, r7 ldrb r1, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -620839,14 +620839,14 @@ sub_814F648: ; 814F648 orrs r1, r0 adds r0, r6, 0 bl GetSpeciesName - 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 @@ -620855,9 +620855,9 @@ sub_814F648: ; 814F648 movs r1, 0x2 adds r2, r6, 0 bl pokemon_getattr - b @0814F81A + b _0814F81A .pool -@0814F808: +_0814F808: ldrb r1, [r4, 0x2] movs r0, 0x64 muls r0, r1 @@ -620866,35 +620866,35 @@ sub_814F648: ; 814F648 movs r1, 0x2 adds r2, r6, 0 bl pokemon_getattr -@0814F81A: +_0814F81A: adds r0, r6, 0 bl GetStringEnd_Limit7 - b @0814F8DE + b _0814F8DE .pool -@0814F828: +_0814F828: ldr r1, =gUnknown_085CBE6C adds r0, r5, r7 ldrb r0, [r0, 0x1] lsls r0, 2 adds r0, r1 ldr r1, [r0] - b @0814F848 + b _0814F848 .pool -@0814F83C: +_0814F83C: adds r0, r5, r7 ldrb r1, [r0, 0x1] movs r0, 0xD muls r1, r0 ldr r0, =gAbilityNames -@0814F846: +_0814F846: adds r1, r0 -@0814F848: +_0814F848: adds r0, r6, 0 bl AppendString adds r5, 0x2 - b @0814F8E0 + b _0814F8E0 .pool -@0814F858: +_0814F858: adds r0, r5, r7 ldrb r2, [r0, 0x1] ldrb r0, [r0, 0x2] @@ -620905,9 +620905,9 @@ sub_814F648: ; 814F648 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 @@ -620920,7 +620920,7 @@ sub_814F648: ; 814F648 ldrb r2, [r1] ldrh r0, [r0, 0x18] cmp r0, r2 - bne @0814F8BC + bne _0814F8BC lsls r1, r2, 3 subs r1, r2 lsls r1, 2 @@ -620929,33 +620929,33 @@ sub_814F648: ; 814F648 adds r0, r6, 0 bl CopyString ldr r1, =gUnknown_085CC0AD - b @0814F8BE + b _0814F8BE .pool -@0814F8BC: +_0814F8BC: ldr r1, =gUnknown_085CC0A0 -@0814F8BE: +_0814F8BE: adds r0, r6, 0 bl AppendString - b @0814F8DE + b _0814F8DE .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 @@ -620971,36 +620971,36 @@ sub_814F8F8: ; 814F8F8 movs r2, 0 ldr r5, =0x0203aba8 ldr r3, =gUnknown_085CD336 -@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, =gUnknown_085CCBB5 adds r0, r4, 0 bl CopyString - b @0814F944 + b _0814F944 .pool -@0814F938: +_0814F938: cmp r2, 0x4 - bgt @0814F944 + bgt _0814F944 ldr r1, =gUnknown_085CCBB9 adds r0, r4, 0 bl CopyString -@0814F944: +_0814F944: pop {r4,r5} pop {r0} bx r0 @@ -621012,71 +621012,71 @@ 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, =gUnknown_085CD336 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 .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, =gUnknown_085CBDB7 - b @0814F9CA + b _0814F9CA .pool -@0814F9B8: +_0814F9B8: ldr r1, =gUnknown_085CBDB9 - b @0814F9CA + b _0814F9CA .pool -@0814F9C0: +_0814F9C0: ldr r1, =gUnknown_085CBDBB - b @0814F9CA + b _0814F9CA .pool -@0814F9C8: +_0814F9C8: ldr r1, =gUnknown_085CBDBD -@0814F9CA: +_0814F9CA: adds r0, r3, 0 bl CopyString - b @0814F9E0 + b _0814F9E0 .pool -@0814F9D8: +_0814F9D8: ldr r1, =gUnknown_085CBDBF adds r0, r3, 0 bl CopyString -@0814F9E0: +_0814F9E0: pop {r4,r5} pop {r0} bx r0 @@ -621104,13 +621104,13 @@ 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 .pool -@0814FA24: +_0814FA24: lsls r0, r7, 1 adds r0, r7 lsls r0, 2 @@ -621119,7 +621119,7 @@ battle_show_message_maybe: ; 814F9EC adds r0, r7, 0 bl FillWindowPixelBuffer movs r0, 0x1 -@0814FA36: +_0814FA36: mov r9, r0 str r4, [sp] mov r0, sp @@ -621173,7 +621173,7 @@ battle_show_message_maybe: ; 814F9EC mov r0, sp ldrb r0, [r0, 0x6] cmp r0, 0xFF - bne @0814FAC6 + bne _0814FAC6 ldr r0, =0x02024474 adds r0, 0x24 ldrb r0, [r0] @@ -621190,22 +621190,22 @@ battle_show_message_maybe: ; 814F9EC 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 .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 @@ -621214,59 +621214,59 @@ battle_show_message_maybe: ; 814F9EC 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 .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 .pool -@0814FB34: +_0814FB34: movs r0, 0x80 lsls r0, 17 ands r1, r0 cmp r1, 0 - beq @0814FB54 + beq _0814FB54 ldr r4, =gUnknown_085CD668 bl sub_8185FC4 lsls r0, 24 lsrs r0, 24 adds r0, r4 ldrb r6, [r0] - b @0814FB5C + b _0814FB5C .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 .pool -@0814FB6C: +_0814FB6C: adds r0, r6, r7 lsls r0, 2 add r0, r8 @@ -621276,20 +621276,20 @@ battle_show_message_maybe: ; 814F9EC negs r0, r0 ands r0, r1 strb r0, [r3] -@0814FB7E: +_0814FB7E: mov r0, sp adds r1, r6, 0 movs r2, 0 bl AddTextPrinter mov r0, r9 cmp r0, 0 - beq @0814FB9C + beq _0814FB9C adds r0, r7, 0 bl PutWindowTilemap adds r0, r7, 0 movs r1, 0x3 bl CopyWindowToVram -@0814FB9C: +_0814FB9C: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -621355,43 +621355,43 @@ 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 @@ -621406,12 +621406,12 @@ sub_814FC70: ; 814FC70 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0814FC8E + bne _0814FC8E ldr r0, =sub_814FCC8 bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@0814FC8E: +_0814FC8E: pop {r4} pop {r0} bx r0 @@ -621455,26 +621455,26 @@ 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 .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 @@ -621495,7 +621495,7 @@ sub_814FCC8: ; 814FCC8 movs r0, 0x81 lsls r0, 24 mov r8, r0 -@0814FD4E: +_0814FD4E: strh r6, [r2] add r0, sp, 0xC str r0, [r1] @@ -621505,7 +621505,7 @@ sub_814FCC8: ; 814FCC8 adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @0814FD4E + bhi _0814FD4E strh r6, [r2] add r2, sp, 0xC str r2, [r1] @@ -621553,9 +621553,9 @@ sub_814FCC8: ; 814FCC8 adds r1, r2 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .pool -@0814FDD8: +_0814FDD8: bl ResetAllObjectData bl clear_tasks bl ResetObjectPaletteAllocator @@ -621568,7 +621568,7 @@ sub_814FCC8: ; 814FCC8 adds r1, r0, 0 adds r1, 0xF0 movs r2, 0 -@0814FDFC: +_0814FDFC: lsls r0, r4, 2 adds r0, r1, r0 str r2, [r0] @@ -621576,7 +621576,7 @@ sub_814FCC8: ; 814FCC8 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 @@ -621616,13 +621616,13 @@ sub_814FCC8: ; 814FCC8 adds r1, r3 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .pool -@0814FE90: +_0814FE90: movs r4, 0 add r5, sp, 0x14 ldr r6, =gUnknown_085CDB54 -@0814FE96: +_0814FE96: lsls r0, r4, 3 adds r0, r6 bl LoadCompressedObjectPic @@ -621630,7 +621630,7 @@ sub_814FCC8: ; 814FCC8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @0814FE96 + bls _0814FE96 ldr r0, =gUnknown_085CDB74 bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085CD67C @@ -621679,15 +621679,15 @@ sub_814FCC8: ; 814FCC8 adds r1, r2 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .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, =gUnknown_08DBA518 movs r1, 0 movs r2, 0x80 @@ -621698,9 +621698,9 @@ sub_814FCC8: ; 814FCC8 adds r1, r3 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .pool -@0814FF7C: +_0814FF7C: bl sub_8150D28 bl run_active_tasks ldr r1, =0x030022c0 @@ -621709,59 +621709,59 @@ sub_814FCC8: ; 814FCC8 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .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 .pool -@0814FFB4: +_0814FFB4: ldr r0, =gUnknown_0854C14C 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 .pool -@0814FFF8: +_0814FFF8: ldr r6, =0x0203abac ldr r0, [r6] movs r1, 0x82 @@ -621823,9 +621823,9 @@ sub_814FCC8: ; 814FCC8 adds r1, r0 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .pool -@08150090: +_08150090: ldr r0, =0x020375e0 ldrb r0, [r0] bl sub_81514C8 @@ -621936,9 +621936,9 @@ sub_814FCC8: ; 814FCC8 adds r1, r2 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .pool -@08150190: +_08150190: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -621958,9 +621958,9 @@ sub_814FCC8: ; 814FCC8 adds r1, r3 ldrb r0, [r1] adds r0, 0x1 - b @08150224 + b _08150224 .pool -@081501C8: +_081501C8: ldr r3, =0x04000208 ldrh r2, [r3] movs r0, 0 @@ -621981,20 +621981,20 @@ sub_814FCC8: ; 814FCC8 ldr r0, =0x020375e0 ldrh r0, [r0] cmp r0, 0 - bne @08150218 + bne _08150218 ldr r0, =sub_8150550 - b @0815021A + b _0815021A .pool -@08150218: +_08150218: ldr r0, =sub_8150664 -@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 @@ -622045,7 +622045,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] @@ -622053,7 +622053,7 @@ c2_8011A1C: ; 8150258 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x13 - bls @08150298 + bls _08150298 bl clear_tasks bl ResetAllObjectData bl sub_80A1A74 @@ -622117,7 +622117,7 @@ c2_8011A1C: ; 8150258 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@08150340: +_08150340: strh r6, [r4] mov r0, sp str r0, [r1] @@ -622127,7 +622127,7 @@ c2_8011A1C: ; 8150258 adds r2, r5 subs r3, r5 cmp r3, r5 - bhi @08150340 + bhi _08150340 strh r6, [r4] mov r0, sp str r0, [r1] @@ -622194,84 +622194,84 @@ 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 .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, =gUnknown_0854C14C 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 .pool -@08150490: +_08150490: ldr r0, =gUnknown_0854C14C ldr r2, [r0] movs r1, 0xDA @@ -622279,27 +622279,27 @@ sub_81503E4: ; 81503E4 adds r0, r2, r1 ldrb r0, [r0] cmp r0, 0x2 - bne @081504A8 + bne _081504A8 strb r0, [r3, 0x1] - b @08150542 + b _08150542 .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] @@ -622312,18 +622312,18 @@ sub_81503E4: ; 81503E4 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 @@ -622334,20 +622334,20 @@ sub_81503E4: ; 81503E4 bl pal_fade_maybe movs r0, 0x4 bl play_sound_effect - b @08150542 + b _08150542 .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 .pool -@08150528: +_08150528: movs r0, 0 bl SetVBlankCallback adds r0, r6, 0 @@ -622357,7 +622357,7 @@ sub_81503E4: ; 81503E4 bl remove_task ldr r0, =c2_8011A1C bl SetMainCallback2 -@08150542: +_08150542: add sp, 0x4 pop {r4-r7} pop {r0} @@ -622373,7 +622373,7 @@ sub_8150550: ; 8150550 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] @@ -622382,17 +622382,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] @@ -622400,22 +622400,22 @@ sub_8150550: ; 8150550 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 .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 @@ -622427,8 +622427,8 @@ sub_8150550: ; 8150550 movs r2, 0 movs r3, 0x16 bl FillBgTilemapBufferRect - b @08150630 -@081505CA: + b _08150630 +_081505CA: movs r0, 0x2 str r0, [sp] str r0, [sp, 0x4] @@ -622437,8 +622437,8 @@ sub_8150550: ; 8150550 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] @@ -622447,11 +622447,11 @@ sub_8150550: ; 8150550 movs r0, 0x3 movs r1, 0 movs r2, 0x2 -@081505EC: +_081505EC: movs r3, 0 bl FillBgTilemapBufferRect - b @08150630 -@081505F4: + b _08150630 +_081505F4: ldr r1, =0x00004108 adds r0, r1 ldr r1, [r0] @@ -622480,7 +622480,7 @@ sub_8150550: ; 8150550 ldr r1, [r6] movs r0, 0x40 strb r0, [r1, 0x15] -@08150630: +_08150630: bl sub_815115C ldr r3, =0x02021bbc movs r0, 0 @@ -622488,10 +622488,10 @@ sub_8150550: ; 8150550 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 @@ -622511,9 +622511,9 @@ sub_8150664: ; 8150664 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] @@ -622522,17 +622522,17 @@ sub_8150664: ; 8150664 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] @@ -622540,22 +622540,22 @@ sub_8150664: ; 8150664 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 .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] @@ -622569,9 +622569,9 @@ sub_8150664: ; 8150664 movs r2, 0 movs r3, 0x2 bl CopyToBgTilemapBufferRect_ChangePalette - b @081507B6 + b _081507B6 .pool -@081506E8: +_081506E8: movs r0, 0x3 str r0, [sp] movs r4, 0x2 @@ -622594,8 +622594,8 @@ sub_8150664: ; 8150664 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] @@ -622641,9 +622641,9 @@ sub_8150664: ; 8150664 movs r2, 0x3 movs r3, 0x1 bl FillBgTilemapBufferRect - b @081507B6 + b _081507B6 .pool -@08150784: +_08150784: ldr r5, =0x00004108 adds r0, r5 ldr r0, [r0] @@ -622667,26 +622667,26 @@ sub_8150664: ; 8150664 movs r2, 0x4 movs r3, 0x1 bl FillBgTilemapBufferRect -@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 .pool -@081507DC: +_081507DC: ldr r0, =gUnknown_0854C14C ldr r4, [r0] ldr r0, =0x000006fc adds r4, r0 ldrh r0, [r4] -@081507E6: +_081507E6: adds r0, 0xF7 movs r1, 0xF8 bl __modsi3 @@ -622752,20 +622752,20 @@ sub_8150868: ; 8150868 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 @@ -622779,10 +622779,10 @@ sub_8150868: ; 8150868 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 @@ -622791,18 +622791,18 @@ sub_8150868: ; 8150868 ldrh r1, [r5, 0x30] subs r1, r0 strh r1, [r5, 0x22] - b @08150934 + b _08150934 .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 @@ -622816,10 +622816,10 @@ sub_8150868: ; 8150868 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 @@ -622828,7 +622828,7 @@ sub_8150868: ; 8150868 ldrh r1, [r5, 0x30] adds r0, r1 strh r0, [r5, 0x22] -@08150934: +_08150934: pop {r4-r6} pop {r0} bx r0 @@ -622843,22 +622843,22 @@ sub_8150948: ; 8150948 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 @@ -622872,10 +622872,10 @@ sub_8150948: ; 8150948 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 @@ -622884,18 +622884,18 @@ sub_8150948: ; 8150948 ldrh r1, [r5, 0x30] subs r1, r0 strh r1, [r5, 0x22] - b @08150A18 + b _08150A18 .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 @@ -622909,10 +622909,10 @@ sub_8150948: ; 8150948 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 @@ -622921,11 +622921,11 @@ sub_8150948: ; 8150948 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] @@ -622934,14 +622934,14 @@ sub_8150948: ; 8150948 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 .pool -@08150A48: +_08150A48: movs r2, 0 movs r0, 0x10 strh r0, [r5, 0x26] @@ -622951,10 +622951,10 @@ sub_8150948: ; 8150948 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 @@ -622967,7 +622967,7 @@ sub_8150A68: ; 8150A68 movs r1, 0x2E ldrsh r0, [r2, r1] cmp r0, 0 - bne @08150A98 + bne _08150A98 adds r0, r2, 0 adds r0, 0x28 ldrb r0, [r0] @@ -622986,7 +622986,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] @@ -622995,45 +622995,45 @@ sub_8150A68: ; 8150A68 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 RemoveObjectAndFreeTiles -@08150AEE: +_08150AEE: pop {r0} bx r0 thumb_func_end sub_8150A68 @@ -623045,7 +623045,7 @@ sub_8150AF4: ; 8150AF4 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 @@ -623055,7 +623055,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] @@ -623064,45 +623064,45 @@ sub_8150AF4: ; 8150AF4 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 RemoveObjectAndFreeTiles -@08150B68: +_08150B68: pop {r0} bx r0 thumb_func_end sub_8150AF4 @@ -623113,10 +623113,10 @@ sub_8150B6C: ; 8150B6C 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 SetGpuReg @@ -623177,8 +623177,8 @@ sub_8150B6C: ; 8150B6C movs r0, 0x50 movs r1, 0 bl SetGpuReg - b @08150D1C -@08150C1C: + b _08150D1C +_08150C1C: movs r0, 0x48 movs r1, 0 bl SetGpuReg @@ -623200,7 +623200,7 @@ sub_8150B6C: ; 8150B6C ldr r0, =0x020375e0 ldrh r3, [r0] cmp r3, 0 - bne @08150C74 + bne _08150C74 ldr r1, =0x0203abac ldr r2, [r1] movs r0, 0xB0 @@ -623212,9 +623212,9 @@ sub_8150B6C: ; 8150B6C strb r3, [r0, 0xC] ldr r2, [r1] movs r0, 0x50 - b @08150C8C + b _08150C8C .pool -@08150C74: +_08150C74: ldr r1, =0x0203abac ldr r2, [r1] movs r3, 0 @@ -623227,7 +623227,7 @@ sub_8150B6C: ; 8150B6C strb r3, [r0, 0xC] ldr r2, [r1] movs r0, 0x4 -@08150C8C: +_08150C8C: strb r0, [r2, 0xD] ldr r0, [r1] strb r3, [r0, 0x9] @@ -623284,7 +623284,7 @@ sub_8150B6C: ; 8150B6C lsls r1, 6 movs r0, 0x50 bl SetGpuReg -@08150D1C: +_08150D1C: pop {r4} pop {r0} bx r0 @@ -623332,10 +623332,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] @@ -623351,7 +623351,7 @@ sub_8150D28: ; 8150D28 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @08150DD0 + beq _08150DD0 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -623372,7 +623372,7 @@ sub_8150D28: ; 8150D28 strh r0, [r1, 0x2E] movs r0, 0x49 strh r0, [r1, 0x30] -@08150DD0: +_08150DD0: ldr r4, =gUnknown_085CDB9C adds r0, r4, 0 movs r1, 0xB0 @@ -623423,9 +623423,9 @@ sub_8150D28: ; 8150D28 strh r0, [r1, 0x4] movs r0, 0x2 bl sub_80AB130 - b @08150F3A + b _08150F3A .pool -@08150E68: +_08150E68: ldr r7, =0x0203abac ldr r0, [r7] ldr r1, =0x000040fc @@ -623457,7 +623457,7 @@ sub_8150D28: ; 8150D28 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @08150ED4 + beq _08150ED4 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -623478,7 +623478,7 @@ sub_8150D28: ; 8150D28 strh r0, [r1, 0x2E] movs r0, 0x27 strh r0, [r1, 0x30] -@08150ED4: +_08150ED4: ldr r4, =gUnknown_085CDB9C adds r0, r4, 0 movs r1, 0x68 @@ -623527,10 +623527,10 @@ sub_8150D28: ; 8150D28 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 @@ -623556,12 +623556,12 @@ sub_8150D28: ; 8150D28 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 @@ -623590,7 +623590,7 @@ sub_8150D28: ; 8150D28 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 @@ -623620,42 +623620,42 @@ sub_8150D28: ; 8150D28 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 .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 StartObjectImageAnim 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 StartObjectImageAnim strh r5, [r4, 0x30] -@0815105C: +_0815105C: ldr r0, =0x02020630 mov r2, r8 adds r1, r2, r6 @@ -623668,7 +623668,7 @@ sub_8150D28: ; 8150D28 adds r0, 0x1C ldrb r0, [r0] strh r0, [r1, 0x32] -@08151074: +_08151074: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -623699,7 +623699,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 @@ -623717,7 +623717,7 @@ sub_8151088: ; 8151088 adds r0, r2 lsls r0, 3 mov r8, r0 -@081510CC: +_081510CC: ldr r0, =0x0203abac ldr r6, [r0] lsls r3, r7, 1 @@ -623765,12 +623765,12 @@ sub_8151088: ; 8151088 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 @@ -623818,17 +623818,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 @@ -623866,17 +623866,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 @@ -623930,7 +623930,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] @@ -623994,7 +623994,7 @@ sub_8151214: ; 8151214 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x8 - bls @0815126E + bls _0815126E ldr r5, =0x0203abb0 ldr r4, =0x0203abac ldr r0, [r4] @@ -624020,7 +624020,7 @@ sub_8151214: ; 8151214 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 @@ -624051,7 +624051,7 @@ sub_8151214: ; 8151214 movs r1, 0 movs r2, 0 bl FillBgTilemapBufferRect -@08151368: +_08151368: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -624103,7 +624103,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] @@ -624167,7 +624167,7 @@ sub_8151388: ; 8151388 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x8 - bls @081513D4 + bls _081513D4 ldr r4, =0x0203abb4 ldr r5, =0x0203abac ldr r3, [r5] @@ -624193,7 +624193,7 @@ sub_8151388: ; 8151388 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 @@ -624205,7 +624205,7 @@ sub_8151388: ; 8151388 movs r0, 0xFE strb r0, [r1, 0x18] bl sub_8151088 -@081514A6: +_081514A6: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -624223,10 +624223,10 @@ sub_81514C8: ; 81514C8 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 @@ -624242,9 +624242,9 @@ sub_81514C8: ; 81514C8 strb r0, [r1, 0x18] bl sub_8151088 bl sub_8151214 - b @08151522 + b _08151522 .pool -@08151500: +_08151500: ldr r1, =0x0203abac ldr r2, [r1] movs r0, 0x2 @@ -624260,7 +624260,7 @@ sub_81514C8: ; 81514C8 strb r0, [r1, 0x18] bl sub_8151088 bl sub_8151388 -@08151522: +_08151522: ldr r0, =0x0203abac ldr r1, [r0] movs r0, 0 @@ -624280,9 +624280,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} @@ -624325,12 +624325,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 @@ -624352,16 +624352,16 @@ sub_81515B0: ; 81515B0 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 @@ -624376,17 +624376,17 @@ 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 @@ -624396,7 +624396,7 @@ 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 @@ -624407,10 +624407,10 @@ 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 @@ -624453,15 +624453,15 @@ sub_815163C: ; 815163C 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 @@ -624484,7 +624484,7 @@ sub_815168C: ; 815168C lsls r1, 24 lsrs r6, r1, 24 cmp r6, 0xF - bhi @081516A8 + bhi _081516A8 lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -624492,11 +624492,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] @@ -624538,15 +624538,15 @@ sub_815168C: ; 815168C 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 @@ -624560,7 +624560,7 @@ sub_8151710: ; 8151710 lsrs r1, 24 adds r4, r1, 0 cmp r4, 0xF - bhi @0815173C + bhi _0815173C lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -624568,16 +624568,16 @@ 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 @@ -624595,9 +624595,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 @@ -624606,7 +624606,7 @@ sub_8151744: ; 8151744 mov r9, r1 movs r0, 0x1F mov r8, r0 -@0815176C: +_0815176C: ldrh r0, [r5, 0x6] add r0, r12 lsls r0, 1 @@ -624618,12 +624618,12 @@ sub_8151744: ; 8151744 lsls r0, 25 lsrs r0, 25 cmp r0, 0x1 - beq @08151798 + beq _08151798 cmp r0, 0x2 - beq @081517F6 - b @081518E2 + beq _081517F6 + b _081518E2 .pool -@08151798: +_08151798: ldr r0, [r3] lsls r2, r0, 27 lsrs r0, r2, 27 @@ -624631,7 +624631,7 @@ sub_8151744: ; 8151744 ldrsb r1, [r5, r1] adds r0, r1 cmp r0, 0x1F - bhi @081517BA + bhi _081517BA lsrs r0, r2, 27 adds r0, r1 ands r0, r7 @@ -624641,7 +624641,7 @@ sub_8151744: ; 8151744 ands r1, r2 orrs r1, r0 strb r1, [r3] -@081517BA: +_081517BA: ldr r0, [r3] lsls r2, r0, 22 lsrs r0, r2, 27 @@ -624649,7 +624649,7 @@ sub_8151744: ; 8151744 ldrsb r1, [r5, r1] adds r0, r1 cmp r0, 0x1F - bhi @081517DE + bhi _081517DE lsrs r0, r2, 27 adds r0, r1 mov r1, r8 @@ -624660,7 +624660,7 @@ sub_8151744: ; 8151744 ands r1, r2 orrs r1, r0 strh r1, [r3] -@081517DE: +_081517DE: ldr r0, [r3] lsls r2, r0, 17 lsrs r0, r2, 27 @@ -624668,17 +624668,17 @@ sub_8151744: ; 8151744 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 @@ -624689,7 +624689,7 @@ sub_8151744: ; 8151744 lsls r0, 27 lsrs r0, 27 cmp r1, r0 - blt @08151826 + blt _08151826 lsrs r0, r4, 27 adds r0, r2 ands r0, r7 @@ -624699,7 +624699,7 @@ sub_8151744: ; 8151744 ands r1, r2 orrs r1, r0 strb r1, [r3] -@08151826: +_08151826: ldr r0, [r3] lsls r4, r0, 22 lsrs r1, r4, 27 @@ -624710,7 +624710,7 @@ sub_8151744: ; 8151744 lsls r0, 22 lsrs r0, 27 cmp r1, r0 - blt @08151850 + blt _08151850 lsrs r0, r4, 27 adds r0, r2 mov r1, r8 @@ -624721,7 +624721,7 @@ sub_8151744: ; 8151744 ands r1, r2 orrs r1, r0 strh r1, [r3] -@08151850: +_08151850: ldr r0, [r3] lsls r4, r0, 17 lsrs r1, r4, 27 @@ -624732,9 +624732,9 @@ sub_8151744: ; 8151744 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 @@ -624745,7 +624745,7 @@ sub_8151744: ; 8151744 lsls r0, 27 lsrs r0, 27 cmp r1, r0 - bgt @08151890 + bgt _08151890 lsrs r0, r4, 27 adds r0, r2 ands r0, r7 @@ -624755,7 +624755,7 @@ sub_8151744: ; 8151744 ands r1, r2 orrs r1, r0 strb r1, [r3] -@08151890: +_08151890: ldr r0, [r3] lsls r4, r0, 22 lsrs r1, r4, 27 @@ -624766,7 +624766,7 @@ sub_8151744: ; 8151744 lsls r0, 22 lsrs r0, 27 cmp r1, r0 - bgt @081518BA + bgt _081518BA lsrs r0, r4, 27 adds r0, r2 mov r1, r8 @@ -624777,7 +624777,7 @@ sub_8151744: ; 8151744 ands r1, r2 orrs r1, r0 strh r1, [r3] -@081518BA: +_081518BA: ldr r0, [r3] lsls r4, r0, 17 lsrs r1, r4, 27 @@ -624788,11 +624788,11 @@ sub_8151744: ; 8151744 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] @@ -624800,7 +624800,7 @@ sub_8151744: ; 8151744 ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] -@081518E2: +_081518E2: mov r0, r12 adds r0, 0x1 lsls r0, 24 @@ -624808,9 +624808,9 @@ sub_8151744: ; 8151744 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] @@ -624819,10 +624819,10 @@ sub_8151744: ; 8151744 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 @@ -624834,16 +624834,16 @@ sub_8151744: ; 8151744 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 @@ -624851,7 +624851,7 @@ sub_8151744: ; 8151744 orrs r1, r0 strb r1, [r5] movs r0, 0x1 -@0815193E: +_0815193E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -624870,16 +624870,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 @@ -624891,21 +624891,21 @@ sub_815194C: ; 815194C 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 .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 @@ -624918,13 +624918,13 @@ sub_815194C: ; 815194C 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 @@ -624932,7 +624932,7 @@ sub_815194C: ; 815194C ands r0, r2 orrs r0, r1 strb r0, [r3] -@081519CA: +_081519CA: movs r0, 0x1 pop {r4,r5} pop {r1} @@ -624947,14 +624947,14 @@ task_tutorial_controls_fadein: ; 81519DC 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 @@ -624966,35 +624966,35 @@ task_tutorial_controls_fadein: ; 81519DC 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 @@ -625013,12 +625013,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 @@ -625026,7 +625026,7 @@ sub_8151A48: ; 8151A48 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] @@ -625037,12 +625037,12 @@ sub_8151A48: ; 8151A48 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 @@ -625057,12 +625057,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 @@ -625070,12 +625070,12 @@ sub_8151A9C: ; 8151A9C 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 @@ -625099,30 +625099,30 @@ sub_8151A9C: ; 8151A9C lsls r0, 24 ldr r3, [sp] cmp r0, 0 - bge @08151B10 + bge _08151B10 movs r0, 0xFF strb r0, [r4, 0x7] - b @08151B12 + b _08151B12 .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 .pool -@08151B2C: +_08151B2C: ldrh r0, [r6, 0x2] bics r0, r7 -@08151B30: +_08151B30: strh r0, [r6, 0x2] add sp, 0x4 pop {r4-r7} @@ -625140,7 +625140,7 @@ sub_8151B3C: ; 8151B3C movs r1, 0 movs r2, 0xC0 bl memset -@08151B4E: +_08151B4E: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -625150,7 +625150,7 @@ sub_8151B3C: ; 8151B3C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xF - bls @08151B4E + bls _08151B4E pop {r4,r5} pop {r0} bx r0 @@ -625166,15 +625166,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 @@ -625182,12 +625182,12 @@ sub_8151B68: ; 8151B68 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 @@ -625208,10 +625208,10 @@ sub_8151B68: ; 8151B68 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 @@ -625226,20 +625226,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 @@ -625252,8 +625252,8 @@ sub_8151BD4: ; 8151BD4 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 @@ -625290,7 +625290,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 @@ -625299,12 +625299,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 @@ -625312,18 +625312,18 @@ sub_8151C50: ; 8151C50 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 @@ -625338,7 +625338,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 @@ -625356,16 +625356,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 @@ -625373,15 +625373,15 @@ sub_8151CA8: ; 8151CA8 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] @@ -625390,13 +625390,13 @@ sub_8151CA8: ; 8151CA8 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 @@ -625416,7 +625416,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 @@ -625429,20 +625429,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 @@ -625455,8 +625455,8 @@ sub_8151D28: ; 8151D28 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 @@ -625468,14 +625468,14 @@ sub_8151D28: ; 8151D28 ldrh r0, [r2] bics r0, r1 strh r0, [r2] - b @08151E3A + b _08151E3A .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 @@ -625487,34 +625487,34 @@ sub_8151D28: ; 8151D28 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 @@ -625527,8 +625527,8 @@ sub_8151D28: ; 8151D28 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 @@ -625540,13 +625540,13 @@ sub_8151D28: ; 8151D28 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 @@ -625571,16 +625571,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 @@ -625592,30 +625592,30 @@ sub_8151E50: ; 8151E50 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] @@ -625628,18 +625628,18 @@ sub_8151E50: ; 8151E50 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 .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 @@ -625655,19 +625655,19 @@ sub_8151E50: ; 8151E50 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 @@ -625678,7 +625678,7 @@ sub_8151E50: ; 8151E50 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] @@ -625693,8 +625693,8 @@ sub_8151E50: ; 8151E50 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 @@ -625710,7 +625710,7 @@ sub_8151E50: ; 8151E50 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] @@ -625725,17 +625725,17 @@ sub_8151E50: ; 8151E50 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 @@ -625743,7 +625743,7 @@ sub_8151E50: ; 8151E50 mov r0, r8 ands r0, r2 orrs r0, r1 -@08151FB0: +_08151FB0: strb r0, [r4, 0x1] ldrb r2, [r4, 0x1] lsls r0, r2, 27 @@ -625760,27 +625760,27 @@ sub_8151E50: ; 8151E50 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 @@ -625812,28 +625812,28 @@ 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 @@ -625858,15 +625858,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 @@ -625875,13 +625875,13 @@ sub_8152058: ; 8152058 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 @@ -625913,17 +625913,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 @@ -625940,8 +625940,8 @@ sub_81520A8: ; 81520A8 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 @@ -625952,8 +625952,8 @@ sub_81520A8: ; 81520A8 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 @@ -625989,17 +625989,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 @@ -626017,8 +626017,8 @@ sub_8152134: ; 8152134 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 @@ -626029,8 +626029,8 @@ sub_8152134: ; 8152134 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 @@ -626050,17 +626050,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 AllocZeroed str r0, [r6] cmp r0, 0 - beq @081521FE + beq _081521FE lsls r0, r4, 1 adds r0, r4 lsls r0, 4 @@ -626068,24 +626068,24 @@ sub_81521C0: ; 81521C0 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 .pool -@08152208: +_08152208: strb r4, [r1] cmp r5, r4 - bcs @08152242 + bcs _08152242 adds r3, r6, 0 ldr r0, =gDefaultOamAttributes mov r12, r0 movs r2, 0x4 mov r8, r2 -@08152218: +_08152218: ldr r0, [r3] ldr r2, [r0, 0x4] lsls r1, r5, 1 @@ -626106,10 +626106,10 @@ sub_81521C0: ; 81521C0 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} @@ -626126,19 +626126,19 @@ sub_8152254: ; 8152254 ldr r2, [r0] adds r5, r0, 0 cmp r2, 0 - bne @0815226C + bne _0815226C movs r0, 0 - b @081522C4 + b _081522C4 .pool -@0815226C: +_0815226C: ldrb r2, [r2] cmp r3, r2 - bcs @08152292 + bcs _08152292 ldr r0, =0x030024f8 mov r12, r0 ldr r4, =gDefaultOamAttributes adds r2, r5, 0 -@0815227A: +_0815227A: lsls r1, r3, 3 add r1, r12 adds r0, r4, 0 @@ -626150,8 +626150,8 @@ sub_8152254: ; 8152254 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 @@ -626173,7 +626173,7 @@ sub_8152254: ; 8152254 bl Free str r4, [r5] movs r0, 0x1 -@081522C4: +_081522C4: pop {r4-r7} pop {r1} bx r1 @@ -626190,22 +626190,22 @@ 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 .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 @@ -626216,13 +626216,13 @@ sub_81522D4: ; 81522D4 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 @@ -626230,16 +626230,16 @@ sub_81522D4: ; 81522D4 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, =gDefaultOamAttributes ldm r1!, {r2,r3} stm r0!, {r2,r3} - b @081523C0 + b _081523C0 .pool -@08152348: +_08152348: ldrb r0, [r2, 0xE] ldrb r4, [r2, 0xA] adds r0, r4 @@ -626300,19 +626300,19 @@ sub_81522D4: ; 81522D4 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} @@ -626328,14 +626328,14 @@ sub_81523F4: ; 81523F4 lsls r1, 24 lsrs r6, r1, 24 cmp r4, 0 - beq @08152430 + beq _08152430 ldrh r0, [r4, 0x10] bl GetObjectTileRangeStartByTag 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 @@ -626348,11 +626348,11 @@ sub_81523F4: ; 81523F4 adds r0, r5, r0 strh r0, [r4, 0x14] movs r0, 0x1 - b @08152432 + b _08152432 .pool -@08152430: +_08152430: movs r0, 0 -@08152432: +_08152432: pop {r4-r6} pop {r1} bx r1 @@ -626367,10 +626367,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 @@ -626380,14 +626380,14 @@ 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 .pool -@0815246C: +_0815246C: movs r0, 0xFF -@0815246E: +_0815246E: pop {r4} pop {r1} bx r1 @@ -626405,10 +626405,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 @@ -626418,21 +626418,21 @@ 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 .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 @@ -626472,13 +626472,13 @@ 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 .pool -@08152514: +_08152514: adds r5, r2, 0 adds r0, r5, 0 movs r1, 0 @@ -626491,16 +626491,16 @@ sub_81524C4: ; 81524C4 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 @@ -626509,19 +626509,19 @@ sub_81524C4: ; 81524C4 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} @@ -626547,7 +626547,7 @@ sub_81524C4: ; 81524C4 strb r4, [r5, 0x5] mov r0, r10 cmp r0, 0x3 - bhi @081525B6 + bhi _081525B6 movs r1, 0x3 ands r1, r0 lsls r3, r1, 3 @@ -626563,12 +626563,12 @@ sub_81524C4: ; 81524C4 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 @@ -626587,7 +626587,7 @@ sub_81525D0: ; 81525D0 ldr r6, =0x0203abb8 ldr r0, [r6] cmp r0, 0 - beq @081525F2 + beq _081525F2 ldr r1, [r0, 0x4] lsls r0, r5, 1 adds r0, r5 @@ -626597,12 +626597,12 @@ 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 .pool -@081525FC: +_081525FC: adds r0, r2, 0 movs r1, 0 movs r2, 0x30 @@ -626634,7 +626634,7 @@ sub_81525D0: ; 81525D0 ldm r0!, {r2,r3} stm r1!, {r2,r3} adds r0, r5, 0 -@0815263C: +_0815263C: pop {r4-r6} pop {r1} bx r1 @@ -626646,7 +626646,7 @@ 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 @@ -626660,7 +626660,7 @@ calls_flash_erase_block: ; 8152650 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xF - bls @08152656 + bls _08152656 pop {r4,r5} pop {r0} bx r0 @@ -626689,44 +626689,44 @@ 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 .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 .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} @@ -626745,15 +626745,15 @@ 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 .pool -@08152730: +_08152730: ldr r1, =0x030061f8 ldr r5, =0x030061f0 ldrh r0, [r5] @@ -626772,7 +626772,7 @@ save_write_to_flash: ; 8152700 str r4, [r6] movs r5, 0x1 movs r4, 0 -@08152756: +_08152756: adds r0, r4, 0 adds r1, r7, 0 bl sub_81527A0 @@ -626780,11 +626780,11 @@ save_write_to_flash: ; 8152700 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 @@ -626794,7 +626794,7 @@ save_write_to_flash: ; 8152700 ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] -@08152782: +_08152782: adds r0, r5, 0 pop {r4-r7} pop {r1} @@ -626844,7 +626844,7 @@ sub_81527A0: ; 81527A0 mov r8, r12 movs r2, 0 ldr r1, =0x00000fff -@081527F2: +_081527F2: mov r7, r8 ldr r0, [r7] adds r0, r3 @@ -626853,7 +626853,7 @@ sub_81527A0: ; 81527A0 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r1 - bls @081527F2 + bls _081527F2 mov r0, r12 ldr r1, [r0] ldr r2, =0x00000ff4 @@ -626871,9 +626871,9 @@ sub_81527A0: ; 81527A0 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 @@ -626884,8 +626884,8 @@ sub_81527A0: ; 81527A0 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 @@ -626920,22 +626920,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] @@ -626944,8 +626944,8 @@ sub_8152890: ; 8152890 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 @@ -626971,18 +626971,18 @@ sub_8152908: ; 8152908 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 @@ -627054,7 +627054,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 @@ -627064,7 +627064,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 @@ -627074,11 +627074,11 @@ sub_81529D4: ; 81529D4 ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] - b @08152A2A + b _08152A2A .pool -@08152A28: +_08152A28: movs r5, 0xFF -@08152A2A: +_08152A2A: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -627097,7 +627097,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 @@ -627107,7 +627107,7 @@ sub_8152A34: ; 8152A34 ldr r0, =0x030061f4 ldr r0, [r0] str r0, [r1] -@08152A5E: +_08152A5E: adds r0, r4, 0 pop {r4} pop {r1} @@ -627157,7 +627157,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 @@ -627166,7 +627166,7 @@ calls_flash_erase_block_2: ; 8152A80 lsls r0, 16 lsrs r4, r0, 16 cmp r4, r1 - bls @08152AD2 + bls _08152AD2 mov r0, r12 ldr r1, [r0] ldr r2, =0x00000ff4 @@ -627185,9 +627185,9 @@ calls_flash_erase_block_2: ; 8152A80 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 @@ -627198,8 +627198,8 @@ calls_flash_erase_block_2: ; 8152A80 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 @@ -627217,15 +627217,15 @@ calls_flash_erase_block_2: ; 8152A80 ldr r7, =0x00000ff7 mov r9, r7 ldr r7, =0x03007854 - b @08152B82 + b _08152B82 .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 @@ -627236,30 +627236,30 @@ calls_flash_erase_block_2: ; 8152A80 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 .pool -@08152BB0: +_08152BB0: movs r6, 0x1 movs r4, 0 ldr r1, =0x03007854 mov r9, r1 ldr r7, =0x00000ff9 - b @08152BCA + b _08152BCA .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] @@ -627272,26 +627272,26 @@ calls_flash_erase_block_2: ; 8152A80 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 .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 @@ -627334,15 +627334,15 @@ 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 .pool -@08152C84: +_08152C84: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 @@ -627354,7 +627354,7 @@ sav12_xor_get: ; 8152C20 ldr r0, [r0] str r0, [r5] movs r0, 0xFF -@08152C9C: +_08152C9C: pop {r4-r6} pop {r1} bx r1 @@ -627398,15 +627398,15 @@ 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 .pool -@08152D1C: +_08152D1C: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 @@ -627418,7 +627418,7 @@ sub_8152CAC: ; 8152CAC ldr r0, [r0] str r0, [r5] movs r0, 0xFF -@08152D34: +_08152D34: pop {r4-r6} pop {r1} bx r1 @@ -627459,15 +627459,15 @@ 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 .pool -@08152DA8: +_08152DA8: lsls r1, r4, 24 lsrs r1, 24 movs r0, 0 @@ -627479,7 +627479,7 @@ sub_8152D44: ; 8152D44 ldr r0, [r0] str r0, [r5] movs r0, 0xFF -@08152DC0: +_08152DC0: pop {r4-r6} pop {r1} bx r1 @@ -627497,11 +627497,11 @@ sub_8152DD0: ; 8152DD0 str r0, [r1] ldr r0, =0x0000ffff cmp r4, r0 - beq @08152DF4 + beq _08152DF4 movs r5, 0xFF - b @08152E06 + b _08152E06 .pool -@08152DF4: +_08152DF4: adds r0, r6, 0 bl sub_8152EC8 lsls r0, 24 @@ -627509,7 +627509,7 @@ sub_8152DD0: ; 8152DD0 adds r0, r4, 0 adds r1, r6, 0 bl sub_8152E10 -@08152E06: +_08152E06: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -627532,7 +627532,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 @@ -627543,10 +627543,10 @@ sub_8152E10: ; 8152E10 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 @@ -627562,19 +627562,19 @@ sub_8152E10: ; 8152E10 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] @@ -627586,12 +627586,12 @@ sub_8152E10: ; 8152E10 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 @@ -627617,7 +627617,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] @@ -627628,7 +627628,7 @@ sub_8152EC8: ; 8152EC8 ldr r1, [r0] ldr r0, =0x08012025 cmp r1, r0 - bne @08152F34 + bne _08152F34 movs r5, 0x1 ldr r3, =0x00000ff4 adds r0, r2, r3 @@ -627645,7 +627645,7 @@ sub_8152EC8: ; 8152EC8 adds r0, r1, r3 ldrh r0, [r0] cmp r0, r2 - bne @08152F34 + bne _08152F34 ldr r2, =0x00000ffc adds r0, r1, r2 ldr r0, [r0] @@ -627656,32 +627656,32 @@ sub_8152EC8: ; 8152EC8 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 .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 @@ -627694,7 +627694,7 @@ sub_8152EC8: ; 8152EC8 ldr r1, [r0] ldr r0, =0x08012025 cmp r1, r0 - bne @08152FD0 + bne _08152FD0 movs r5, 0x1 ldr r3, =0x00000ff4 adds r0, r2, r3 @@ -627711,7 +627711,7 @@ sub_8152EC8: ; 8152EC8 adds r0, r1, r3 ldrh r0, [r0] cmp r0, r2 - bne @08152FD0 + bne _08152FD0 ldr r2, =0x00000ffc adds r0, r1, r2 ldr r0, [r0] @@ -627722,119 +627722,119 @@ sub_8152EC8: ; 8152EC8 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 .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 .pool -@08153044: +_08153044: ldr r0, =0x03006200 mov r1, r8 str r1, [r0] - b @08153094 + b _08153094 .pool -@08153050: +_08153050: cmp r8, r9 - bcs @08153060 + bcs _08153060 ldr r0, =0x03006200 mov r2, r9 str r2, [r0] - b @08153094 + b _08153094 .pool -@08153060: +_08153060: ldr r0, =0x03006200 mov r3, r8 -@08153064: +_08153064: str r3, [r0] - b @08153094 + b _08153094 .pool -@0815306C: +_0815306C: ldr r0, =0x03006200 mov r2, r8 str r2, [r0] cmp r1, 0xFF - beq @0815308C - b @08153094 + beq _0815308C + b _08153094 .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 .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 .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 @@ -627862,7 +627862,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 @@ -627872,11 +627872,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] @@ -627885,17 +627885,17 @@ sub_81530DC: ; 81530DC lsls r0, 16 lsrs r2, r0, 16 cmp r2, r4 - bcc @08153118 -@0815312A: + bcc _08153118 +_0815312A: movs r0, 0x1 - b @08153146 + b _08153146 .pool -@08153140: +_08153140: movs r0, 0x2 - b @08153146 -@08153144: + b _08153146 +_08153144: movs r0, 0 -@08153146: +_08153146: pop {r4-r6} pop {r1} bx r1 @@ -627925,16 +627925,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 @@ -627960,7 +627960,7 @@ sub_8153190: ; 8153190 adds r3, 0x8 adds r2, 0x4 movs r4, 0x3 -@081531AC: +_081531AC: ldrh r0, [r2] ldr r1, [r5] adds r1, r0 @@ -627971,7 +627971,7 @@ sub_8153190: ; 8153190 adds r2, 0x4 subs r4, 0x1 cmp r4, 0 - bge @081531AC + bge _081531AC movs r4, 0x5 ldr r1, =0x03006220 ldr r5, =0x03005d94 @@ -627980,7 +627980,7 @@ sub_8153190: ; 8153190 adds r3, 0x28 adds r2, r0, 0 adds r2, 0x14 -@081531D2: +_081531D2: ldrh r0, [r2] ldr r1, [r5] adds r1, r0 @@ -627991,7 +627991,7 @@ sub_8153190: ; 8153190 adds r2, 0x4 adds r4, 0x1 cmp r4, 0xD - ble @081531D2 + ble _081531D2 pop {r4,r5} pop {r0} bx r0 @@ -628009,25 +628009,25 @@ 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 .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 @@ -628035,16 +628035,16 @@ calls_flash_erase_block_3: ; 8153204 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 @@ -628061,19 +628061,19 @@ calls_flash_erase_block_3: ; 8153204 adds r1, r4, 0 adds r2, r5, 0 bl sub_8152890 - b @0815331A + b _0815331A .pool -@081532AC: +_081532AC: bl save_serialize_game ldr r0, =0x0000ffff ldr r1, =0x03006220 bl save_write_to_flash - b @0815331A + b _0815331A .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 @@ -628081,9 +628081,9 @@ calls_flash_erase_block_3: ; 8153204 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 @@ -628091,13 +628091,13 @@ calls_flash_erase_block_3: ; 8153204 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls @081532DE - b @0815331A + bls _081532DE + b _0815331A .pool -@081532F8: +_081532F8: movs r4, 0x1C ldr r5, =0x03007860 -@081532FC: +_081532FC: ldr r1, [r5] adds r0, r4, 0 bl _call_via_r1 @@ -628105,12 +628105,12 @@ calls_flash_erase_block_3: ; 8153204 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 @@ -628128,27 +628128,27 @@ save_game_when_memory_present: ; 8153338 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 .pool -@08153370: +_08153370: ldr r0, =0x03006294 strh r4, [r0] movs r0, 0x1 -@08153376: +_08153376: pop {r4,r5} pop {r1} bx r1 @@ -628161,17 +628161,17 @@ sub_8153380: ; 8153380 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 .pool -@081533A4: +_081533A4: movs r0, 0x1 -@081533A6: +_081533A6: pop {r1} bx r1 thumb_func_end sub_8153380 @@ -628187,18 +628187,18 @@ 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 .pool -@081533D8: +_081533D8: movs r0, 0x1 -@081533DA: +_081533DA: pop {r4} pop {r1} bx r1 @@ -628213,10 +628213,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 @@ -628232,10 +628232,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 @@ -628248,7 +628248,7 @@ sub_8153430: ; 8153430 ldr r0, =0x03005d88 ldr r0, [r0] cmp r0, 0x1 - bne @0815346C + bne _0815346C bl sub_8153190 bl save_serialize_game ldr r4, =0x03006220 @@ -628262,11 +628262,11 @@ sub_8153430: ; 8153430 adds r1, r4, 0 bl sub_8152A34 movs r0, 0 - b @0815346E + b _0815346E .pool -@0815346C: +_0815346C: movs r0, 0x1 -@0815346E: +_0815346E: pop {r4} pop {r1} bx r1 @@ -628283,7 +628283,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 @@ -628293,21 +628293,21 @@ sub_8153474: ; 8153474 adds r0, r5, 0 adds r1, r4, 0 bl sub_8152D44 - b @081534B2 + b _081534B2 .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} @@ -628323,20 +628323,20 @@ sub_81534D0: ; 81534D0 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 .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 @@ -628348,9 +628348,9 @@ sub_81534D0: ; 81534D0 ldr r1, =0x03006214 movs r0, 0 str r0, [r1] - b @0815354E + b _0815354E .pool -@08153528: +_08153528: ldr r5, =0x0201c000 movs r6, 0xF8 lsls r6, 4 @@ -628361,16 +628361,16 @@ sub_81534D0: ; 81534D0 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 @@ -628387,10 +628387,10 @@ sub_815355C: ; 815355C ldr r0, =0x03005d88 ldr r4, [r0] cmp r4, 0x1 - beq @0815358C - b @081535C8 + beq _0815358C + b _081535C8 .pool -@0815357C: +_0815357C: ldrb r1, [r7, 0xA] ldrb r0, [r7, 0xB] adds r1, r0 @@ -628398,8 +628398,8 @@ sub_815355C: ; 815355C 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 @@ -628411,7 +628411,7 @@ sub_815355C: ; 815355C lsls r0, 17 lsrs r6, r0, 16 movs r4, 0 -@081535A6: +_081535A6: adds r0, r4, r6 lsls r0, 24 lsrs r0, 24 @@ -628422,15 +628422,15 @@ sub_815355C: ; 815355C 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 @@ -628448,7 +628448,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 @@ -628459,25 +628459,25 @@ 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 .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 @@ -628495,32 +628495,32 @@ 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 .pool -@08153680: +_08153680: movs r0, 0xFF -@08153682: +_08153682: pop {r4-r7} pop {r1} bx r1 @@ -628539,142 +628539,142 @@ 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 .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 .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 @@ -628692,24 +628692,24 @@ 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 @@ -628757,15 +628757,15 @@ sub_8153850: ; 8153850 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 @@ -628804,11 +628804,11 @@ sub_81538A0: ; 81538A0 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} @@ -628833,13 +628833,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 @@ -628857,28 +628857,28 @@ 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 .pool -@0815393C: +_0815393C: movs r0, 0x1 -@0815393E: +_0815393E: pop {r4,r5} pop {r1} bx r1 @@ -628917,15 +628917,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 @@ -628944,7 +628944,7 @@ sub_8153970: ; 8153970 ldr r2, =0x00003b14 adds r1, r2 str r0, [r1] -@081539BC: +_081539BC: pop {r4-r6} pop {r0} bx r0 @@ -628960,30 +628960,30 @@ 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 .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 @@ -629026,12 +629026,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} @@ -629070,14 +629070,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 ExpandStringRefs -@08153ABE: +_08153ABE: movs r0, 0 pop {r4,r5} pop {r1} @@ -629135,40 +629135,40 @@ sub_8153AE8: ; 8153AE8 bl CopyString_LimitN mov r0, r8 cmp r0, 0 - bne @08153B54 + bne _08153B54 ldr r0, =0x02021fc4 ldr r1, =gUnknown_08674AE4 - b @08153B74 + b _08153B74 .pool -@08153B54: +_08153B54: mov r0, r9 adds r1, r4, 0 bl CompareString cmp r0, 0 - beq @08153B70 + beq _08153B70 ldr r0, =0x02021fc4 ldr r1, =gUnknown_08674B16 - b @08153B74 + b _08153B74 .pool -@08153B70: +_08153B70: ldr r0, =0x02021fc4 ldr r1, =gUnknown_08674B42 -@08153B74: +_08153B74: bl ExpandStringRefs movs r0, 0x2 str r0, [r7, 0x6C] bl sub_80E162C cmp r0, 0x1 - bne @08153B9C + bne _08153B9C ldr r0, =0x0000402d movs r1, 0x1 bl VarSet - b @08153BA0 + b _08153BA0 .pool -@08153B9C: +_08153B9C: movs r0, 0x1 str r0, [r7, 0x6C] -@08153BA0: +_08153BA0: movs r0, 0 pop {r3,r4} mov r8, r3 @@ -629343,30 +629343,30 @@ sub_8153CC8: ; 8153CC8 movs r0, 0xCE lsls r0, 1 cmp r4, r0 - bne @08153D18 + bne _08153D18 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085E8264 movs r2, 0xB bl CopyString_LimitN - b @08153D22 + b _08153D22 .pool -@08153D18: +_08153D18: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085E8268 movs r2, 0xB bl CopyString_LimitN -@08153D22: +_08153D22: ldr r0, =0x020244e9 ldrb r0, [r0] cmp r0, 0x6 - bne @08153D4C + bne _08153D4C ldr r0, =0x02021fc4 ldr r1, =gUnknown_08674C02 bl ExpandStringRefs movs r0, 0x3 - b @08153DB6 + b _08153DB6 .pool -@08153D4C: +_08153D4C: ldr r7, =0x020246e0 adds r0, r7, 0 adds r1, r5, 0 @@ -629379,7 +629379,7 @@ sub_8153CC8: ; 8153CC8 movs r0, 0xCE lsls r0, 1 cmp r4, r0 - beq @08153D86 + beq _08153D86 adds r0, r4, 0 bl SpeciesToNationalPokedexNum adds r4, r0, 0 @@ -629391,7 +629391,7 @@ sub_8153CC8: ; 8153CC8 adds r0, r4, 0 movs r1, 0x3 bl pokedex_flag_operation -@08153D86: +_08153D86: adds r0, r7, 0 movs r1, 0xC bl pokemon_getattr @@ -629400,18 +629400,18 @@ sub_8153CC8: ; 8153CC8 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, =gUnknown_08674BF0 bl ExpandStringRefs movs r0, 0x2 -@08153DB6: +_08153DB6: str r0, [r6, 0x6C] movs r0, 0 add sp, 0x88 @@ -629493,12 +629493,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} @@ -629531,12 +629531,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} @@ -629617,7 +629617,7 @@ SetUpReflection: ; 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 @@ -629625,7 +629625,7 @@ SetUpReflection: ; 8153ED4 movs r0, 0x1 orrs r1, r0 strb r1, [r7, 0x1] -@08153F7A: +_08153F7A: pop {r3} mov r8, r3 pop {r4-r7} @@ -629666,20 +629666,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 @@ -629689,14 +629689,14 @@ npc_pal_op: ; 8153FAC lsrs r1, 4 adds r0, r5, 0 bl npc_pal_op_A - b @08154012 + b _08154012 .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} @@ -629715,35 +629715,35 @@ 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 .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 @@ -629760,13 +629760,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 @@ -629798,13 +629798,13 @@ objc_reflection_maybe: ; 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] @@ -629812,9 +629812,9 @@ objc_reflection_maybe: ; 81540A8 negs r0, r0 ands r0, r1 strb r0, [r2] - b @08154214 + b _08154214 .pool -@081540FC: +_081540FC: ldr r1, =gUnknown_084975C4 ldrb r0, [r5, 0x5] lsrs r0, 4 @@ -629931,15 +629931,15 @@ objc_reflection_maybe: ; 81540A8 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 @@ -629950,12 +629950,12 @@ objc_reflection_maybe: ; 81540A8 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 @@ -629978,7 +629978,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 @@ -629997,7 +629997,7 @@ sub_8154228: ; 8154228 orrs r0, r2 orrs r0, r3 strb r0, [r1] -@08154266: +_08154266: adds r0, r4, 0 pop {r4} pop {r1} @@ -630049,20 +630049,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 @@ -630099,7 +630099,7 @@ sub_8154298: ; 8154298 lsrs r1, 24 adds r0, r2, 0 bl StartObjectImageAnim -@0815432E: +_0815432E: add sp, 0x4 pop {r3} mov r8, r3 @@ -630144,7 +630144,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 @@ -630174,7 +630174,7 @@ oei_shadow: ; 8154340 ldrh r0, [r0] subs r1, r0 strh r1, [r2, 0x34] -@081543C4: +_081543C4: movs r0, 0 pop {r4,r5} pop {r1} @@ -630200,12 +630200,12 @@ oamc_shadow: ; 81543E4 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - beq @08154412 + beq _08154412 adds r0, r5, 0 movs r1, 0x3 bl FieldEffectStop - b @08154498 -@08154412: + b _08154498 +_08154412: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -630238,37 +630238,37 @@ oamc_shadow: ; 81543E4 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 MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, 24 cmp r0, 0 - bne @08154490 + bne _08154490 ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsSurfableWaterOrUnderwater lsls r0, 24 cmp r0, 0 - bne @08154490 + bne _08154490 ldrb r0, [r4, 0x1E] bl MetatileBehavior_IsReflective lsls r0, 24 cmp r0, 0 - bne @08154490 + bne _08154490 ldrb r0, [r4, 0x1F] bl MetatileBehavior_IsReflective lsls r0, 24 cmp r0, 0 - beq @08154498 -@08154490: + beq _08154498 +_08154490: adds r0, r5, 0 movs r1, 0x3 bl FieldEffectStop -@08154498: +_08154498: add sp, 0x4 pop {r4,r5} pop {r0} @@ -630305,7 +630305,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 @@ -630341,11 +630341,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 SeekObjectImageAnim -@08154538: +_08154538: movs r0, 0 add sp, 0x4 pop {r4,r5} @@ -630370,18 +630370,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 @@ -630395,7 +630395,7 @@ unc_grass_normal: ; 8154550 ldrb r0, [r2, 0x4] orrs r0, r1 strh r0, [r5, 0x38] -@0815459C: +_0815459C: ldrh r0, [r5, 0x34] lsrs r1, r0, 8 mov r8, r1 @@ -630418,30 +630418,30 @@ unc_grass_normal: ; 8154550 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @081545F0 + bne _081545F0 adds r0, r6, 0 bl MetatileBehavior_IsTallGrass 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 FieldEffectStop - b @08154648 + b _08154648 .pool -@08154604: +_08154604: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -630452,21 +630452,21 @@ unc_grass_normal: ; 8154550 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 @@ -630476,7 +630476,7 @@ unc_grass_normal: ; 8154550 adds r0, r5, 0 adds r2, r6, 0 bl sub_81561FC -@08154648: +_08154648: add sp, 0x4 pop {r3} mov r8, r3 @@ -630506,7 +630506,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 @@ -630532,7 +630532,7 @@ sub_8154658: ; 8154658 strh r0, [r2, 0x2E] movs r0, 0xC strh r0, [r2, 0x30] -@081546B4: +_081546B4: movs r0, 0 pop {r4} pop {r1} @@ -630560,7 +630560,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 @@ -630571,42 +630571,42 @@ sub_81546C8: ; 81546C8 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - beq @08154740 + beq _08154740 ldr r1, [r2, 0x1C] ldr r0, =unc_grass_normal 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 .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} @@ -630643,7 +630643,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 @@ -630680,11 +630680,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 SeekObjectImageAnim -@081547E8: +_081547E8: movs r0, 0 add sp, 0x4 pop {r4,r5} @@ -630709,18 +630709,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 @@ -630734,7 +630734,7 @@ unc_grass_tall: ; 8154800 ldrb r0, [r2, 0x4] orrs r0, r1 strh r0, [r5, 0x38] -@0815484C: +_0815484C: ldrh r0, [r5, 0x34] lsrs r1, r0, 8 mov r8, r1 @@ -630757,30 +630757,30 @@ unc_grass_tall: ; 8154800 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @081548A0 + bne _081548A0 adds r0, r4, 0 bl MetatileBehavior_IsLongGrass 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 FieldEffectStop - b @081548EA + b _081548EA .pool -@081548B4: +_081548B4: mov r0, sp ldrb r1, [r0] lsls r0, r1, 3 @@ -630791,13 +630791,13 @@ unc_grass_tall: ; 8154800 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 @@ -630807,7 +630807,7 @@ unc_grass_tall: ; 8154800 adds r0, r5, 0 movs r2, 0 bl sub_81561FC -@081548EA: +_081548EA: add sp, 0x4 pop {r3} mov r8, r3 @@ -630837,7 +630837,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 @@ -630863,7 +630863,7 @@ sub_81548FC: ; 81548FC strh r0, [r2, 0x2E] movs r0, 0x12 strh r0, [r2, 0x30] -@08154958: +_08154958: movs r0, 0 pop {r4} pop {r1} @@ -630895,7 +630895,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 @@ -630941,7 +630941,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} @@ -630969,7 +630969,7 @@ sub_8154A10: ; 8154A10 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08154A4E + bne _08154A4E ldr r5, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -630980,14 +630980,14 @@ 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 FieldEffectStop - b @08154AF2 + b _08154AF2 .pool -@08154A5C: +_08154A5C: ldrb r0, [r1, 0x5] bl GetFieldObjectGraphicsInfo mov r8, r0 @@ -631010,14 +631010,14 @@ sub_8154A10: ; 8154A10 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 @@ -631026,11 +631026,11 @@ sub_8154A10: ; 8154A10 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @08154AB2 + beq _08154AB2 adds r0, r4, 0 movs r1, 0 bl StartObjectImageAnim -@08154AB2: +_08154AB2: strh r7, [r4, 0x20] strh r5, [r4, 0x22] mov r1, r8 @@ -631062,7 +631062,7 @@ sub_8154A10: ; 8154A10 lsrs r1, 31 adds r0, r4, 0 bl sub_80979D4 -@08154AF2: +_08154AF2: add sp, 0x4 pop {r3} mov r8, r3 @@ -631092,7 +631092,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 @@ -631118,7 +631118,7 @@ sub_8154B04: ; 8154B04 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] bl StartObjectImageAnim -@08154B62: +_08154B62: movs r0, 0 pop {r4} pop {r1} @@ -631147,7 +631147,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 @@ -631173,7 +631173,7 @@ sub_8154B78: ; 8154B78 strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] bl StartObjectImageAnim -@08154BD8: +_08154BD8: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -631202,7 +631202,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 @@ -631228,7 +631228,7 @@ sub_8154BEC: ; 8154BEC strh r1, [r0, 0x3C] ldrb r1, [r4, 0x10] bl StartObjectImageAnim -@08154C4C: +_08154C4C: adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -631261,10 +631261,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 @@ -631300,13 +631300,13 @@ 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 FieldEffectStop -@08154CE4: +_08154CE4: pop {r4} pop {r0} bx r0 @@ -631336,7 +631336,7 @@ sub_8154CEC: ; 8154CEC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - beq @08154D76 + beq _08154D76 ldrb r0, [r5, 0x5] bl GetFieldObjectGraphicsInfo lsls r3, r4, 4 @@ -631379,7 +631379,7 @@ sub_8154CEC: ; 8154CEC strh r0, [r3, 0x26] movs r0, 0x46 bl audio_play -@08154D76: +_08154D76: movs r0, 0 pop {r4-r6} pop {r1} @@ -631397,7 +631397,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 @@ -631411,13 +631411,13 @@ sub_8154D90: ; 8154D90 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - beq @08154DCA -@08154DC0: + beq _08154DCA +_08154DC0: adds r0, r4, 0 movs r1, 0xF bl FieldEffectStop - b @08154E0A -@08154DCA: + b _08154E0A +_08154DCA: ldr r3, =0x02020630 ldr r2, =0x02037350 mov r0, sp @@ -631449,7 +631449,7 @@ sub_8154D90: ; 8154D90 adds r0, r4, 0 movs r1, 0 bl sub_80979D4 -@08154E0A: +_08154E0A: add sp, 0x4 pop {r4} pop {r0} @@ -631477,7 +631477,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 @@ -631503,7 +631503,7 @@ sub_8154E1C: ; 8154E1C strh r0, [r2, 0x2E] movs r0, 0x10 strh r0, [r2, 0x30] -@08154E78: +_08154E78: movs r0, 0 pop {r4} pop {r1} @@ -631531,7 +631531,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 @@ -631557,7 +631557,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} @@ -631589,7 +631589,7 @@ sub_8154EFC: ; 8154EFC lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x40 - beq @08154F92 + beq _08154F92 ldrb r0, [r6, 0x5] bl GetFieldObjectGraphicsInfo adds r4, r0, 0 @@ -631638,7 +631638,7 @@ sub_8154EFC: ; 8154EFC strh r1, [r0, 0x26] movs r1, 0x1 bl StartObjectImageAnim -@08154F92: +_08154F92: movs r0, 0 pop {r4-r7} pop {r1} @@ -631664,7 +631664,7 @@ sub_8154FB4: ; 8154FB4 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08154FEE + bne _08154FEE ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -631675,14 +631675,14 @@ 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 FieldEffectStop - b @08155046 + b _08155046 .pool -@08154FFC: +_08154FFC: ldrb r1, [r5, 0x4] lsls r0, r1, 4 adds r0, r1 @@ -631704,7 +631704,7 @@ sub_8154FB4: ; 8154FB4 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] @@ -631715,10 +631715,10 @@ sub_8154FB4: ; 8154FB4 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} @@ -631741,7 +631741,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 @@ -631765,7 +631765,7 @@ oei_ripples: ; 8155054 strb r0, [r2, 0x5] movs r0, 0x5 strh r0, [r2, 0x2E] -@081550A0: +_081550A0: movs r0, 0 pop {r4} pop {r1} @@ -631797,7 +631797,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 @@ -631843,7 +631843,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} @@ -631869,7 +631869,7 @@ sub_8155158: ; 8155158 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @08155192 + bne _08155192 ldr r5, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -631880,14 +631880,14 @@ 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 FieldEffectStop - b @081551E4 + b _081551E4 .pool -@081551A0: +_081551A0: ldrb r0, [r1, 0x5] bl GetFieldObjectGraphicsInfo mov r1, sp @@ -631920,7 +631920,7 @@ sub_8155158: ; 8155158 adds r0, r4, 0 movs r1, 0 bl sub_80979D4 -@081551E4: +_081551E4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -631948,7 +631948,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 @@ -631972,7 +631972,7 @@ sub_81551F0: ; 81551F0 strb r0, [r2, 0x5] movs r0, 0x13 strh r0, [r2, 0x2E] -@08155248: +_08155248: movs r0, 0 pop {r4} pop {r1} @@ -632000,7 +632000,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 @@ -632024,7 +632024,7 @@ sub_815525C: ; 815525C strb r0, [r2, 0x5] movs r0, 0x14 strh r0, [r2, 0x2E] -@081552B4: +_081552B4: movs r0, 0 pop {r4} pop {r1} @@ -632052,7 +632052,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 @@ -632076,7 +632076,7 @@ sub_81552C8: ; 81552C8 strb r0, [r2, 0x5] movs r0, 0x15 strh r0, [r2, 0x2E] -@08155320: +_08155320: movs r0, 0 pop {r4} pop {r1} @@ -632104,7 +632104,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 @@ -632128,7 +632128,7 @@ sub_8155334: ; 8155334 strb r0, [r2, 0x5] movs r0, 0x16 strh r0, [r2, 0x2E] -@0815538C: +_0815538C: movs r0, 0 pop {r4} pop {r1} @@ -632193,7 +632193,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 @@ -632223,7 +632223,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} @@ -632267,10 +632267,10 @@ 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 @@ -632334,11 +632334,11 @@ sub_815550C: ; 815550C movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @0815552C + beq _0815552C adds r0, r4, 0 movs r1, 0x7 bl FieldEffectStop -@0815552C: +_0815552C: pop {r4} pop {r0} bx r0 @@ -632365,7 +632365,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 @@ -632389,7 +632389,7 @@ sub_8155534: ; 8155534 negs r0, r0 strh r0, [r1, 0x3A] strh r0, [r1, 0x3C] -@0815558E: +_0815558E: movs r0, 0x8 bl FieldEffectActiveListRemove adds r0, r5, 0 @@ -632557,14 +632557,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 StartObjectImageAnimIfDifferent -@081556DC: +_081556DC: add sp, 0xC pop {r4,r5} pop {r0} @@ -632590,21 +632590,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 @@ -632614,7 +632614,7 @@ sub_81556E8: ; 81556E8 movs r5, 0x1 mov r7, r8 mov r6, sp -@08155736: +_08155736: adds r0, r5, 0 mov r1, sp adds r2, r7, 0 @@ -632627,12 +632627,12 @@ sub_81556E8: ; 81556E8 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 @@ -632642,8 +632642,8 @@ sub_81556E8: ; 81556E8 mov r1, r8 strh r0, [r1] cmp r5, 0x4 - bls @08155736 -@08155770: + bls _08155736 +_08155770: add sp, 0x4 pop {r3} mov r8, r3 @@ -632668,7 +632668,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] @@ -632679,43 +632679,43 @@ 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 .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} @@ -632776,21 +632776,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 .pool @@ -632816,7 +632816,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 @@ -632842,7 +632842,7 @@ sub_8155890: ; 8155890 strh r0, [r2, 0x2E] movs r0, 0xA strh r0, [r2, 0x30] -@081558EC: +_081558EC: movs r0, 0 pop {r4} pop {r1} @@ -632874,7 +632874,7 @@ sub_8155900: ; 8155900 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x40 - beq @081559A4 + beq _081559A4 ldrb r0, [r6, 0x5] bl GetFieldObjectGraphicsInfo adds r5, r0, 0 @@ -632930,7 +632930,7 @@ sub_8155900: ; 8155900 strh r1, [r0, 0x26] movs r1, 0x2 bl SeekObjectImageAnim -@081559A4: +_081559A4: movs r0, 0 pop {r4-r7} pop {r1} @@ -632956,7 +632956,7 @@ sub_81559BC: ; 81559BC bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - bne @081559F6 + bne _081559F6 ldr r2, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -632967,14 +632967,14 @@ 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 FieldEffectStop - b @08155A76 + b _08155A76 .pool -@08155A04: +_08155A04: ldr r2, =0x02020630 ldrb r1, [r1, 0x4] lsls r0, r1, 4 @@ -632988,14 +632988,14 @@ sub_81559BC: ; 81559BC 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 @@ -633004,11 +633004,11 @@ sub_81559BC: ; 81559BC movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @08155A46 + beq _08155A46 adds r0, r4, 0 movs r1, 0 bl StartObjectImageAnim -@08155A46: +_08155A46: strh r6, [r4, 0x20] strh r5, [r4, 0x22] ldr r3, =0x02020630 @@ -633032,7 +633032,7 @@ sub_81559BC: ; 81559BC adds r0, r4, 0 movs r1, 0 bl sub_80979D4 -@08155A76: +_08155A76: add sp, 0x4 pop {r4-r6} pop {r0} @@ -633061,7 +633061,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 @@ -633080,7 +633080,7 @@ sub_8155A88: ; 8155A88 movs r2, 0x4 orrs r0, r2 strb r0, [r1, 0x5] -@08155AD8: +_08155AD8: movs r0, 0 pop {r4} pop {r1} @@ -633110,11 +633110,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 FieldEffectStop -@08155B20: +_08155B20: pop {r4} pop {r0} bx r0 @@ -633141,7 +633141,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 @@ -633169,7 +633169,7 @@ sub_8155B2C: ; 8155B2C strb r0, [r2, 0x5] movs r0, 0x17 strh r0, [r2, 0x2E] -@08155B8C: +_08155B8C: movs r0, 0 pop {r4} pop {r1} @@ -633235,13 +633235,13 @@ ShowDisguiseFieldEffect: ; 8155BD0 bl TryGetFieldObjectIdByLocalIdAndMap lsls r0, 24 cmp r0, 0 - beq @08155C08 + beq _08155C08 adds r0, r4, 0 bl FieldEffectActiveListRemove movs r0, 0x40 - b @08155C74 + b _08155C74 .pool -@08155C08: +_08155C08: ldr r1, =gFieldEffectObjectTemplatePointers lsls r0, r6, 2 adds r0, r1 @@ -633255,7 +633255,7 @@ ShowDisguiseFieldEffect: ; 8155BD0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @08155C70 + beq _08155C70 mov r0, sp ldrb r0, [r0] lsls r2, r0, 4 @@ -633293,10 +633293,10 @@ ShowDisguiseFieldEffect: ; 8155BD0 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 @@ -633324,13 +633324,13 @@ sub_8155C88: ; 8155C88 bl TryGetFieldObjectIdByLocalIdAndMap 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 FieldEffectStop -@08155CB8: +_08155CB8: ldr r4, =0x02037350 mov r0, sp ldrb r1, [r0] @@ -633387,38 +633387,38 @@ sub_8155C88: ; 8155C88 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 StartObjectImageAnim -@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 FieldEffectStop -@08155D68: +_08155D68: add sp, 0x4 pop {r4,r5} pop {r0} @@ -633433,7 +633433,7 @@ sub_8155D78: ; 8155D78 adds r0, 0x21 ldrb r0, [r0] cmp r0, 0x1 - bne @08155D96 + bne _08155D96 ldr r2, =0x02020630 ldrb r1, [r1, 0x1A] lsls r0, r1, 4 @@ -633443,7 +633443,7 @@ sub_8155D78: ; 8155D78 ldrh r1, [r0, 0x2E] adds r1, 0x1 strh r1, [r0, 0x2E] -@08155D96: +_08155D96: pop {r0} bx r0 .pool @@ -633456,9 +633456,9 @@ sub_8155DA0: ; 8155DA0 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 @@ -633468,19 +633468,19 @@ sub_8155DA0: ; 8155DA0 movs r3, 0x3C ldrsh r0, [r1, r3] cmp r0, 0 - bne @08155DCC + bne _08155DCC movs r0, 0 - b @08155DD8 + b _08155DD8 .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 @@ -633512,7 +633512,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 @@ -633533,7 +633533,7 @@ sub_8155DDC: ; 8155DDC movs r2, 0x2 orrs r0, r2 strb r0, [r1] -@08155E3C: +_08155E3C: movs r0, 0 pop {r4} pop {r1} @@ -633548,14 +633548,14 @@ sub_8155E50: ; 8155E50 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] @@ -633565,23 +633565,23 @@ 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 FieldEffectStop -@08155E9A: +_08155E9A: pop {r0} bx r0 thumb_func_end sub_8155E50 @@ -633602,19 +633602,19 @@ sub_8155EA8: ; 8155EA8 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 @@ -633623,8 +633623,8 @@ sub_8155EA8: ; 8155EA8 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 @@ -633642,8 +633642,8 @@ sub_8155EA8: ; 8155EA8 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 @@ -633652,8 +633652,8 @@ sub_8155EA8: ; 8155EA8 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 @@ -633668,13 +633668,13 @@ sub_8155EA8: ; 8155EA8 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 @@ -633688,20 +633688,20 @@ sub_8155EA8: ; 8155EA8 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} @@ -633715,27 +633715,27 @@ sub_8155F80: ; 8155F80 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 .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 @@ -633749,20 +633749,20 @@ sub_8155F80: ; 8155F80 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 @@ -633774,24 +633774,24 @@ sub_8155F80: ; 8155F80 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 .pool -@08156034: +_08156034: ldr r4, =gUnknown_08329F40 movs r3, 0x2E ldrsh r0, [r5, r3] @@ -633810,83 +633810,83 @@ sub_8155F80: ; 8155F80 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 .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] @@ -633895,35 +633895,35 @@ sub_8155F80: ; 8155F80 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 @@ -633932,44 +633932,44 @@ sub_8155F80: ; 8155F80 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 SetGpuReg adds r0, r5, 0 movs r1, 0x40 bl FieldEffectStop -@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] @@ -633988,14 +633988,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 FieldEffectStop - b @081561C8 -@081561B2: + b _081561C8 +_081561B2: adds r0, r4, 0 movs r1, 0 bl sub_80979D4 @@ -634005,7 +634005,7 @@ sub_8156194: ; 8156194 adds r1, r4, 0 movs r2, 0 bl SetObjectSubpriorityByZCoord -@081561C8: +_081561C8: pop {r4} pop {r0} bx r0 @@ -634020,18 +634020,18 @@ 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 FieldEffectStop - 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 @@ -634048,7 +634048,7 @@ sub_81561FC: ; 81561FC adds r1, r6, 0 bl SetObjectSubpriorityByZCoord movs r7, 0 -@08156212: +_08156212: lsls r0, r7, 3 adds r0, r7 lsls r0, 2 @@ -634057,7 +634057,7 @@ sub_81561FC: ; 81561FC ldrb r0, [r4] lsls r0, 31 cmp r0, 0 - beq @081562B4 + beq _081562B4 ldrb r0, [r4, 0x5] bl GetFieldObjectGraphicsInfo ldrb r1, [r4, 0x4] @@ -634080,11 +634080,11 @@ sub_81561FC: ; 81561FC 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 @@ -634106,14 +634106,14 @@ sub_81561FC: ; 81561FC 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 @@ -634121,18 +634121,18 @@ sub_81561FC: ; 81561FC ldrb r1, [r0] ldrb r0, [r2] cmp r0, r1 - bhi @081562B4 + bhi _081562B4 adds r0, r1, 0x2 strb r0, [r2] - b @081562BE + b _081562BE .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 @@ -634152,7 +634152,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 @@ -634160,7 +634160,7 @@ sub_81562C4: ; 81562C4 strb r3, [r0] adds r1, 0x1 cmp r1, 0x3 - ble @081562DE + ble _081562DE ldr r0, [r2] ldr r0, [r0, 0xC] adds r0, 0x41 @@ -634195,20 +634195,20 @@ sub_8156324: ; 8156324 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] @@ -634224,10 +634224,10 @@ sub_8156324: ; 8156324 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 @@ -634240,22 +634240,22 @@ sub_8156324: ; 8156324 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} @@ -634274,21 +634274,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, =gUnknown_082DE350 ldrb r0, [r2, 0x10] lsls r0, 2 @@ -634306,23 +634306,23 @@ sub_81563B0: ; 81563B0 ldrh r1, [r1] adds r0, r1, 0 cmp r0, 0 - bne @08156418 + bne _08156418 strh r0, [r2, 0x2] - b @0815641A + b _0815641A .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, =gUnknown_085CDD00 ldr r0, [r6] ldrb r0, [r0] @@ -634330,9 +634330,9 @@ sub_81563B0: ; 81563B0 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - b @08156458 + b _08156458 .pool -@08156444: +_08156444: adds r0, r2, 0x5 ldrb r2, [r2, 0x4] adds r0, r2 @@ -634343,7 +634343,7 @@ sub_81563B0: ; 81563B0 movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x9] -@08156458: +_08156458: ldr r2, =0x02039f34 ldr r0, [r2] ldr r3, [r0, 0xC] @@ -634352,7 +634352,7 @@ sub_81563B0: ; 81563B0 ands r0, r1 adds r4, r2, 0 cmp r0, 0 - beq @08156496 + beq _08156496 ldrb r0, [r3, 0x4] adds r0, 0x1 movs r2, 0 @@ -634361,28 +634361,28 @@ sub_81563B0: ; 81563B0 ldr r1, [r0, 0xC] ldrb r0, [r1, 0x4] cmp r0, 0x3 - bhi @08156484 + bhi _08156484 strb r2, [r1] - b @0815648A + b _0815648A .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} @@ -634399,20 +634399,20 @@ sub_81564AC: ; 81564AC ldr r3, =0x02039f34 ldr r0, [r3] ldr r0, [r0, 0x8] - b @081564CC + b _081564CC .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} @@ -634439,15 +634439,15 @@ sub_81564DC: ; 81564DC lsrs r4, r0, 16 asrs r0, 16 cmp r0, 0xFF - ble @08156510 + ble _08156510 movs r4, 0xFF - b @08156516 + b _08156516 .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 @@ -634491,7 +634491,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 @@ -634503,12 +634503,12 @@ sub_8156550: ; 8156550 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156590 + b _08156590 .pool -@0815658C: +_0815658C: adds r0, r2, 0x5 str r0, [r3] -@08156590: +_08156590: pop {r0} bx r0 thumb_func_end sub_8156550 @@ -634526,7 +634526,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 @@ -634538,12 +634538,12 @@ sub_8156594: ; 8156594 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081565D4 + b _081565D4 .pool -@081565D0: +_081565D0: adds r0, r2, 0x5 str r0, [r3] -@081565D4: +_081565D4: pop {r0} bx r0 thumb_func_end sub_8156594 @@ -634561,7 +634561,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 @@ -634573,12 +634573,12 @@ sub_81565D8: ; 81565D8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156618 + b _08156618 .pool -@08156614: +_08156614: adds r0, r2, 0x5 str r0, [r3] -@08156618: +_08156618: pop {r0} bx r0 thumb_func_end sub_81565D8 @@ -634596,7 +634596,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 @@ -634608,12 +634608,12 @@ sub_815661C: ; 815661C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815665C + b _0815665C .pool -@08156658: +_08156658: adds r0, r2, 0x5 str r0, [r3] -@0815665C: +_0815665C: pop {r0} bx r0 thumb_func_end sub_815661C @@ -634649,7 +634649,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 @@ -634661,12 +634661,12 @@ sub_8156684: ; 8156684 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081566C4 + b _081566C4 .pool -@081566C0: +_081566C0: adds r0, r2, 0x5 str r0, [r3] -@081566C4: +_081566C4: pop {r0} bx r0 thumb_func_end sub_8156684 @@ -634684,7 +634684,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 @@ -634696,12 +634696,12 @@ sub_81566C8: ; 81566C8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156708 + b _08156708 .pool -@08156704: +_08156704: adds r0, r2, 0x5 str r0, [r3] -@08156708: +_08156708: pop {r0} bx r0 thumb_func_end sub_81566C8 @@ -634719,7 +634719,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 @@ -634731,12 +634731,12 @@ sub_815670C: ; 815670C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815674C + b _0815674C .pool -@08156748: +_08156748: adds r0, r2, 0x5 str r0, [r3] -@0815674C: +_0815674C: pop {r0} bx r0 thumb_func_end sub_815670C @@ -634754,7 +634754,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 @@ -634766,12 +634766,12 @@ sub_8156750: ; 8156750 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156790 + b _08156790 .pool -@0815678C: +_0815678C: adds r0, r2, 0x5 str r0, [r3] -@08156790: +_08156790: pop {r0} bx r0 thumb_func_end sub_8156750 @@ -634809,7 +634809,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 @@ -634821,12 +634821,12 @@ sub_81567BC: ; 81567BC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081567FC + b _081567FC .pool -@081567F8: +_081567F8: adds r0, r2, 0x5 str r0, [r3] -@081567FC: +_081567FC: pop {r0} bx r0 thumb_func_end sub_81567BC @@ -634844,7 +634844,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 @@ -634856,12 +634856,12 @@ sub_8156800: ; 8156800 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156840 + b _08156840 .pool -@0815683C: +_0815683C: adds r0, r2, 0x5 str r0, [r3] -@08156840: +_08156840: pop {r0} bx r0 thumb_func_end sub_8156800 @@ -634879,7 +634879,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 @@ -634891,12 +634891,12 @@ sub_8156844: ; 8156844 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156884 + b _08156884 .pool -@08156880: +_08156880: adds r0, r2, 0x5 str r0, [r3] -@08156884: +_08156884: pop {r0} bx r0 thumb_func_end sub_8156844 @@ -634914,7 +634914,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 @@ -634926,12 +634926,12 @@ sub_8156888: ; 8156888 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081568C8 + b _081568C8 .pool -@081568C4: +_081568C4: adds r0, r2, 0x5 str r0, [r3] -@081568C8: +_081568C8: pop {r0} bx r0 thumb_func_end sub_8156888 @@ -634981,7 +634981,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 @@ -634993,12 +634993,12 @@ sub_815690C: ; 815690C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815694C + b _0815694C .pool -@08156948: +_08156948: adds r0, r2, 0x5 str r0, [r3] -@0815694C: +_0815694C: pop {r0} bx r0 thumb_func_end sub_815690C @@ -635016,7 +635016,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 @@ -635028,12 +635028,12 @@ sub_8156950: ; 8156950 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156990 + b _08156990 .pool -@0815698C: +_0815698C: adds r0, r2, 0x5 str r0, [r3] -@08156990: +_08156990: pop {r0} bx r0 thumb_func_end sub_8156950 @@ -635051,7 +635051,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 @@ -635063,12 +635063,12 @@ sub_8156994: ; 8156994 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081569D4 + b _081569D4 .pool -@081569D0: +_081569D0: adds r0, r2, 0x5 str r0, [r3] -@081569D4: +_081569D4: pop {r0} bx r0 thumb_func_end sub_8156994 @@ -635086,7 +635086,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 @@ -635098,12 +635098,12 @@ sub_81569D8: ; 81569D8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156A18 + b _08156A18 .pool -@08156A14: +_08156A14: adds r0, r2, 0x5 str r0, [r3] -@08156A18: +_08156A18: pop {r0} bx r0 thumb_func_end sub_81569D8 @@ -635149,7 +635149,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 @@ -635161,12 +635161,12 @@ sub_8156A48: ; 8156A48 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156A90 + b _08156A90 .pool -@08156A8C: +_08156A8C: adds r0, r3, 0x6 str r0, [r4] -@08156A90: +_08156A90: pop {r4,r5} pop {r0} bx r0 @@ -635190,7 +635190,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 @@ -635202,12 +635202,12 @@ sub_8156A98: ; 8156A98 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156AE0 + b _08156AE0 .pool -@08156ADC: +_08156ADC: adds r0, r3, 0x6 str r0, [r4] -@08156AE0: +_08156AE0: pop {r4,r5} pop {r0} bx r0 @@ -635231,7 +635231,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 @@ -635243,12 +635243,12 @@ sub_8156AE8: ; 8156AE8 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156B30 + b _08156B30 .pool -@08156B2C: +_08156B2C: adds r0, r3, 0x6 str r0, [r4] -@08156B30: +_08156B30: pop {r4,r5} pop {r0} bx r0 @@ -635272,7 +635272,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 @@ -635284,12 +635284,12 @@ sub_8156B38: ; 8156B38 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156B80 + b _08156B80 .pool -@08156B7C: +_08156B7C: adds r0, r3, 0x6 str r0, [r4] -@08156B80: +_08156B80: pop {r4,r5} pop {r0} bx r0 @@ -635334,7 +635334,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 @@ -635346,12 +635346,12 @@ sub_8156BB4: ; 8156BB4 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156BFC + b _08156BFC .pool -@08156BF8: +_08156BF8: adds r0, r3, 0x6 str r0, [r4] -@08156BFC: +_08156BFC: pop {r4,r5} pop {r0} bx r0 @@ -635375,7 +635375,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 @@ -635387,12 +635387,12 @@ sub_8156C04: ; 8156C04 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156C4C + b _08156C4C .pool -@08156C48: +_08156C48: adds r0, r3, 0x6 str r0, [r4] -@08156C4C: +_08156C4C: pop {r4,r5} pop {r0} bx r0 @@ -635416,7 +635416,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 @@ -635428,12 +635428,12 @@ sub_8156C54: ; 8156C54 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156C9C + b _08156C9C .pool -@08156C98: +_08156C98: adds r0, r3, 0x6 str r0, [r4] -@08156C9C: +_08156C9C: pop {r4,r5} pop {r0} bx r0 @@ -635457,7 +635457,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 @@ -635469,12 +635469,12 @@ sub_8156CA4: ; 8156CA4 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08156CEC + b _08156CEC .pool -@08156CE8: +_08156CE8: adds r0, r3, 0x6 str r0, [r4] -@08156CEC: +_08156CEC: pop {r4,r5} pop {r0} bx r0 @@ -635509,7 +635509,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 @@ -635521,12 +635521,12 @@ sub_8156D18: ; 8156D18 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156D58 + b _08156D58 .pool -@08156D54: +_08156D54: adds r0, r2, 0x5 str r0, [r3] -@08156D58: +_08156D58: pop {r0} bx r0 thumb_func_end sub_8156D18 @@ -635544,7 +635544,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 @@ -635556,12 +635556,12 @@ sub_8156D5C: ; 8156D5C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156D9C + b _08156D9C .pool -@08156D98: +_08156D98: adds r0, r2, 0x5 str r0, [r3] -@08156D9C: +_08156D9C: pop {r0} bx r0 thumb_func_end sub_8156D5C @@ -635612,7 +635612,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 @@ -635624,12 +635624,12 @@ sub_8156DE4: ; 8156DE4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156E24 + b _08156E24 .pool -@08156E20: +_08156E20: adds r0, r2, 0x5 str r0, [r3] -@08156E24: +_08156E24: pop {r4} pop {r0} bx r0 @@ -635649,7 +635649,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 @@ -635661,12 +635661,12 @@ sub_8156E2C: ; 8156E2C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156E6C + b _08156E6C .pool -@08156E68: +_08156E68: adds r0, r2, 0x5 str r0, [r3] -@08156E6C: +_08156E6C: pop {r4} pop {r0} bx r0 @@ -635686,7 +635686,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 @@ -635698,12 +635698,12 @@ sub_8156E74: ; 8156E74 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156EB4 + b _08156EB4 .pool -@08156EB0: +_08156EB0: adds r0, r2, 0x5 str r0, [r3] -@08156EB4: +_08156EB4: pop {r4} pop {r0} bx r0 @@ -635723,7 +635723,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 @@ -635735,12 +635735,12 @@ sub_8156EBC: ; 8156EBC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156EFC + b _08156EFC .pool -@08156EF8: +_08156EF8: adds r0, r2, 0x5 str r0, [r3] -@08156EFC: +_08156EFC: pop {r4} pop {r0} bx r0 @@ -635788,7 +635788,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 @@ -635800,12 +635800,12 @@ sub_8156F44: ; 8156F44 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156F84 + b _08156F84 .pool -@08156F80: +_08156F80: adds r0, r2, 0x5 str r0, [r3] -@08156F84: +_08156F84: pop {r0} bx r0 thumb_func_end sub_8156F44 @@ -635823,7 +635823,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 @@ -635835,12 +635835,12 @@ sub_8156F88: ; 8156F88 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08156FC8 + b _08156FC8 .pool -@08156FC4: +_08156FC4: adds r0, r2, 0x5 str r0, [r3] -@08156FC8: +_08156FC8: pop {r0} bx r0 thumb_func_end sub_8156F88 @@ -635891,7 +635891,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 @@ -635903,12 +635903,12 @@ sub_8157018: ; 8157018 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157058 + b _08157058 .pool -@08157054: +_08157054: adds r0, r2, 0x5 str r0, [r3] -@08157058: +_08157058: pop {r0} bx r0 thumb_func_end sub_8157018 @@ -635926,7 +635926,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 @@ -635938,12 +635938,12 @@ sub_815705C: ; 815705C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815709C + b _0815709C .pool -@08157098: +_08157098: adds r0, r2, 0x5 str r0, [r3] -@0815709C: +_0815709C: pop {r0} bx r0 thumb_func_end sub_815705C @@ -635976,10 +635976,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] @@ -635987,25 +635987,25 @@ sub_81570A0: ; 81570A0 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 .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] @@ -636026,7 +636026,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] @@ -636040,14 +636040,14 @@ sub_815712C: ; 815712C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815716C + b _0815716C .pool -@08157164: +_08157164: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@0815716C: +_0815716C: pop {r0} bx r0 .pool @@ -636081,10 +636081,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] @@ -636092,25 +636092,25 @@ sub_8157174: ; 8157174 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 .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] @@ -636131,7 +636131,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] @@ -636145,14 +636145,14 @@ sub_8157200: ; 8157200 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157240 + b _08157240 .pool -@08157238: +_08157238: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x5 str r0, [r1] -@08157240: +_08157240: pop {r0} bx r0 .pool @@ -636211,7 +636211,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 @@ -636223,12 +636223,12 @@ sub_81572A4: ; 81572A4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081572E4 + b _081572E4 .pool -@081572E0: +_081572E0: adds r0, r2, 0x5 str r0, [r3] -@081572E4: +_081572E4: pop {r0} bx r0 thumb_func_end sub_81572A4 @@ -636246,7 +636246,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 @@ -636258,12 +636258,12 @@ sub_81572E8: ; 81572E8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157328 + b _08157328 .pool -@08157324: +_08157324: adds r0, r2, 0x5 str r0, [r3] -@08157328: +_08157328: pop {r0} bx r0 thumb_func_end sub_81572E8 @@ -636281,7 +636281,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 @@ -636293,12 +636293,12 @@ sub_815732C: ; 815732C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815736C + b _0815736C .pool -@08157368: +_08157368: adds r0, r2, 0x5 str r0, [r3] -@0815736C: +_0815736C: pop {r0} bx r0 thumb_func_end sub_815732C @@ -636316,7 +636316,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 @@ -636328,12 +636328,12 @@ sub_8157370: ; 8157370 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081573B0 + b _081573B0 .pool -@081573AC: +_081573AC: adds r0, r2, 0x5 str r0, [r3] -@081573B0: +_081573B0: pop {r0} bx r0 thumb_func_end sub_8157370 @@ -636391,7 +636391,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 @@ -636403,12 +636403,12 @@ sub_8157410: ; 8157410 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157450 + b _08157450 .pool -@0815744C: +_0815744C: adds r0, r2, 0x5 str r0, [r3] -@08157450: +_08157450: pop {r0} bx r0 thumb_func_end sub_8157410 @@ -636426,7 +636426,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 @@ -636438,12 +636438,12 @@ sub_8157454: ; 8157454 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157494 + b _08157494 .pool -@08157490: +_08157490: adds r0, r2, 0x5 str r0, [r3] -@08157494: +_08157494: pop {r0} bx r0 thumb_func_end sub_8157454 @@ -636461,7 +636461,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 @@ -636473,12 +636473,12 @@ sub_8157498: ; 8157498 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081574D8 + b _081574D8 .pool -@081574D4: +_081574D4: adds r0, r2, 0x5 str r0, [r3] -@081574D8: +_081574D8: pop {r0} bx r0 thumb_func_end sub_8157498 @@ -636496,7 +636496,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 @@ -636508,12 +636508,12 @@ sub_81574DC: ; 81574DC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815751C + b _0815751C .pool -@08157518: +_08157518: adds r0, r2, 0x5 str r0, [r3] -@0815751C: +_0815751C: pop {r0} bx r0 thumb_func_end sub_81574DC @@ -636541,16 +636541,16 @@ sub_8157520: ; 8157520 adds r0, r1 ldrh r1, [r0, 0x8] cmp r3, r1 - beq @08157558 + beq _08157558 movs r1, 0 - b @08157560 + b _08157560 .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] @@ -636577,7 +636577,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 @@ -636589,12 +636589,12 @@ sub_8157578: ; 8157578 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081575B8 + b _081575B8 .pool -@081575B4: +_081575B4: adds r0, r2, 0x5 str r0, [r3] -@081575B8: +_081575B8: pop {r0} bx r0 thumb_func_end sub_8157578 @@ -636612,7 +636612,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 @@ -636624,12 +636624,12 @@ sub_81575BC: ; 81575BC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081575FC + b _081575FC .pool -@081575F8: +_081575F8: adds r0, r2, 0x5 str r0, [r3] -@081575FC: +_081575FC: pop {r0} bx r0 thumb_func_end sub_81575BC @@ -636647,7 +636647,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 @@ -636659,12 +636659,12 @@ sub_8157600: ; 8157600 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157640 + b _08157640 .pool -@0815763C: +_0815763C: adds r0, r2, 0x5 str r0, [r3] -@08157640: +_08157640: pop {r0} bx r0 thumb_func_end sub_8157600 @@ -636682,7 +636682,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 @@ -636694,12 +636694,12 @@ sub_8157644: ; 8157644 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157684 + b _08157684 .pool -@08157680: +_08157680: adds r0, r2, 0x5 str r0, [r3] -@08157684: +_08157684: pop {r0} bx r0 thumb_func_end sub_8157644 @@ -636723,7 +636723,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] @@ -636735,23 +636735,23 @@ sub_8157688: ; 8157688 adds r1, r6 ldrh r0, [r1] cmp r0, 0 - beq @081576D2 + beq _081576D2 adds r1, r0, 0 adds r0, r5, 0 bl AreMovesContestCombo 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] @@ -636776,7 +636776,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] @@ -636790,14 +636790,14 @@ sub_8157700: ; 8157700 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157740 + b _08157740 .pool -@08157738: +_08157738: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157740: +_08157740: pop {r0} bx r0 .pool @@ -636813,7 +636813,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] @@ -636827,14 +636827,14 @@ sub_8157748: ; 8157748 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157788 + b _08157788 .pool -@08157780: +_08157780: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157788: +_08157788: pop {r0} bx r0 .pool @@ -636859,7 +636859,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] @@ -636871,22 +636871,22 @@ sub_8157790: ; 8157790 adds r1, r6 ldrh r0, [r1] cmp r0, 0 - beq @081577D8 + beq _081577D8 adds r1, r5, 0 bl AreMovesContestCombo 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] @@ -636911,7 +636911,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] @@ -636925,14 +636925,14 @@ sub_8157808: ; 8157808 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157848 + b _08157848 .pool -@08157840: +_08157840: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157848: +_08157848: pop {r0} bx r0 .pool @@ -636948,7 +636948,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] @@ -636962,14 +636962,14 @@ sub_8157850: ; 8157850 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157890 + b _08157890 .pool -@08157888: +_08157888: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157890: +_08157890: pop {r0} bx r0 .pool @@ -636999,16 +636999,16 @@ sub_8157898: ; 8157898 adds r1, r0, r1 ldrh r0, [r1, 0x8] cmp r0, 0 - beq @081578D0 + beq _081578D0 adds r1, r3, 0 bl AreMovesContestCombo 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] @@ -637032,7 +637032,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] @@ -637046,14 +637046,14 @@ sub_81578F8: ; 81578F8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157938 + b _08157938 .pool -@08157930: +_08157930: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157938: +_08157938: pop {r0} bx r0 .pool @@ -637069,7 +637069,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] @@ -637083,14 +637083,14 @@ sub_8157940: ; 8157940 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157980 + b _08157980 .pool -@08157978: +_08157978: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157980: +_08157980: pop {r0} bx r0 .pool @@ -637142,7 +637142,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 @@ -637154,12 +637154,12 @@ sub_81579CC: ; 81579CC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157A0C + b _08157A0C .pool -@08157A08: +_08157A08: adds r0, r2, 0x5 str r0, [r3] -@08157A0C: +_08157A0C: pop {r0} bx r0 thumb_func_end sub_81579CC @@ -637177,7 +637177,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 @@ -637189,12 +637189,12 @@ sub_8157A10: ; 8157A10 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157A50 + b _08157A50 .pool -@08157A4C: +_08157A4C: adds r0, r2, 0x5 str r0, [r3] -@08157A50: +_08157A50: pop {r0} bx r0 thumb_func_end sub_8157A10 @@ -637212,7 +637212,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 @@ -637224,12 +637224,12 @@ sub_8157A54: ; 8157A54 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157A94 + b _08157A94 .pool -@08157A90: +_08157A90: adds r0, r2, 0x5 str r0, [r3] -@08157A94: +_08157A94: pop {r0} bx r0 thumb_func_end sub_8157A54 @@ -637247,7 +637247,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 @@ -637259,12 +637259,12 @@ sub_8157A98: ; 8157A98 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157AD8 + b _08157AD8 .pool -@08157AD4: +_08157AD4: adds r0, r2, 0x5 str r0, [r3] -@08157AD8: +_08157AD8: pop {r0} bx r0 thumb_func_end sub_8157A98 @@ -637283,7 +637283,7 @@ sub_8157ADC: ; 8157ADC bl sub_80DE1E8 lsls r0, 24 cmp r0, 0 - beq @08157B18 + beq _08157B18 ldr r2, =gContestMoves ldr r0, =0x02039f34 ldr r0, [r0] @@ -637299,7 +637299,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] @@ -637326,7 +637326,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 @@ -637338,12 +637338,12 @@ sub_8157B38: ; 8157B38 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157B78 + b _08157B78 .pool -@08157B74: +_08157B74: adds r0, r2, 0x5 str r0, [r3] -@08157B78: +_08157B78: pop {r0} bx r0 thumb_func_end sub_8157B38 @@ -637361,7 +637361,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 @@ -637373,12 +637373,12 @@ sub_8157B7C: ; 8157B7C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157BBC + b _08157BBC .pool -@08157BB8: +_08157BB8: adds r0, r2, 0x5 str r0, [r3] -@08157BBC: +_08157BBC: pop {r0} bx r0 thumb_func_end sub_8157B7C @@ -637396,7 +637396,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 @@ -637408,12 +637408,12 @@ sub_8157BC0: ; 8157BC0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157C00 + b _08157C00 .pool -@08157BFC: +_08157BFC: adds r0, r2, 0x5 str r0, [r3] -@08157C00: +_08157C00: pop {r0} bx r0 thumb_func_end sub_8157BC0 @@ -637431,7 +637431,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 @@ -637443,12 +637443,12 @@ sub_8157C04: ; 8157C04 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157C44 + b _08157C44 .pool -@08157C40: +_08157C40: adds r0, r2, 0x5 str r0, [r3] -@08157C44: +_08157C44: pop {r0} bx r0 thumb_func_end sub_8157C04 @@ -637465,19 +637465,19 @@ 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 .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] @@ -637498,7 +637498,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] @@ -637512,14 +637512,14 @@ sub_8157C94: ; 8157C94 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157CD4 + b _08157CD4 .pool -@08157CCC: +_08157CCC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157CD4: +_08157CD4: pop {r0} bx r0 .pool @@ -637535,7 +637535,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] @@ -637549,14 +637549,14 @@ sub_8157CDC: ; 8157CDC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157D1C + b _08157D1C .pool -@08157D14: +_08157D14: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157D1C: +_08157D1C: pop {r0} bx r0 .pool @@ -637602,7 +637602,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] @@ -637616,14 +637616,14 @@ sub_8157D60: ; 8157D60 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157DA0 + b _08157DA0 .pool -@08157D98: +_08157D98: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157DA0: +_08157DA0: pop {r0} bx r0 .pool @@ -637639,7 +637639,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] @@ -637653,14 +637653,14 @@ sub_8157DA8: ; 8157DA8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157DE8 + b _08157DE8 .pool -@08157DE0: +_08157DE0: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157DE8: +_08157DE8: pop {r0} bx r0 .pool @@ -637713,7 +637713,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] @@ -637727,14 +637727,14 @@ sub_8157E3C: ; 8157E3C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157E7C + b _08157E7C .pool -@08157E74: +_08157E74: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157E7C: +_08157E7C: pop {r0} bx r0 .pool @@ -637750,7 +637750,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] @@ -637764,14 +637764,14 @@ sub_8157E84: ; 8157E84 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157EC4 + b _08157EC4 .pool -@08157EBC: +_08157EBC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157EC4: +_08157EC4: pop {r0} bx r0 .pool @@ -637787,7 +637787,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] @@ -637801,14 +637801,14 @@ sub_8157ECC: ; 8157ECC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157F0C + b _08157F0C .pool -@08157F04: +_08157F04: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157F0C: +_08157F0C: pop {r0} bx r0 .pool @@ -637824,7 +637824,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] @@ -637838,14 +637838,14 @@ sub_8157F14: ; 8157F14 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157F54 + b _08157F54 .pool -@08157F4C: +_08157F4C: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157F54: +_08157F54: pop {r0} bx r0 .pool @@ -637893,7 +637893,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] @@ -637907,14 +637907,14 @@ sub_8157FA0: ; 8157FA0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08157FE0 + b _08157FE0 .pool -@08157FD8: +_08157FD8: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08157FE0: +_08157FE0: pop {r0} bx r0 .pool @@ -637930,7 +637930,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] @@ -637944,14 +637944,14 @@ sub_8157FE8: ; 8157FE8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158028 + b _08158028 .pool -@08158020: +_08158020: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08158028: +_08158028: pop {r0} bx r0 .pool @@ -637967,7 +637967,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] @@ -637981,14 +637981,14 @@ sub_8158030: ; 8158030 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158070 + b _08158070 .pool -@08158068: +_08158068: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08158070: +_08158070: pop {r0} bx r0 .pool @@ -638004,7 +638004,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] @@ -638018,14 +638018,14 @@ sub_8158078: ; 8158078 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081580B8 + b _081580B8 .pool -@081580B0: +_081580B0: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@081580B8: +_081580B8: pop {r0} bx r0 .pool @@ -638077,7 +638077,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 @@ -638089,12 +638089,12 @@ sub_8158108: ; 8158108 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158148 + b _08158148 .pool -@08158144: +_08158144: adds r0, r2, 0x5 str r0, [r3] -@08158148: +_08158148: pop {r0} bx r0 thumb_func_end sub_8158108 @@ -638112,7 +638112,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 @@ -638124,12 +638124,12 @@ sub_815814C: ; 815814C lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815818C + b _0815818C .pool -@08158188: +_08158188: adds r0, r2, 0x5 str r0, [r3] -@0815818C: +_0815818C: pop {r0} bx r0 thumb_func_end sub_815814C @@ -638147,7 +638147,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 @@ -638159,12 +638159,12 @@ sub_8158190: ; 8158190 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081581D0 + b _081581D0 .pool -@081581CC: +_081581CC: adds r0, r2, 0x5 str r0, [r3] -@081581D0: +_081581D0: pop {r0} bx r0 thumb_func_end sub_8158190 @@ -638182,7 +638182,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 @@ -638194,12 +638194,12 @@ sub_81581D4: ; 81581D4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158214 + b _08158214 .pool -@08158210: +_08158210: adds r0, r2, 0x5 str r0, [r3] -@08158214: +_08158214: pop {r0} bx r0 thumb_func_end sub_81581D4 @@ -638247,7 +638247,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 @@ -638259,12 +638259,12 @@ sub_8158254: ; 8158254 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158294 + b _08158294 .pool -@08158290: +_08158290: adds r0, r2, 0x5 str r0, [r3] -@08158294: +_08158294: pop {r0} bx r0 thumb_func_end sub_8158254 @@ -638282,7 +638282,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 @@ -638294,12 +638294,12 @@ sub_8158298: ; 8158298 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081582D8 + b _081582D8 .pool -@081582D4: +_081582D4: adds r0, r2, 0x5 str r0, [r3] -@081582D8: +_081582D8: pop {r0} bx r0 thumb_func_end sub_8158298 @@ -638317,7 +638317,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 @@ -638329,12 +638329,12 @@ sub_81582DC: ; 81582DC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815831C + b _0815831C .pool -@08158318: +_08158318: adds r0, r2, 0x5 str r0, [r3] -@0815831C: +_0815831C: pop {r0} bx r0 thumb_func_end sub_81582DC @@ -638352,7 +638352,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 @@ -638364,12 +638364,12 @@ sub_8158320: ; 8158320 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158360 + b _08158360 .pool -@0815835C: +_0815835C: adds r0, r2, 0x5 str r0, [r3] -@08158360: +_08158360: pop {r0} bx r0 thumb_func_end sub_8158320 @@ -638424,7 +638424,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 @@ -638436,12 +638436,12 @@ sub_81583B8: ; 81583B8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081583F8 + b _081583F8 .pool -@081583F4: +_081583F4: adds r0, r2, 0x5 str r0, [r3] -@081583F8: +_081583F8: pop {r0} bx r0 thumb_func_end sub_81583B8 @@ -638459,7 +638459,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 @@ -638471,12 +638471,12 @@ sub_81583FC: ; 81583FC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @0815843C + b _0815843C .pool -@08158438: +_08158438: adds r0, r2, 0x5 str r0, [r3] -@0815843C: +_0815843C: pop {r0} bx r0 thumb_func_end sub_81583FC @@ -638630,7 +638630,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 @@ -638642,13 +638642,13 @@ sub_815853C: ; 815853C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08158586 + b _08158586 .pool -@08158580: +_08158580: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -@08158586: +_08158586: pop {r4} pop {r0} bx r0 @@ -638673,7 +638673,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 @@ -638685,13 +638685,13 @@ sub_815858C: ; 815858C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @081585D6 + b _081585D6 .pool -@081585D0: +_081585D0: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -@081585D6: +_081585D6: pop {r4} pop {r0} bx r0 @@ -638716,7 +638716,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 @@ -638728,13 +638728,13 @@ sub_81585DC: ; 81585DC lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08158626 + b _08158626 .pool -@08158620: +_08158620: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -@08158626: +_08158626: pop {r4} pop {r0} bx r0 @@ -638759,7 +638759,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 @@ -638771,13 +638771,13 @@ sub_815862C: ; 815862C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08158676 + b _08158676 .pool -@08158670: +_08158670: adds r0, r3, 0 adds r0, 0x8 str r0, [r4] -@08158676: +_08158676: pop {r4} pop {r0} bx r0 @@ -638803,7 +638803,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 @@ -638815,12 +638815,12 @@ sub_815867C: ; 815867C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @081586C8 + b _081586C8 .pool -@081586C4: +_081586C4: adds r0, r3, 0x7 str r0, [r4] -@081586C8: +_081586C8: pop {r4,r5} pop {r0} bx r0 @@ -638846,7 +638846,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 @@ -638858,12 +638858,12 @@ sub_81586D0: ; 81586D0 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @0815871C + b _0815871C .pool -@08158718: +_08158718: adds r0, r3, 0x7 str r0, [r4] -@0815871C: +_0815871C: pop {r4,r5} pop {r0} bx r0 @@ -638889,7 +638889,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 @@ -638901,12 +638901,12 @@ sub_8158724: ; 8158724 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08158770 + b _08158770 .pool -@0815876C: +_0815876C: adds r0, r3, 0x7 str r0, [r4] -@08158770: +_08158770: pop {r4,r5} pop {r0} bx r0 @@ -638932,7 +638932,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 @@ -638944,12 +638944,12 @@ sub_8158778: ; 8158778 lsls r0, 24 orrs r1, r0 str r1, [r4] - b @081587C4 + b _081587C4 .pool -@081587C0: +_081587C0: adds r0, r3, 0x7 str r0, [r4] -@081587C4: +_081587C4: pop {r4,r5} pop {r0} bx r0 @@ -638973,7 +638973,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 @@ -638985,12 +638985,12 @@ sub_81587CC: ; 81587CC lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08158814 + b _08158814 .pool -@08158810: +_08158810: adds r0, r3, 0x6 str r0, [r4] -@08158814: +_08158814: pop {r4,r5} pop {r0} bx r0 @@ -639014,7 +639014,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 @@ -639026,12 +639026,12 @@ sub_815881C: ; 815881C lsls r0, 24 orrs r1, r0 str r1, [r4] - b @08158864 + b _08158864 .pool -@08158860: +_08158860: adds r0, r3, 0x6 str r0, [r4] -@08158864: +_08158864: pop {r4,r5} pop {r0} bx r0 @@ -639087,7 +639087,7 @@ sub_81588BC: ; 81588BC bl sub_8158908 lsls r0, 24 cmp r0, 0 - bne @081588D6 + bne _081588D6 ldr r0, =0x02039f34 ldr r0, [r0] ldr r2, [r0, 0xC] @@ -639095,7 +639095,7 @@ sub_81588BC: ; 81588BC movs r0, 0x1 orrs r0, r1 strb r0, [r2, 0x9] -@081588D6: +_081588D6: pop {r0} bx r0 .pool @@ -639133,11 +639133,11 @@ sub_8158908: ; 8158908 adds r1, 0x40 ldrb r0, [r1] cmp r0, 0 - bne @08158924 + bne _08158924 movs r0, 0 - b @08158940 + b _08158940 .pool -@08158924: +_08158924: subs r0, 0x1 strb r0, [r1] ldr r2, =0x0203ab38 @@ -639152,7 +639152,7 @@ sub_8158908: ; 8158908 ldr r0, [r1] str r0, [r2] movs r0, 0x1 -@08158940: +_08158940: pop {r1} bx r1 .pool @@ -639164,7 +639164,7 @@ sub_8158948: ; 8158948 movs r5, 0 movs r4, 0 ldr r6, =0x02039e1e -@08158950: +_08158950: lsls r1, r4, 1 ldr r0, =0x02039f34 ldr r0, [r0] @@ -639176,20 +639176,20 @@ sub_8158948: ; 8158948 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 .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] @@ -639214,7 +639214,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] @@ -639228,14 +639228,14 @@ sub_81589A4: ; 81589A4 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @081589E4 + b _081589E4 .pool -@081589DC: +_081589DC: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@081589E4: +_081589E4: pop {r0} bx r0 .pool @@ -639251,7 +639251,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] @@ -639265,14 +639265,14 @@ sub_81589EC: ; 81589EC lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158A2C + b _08158A2C .pool -@08158A24: +_08158A24: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08158A2C: +_08158A2C: pop {r0} bx r0 .pool @@ -639301,12 +639301,12 @@ sub_8158A34: ; 8158A34 adds r1, 0x1E adds r0, r1 ldrh r0, [r0] - b @08158A88 + b _08158A88 .pool -@08158A6C: +_08158A6C: adds r4, 0x1 cmp r4, 0x3 - bgt @08158A8E + bgt _08158A8E lsls r1, r4, 1 ldr r0, [r2] ldr r0, [r0, 0xC] @@ -639318,11 +639318,11 @@ sub_8158A34: ; 8158A34 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] @@ -639344,7 +639344,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] @@ -639358,14 +639358,14 @@ sub_8158AA0: ; 8158AA0 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158AE0 + b _08158AE0 .pool -@08158AD8: +_08158AD8: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08158AE0: +_08158AE0: pop {r0} bx r0 .pool @@ -639381,7 +639381,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] @@ -639395,14 +639395,14 @@ sub_8158AE8: ; 8158AE8 lsls r0, 24 orrs r1, r0 str r1, [r3] - b @08158B28 + b _08158B28 .pool -@08158B20: +_08158B20: ldr r1, =0x0203ab38 ldr r0, [r1] adds r0, 0x4 str r0, [r1] -@08158B28: +_08158B28: pop {r0} bx r0 .pool @@ -639474,28 +639474,28 @@ 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 str r0, [r4] - b @08158BFE + b _08158BFE .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 @@ -639505,7 +639505,7 @@ sub_8158B98: ; 8158B98 asrs r0, 16 bl sub_80A52EC strh r0, [r4, 0xC] -@08158BFE: +_08158BFE: pop {r4-r6} pop {r0} bx r0 @@ -639527,7 +639527,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 @@ -639543,10 +639543,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 @@ -639653,7 +639653,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] @@ -639665,12 +639665,12 @@ 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 .pool -@08158D50: +_08158D50: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -639684,7 +639684,7 @@ sub_8158D08: ; 8158D08 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] @@ -639695,7 +639695,7 @@ sub_8158D08: ; 8158D08 ldrsh r0, [r4, r2] bl sub_80A52EC strh r0, [r4, 0x1E] -@08158D82: +_08158D82: pop {r4,r5} pop {r0} bx r0 @@ -639716,76 +639716,76 @@ 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 .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 .pool -@08158DEC: +_08158DEC: cmp r1, 0x1 - bne @08158DFC + bne _08158DFC ldr r0, =0x02038437 ldrb r4, [r0] - b @08158E12 + b _08158E12 .pool -@08158DFC: +_08158DFC: cmp r1, 0x2 - bne @08158E08 + bne _08158E08 ldr r0, =0x02038436 - b @08158E0A + b _08158E0A .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 .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 @@ -639793,9 +639793,9 @@ sub_8158D8C: ; 8158D8C movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @08158E6A + b _08158E6A .pool -@08158E5C: +_08158E5C: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -639803,24 +639803,24 @@ sub_8158D8C: ; 8158D8C 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 @@ -639841,76 +639841,76 @@ 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 .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 .pool -@08158EFC: +_08158EFC: cmp r1, 0x1 - bne @08158F0C + bne _08158F0C ldr r0, =0x02038437 ldrb r4, [r0] - b @08158F22 + b _08158F22 .pool -@08158F0C: +_08158F0C: cmp r1, 0x2 - bne @08158F18 + bne _08158F18 ldr r0, =0x02038436 - b @08158F1A + b _08158F1A .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 .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 @@ -639918,9 +639918,9 @@ sub_8158E9C: ; 8158E9C movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 - b @08158F7A + b _08158F7A .pool -@08158F6C: +_08158F6C: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -639928,13 +639928,13 @@ sub_8158E9C: ; 8158E9C 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 @@ -639949,33 +639949,33 @@ sub_8158E9C: ; 8158E9C 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 .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 str r0, [r1] - b @08158FEE + b _08158FEE .pool -@08158FE8: +_08158FE8: adds r0, r6, 0 bl move_anim_task_del -@08158FEE: +_08158FEE: pop {r4-r6} pop {r0} bx r0 @@ -640003,20 +640003,20 @@ 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 .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 @@ -640024,12 +640024,12 @@ sub_8158FF4: ; 8158FF4 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 @@ -640037,7 +640037,7 @@ sub_8158FF4: ; 8158FF4 bl sub_80A32E4 mov r0, r9 bl move_anim_task_del -@0815906A: +_0815906A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -640061,19 +640061,19 @@ 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 .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 @@ -640100,19 +640100,19 @@ 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 .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 @@ -640124,15 +640124,15 @@ sub_81590B8: ; 81590B8 asrs r0, 24 strh r0, [r1, 0xC] cmp r2, 0 - beq @08159130 + beq _08159130 ldr r0, =sub_815913C str r0, [r1] - b @08159136 + b _08159136 .pool -@08159130: +_08159130: adds r0, r4, 0 bl move_anim_task_del -@08159136: +_08159136: pop {r4,r5} pop {r0} bx r0 @@ -640158,22 +640158,22 @@ 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 .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 @@ -640184,24 +640184,24 @@ sub_815913C: ; 815913C adds r0, r4 lsls r0, 3 adds r0, r1 - b @081591B0 + b _081591B0 .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 @@ -640211,29 +640211,29 @@ sub_815913C: ; 815913C ldrh r0, [r1, 0x1A] adds r0, 0x1 strh r0, [r1, 0x1A] - b @08159204 + b _08159204 .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} @@ -640377,7 +640377,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] @@ -640387,7 +640387,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] @@ -640396,10 +640396,10 @@ sub_8159308: ; 8159308 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 @@ -640437,24 +640437,24 @@ 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, =gUnknown_085CDF20 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @081593D4 + b _081593D4 .pool -@081593D0: +_081593D0: bl dp01_tbl6_exec_completed -@081593D4: +_081593D4: pop {r0} bx r0 thumb_func_end bx_exec_buffer_A_ch0_tbl6 @@ -640468,7 +640468,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 @@ -640477,47 +640477,47 @@ 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 .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] @@ -640526,7 +640526,7 @@ bx_battle_menu_t6_2: ; 81593D8 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - beq @0815954E + beq _0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -640537,13 +640537,13 @@ bx_battle_menu_t6_2: ; 81593D8 adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b @081594F2 + b _081594F2 .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] @@ -640552,7 +640552,7 @@ bx_battle_menu_t6_2: ; 81593D8 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne @0815954E + bne _0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -640563,13 +640563,13 @@ bx_battle_menu_t6_2: ; 81593D8 adds r1, r5 ldrb r0, [r1] movs r2, 0x1 - b @081594F2 + b _081594F2 .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] @@ -640578,7 +640578,7 @@ bx_battle_menu_t6_2: ; 81593D8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @0815954E + beq _0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -640589,7 +640589,7 @@ bx_battle_menu_t6_2: ; 81593D8 adds r1, r5 ldrb r0, [r1] movs r2, 0x2 -@081594F2: +_081594F2: eors r0, r2 strb r0, [r1] ldrb r0, [r4] @@ -640597,13 +640597,13 @@ bx_battle_menu_t6_2: ; 81593D8 ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 - b @0815954E + b _0815954E .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] @@ -640612,7 +640612,7 @@ bx_battle_menu_t6_2: ; 81593D8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @0815954E + bne _0815954E movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -640630,7 +640630,7 @@ bx_battle_menu_t6_2: ; 81593D8 ldrb r0, [r0] movs r1, 0 bl sub_8059CB4 -@0815954E: +_0815954E: pop {r4,r5} pop {r0} bx r0 @@ -640654,9 +640654,9 @@ sub_815955C: ; 815955C ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08159580 + bne _08159580 bl dp01_tbl6_exec_completed -@08159580: +_08159580: pop {r0} bx r0 .pool @@ -640669,9 +640669,9 @@ bx_t6_button_a: ; 8159594 bl IsTextPrinterActive 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 @@ -640693,9 +640693,9 @@ sub_81595AC: ; 81595AC ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081595D0 + bne _081595D0 bl dp01_tbl6_exec_completed -@081595D0: +_081595D0: pop {r0} bx r0 .pool @@ -640709,7 +640709,7 @@ sub_81595E4: ; 81595E4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0815960E + bne _0815960E ldr r2, =0x030022c0 ldr r0, =0x00000439 adds r3, r2, r0 @@ -640723,7 +640723,7 @@ sub_81595E4: ; 81595E4 str r0, [r2] ldr r0, [r2, 0x8] bl SetMainCallback2 -@0815960E: +_0815960E: pop {r0} bx r0 .pool @@ -640735,7 +640735,7 @@ bx_wait_t6: ; 8159624 ldr r0, =0x020244b9 ldrb r0, [r0] cmp r0, 0 - beq @0815964A + beq _0815964A ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -640749,10 +640749,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 .pool @@ -640766,7 +640766,7 @@ sub_8159660: ; 8159660 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08159684 + bne _08159684 ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -640776,7 +640776,7 @@ sub_8159660: ; 8159660 str r1, [r0] bl FreeAllWindowBuffers bl sub_81358F4 -@08159684: +_08159684: pop {r0} bx r0 .pool @@ -640789,19 +640789,19 @@ sub_8159698: ; 8159698 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 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 .pool @@ -640823,9 +640823,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 .pool @@ -640847,7 +640847,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] @@ -640861,9 +640861,9 @@ dp01_tbl6_exec_completed: ; 8159704 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @0815976A + b _0815976A .pool -@08159758: +_08159758: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -640873,7 +640873,7 @@ dp01_tbl6_exec_completed: ; 8159704 ldr r0, [r2] bics r0, r1 str r0, [r2] -@0815976A: +_0815976A: add sp, 0x4 pop {r4} pop {r0} @@ -640897,9 +640897,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 .pool @@ -641213,13 +641213,13 @@ dp01t_11_6_message_for_player_only: ; 8159A30 bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne @08159A4C + bne _08159A4C bl dp01t_10_6_message - b @08159A50 + b _08159A50 .pool -@08159A4C: +_08159A4C: bl dp01_tbl6_exec_completed -@08159A50: +_08159A50: pop {r0} bx r0 thumb_func_end dp01t_11_6_message_for_player_only @@ -641231,7 +641231,7 @@ sub_8159A54: ; 8159A54 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @08159A7A + bne _08159A7A ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -641244,7 +641244,7 @@ sub_8159A54: ; 8159A54 adds r0, r1 ldr r1, =bx_battle_menu_t6_2 str r1, [r0] -@08159A7A: +_08159A7A: pop {r0} bx r0 .pool @@ -641264,13 +641264,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] @@ -641525,9 +641525,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 @@ -641560,7 +641560,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 @@ -641573,9 +641573,9 @@ dp01t_34_6_move_anim_start_t3: ; 8159CC4 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @08159D14 + b _08159D14 .pool -@08159D00: +_08159D00: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -641585,7 +641585,7 @@ dp01t_34_6_move_anim_start_t3: ; 8159CC4 lsls r1, 8 orrs r0, r1 bl fanfare_play -@08159D14: +_08159D14: bl dp01_tbl6_exec_completed pop {r4,r5} pop {r0} @@ -641732,18 +641732,18 @@ 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 .pool -@08159E5C: +_08159E5C: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_81596D4 str r0, [r1] -@08159E68: +_08159E68: add sp, 0x4 pop {r4-r6} pop {r0} @@ -641789,14 +641789,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 str r0, [r1] -@08159ECC: +_08159ECC: pop {r4} pop {r0} bx r0 @@ -641929,7 +641929,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 @@ -641944,18 +641944,18 @@ 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 .pool -@0815A044: +_0815A044: ldr r0, =sub_815A090 str r0, [r4] bl GetPlayerAvatarObjectId @@ -641979,12 +641979,12 @@ sub_8159FEC: ; 8159FEC movs r3, 0 bl pal_fade_maybe bl sub_81BE6B8 - b @0815A088 + b _0815A088 .pool -@0815A084: +_0815A084: adds r0, r1, 0x1 strh r0, [r4, 0x8] -@0815A088: +_0815A088: add sp, 0x4 pop {r4-r6} pop {r0} @@ -642001,7 +642001,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 @@ -642012,7 +642012,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 @@ -642035,14 +642035,14 @@ 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 .pool -@0815A0FC: +_0815A0FC: ldrh r0, [r1, 0x4] negs r0, r0 -@0815A100: +_0815A100: strh r0, [r2, 0x2E] ldrh r0, [r1, 0x8] strh r0, [r2, 0x30] @@ -642060,7 +642060,7 @@ sub_815A114: ; 815A114 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 @@ -642086,11 +642086,11 @@ 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 @@ -642183,7 +642183,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] @@ -642192,7 +642192,7 @@ sub_815A1F4: ; 815A1F4 strb r0, [r2] ldr r0, =sub_815A234 str r0, [r4, 0x1C] -@0815A228: +_0815A228: pop {r4} pop {r0} bx r0 @@ -642254,13 +642254,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] @@ -642323,34 +642323,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 SetGpuReg @@ -642375,7 +642375,7 @@ sub_815A31C: ; 815A31C strb r0, [r2] ldr r0, =sub_815A3AC str r0, [r4, 0x1C] -@0815A3A0: +_0815A3A0: pop {r4} pop {r0} bx r0 @@ -642392,7 +642392,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] @@ -642411,10 +642411,10 @@ sub_815A3AC: ; 815A3AC movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @0815A3E8 + beq _0815A3E8 ldr r0, =sub_815A3F0 str r0, [r3, 0x1C] -@0815A3E8: +_0815A3E8: pop {r0} bx r0 .pool @@ -642427,46 +642427,46 @@ sub_815A3F0: ; 815A3F0 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 .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 .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 @@ -642474,16 +642474,16 @@ sub_815A3F0: ; 815A3F0 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] @@ -642496,7 +642496,7 @@ sub_815A3F0: ; 815A3F0 bl SetGpuReg ldr r0, =sub_815A49C str r0, [r4, 0x1C] -@0815A48C: +_0815A48C: pop {r4} pop {r0} bx r0 @@ -642522,28 +642522,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 SetGpuReg @@ -642552,7 +642552,7 @@ sub_815A49C: ; 815A49C bl SetGpuReg adds r0, r4, 0 bl move_anim_8072740 -@0815A4FE: +_0815A4FE: pop {r4} pop {r0} bx r0 @@ -642599,7 +642599,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 @@ -642617,14 +642617,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 @@ -642635,15 +642635,15 @@ sub_815A52C: ; 815A52C 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 @@ -642697,7 +642697,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 @@ -642715,14 +642715,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 @@ -642737,14 +642737,14 @@ sub_815A5F0: ; 815A5F0 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 @@ -642756,15 +642756,15 @@ sub_815A5F0: ; 815A5F0 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 @@ -642795,12 +642795,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] @@ -642833,7 +642833,7 @@ sub_815A73C: ; 815A73C bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @0815A75E + beq _0815A75E movs r1, 0 movs r0, 0x1E strh r0, [r4, 0x2E] @@ -642843,7 +642843,7 @@ sub_815A73C: ; 815A73C ldr r1, =sub_815A76C adds r0, r4, 0 bl oamt_set_x3A_32 -@0815A75E: +_0815A75E: pop {r4} pop {r0} bx r0 @@ -642858,7 +642858,7 @@ sub_815A76C: ; 815A76C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0815A798 + beq _0815A798 movs r0, 0x3E adds r0, r3 mov r12, r0 @@ -642874,17 +642874,17 @@ 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 @@ -642921,7 +642921,7 @@ sub_815A7EC: ; 815A7EC movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - bne @0815A84C + bne _0815A84C adds r0, r4, 0 bl sub_80A6838 ldr r5, =0x0203841e @@ -642932,17 +642932,17 @@ 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 .pool -@0815A830: +_0815A830: movs r1, 0x4 ldrsh r0, [r5, r1] negs r0, r0 @@ -642950,17 +642950,17 @@ sub_815A7EC: ; 815A7EC 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] @@ -643000,10 +643000,10 @@ sub_815A7EC: ; 815A7EC 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 @@ -643018,10 +643018,10 @@ 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 @@ -643037,15 +643037,15 @@ 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 .pool -@0815A8EC: +_0815A8EC: ldr r1, =0x0203841e movs r0, 0x1 -@0815A8F0: +_0815A8F0: strh r0, [r1, 0xE] adds r0, r4, 0 bl move_anim_task_del @@ -643063,15 +643063,15 @@ sub_815A904: ; 815A904 ldr r0, =0x02038404 ldr r0, [r0] cmp r0, 0 - ble @0815A920 + ble _0815A920 ldr r1, =0x0203841e movs r0, 0 - b @0815A924 + b _0815A924 .pool -@0815A920: +_0815A920: ldr r1, =0x0203841e movs r0, 0x1 -@0815A924: +_0815A924: strh r0, [r1, 0xE] adds r0, r2, 0 bl move_anim_task_del @@ -643133,22 +643133,22 @@ sub_815A9A0: ; 815A9A0 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 .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] @@ -643162,9 +643162,9 @@ sub_815A9A0: ; 815A9A0 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] @@ -643177,11 +643177,11 @@ sub_815A9A0: ; 815A9A0 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] @@ -643194,27 +643194,27 @@ sub_815A9A0: ; 815A9A0 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] @@ -643223,7 +643223,7 @@ sub_815A9A0: ; 815A9A0 strb r0, [r2] ldr r0, =sub_815AA6C str r0, [r4, 0x1C] -@0815AA60: +_0815AA60: pop {r4} pop {r0} bx r0 @@ -643264,7 +643264,7 @@ sub_815AAA4: ; 815AAA4 movs r1, 0x6 ldrsh r0, [r6, r1] cmp r0, 0 - bne @0815AAD0 + bne _0815AAD0 ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -643278,7 +643278,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 @@ -643302,7 +643302,7 @@ sub_815AAA4: ; 815AAA4 movs r1, 0x4 ldrsh r0, [r6, r1] cmp r0, 0 - bne @0815AB2C + bne _0815AB2C ldrb r1, [r5, 0x3] movs r0, 0x3F negs r0, r0 @@ -643313,13 +643313,13 @@ sub_815AAA4: ; 815AAA4 ldr r0, =0x0000fff4 strh r0, [r5, 0x24] movs r0, 0x2 - b @0815AB32 + b _0815AB32 .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] @@ -643327,10 +643327,10 @@ sub_815AAA4: ; 815AAA4 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 str r0, [r5, 0x1C] pop {r4-r6} @@ -643347,20 +643347,20 @@ sub_815AB5C: ; 815AB5C 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 @@ -643369,8 +643369,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 @@ -643378,24 +643378,24 @@ sub_815AB5C: ; 815AB5C 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 @@ -643426,7 +643426,7 @@ sub_815ABEC: ; 815ABEC bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @0815AC40 + beq _0815AC40 ldr r1, =0x00001f3f movs r0, 0x48 bl SetGpuReg @@ -643445,9 +643445,9 @@ sub_815ABEC: ; 815ABEC ldrh r1, [r0] movs r0, 0x46 bl SetGpuReg - b @0815AC70 + b _0815AC70 .pool -@0815AC40: +_0815AC40: ldr r1, =0x00001f3f movs r0, 0x48 bl SetGpuReg @@ -643468,7 +643468,7 @@ sub_815ABEC: ; 815ABEC lsls r1, 7 movs r0, 0 bl SetGpuRegBits -@0815AC70: +_0815AC70: adds r0, r5, 0 bl move_anim_task_del pop {r4,r5} @@ -643493,12 +643493,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 ResetGpuRegBits -@0815ACB8: +_0815ACB8: adds r0, r4, 0 bl move_anim_task_del pop {r4} @@ -643515,13 +643515,13 @@ sub_815ACD0: ; 815ACD0 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne @0815ACEC + bne _0815ACEC ldr r4, =0x02038436 - b @0815ACEE + b _0815ACEE .pool -@0815ACEC: +_0815ACEC: ldr r4, =0x02038437 -@0815ACEE: +_0815ACEE: ldrb r0, [r4] movs r1, 0 bl sub_80A5C6C @@ -643546,9 +643546,9 @@ sub_815ACD0: ; 815ACD0 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] @@ -643591,27 +643591,27 @@ 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 .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 @@ -643631,13 +643631,13 @@ sub_815ADB0: ; 815ADB0 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0815ADDC + bne _0815ADDC ldr r4, =0x02038436 - b @0815ADDE + b _0815ADDE .pool -@0815ADDC: +_0815ADDC: ldr r4, =0x02038437 -@0815ADDE: +_0815ADDE: ldrb r0, [r4] bl sub_80A6190 lsls r0, 24 @@ -643655,9 +643655,9 @@ sub_815ADB0: ; 815ADB0 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 @@ -643668,13 +643668,13 @@ sub_815ADB0: ; 815ADB0 strh r2, [r5, 0x14] strh r2, [r5, 0x16] cmp r7, 0x1 - bne @0815AE30 + bne _0815AE30 ldr r0, =0x02022e18 - b @0815AE32 + b _0815AE32 .pool -@0815AE30: +_0815AE30: ldr r0, =0x02022e1c -@0815AE32: +_0815AE32: ldrh r2, [r0] strh r2, [r5, 0x18] adds r3, r2, 0 @@ -643685,15 +643685,15 @@ sub_815ADB0: ; 815ADB0 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 .pool -@0815AE54: +_0815AE54: strh r2, [r5, 0x1E] ldrh r3, [r5, 0x1A] -@0815AE58: +_0815AE58: movs r0, 0 strh r0, [r5, 0x26] ldrh r1, [r5, 0xC] @@ -643702,13 +643702,13 @@ sub_815ADB0: ; 815ADB0 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 @@ -643721,16 +643721,16 @@ sub_815ADB0: ; 815ADB0 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 .pool -@0815AEA0: +_0815AEA0: ldr r0, =0x04000018 -@0815AEA2: +_0815AEA2: str r0, [sp] ldr r0, =0xa2600001 str r0, [sp, 0x4] @@ -643773,14 +643773,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 @@ -643791,54 +643791,54 @@ sub_815AED8: ; 815AED8 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 .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 @@ -643853,20 +643853,20 @@ sub_815AED8: ; 815AED8 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 @@ -643881,23 +643881,23 @@ sub_815AED8: ; 815AED8 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 @@ -643964,40 +643964,40 @@ 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 .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] @@ -644025,7 +644025,7 @@ sub_815B054: ; 815B054 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 @@ -644045,20 +644045,20 @@ sub_815B054: ; 815B054 adds r1, r5 ldr r0, =DummyObjectCallback 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 @@ -644069,66 +644069,66 @@ sub_815B054: ; 815B054 adds r0, 0x1 strh r0, [r6, 0xA] strh r4, [r6, 0x8] - b @0815B22E + b _0815B22E .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 @@ -644138,7 +644138,7 @@ sub_815B054: ; 815B054 ldr r1, [r0] ldr r0, =gUnknown_08593114 cmp r1, r0 - bne @0815B200 + bne _0815B200 adds r0, r4, r3 strh r2, [r0, 0x2E] movs r1, 0x6 @@ -644157,27 +644157,27 @@ sub_815B054: ; 815B054 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 .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 @@ -644195,7 +644195,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] @@ -644213,7 +644213,7 @@ sub_815B23C: ; 815B23C strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0815B270: +_0815B270: pop {r4} pop {r0} bx r0 @@ -644227,43 +644227,43 @@ sub_815B27C: ; 815B27C 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] @@ -644271,11 +644271,11 @@ sub_815B27C: ; 815B27C 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 adds r0, r5, 0 bl oamt_set_x3A_32 @@ -644307,7 +644307,7 @@ sub_815B27C: ; 815B27C strh r0, [r5, 0x36] ldr r0, =sub_80A6EEC str r0, [r5, 0x1C] -@0815B324: +_0815B324: pop {r4,r5} pop {r0} bx r0 @@ -644327,12 +644327,12 @@ 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 .pool -@0815B35C: +_0815B35C: movs r0, 0 bl obj_id_for_side_relative_to_move adds r1, r0, 0 @@ -644344,17 +644344,17 @@ sub_815B338: ; 815B338 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0815B38E + b _0815B38E .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 @@ -644371,19 +644371,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 @@ -644404,9 +644404,9 @@ sub_815B394: ; 815B394 lsls r0, 1 strh r0, [r5, 0x30] strh r0, [r5, 0x32] - b @0815B46C + b _0815B46C .pool -@0815B3F4: +_0815B3F4: ldrh r0, [r5, 0x30] adds r0, 0x60 strh r0, [r5, 0x30] @@ -644426,11 +644426,11 @@ sub_815B394: ; 815B394 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] @@ -644450,7 +644450,7 @@ sub_815B394: ; 815B394 lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bne @0815B496 + bne _0815B496 movs r0, 0 strh r0, [r5, 0x34] ldr r1, =0x02020630 @@ -644465,13 +644465,13 @@ sub_815B394: ; 815B394 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 .pool -@0815B478: +_0815B478: ldrh r0, [r5, 0x26] subs r0, 0x6 strh r0, [r5, 0x26] @@ -644483,10 +644483,10 @@ sub_815B394: ; 815B394 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 @@ -644501,14 +644501,14 @@ 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 .pool -@0815B4BC: +_0815B4BC: movs r0, 0x80 lsls r0, 1 -@0815B4C0: +_0815B4C0: strh r0, [r4, 0x20] movs r0, 0 strh r0, [r4, 0x22] @@ -644532,18 +644532,18 @@ 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 .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 @@ -644562,7 +644562,7 @@ sub_815B4D4: ; 815B4D4 bl __modsi3 lsls r0, 16 cmp r0, 0 - bne @0815B54C + bne _0815B54C ldr r0, =gUnknown_085CE3A0 ldrh r1, [r4, 0x24] ldrh r2, [r4, 0x20] @@ -644580,7 +644580,7 @@ sub_815B4D4: ; 815B4D4 lsls r3, 24 lsrs r3, 24 bl AddObjectAndAnimateForOneFrame -@0815B54C: +_0815B54C: movs r1, 0x20 ldrsh r0, [r4, r1] movs r2, 0x24 @@ -644590,10 +644590,10 @@ sub_815B4D4: ; 815B4D4 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 @@ -644608,18 +644608,18 @@ sub_815B570: ; 815B570 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 @@ -644632,11 +644632,11 @@ sub_815B570: ; 815B570 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] @@ -644658,14 +644658,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 @@ -644682,12 +644682,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] @@ -644695,11 +644695,11 @@ sub_815B5D0: ; 815B5D0 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] @@ -644708,19 +644708,19 @@ sub_815B5D0: ; 815B5D0 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 RemoveObjectAndFreeTiles -@0815B654: +_0815B654: pop {r0} bx r0 .pool @@ -644740,7 +644740,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 @@ -644752,17 +644752,17 @@ sub_815B65C: ; 815B65C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0815B6AE + b _0815B6AE .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 @@ -644782,7 +644782,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 @@ -644794,17 +644794,17 @@ sub_815B6B4: ; 815B6B4 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0815B706 + b _0815B706 .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 @@ -644817,11 +644817,11 @@ sub_815B70C: ; 815B70C 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 @@ -644838,9 +644838,9 @@ sub_815B70C: ; 815B70C ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b @0815B770 + b _0815B770 .pool -@0815B748: +_0815B748: ldrh r2, [r4, 0x30] lsls r1, r2, 16 asrs r1, 24 @@ -644857,10 +644857,10 @@ sub_815B70C: ; 815B70C 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 @@ -644880,7 +644880,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 @@ -644892,17 +644892,17 @@ sub_815B778: ; 815B778 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0815B7CA + b _0815B7CA .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 @@ -644927,23 +644927,23 @@ 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 .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 SetGpuReg @@ -644953,19 +644953,19 @@ sub_815B7D0: ; 815B7D0 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 .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 @@ -644975,9 +644975,9 @@ sub_815B7D0: ; 815B7D0 ldr r0, =0x0203841e ldrh r0, [r0] strh r0, [r1, 0x1C] - b @0815BA26 + b _0815BA26 .pool -@0815B86C: +_0815B86C: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -644989,9 +644989,9 @@ sub_815B7D0: ; 815B7D0 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] @@ -645005,11 +645005,11 @@ sub_815B7D0: ; 815B7D0 movs r0, 0x4C bl SetGpuReg 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 @@ -645028,16 +645028,16 @@ sub_815B7D0: ; 815B7D0 lsls r0, 24 mov r9, r4 cmp r0, 0 - beq @0815B8E0 + beq _0815B8E0 movs r1, 0 - b @0815B8EA + b _0815B8EA .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 @@ -645064,7 +645064,7 @@ sub_815B7D0: ; 815B7D0 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @0815BA1C + beq _0815BA1C ldr r5, =0x02039f34 ldr r0, [r5] ldr r0, [r0, 0x18] @@ -645078,19 +645078,19 @@ sub_815B7D0: ; 815B7D0 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] @@ -645099,34 +645099,34 @@ sub_815B7D0: ; 815B7D0 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] @@ -645134,7 +645134,7 @@ sub_815B7D0: ; 815B7D0 bl sub_80DB2A8 lsls r0, 24 cmp r0, 0 - beq @0815B9EC + beq _0815B9EC ldr r3, =0x02020630 ldr r4, =0x020241e4 ldr r2, =0x02038436 @@ -645148,9 +645148,9 @@ sub_815B7D0: ; 815B7D0 adds r1, 0x10 adds r0, r1 ldr r1, =gUnknown_082FF6C0 - b @0815BA06 + b _0815BA06 .pool -@0815B9EC: +_0815B9EC: ldr r3, =0x02020630 ldr r4, =0x020241e4 ldr r2, =0x02038436 @@ -645164,7 +645164,7 @@ sub_815B7D0: ; 815B7D0 adds r1, 0x10 adds r0, r1 ldr r1, =gUnknown_082FF694 -@0815BA06: +_0815BA06: str r1, [r0] ldrb r0, [r2] adds r0, r4 @@ -645175,19 +645175,19 @@ sub_815B7D0: ; 815B7D0 adds r0, r3 movs r1, 0 bl StartObjectRotScalAnim -@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 .pool -@0815BA44: +_0815BA44: mov r1, r8 lsls r0, r1, 2 add r0, r8 @@ -645199,7 +645199,7 @@ sub_815B7D0: ; 815B7D0 lsls r0, 16 asrs r0, 16 cmp r0, 0x1 - ble @0815BAFC + ble _0815BAFC movs r0, 0 strh r0, [r4, 0xC] ldrh r0, [r4, 0xA] @@ -645213,13 +645213,13 @@ sub_815B7D0: ; 815B7D0 movs r0, 0x4C bl SetGpuReg 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 SetGpuReg @@ -645229,30 +645229,30 @@ sub_815B7D0: ; 815B7D0 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 .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 @@ -645262,7 +645262,7 @@ sub_815B7D0: ; 815B7D0 movs r6, 0x1C ldrsh r0, [r1, r6] cmp r0, 0 - bne @0815BAF6 + bne _0815BAF6 ldrb r0, [r4] ldr r1, =0x020244d0 ldr r1, [r1] @@ -645271,10 +645271,10 @@ sub_815B7D0: ; 815B7D0 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 @@ -645348,23 +645348,23 @@ 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 .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 SetGpuReg @@ -645383,12 +645383,12 @@ sub_815BB84: ; 815BB84 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, =gUnknown_08C2A6EC @@ -645398,29 +645398,29 @@ sub_815BB84: ; 815BB84 bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @0815BC34 + beq _0815BC34 ldr r1, =0x02022e18 ldr r3, =0x0000ffc8 - b @0815BC5C + b _0815BC5C .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 .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 @@ -645450,9 +645450,9 @@ sub_815BB84: ; 815BB84 strh r0, [r1, 0x1E] ldrh r0, [r1, 0x8] adds r0, 0x1 - b @0815BD8E + b _0815BD8E .pool -@0815BCB8: +_0815BCB8: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -645462,9 +645462,9 @@ sub_815BB84: ; 815BB84 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] @@ -645473,10 +645473,10 @@ sub_815BB84: ; 815BB84 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 @@ -645489,12 +645489,12 @@ sub_815BB84: ; 815BB84 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 @@ -645504,10 +645504,10 @@ sub_815BB84: ; 815BB84 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 @@ -645520,7 +645520,7 @@ sub_815BB84: ; 815BB84 movs r2, 0xA ldrsh r0, [r4, r2] cmp r0, 0 - bne @0815BDF2 + bne _0815BDF2 ldr r2, =0x02022e18 ldr r1, =gUnknown_085CE460 movs r3, 0xC @@ -645538,15 +645538,15 @@ sub_815BB84: ; 815BB84 lsls r0, 16 asrs r0, 16 cmp r0, 0x4 - bne @0815BD6C + bne _0815BD6C strh r0, [r4, 0x8] - b @0815BDF2 + b _0815BDF2 .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 @@ -645557,11 +645557,11 @@ sub_815BB84: ; 815BB84 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 @@ -645571,8 +645571,8 @@ sub_815BB84: ; 815BB84 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 @@ -645581,12 +645581,12 @@ sub_815BB84: ; 815BB84 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 @@ -645604,7 +645604,7 @@ sub_815BB84: ; 815BB84 bl SetGpuReg adds r0, r4, 0 bl move_anim_task_del -@0815BDF2: +_0815BDF2: add sp, 0x10 pop {r4} pop {r0} @@ -645629,12 +645629,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 @@ -645774,13 +645774,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] @@ -645797,17 +645797,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] @@ -645824,7 +645824,7 @@ sub_815BF44: ; 815BF44 ldrh r0, [r3, 0x36] adds r0, 0x1 strh r0, [r3, 0x36] -@0815BFC6: +_0815BFC6: ldrh r0, [r3, 0x30] subs r0, 0x1 strh r0, [r3, 0x30] @@ -645833,7 +645833,7 @@ sub_815BF44: ; 815BF44 movs r1, 0x1 negs r1, r1 cmp r0, r1 - bne @0815BFE8 + bne _0815BFE8 adds r2, r3, 0 adds r2, 0x3E ldrb r0, [r2] @@ -645842,7 +645842,7 @@ sub_815BF44: ; 815BF44 strb r0, [r2] ldr r0, =sub_815BFF4 str r0, [r3, 0x1C] -@0815BFE8: +_0815BFE8: pop {r0} bx r0 .pool @@ -645864,7 +645864,7 @@ sub_815BFF4: ; 815BFF4 ldr r2, [r0] ldr r0, =DummyObjectCallback cmp r2, r0 - bne @0815C040 + bne _0815C040 movs r1, 0x3C ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -645873,7 +645873,7 @@ sub_815BFF4: ; 815BFF4 adds r1, r6 ldr r0, [r1] cmp r0, r2 - bne @0815C040 + bne _0815C040 adds r0, r3, r5 bl RemoveObjectAndFreeTiles movs r0, 0x3C @@ -645885,7 +645885,7 @@ sub_815BFF4: ; 815BFF4 bl RemoveObjectAndFreeTiles adds r0, r4, 0 bl move_anim_8072740 -@0815C040: +_0815C040: pop {r4-r6} pop {r0} bx r0 @@ -645903,7 +645903,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 @@ -645923,7 +645923,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 @@ -645932,7 +645932,7 @@ sub_815C050: ; 815C050 strb r0, [r1] ldr r0, =DummyObjectCallback str r0, [r3, 0x1C] -@0815C09C: +_0815C09C: pop {r0} bx r0 .pool @@ -645953,24 +645953,24 @@ 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 .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 SetGpuReg @@ -645988,12 +645988,12 @@ sub_815C0A4: ; 815C0A4 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, =gUnknown_08C2A6EC @@ -646003,13 +646003,13 @@ sub_815C0A4: ; 815C0A4 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 .pool -@0815C15C: +_0815C15C: ldr r0, =0x02038437 ldrb r0, [r0] bl battle_get_per_side_status @@ -646019,50 +646019,50 @@ sub_815C0A4: ; 815C0A4 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 .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] @@ -646089,9 +646089,9 @@ sub_815C0A4: ; 815C0A4 ldr r0, =0x02022e1a ldrh r0, [r0] strh r0, [r1, 0x1E] - b @0815C2A4 + b _0815C2A4 .pool -@0815C224: +_0815C224: ldr r1, =0x03005e00 lsls r4, r6, 2 adds r0, r4, r6 @@ -646105,7 +646105,7 @@ sub_815C0A4: ; 815C0A4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0815C268 + bne _0815C268 ldr r2, =0x02022e18 ldr r1, =gUnknown_085CE4A4 movs r3, 0xC @@ -646116,9 +646116,9 @@ sub_815C0A4: ; 815C0A4 asrs r0, 24 ldrh r5, [r5, 0x1C] adds r0, r5 - b @0815C27A + b _0815C27A .pool -@0815C268: +_0815C268: ldr r2, =0x02022e18 ldr r1, =gUnknown_085CE4A4 movs r3, 0xC @@ -646128,7 +646128,7 @@ sub_815C0A4: ; 815C0A4 ldrsb r1, [r0, r1] ldrh r0, [r5, 0x1C] subs r0, r1 -@0815C27A: +_0815C27A: strh r0, [r2] ldr r0, =0x03005e00 adds r1, r4, r6 @@ -646140,16 +646140,16 @@ sub_815C0A4: ; 815C0A4 lsls r0, 16 asrs r0, 16 cmp r0, 0x5 - bne @0815C2A4 + bne _0815C2A4 strh r0, [r1, 0x8] - b @0815C396 + b _0815C396 .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 @@ -646160,10 +646160,10 @@ sub_815C0A4: ; 815C0A4 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 @@ -646175,9 +646175,9 @@ sub_815C0A4: ; 815C0A4 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 @@ -646193,14 +646193,14 @@ sub_815C0A4: ; 815C0A4 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 .pool -@0815C310: +_0815C310: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -646211,10 +646211,10 @@ sub_815C0A4: ; 815C0A4 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 @@ -646226,11 +646226,11 @@ sub_815C0A4: ; 815C0A4 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 @@ -646239,12 +646239,12 @@ sub_815C0A4: ; 815C0A4 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 @@ -646262,7 +646262,7 @@ sub_815C0A4: ; 815C0A4 bl SetGpuReg adds r0, r6, 0 bl move_anim_task_del -@0815C396: +_0815C396: add sp, 0x10 pop {r4-r6} pop {r0} @@ -646284,7 +646284,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 @@ -646296,17 +646296,17 @@ sub_815C3A8: ; 815C3A8 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0815C3FA + b _0815C3FA .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 @@ -646320,19 +646320,19 @@ sub_815C400: ; 815C400 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] @@ -646344,18 +646344,18 @@ sub_815C400: ; 815C400 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 .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 @@ -646366,10 +646366,10 @@ sub_815C400: ; 815C400 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 @@ -646389,26 +646389,26 @@ 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 .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] @@ -646440,19 +646440,19 @@ sub_815C478: ; 815C478 movs r1, 0 ldrsh r0, [r5, r1] cmp r0, 0 - bne @0815C508 + bne _0815C508 ldr r0, =0x02038436 - b @0815C50A + b _0815C50A .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 @@ -646461,7 +646461,7 @@ sub_815C478: ; 815C478 ldrsh r0, [r4, r1] negs r0, r0 strh r0, [r4, 0x12] -@0815C528: +_0815C528: ldrh r0, [r4, 0x26] lsls r0, 24 lsrs r0, 24 @@ -646469,7 +646469,7 @@ sub_815C478: ; 815C478 bl sub_80A7270 ldr r0, =sub_815C548 str r0, [r4] -@0815C538: +_0815C538: pop {r4,r5} pop {r0} bx r0 @@ -646489,22 +646489,22 @@ 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 .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] @@ -646540,11 +646540,11 @@ sub_815C548: ; 815C548 movs r2, 0xE ldrsh r1, [r4, r2] cmp r0, r1 - blt @0815C6A8 + blt _0815C6A8 strh r6, [r4, 0xA] - b @0815C690 + b _0815C690 .pool -@0815C5D0: +_0815C5D0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -646581,12 +646581,12 @@ sub_815C548: ; 815C548 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 .pool -@0815C628: +_0815C628: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -646623,31 +646623,31 @@ sub_815C548: ; 815C548 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 .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 @@ -646663,19 +646663,19 @@ 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 .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] @@ -646702,7 +646702,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] @@ -646712,18 +646712,18 @@ 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 .pool -@0815C744: +_0815C744: ldrh r1, [r4, 0x20] subs r1, 0x5 strh r1, [r4, 0x20] @@ -646732,16 +646732,16 @@ sub_815C700: ; 815C700 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} @@ -646803,19 +646803,19 @@ 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 .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 @@ -646829,7 +646829,7 @@ sub_815C7C4: ; 815C7C4 movs r3, 0x24 ldrsh r1, [r7, r3] cmp r0, r1 - blt @0815C8DA + blt _0815C8DA mov r0, r8 subs r5, r0, r2 lsls r5, 16 @@ -646852,20 +646852,20 @@ sub_815C7C4: ; 815C7C4 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] @@ -646876,7 +646876,7 @@ sub_815C7C4: ; 815C7C4 movs r2, 0x24 ldrsh r6, [r7, r2] cmn r0, r6 - bgt @0815C8DA + bgt _0815C8DA ldrh r3, [r7, 0x24] mov r9, r3 mov r0, r9 @@ -646900,32 +646900,32 @@ sub_815C7C4: ; 815C7C4 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 .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 @@ -646948,9 +646948,9 @@ sub_815C7C4: ; 815C7C4 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] @@ -646960,12 +646960,12 @@ sub_815C7C4: ; 815C7C4 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] @@ -646975,15 +646975,15 @@ sub_815C7C4: ; 815C7C4 lsls r0, 16 asrs r0, 16 cmp r0, 0xF - bgt @0815C950 + bgt _0815C950 movs r0, 0x10 strh r0, [r7, 0x24] - b @0815C950 + b _0815C950 .pool -@0815C94C: +_0815C94C: movs r0, 0x2 strh r0, [r7, 0x8] -@0815C950: +_0815C950: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -646999,12 +646999,12 @@ sub_815C95C: ; 815C95C 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 @@ -647018,7 +647018,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 @@ -647036,9 +647036,9 @@ sub_815C95C: ; 815C95C ldrh r0, [r5, 0x2E] adds r0, 0x1 strh r0, [r5, 0x2E] - b @0815CA1A + b _0815CA1A .pool -@0815C9BC: +_0815C9BC: ldrh r1, [r5, 0x30] lsls r0, r1, 16 asrs r0, 24 @@ -647053,13 +647053,13 @@ sub_815C95C: ; 815C95C 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 @@ -647069,7 +647069,7 @@ sub_815C95C: ; 815C95C bl __divsi3 lsls r0, 1 strh r0, [r5, 0x32] -@0815C9FA: +_0815C9FA: adds r0, r4, 0 adds r0, 0xC0 strh r0, [r5, 0x30] @@ -647082,10 +647082,10 @@ sub_815C95C: ; 815C95C 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 @@ -647107,19 +647107,19 @@ 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 .pool -@0815CA5C: +_0815CA5C: ldr r0, =0x02038437 -@0815CA5E: +_0815CA5E: ldrb r0, [r0] strh r0, [r2, 0x1E] mov r1, r8 @@ -647140,20 +647140,20 @@ sub_815CA20: ; 815CA20 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 .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 @@ -647163,19 +647163,19 @@ sub_815CA20: ; 815CA20 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 @@ -647184,14 +647184,14 @@ sub_815CA20: ; 815CA20 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 @@ -647200,7 +647200,7 @@ sub_815CA20: ; 815CA20 ldrh r0, [r1, 0x26] adds r0, 0x10 strh r0, [r1, 0x26] -@0815CB08: +_0815CB08: ldr r1, =0x02020630 adds r0, r2, r5 lsls r0, 2 @@ -647214,9 +647214,9 @@ sub_815CA20: ; 815CA20 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @0815CB78 + b _0815CB78 .pool -@0815CB2C: +_0815CB2C: ldrb r5, [r2, 0x1C] ldrh r0, [r2, 0xC] adds r0, 0x1 @@ -647225,7 +647225,7 @@ sub_815CA20: ; 815CA20 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne @0815CB50 + bne _0815CB50 strh r4, [r2, 0xC] ldr r0, =0x02020630 lsls r1, r5, 4 @@ -647235,14 +647235,14 @@ sub_815CA20: ; 815CA20 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 @@ -647254,7 +647254,7 @@ sub_815CA20: ; 815CA20 strh r4, [r0, 0x26] adds r0, r7, 0 bl move_anim_task_del -@0815CB78: +_0815CB78: pop {r3} mov r8, r3 pop {r4-r7} @@ -647294,46 +647294,46 @@ 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 .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 .pool -@0815CC1C: +_0815CC1C: movs r0, 0xF8 -@0815CC1E: +_0815CC1E: strh r0, [r4, 0x20] movs r0, 0x68 strh r0, [r4, 0x22] @@ -647352,20 +647352,20 @@ sub_815CC34: ; 815CC34 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 @@ -647381,20 +647381,20 @@ sub_815CC34: ; 815CC34 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 @@ -647456,19 +647456,19 @@ sub_815CD0C: ; 815CD0C 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] @@ -647482,39 +647482,39 @@ sub_815CD0C: ; 815CD0C 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 SetGpuReg @@ -647531,7 +647531,7 @@ sub_815CD0C: ; 815CD0C bl SetGpuReg adds r0, r4, 0 bl move_anim_8072740 -@0815CDAA: +_0815CDAA: pop {r4} pop {r0} bx r0 @@ -647595,30 +647595,30 @@ 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 .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 @@ -647639,15 +647639,15 @@ sub_815CDFC: ; 815CDFC 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 .pool -@0815CE98: +_0815CE98: cmp r2, 0x1 - bne @0815CEC8 + bne _0815CEC8 ldr r1, =0xfffffc00 adds r0, r1, 0 ldrh r2, [r4, 0x32] @@ -647666,10 +647666,10 @@ sub_815CDFC: ; 815CDFC 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 @@ -647692,7 +647692,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 @@ -647704,15 +647704,15 @@ sub_815CED8: ; 815CED8 mov r8, r2 ldrh r6, [r0, 0x2] movs r3, 0x14 - b @0815D058 + b _0815D058 .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 @@ -647745,21 +647745,21 @@ sub_815CED8: ; 815CED8 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 .pool -@0815CF9C: +_0815CF9C: ldrb r0, [r4] lsls r0, 1 adds r0, r6 @@ -647767,20 +647767,20 @@ sub_815CED8: ; 815CED8 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 .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 @@ -647813,12 +647813,12 @@ sub_815CED8: ; 815CED8 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 @@ -647826,28 +647826,28 @@ sub_815CED8: ; 815CED8 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 - b @0815D048 + b _0815D048 .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 @@ -647977,7 +647977,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] @@ -647994,14 +647994,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 str r0, [r4] -@0815D1AE: +_0815D1AE: pop {r4} pop {r0} bx r0 @@ -648055,14 +648055,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 str r0, [r5] -@0815D22A: +_0815D22A: add sp, 0x4 pop {r4-r6} pop {r0} @@ -648085,13 +648085,13 @@ sub_815D240: ; 815D240 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0815D26C + bne _0815D26C ldr r0, =0x02038436 - b @0815D26E + b _0815D26E .pool -@0815D26C: +_0815D26C: ldr r0, =0x02038437 -@0815D26E: +_0815D26E: ldrb r5, [r0] movs r6, 0 strh r6, [r4, 0x8] @@ -648111,12 +648111,12 @@ sub_815D240: ; 815D240 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 @@ -648124,9 +648124,9 @@ sub_815D240: ; 815D240 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] @@ -648141,7 +648141,7 @@ sub_815D240: ; 815D240 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0815D304 + bne _0815D304 ldr r0, =0x04000014 str r0, [sp] ldr r1, =0x00003f42 @@ -648150,9 +648150,9 @@ sub_815D240: ; 815D240 ldr r0, =0x02022e18 ldrh r5, [r0] ldr r0, =0x02022e1a - b @0815D316 + b _0815D316 .pool -@0815D304: +_0815D304: ldr r0, =0x04000018 str r0, [sp] ldr r1, =0x00003f44 @@ -648161,7 +648161,7 @@ sub_815D240: ; 815D240 ldr r0, =0x02022e1c ldrh r5, [r0] ldr r0, =0x02022e1e -@0815D316: +_0815D316: ldrh r3, [r0] movs r7, 0 movs r2, 0 @@ -648170,7 +648170,7 @@ sub_815D240: ; 815D240 lsls r0, 3 adds r0, r6 mov r12, r0 -@0815D326: +_0815D326: lsls r2, 16 asrs r2, 16 lsls r1, r2, 1 @@ -648194,7 +648194,7 @@ sub_815D240: ; 815D240 lsrs r7, r0, 16 asrs r0, 16 cmp r0, 0x9F - ble @0815D326 + ble _0815D326 ldr r0, =0xa6600001 str r0, [sp, 0x4] mov r1, sp @@ -648236,44 +648236,44 @@ 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 .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 .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 @@ -648317,7 +648317,7 @@ sub_815D398: ; 815D398 movs r3, 0x22 ldrsh r0, [r6, r3] cmp r1, r0 - ble @0815D52E + ble _0815D52E ldr r0, =0x02039b28 mov r10, r0 ldr r1, [sp, 0x4] @@ -648328,7 +648328,7 @@ sub_815D398: ; 815D398 lsls r0, r2, 16 asrs r0, 16 str r0, [sp, 0xC] -@0815D47E: +_0815D47E: lsls r5, 16 asrs r5, 16 adds r2, r5, 0x1 @@ -648416,11 +648416,11 @@ sub_815D398: ; 815D398 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 @@ -648430,7 +648430,7 @@ sub_815D398: ; 815D398 movs r0, 0xF0 lsls r0, 3 adds r5, r4, r0 -@0815D546: +_0815D546: asrs r2, r1, 16 lsls r1, r2, 1 adds r0, r1, r4 @@ -648440,15 +648440,15 @@ sub_815D398: ; 815D398 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] @@ -648457,17 +648457,17 @@ sub_815D398: ; 815D398 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 .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] @@ -648479,52 +648479,52 @@ sub_815D398: ; 815D398 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 .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] @@ -648536,22 +648536,22 @@ sub_815D398: ; 815D398 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 @@ -648611,14 +648611,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 @@ -648626,7 +648626,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] @@ -648636,9 +648636,9 @@ sub_815D694: ; 815D694 adds r0, r2 ldr r1, =0x0000ffff strh r1, [r0, 0x24] - b @0815D708 + b _0815D708 .pool -@0815D6F8: +_0815D6F8: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -648647,7 +648647,7 @@ sub_815D694: ; 815D694 lsls r0, 2 adds r0, r2 strh r5, [r0, 0x24] -@0815D708: +_0815D708: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -648655,10 +648655,10 @@ sub_815D694: ; 815D694 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 @@ -648796,14 +648796,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] @@ -648822,10 +648822,10 @@ 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 @@ -648846,11 +648846,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 @@ -648899,7 +648899,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] @@ -648908,20 +648908,20 @@ 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 .pool -@0815D92C: +_0815D92C: strh r7, [r3, 0x1A] -@0815D92E: +_0815D92E: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -648930,23 +648930,23 @@ sub_815D8D8: ; 815D8D8 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 @@ -648961,7 +648961,7 @@ sub_815D8D8: ; 815D8D8 ands r0, r1 mov r12, r2 cmp r0, 0 - beq @0815D998 + beq _0815D998 ldr r3, =0x02020630 movs r2, 0x26 ldrsh r0, [r4, r2] @@ -648974,9 +648974,9 @@ sub_815D8D8: ; 815D8D8 subs r0, r2 strh r0, [r1, 0x24] adds r2, r3, 0 - b @0815D9AE + b _0815D9AE .pool -@0815D998: +_0815D998: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -648988,7 +648988,7 @@ sub_815D8D8: ; 815D8D8 ldrh r4, [r4, 0x1A] adds r1, r4 strh r1, [r0, 0x24] -@0815D9AE: +_0815D9AE: mov r1, r12 adds r0, r1, r5 lsls r0, 3 @@ -649000,7 +649000,7 @@ sub_815D8D8: ; 815D8D8 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @0815D9E0 + beq _0815D9E0 movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -649010,9 +649010,9 @@ sub_815D8D8: ; 815D8D8 lsrs r2, r7, 8 ldrh r0, [r4, 0x1C] subs r0, r2 - b @0815D9F2 + b _0815D9F2 .pool -@0815D9E0: +_0815D9E0: movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -649022,7 +649022,7 @@ sub_815D8D8: ; 815D8D8 lsrs r0, r7, 8 ldrh r4, [r4, 0x1C] adds r0, r4 -@0815D9F2: +_0815D9F2: strh r0, [r1, 0x26] mov r2, r12 adds r0, r2, r5 @@ -649031,14 +649031,14 @@ sub_815D8D8: ; 815D8D8 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} @@ -649071,7 +649071,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] @@ -649080,20 +649080,20 @@ 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 .pool -@0815DA78: +_0815DA78: strh r7, [r3, 0x1A] -@0815DA7A: +_0815DA7A: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -649102,23 +649102,23 @@ sub_815DA20: ; 815DA20 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 @@ -649146,7 +649146,7 @@ sub_815DA20: ; 815DA20 ands r0, r1 mov r12, r3 cmp r0, 0 - beq @0815DB00 + beq _0815DB00 ldr r3, =0x02020630 movs r2, 0x26 ldrsh r0, [r4, r2] @@ -649159,9 +649159,9 @@ sub_815DA20: ; 815DA20 subs r0, r2 strh r0, [r1, 0x24] adds r2, r3, 0 - b @0815DB16 + b _0815DB16 .pool -@0815DB00: +_0815DB00: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -649173,7 +649173,7 @@ sub_815DA20: ; 815DA20 ldrh r4, [r4, 0x1A] adds r1, r4 strh r1, [r0, 0x24] -@0815DB16: +_0815DB16: mov r1, r12 adds r0, r1, r6 lsls r0, 3 @@ -649185,7 +649185,7 @@ sub_815DA20: ; 815DA20 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @0815DB48 + beq _0815DB48 movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -649195,9 +649195,9 @@ sub_815DA20: ; 815DA20 lsrs r2, r7, 8 ldrh r0, [r4, 0x1C] subs r0, r2 - b @0815DB5A + b _0815DB5A .pool -@0815DB48: +_0815DB48: movs r1, 0x26 ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -649207,7 +649207,7 @@ sub_815DA20: ; 815DA20 lsrs r0, r7, 8 ldrh r4, [r4, 0x1C] adds r0, r4 -@0815DB5A: +_0815DB5A: strh r0, [r1, 0x26] mov r2, r12 adds r0, r2, r6 @@ -649220,14 +649220,14 @@ sub_815DA20: ; 815DA20 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 str r0, [r2] -@0815DB80: +_0815DB80: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -649267,45 +649267,45 @@ 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 .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 .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 @@ -649315,7 +649315,7 @@ sub_815DB90: ; 815DB90 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 @@ -649324,9 +649324,9 @@ sub_815DB90: ; 815DB90 ldrh r2, [r5, 0x4] ldr r0, =0x00007fff ands r0, r2 - b @0815DC72 + b _0815DC72 .pool -@0815DC60: +_0815DC60: ldr r3, =0x03005e00 lsls r4, r6, 2 adds r1, r4, r6 @@ -649336,9 +649336,9 @@ sub_815DB90: ; 815DB90 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 @@ -649373,10 +649373,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] @@ -649386,13 +649386,13 @@ sub_815DCA4: ; 815DCA4 movs r1, 0 ldrsh r0, [r4, r1] cmp r0, 0 - bne @0815DCE8 + bne _0815DCE8 ldr r0, =0x02038436 - b @0815DCEA + b _0815DCEA .pool -@0815DCE8: +_0815DCE8: ldr r0, =0x02038437 -@0815DCEA: +_0815DCEA: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0 @@ -649442,48 +649442,48 @@ 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 .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 @@ -649491,16 +649491,16 @@ sub_815DD48: ; 815DD48 ldr r2, =gUnknown_085CE74C adds r0, r4, 0 bl sub_80A7CFC - b @0815DDDA + b _0815DDDA .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 @@ -649521,15 +649521,15 @@ 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 .pool -@0815DE08: +_0815DE08: movs r1, 0x1E movs r3, 0x14 -@0815DE0C: +_0815DE0C: mov r2, sp ldrh r0, [r4, 0x10] subs r0, r1 @@ -649558,7 +649558,7 @@ sub_815DDE0: ; 815DDE0 movs r5, 0 mov r8, r2 ldr r7, =0x02020630 -@0815DE44: +_0815DE44: lsls r0, r5, 1 add r0, sp movs r2, 0 @@ -649578,7 +649578,7 @@ sub_815DDE0: ; 815DDE0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @0815DE98 + beq _0815DE98 lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -649587,11 +649587,11 @@ sub_815DDE0: ; 815DDE0 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] @@ -649601,12 +649601,12 @@ sub_815DDE0: ; 815DDE0 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 @@ -649634,7 +649634,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] @@ -649652,7 +649652,7 @@ sub_815DEBC: ; 815DEBC strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0815DF02: +_0815DF02: pop {r4} pop {r0} bx r0 @@ -649712,7 +649712,7 @@ sub_815DF64: ; 815DF64 movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - beq @0815DFB4 + beq _0815DFB4 ldrh r0, [r4, 0xC] ldr r2, =gUnknown_085CE784 movs r3, 0x8 @@ -649729,16 +649729,16 @@ 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 .pool -@0815DFB4: +_0815DFB4: ldrh r0, [r4, 0xC] movs r1, 0x10 movs r2, 0 @@ -649746,7 +649746,7 @@ sub_815DF64: ; 815DF64 bl pal_fade_1 adds r0, r5, 0 bl move_anim_task_del -@0815DFC6: +_0815DFC6: pop {r4,r5} pop {r0} bx r0 @@ -649795,12 +649795,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 @@ -649821,17 +649821,17 @@ sub_815E01C: ; 815E01C 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 .pool -@0815E080: +_0815E080: cmp r0, 0x1 - bne @0815E09A + bne _0815E09A adds r2, r5, 0 adds r2, 0x3F ldrb r0, [r2] @@ -649842,21 +649842,21 @@ sub_815E01C: ; 815E01C 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 StartObjectImageAnim 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] @@ -649866,7 +649866,7 @@ sub_815E01C: ; 815E01C movs r1, 0x1 orrs r0, r1 strb r0, [r2] -@0815E0C8: +_0815E0C8: ldr r0, =sub_815E0DC str r0, [r5, 0x1C] pop {r4-r6} @@ -649899,10 +649899,10 @@ 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 @@ -649921,28 +649921,28 @@ 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 .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 @@ -649955,14 +649955,14 @@ sub_815E114: ; 815E114 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 .pool -@0815E188: +_0815E188: ldrb r0, [r5] movs r1, 0x2 bl sub_80A5C6C @@ -649975,12 +649975,12 @@ sub_815E114: ; 815E114 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] @@ -649995,9 +649995,9 @@ sub_815E114: ; 815E114 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] @@ -650038,21 +650038,21 @@ 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 .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] @@ -650074,7 +650074,7 @@ sub_815E20C: ; 815E20C movs r6, 0 mov r8, r4 ldr r4, =0x02020630 -@0815E272: +_0815E272: add r0, sp, 0x10 movs r2, 0 ldrsh r1, [r0, r2] @@ -650087,13 +650087,13 @@ sub_815E20C: ; 815E20C 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 @@ -650102,9 +650102,9 @@ sub_815E20C: ; 815E20C negs r0, r0 strh r0, [r1, 0x26] strh r0, [r1, 0x24] - b @0815E2EE + b _0815E2EE .pool -@0815E2B4: +_0815E2B4: lsls r2, r3, 4 adds r1, r2, r3 lsls r1, 2 @@ -650113,10 +650113,10 @@ sub_815E20C: ; 815E20C 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 @@ -650125,8 +650125,8 @@ sub_815E20C: ; 815E20C 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 @@ -650135,9 +650135,9 @@ sub_815E20C: ; 815E20C 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 @@ -650150,35 +650150,35 @@ sub_815E20C: ; 815E20C 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 .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 @@ -650219,21 +650219,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 @@ -650272,7 +650272,7 @@ sub_815E34C: ; 815E34C asrs r4, 8 mov r1, r10 strh r4, [r1] -@0815E3F2: +_0815E3F2: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -650293,7 +650293,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] @@ -650311,7 +650311,7 @@ sub_815E404: ; 815E404 strh r0, [r1] adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0815E43A: +_0815E43A: pop {r4} pop {r0} bx r0 @@ -650396,9 +650396,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] @@ -650422,7 +650422,7 @@ sub_815E47C: ; 815E47C lsrs r0, 24 strh r0, [r7, 0x26] cmp r0, 0x40 - beq @0815E5B8 + beq _0815E5B8 ldr r4, =0x02020630 movs r0, 0x26 ldrsh r1, [r7, r0] @@ -650469,7 +650469,7 @@ sub_815E47C: ; 815E47C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0815E596 + bne _0815E596 movs r0, 0x26 ldrsh r1, [r7, r0] lsls r0, r1, 4 @@ -650478,15 +650478,15 @@ sub_815E47C: ; 815E47C adds r0, r4 movs r1, 0x1 bl StartObjectRotScalAnim -@0815E596: +_0815E596: ldr r0, =sub_815E5CC str r0, [r7] - b @0815E5BE + b _0815E5BE .pool -@0815E5B8: +_0815E5B8: mov r0, r9 bl move_anim_task_del -@0815E5BE: +_0815E5BE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -650509,27 +650509,27 @@ 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 .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] @@ -650545,10 +650545,10 @@ sub_815E5CC: ; 815E5CC lsls r0, 16 asrs r0, 16 cmp r0, 0x7 - ble @0815E6D2 - b @0815E6BE + ble _0815E6D2 + b _0815E6BE .pool -@0815E634: +_0815E634: movs r0, 0x26 ldrsh r1, [r4, r0] lsls r0, r1, 4 @@ -650559,20 +650559,20 @@ sub_815E5CC: ; 815E5CC 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 .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] @@ -650597,7 +650597,7 @@ sub_815E5CC: ; 815E5CC 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 @@ -650615,16 +650615,16 @@ sub_815E5CC: ; 815E5CC lsls r0, 2 adds r0, r5 bl RemoveObjectAndFreeTiles -@0815E6BE: +_0815E6BE: ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0815E6D2 + b _0815E6D2 .pool -@0815E6CC: +_0815E6CC: adds r0, r2, 0 bl move_anim_task_del -@0815E6D2: +_0815E6D2: pop {r4,r5} pop {r0} bx r0 @@ -650639,13 +650639,13 @@ 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 .pool -@0815E6F4: +_0815E6F4: ldr r0, =0x02038437 -@0815E6F6: +_0815E6F6: ldrb r5, [r0] ldrh r2, [r4, 0x4] lsls r1, r2, 22 @@ -650665,11 +650665,11 @@ sub_815E6D8: ; 815E6D8 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 @@ -650680,7 +650680,7 @@ sub_815E6D8: ; 815E6D8 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 @@ -650695,14 +650695,14 @@ sub_815E6D8: ; 815E6D8 movs r1, 0x4 bl sub_80A861C subs r0, 0x8 - b @0815E772 + b _0815E772 .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 str r0, [r4, 0x1C] @@ -650719,26 +650719,26 @@ sub_815E784: ; 815E784 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] @@ -650750,18 +650750,18 @@ sub_815E784: ; 815E784 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 @@ -650774,16 +650774,16 @@ sub_815E784: ; 815E784 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 @@ -650797,23 +650797,23 @@ sub_815E784: ; 815E784 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 @@ -650827,12 +650827,12 @@ 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 .pool -@0815E85C: +_0815E85C: ldr r0, =0x03005e00 lsls r4, r1, 2 adds r4, r1 @@ -650851,7 +650851,7 @@ sub_815E840: ; 815E840 bl sub_80A7CFC ldr r0, =sub_815E898 str r0, [r4] -@0815E884: +_0815E884: pop {r4} pop {r0} bx r0 @@ -650874,14 +650874,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] @@ -650890,9 +650890,9 @@ sub_815E898: ; 815E898 lsls r0, 2 adds r0, r2 movs r1, 0x2 - b @0815E8F0 + b _0815E8F0 .pool -@0815E8E0: +_0815E8E0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r4, r0] @@ -650901,15 +650901,15 @@ sub_815E898: ; 815E898 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] @@ -650923,7 +650923,7 @@ sub_815E898: ; 815E898 strh r0, [r4, 0x8] lsls r0, 16 cmp r0, 0 - beq @0815E948 + beq _0815E948 lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -650936,12 +650936,12 @@ sub_815E898: ; 815E898 bl sub_80A7CFC strh r5, [r4, 0xA] strh r5, [r4, 0xC] - b @0815E94E + b _0815E94E .pool -@0815E948: +_0815E948: adds r0, r6, 0 bl move_anim_task_del -@0815E94E: +_0815E94E: pop {r4-r6} pop {r0} bx r0 @@ -650955,13 +650955,13 @@ sub_815E954: ; 815E954 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - bne @0815E970 + bne _0815E970 ldr r4, =0x02038436 - b @0815E972 + b _0815E972 .pool -@0815E970: +_0815E970: ldr r4, =0x02038437 -@0815E972: +_0815E972: ldrb r0, [r4] movs r1, 0x2 bl sub_80A5C6C @@ -650975,10 +650975,10 @@ sub_815E954: ; 815E954 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 @@ -651007,7 +651007,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] @@ -651029,16 +651029,16 @@ 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 @@ -651051,7 +651051,7 @@ sub_815EA14: ; 815EA14 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 @@ -651065,13 +651065,13 @@ sub_815EA14: ; 815EA14 movs r0, 0x64 strh r0, [r3, 0x20] movs r0, 0x1 - b @0815EA4A + b _0815EA4A .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] @@ -651089,27 +651089,27 @@ sub_815EA60: ; 815EA60 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 .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 @@ -651120,35 +651120,35 @@ sub_815EA60: ; 815EA60 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] @@ -651175,23 +651175,23 @@ sub_815EA60: ; 815EA60 lsls r2, 16 asrs r2, 16 cmp r2, 0xC - beq @0815EB1C - b @0815EC40 -@0815EB1C: - b @0815EC12 + beq _0815EB1C + b _0815EC40 +_0815EB1C: + b _0815EC12 .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] @@ -651218,10 +651218,10 @@ sub_815EA60: ; 815EA60 lsls r2, 16 asrs r2, 16 cmp r2, 0xC - bne @0815EC40 - b @0815EC16 + bne _0815EC40 + b _0815EC16 .pool -@0815EB74: +_0815EB74: ldrh r2, [r4, 0x30] adds r2, 0x1 strh r2, [r4, 0x30] @@ -651248,7 +651248,7 @@ sub_815EA60: ; 815EA60 lsls r2, 16 asrs r2, 16 cmp r2, 0xF - bne @0815EBC0 + bne _0815EBC0 ldrh r2, [r4, 0x4] lsls r1, r2, 22 lsrs r1, 22 @@ -651260,14 +651260,14 @@ sub_815EA60: ; 815EA60 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 .pool -@0815EBD8: +_0815EBD8: movs r3, 0x3C ldrsh r0, [r4, r3] lsls r1, r0, 1 @@ -651282,9 +651282,9 @@ sub_815EA60: ; 815EA60 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 @@ -651297,16 +651297,16 @@ sub_815EA60: ; 815EA60 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 @@ -651320,10 +651320,10 @@ sub_815EA60: ; 815EA60 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 @@ -651347,12 +651347,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 @@ -651368,29 +651368,29 @@ sub_815EC48: ; 815EC48 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - ble @0815ECAC + ble _0815ECAC strh r7, [r6, 0x24] - b @0815ECD4 + b _0815ECD4 .pool -@0815ECAC: +_0815ECAC: ldr r0, =0x0000ffff - b @0815ECD2 + b _0815ECD2 .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 .pool -@0815ECD0: +_0815ECD0: movs r0, 0x1 -@0815ECD2: +_0815ECD2: strh r0, [r6, 0x24] -@0815ECD4: +_0815ECD4: ldr r0, =sub_815ECE4 str r0, [r6] pop {r4-r7} @@ -651412,38 +651412,38 @@ 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 .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] @@ -651464,12 +651464,12 @@ sub_815ECE4: ; 815ECE4 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - beq @0815ED72 - b @0815EE78 -@0815ED72: - b @0815EE50 + beq _0815ED72 + b _0815EE78 +_0815ED72: + b _0815EE50 .pool -@0815ED78: +_0815ED78: ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] @@ -651490,30 +651490,30 @@ sub_815ECE4: ; 815ECE4 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - bne @0815EE78 - b @0815EE50 + bne _0815EE78 + b _0815EE50 .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] @@ -651531,19 +651531,19 @@ sub_815ECE4: ; 815ECE4 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - bne @0815EE78 - b @0815EE50 + bne _0815EE78 + b _0815EE50 .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] @@ -651556,9 +651556,9 @@ sub_815ECE4: ; 815ECE4 lsls r2, 2 ldrh r0, [r1, 0x24] subs r0, r2 - b @0815EE40 + b _0815EE40 .pool -@0815EE28: +_0815EE28: ldr r2, =0x02020630 movs r1, 0x26 ldrsh r0, [r3, r1] @@ -651571,7 +651571,7 @@ sub_815ECE4: ; 815ECE4 lsls r0, 2 ldrh r2, [r1, 0x24] adds r0, r2 -@0815EE40: +_0815EE40: strh r0, [r1, 0x24] ldrh r0, [r3, 0xA] adds r0, 0x1 @@ -651579,17 +651579,17 @@ sub_815ECE4: ; 815ECE4 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 .pool -@0815EE60: +_0815EE60: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -651601,7 +651601,7 @@ sub_815ECE4: ; 815ECE4 strh r1, [r0, 0x24] adds r0, r4, 0 bl move_anim_task_del -@0815EE78: +_0815EE78: pop {r4} pop {r0} bx r0 @@ -651616,16 +651616,16 @@ sub_815EE84: ; 815EE84 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 .pool -@0815EEA8: +_0815EEA8: ldr r0, =0x02038437 -@0815EEAA: +_0815EEAA: ldrb r0, [r0] strh r0, [r4, 0x3C] ldrh r0, [r4, 0x3C] @@ -651635,7 +651635,7 @@ sub_815EE84: ; 815EE84 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0815EECE + bne _0815EECE ldrb r0, [r4, 0x3] movs r1, 0x3F negs r1, r1 @@ -651643,7 +651643,7 @@ sub_815EE84: ; 815EE84 movs r0, 0x10 orrs r1, r0 strb r1, [r4, 0x3] -@0815EECE: +_0815EECE: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 @@ -651678,45 +651678,45 @@ sub_815EF08: ; 815EF08 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 .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 .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 @@ -651729,8 +651729,8 @@ sub_815EF08: ; 815EF08 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 @@ -651745,8 +651745,8 @@ sub_815EF08: ; 815EF08 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 @@ -651759,8 +651759,8 @@ sub_815EF08: ; 815EF08 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 @@ -651773,14 +651773,14 @@ sub_815EF08: ; 815EF08 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 @@ -651795,21 +651795,21 @@ sub_815EF08: ; 815EF08 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] @@ -651819,19 +651819,19 @@ sub_815EF08: ; 815EF08 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 @@ -651847,8 +651847,8 @@ sub_815EF08: ; 815EF08 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 @@ -651861,12 +651861,12 @@ sub_815EF08: ; 815EF08 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 @@ -651874,33 +651874,33 @@ sub_815EF08: ; 815EF08 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] @@ -651915,22 +651915,22 @@ sub_815EF08: ; 815EF08 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 @@ -651970,7 +651970,7 @@ sub_815F10C: ; 815F10C movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @0815F16A + bne _0815F16A ldr r0, =gUnknown_085CE3A0 ldrh r1, [r4, 0x20] adds r1, r5 @@ -651982,16 +651982,16 @@ sub_815F10C: ; 815F10C asrs r2, 16 movs r3, 0x5 bl AddObjectToFront -@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] @@ -652016,12 +652016,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] @@ -652029,9 +652029,9 @@ sub_815F18C: ; 815F18C strh r0, [r5, 0x2E] ldrh r0, [r2, 0x4] subs r1, r0 - b @0815F1DE + b _0815F1DE .pool -@0815F1D0: +_0815F1D0: ldr r2, =0x0203841e ldrh r1, [r5, 0x20] ldrh r0, [r2] @@ -652039,7 +652039,7 @@ sub_815F18C: ; 815F18C 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] @@ -652086,7 +652086,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 @@ -652094,11 +652094,11 @@ sub_815F20C: ; 815F20C lsls r0, 1 strh r0, [r4, 0xA] strh r0, [r4, 0xC] - b @0815F2A0 + b _0815F2A0 .pool -@0815F254: +_0815F254: cmp r0, 0x1 - bne @0815F2AC + bne _0815F2AC ldrh r0, [r4, 0xA] adds r0, 0x60 strh r0, [r4, 0xA] @@ -652118,7 +652118,7 @@ sub_815F20C: ; 815F20C lsls r0, 16 asrs r0, 16 cmp r0, 0x9 - bne @0815F310 + bne _0815F310 movs r0, 0 strh r0, [r4, 0xE] adds r0, r5, 0 @@ -652133,13 +652133,13 @@ sub_815F20C: ; 815F20C 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 .pool -@0815F2AC: +_0815F2AC: ldr r4, =0x02038436 ldrb r0, [r4] movs r1, 0 @@ -652147,7 +652147,7 @@ sub_815F20C: ; 815F20C bl sub_80A4DF0 lsls r0, 24 cmp r0, 0 - beq @0815F2EE + beq _0815F2EE ldr r3, =0x02020630 ldr r2, =0x020241e4 ldrb r0, [r4] @@ -652170,7 +652170,7 @@ sub_815F20C: ; 815F20C adds r0, r3 movs r1, 0 bl StartObjectRotScalAnim -@0815F2EE: +_0815F2EE: mov r4, r9 adds r3, r7, 0 ldr r5, =sub_815F330 @@ -652179,17 +652179,17 @@ sub_815F20C: ; 815F20C 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 @@ -652216,20 +652216,20 @@ 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 .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 @@ -652245,9 +652245,9 @@ sub_815F330: ; 815F330 ands r0, r2 strb r0, [r1] strh r5, [r4, 0x1C] - b @0815F42E + b _0815F42E .pool -@0815F394: +_0815F394: ldrh r1, [r4, 0x1C] adds r1, 0x70 movs r5, 0 @@ -652270,19 +652270,19 @@ sub_815F330: ; 815F330 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 @@ -652296,18 +652296,18 @@ sub_815F330: ; 815F330 ldrh r2, [r4, 0x1C] adds r0, r2 strh r0, [r4, 0x1C] - b @0815F42E + b _0815F42E .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 @@ -652322,14 +652322,14 @@ sub_815F330: ; 815F330 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 .pool -@0815F43C: +_0815F43C: ldrh r0, [r4, 0x1C] adds r0, 0x70 strh r0, [r4, 0x1C] @@ -652345,14 +652345,14 @@ sub_815F330: ; 815F330 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 @@ -652363,7 +652363,7 @@ sub_815F330: ; 815F330 bl audio_play_and_stuff adds r0, r6, 0 bl move_anim_task_del -@0815F482: +_0815F482: pop {r4-r6} pop {r0} bx r0 @@ -652379,7 +652379,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 @@ -652387,9 +652387,9 @@ sub_815F48C: ; 815F48C adds r1, 0x43 strb r0, [r1] ldr r4, =0x0000ff70 - b @0815F4C8 + b _0815F4C8 .pool -@0815F4B8: +_0815F4B8: ldrb r0, [r4] bl sub_80A82E4 adds r0, 0x2 @@ -652397,7 +652397,7 @@ sub_815F48C: ; 815F48C adds r1, 0x43 strb r0, [r1] ldr r4, =0x0000ffa0 -@0815F4C8: +_0815F4C8: ldr r0, =0x02038437 ldrb r0, [r0] movs r1, 0x3 @@ -652421,29 +652421,29 @@ sub_815F4F0: ; 815F4F0 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 .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 @@ -652453,8 +652453,8 @@ sub_815F4F0: ; 815F4F0 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 @@ -652472,7 +652472,7 @@ sub_815F4F0: ; 815F4F0 lsls r1, 16 asrs r1, 16 cmp r1, 0x7F - ble @0815F61A + ble _0815F61A movs r0, 0x3F bl sub_80A5178 adds r1, r0, 0 @@ -652482,9 +652482,9 @@ sub_815F4F0: ; 815F4F0 bl audio_play_and_stuff strh r5, [r4, 0x30] strh r5, [r4, 0x26] - b @0815F5D8 + b _0815F5D8 .pool -@0815F584: +_0815F584: ldrh r1, [r4, 0x30] adds r1, 0x6 movs r3, 0 @@ -652502,19 +652502,19 @@ sub_815F4F0: ; 815F4F0 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 .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 @@ -652524,19 +652524,19 @@ sub_815F4F0: ; 815F4F0 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] @@ -652555,10 +652555,10 @@ sub_815F4F0: ; 815F4F0 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 @@ -652578,7 +652578,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 @@ -652586,7 +652586,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 @@ -652594,19 +652594,19 @@ 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 .pool -@0815F67C: +_0815F67C: ldr r4, =0x02020630 lsls r0, r1, 4 adds r0, r1 @@ -652664,7 +652664,7 @@ sub_815F620: ; 815F620 adds r7, r4, 0 mov r12, r3 cmp r0, 0 - bne @0815F720 + bne _0815F720 adds r2, r5, 0 adds r2, 0x3E ldrb r1, [r2] @@ -652678,9 +652678,9 @@ sub_815F620: ; 815F620 movs r1, 0x4 orrs r0, r1 strb r0, [r2] - b @0815F736 + b _0815F736 .pool -@0815F720: +_0815F720: adds r1, r5, 0 adds r1, 0x3E ldrb r0, [r1] @@ -652692,7 +652692,7 @@ sub_815F620: ; 815F620 ldrb r0, [r1] orrs r0, r2 strb r0, [r1] -@0815F736: +_0815F736: mov r1, r9 lsls r0, r1, 16 asrs r0, 16 @@ -652730,7 +652730,7 @@ sub_815F620: ; 815F620 adds r0, r1 ldr r1, =sub_815F79C str r1, [r0] -@0815F780: +_0815F780: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -652754,10 +652754,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 .pool @@ -652773,7 +652773,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 @@ -652787,7 +652787,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] @@ -652802,7 +652802,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 @@ -652819,38 +652819,38 @@ sub_815F7C4: ; 815F7C4 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 .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] @@ -652868,7 +652868,7 @@ sub_815F7C4: ; 815F7C4 strh r0, [r1] adds r0, r4, 0 bl obj_delete_but_dont_free_vram -@0815F896: +_0815F896: pop {r4,r5} pop {r0} bx r0 @@ -652892,26 +652892,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} @@ -652939,23 +652939,23 @@ 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 .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 @@ -652978,7 +652978,7 @@ sub_815F8F4: ; 815F8F4 lsls r0, 24 mov r9, r4 cmp r0, 0 - bne @0815F998 + bne _0815F998 ldr r2, =0x02020630 lsls r3, r7, 4 adds r1, r3, r7 @@ -652990,9 +652990,9 @@ sub_815F8F4: ; 815F8F4 ldrh r4, [r1, 0x24] adds r0, r4 strh r0, [r1, 0x24] - b @0815F9B2 + b _0815F9B2 .pool -@0815F998: +_0815F998: ldr r3, =0x02020630 lsls r4, r7, 4 adds r2, r4, r7 @@ -653006,7 +653006,7 @@ sub_815F8F4: ; 815F8F4 strh r0, [r2, 0x24] adds r2, r3, 0 adds r3, r4, 0 -@0815F9B2: +_0815F9B2: ldr r1, =0x03005e00 mov r0, r9 add r0, r8 @@ -653027,21 +653027,21 @@ sub_815F8F4: ; 815F8F4 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 .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] @@ -653056,15 +653056,15 @@ sub_815F8F4: ; 815F8F4 lsls r0, 24 lsrs r4, r0, 24 movs r7, 0 - b @0815FB4E + b _0815FB4E .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 @@ -653094,7 +653094,7 @@ sub_815F8F4: ; 815F8F4 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] @@ -653104,11 +653104,11 @@ sub_815F8F4: ; 815F8F4 bl pokemon_getattr lsls r0, 16 lsrs r6, r0, 16 - b @0815FA9E + b _0815FA9E .pool -@0815FA9C: +_0815FA9C: ldrh r6, [r1, 0x2] -@0815FA9E: +_0815FA9E: movs r0, 0x1 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -653126,9 +653126,9 @@ sub_815F8F4: ; 815F8F4 movs r7, 0 movs r5, 0x88 lsls r5, 1 - b @0815FB50 + b _0815FB50 .pool -@0815FAC8: +_0815FAC8: ldr r7, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -653158,7 +653158,7 @@ sub_815F8F4: ; 815F8F4 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] @@ -653168,11 +653168,11 @@ sub_815F8F4: ; 815F8F4 bl pokemon_getattr lsls r0, 16 lsrs r6, r0, 16 - b @0815FB2E + b _0815FB2E .pool -@0815FB2C: +_0815FB2C: ldrh r6, [r1, 0x2] -@0815FB2E: +_0815FB2E: movs r0, 0x1 bl obj_id_for_side_relative_to_move ldr r2, =0x02020630 @@ -653188,9 +653188,9 @@ sub_815F8F4: ; 815F8F4 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 @@ -653224,7 +653224,7 @@ sub_815F8F4: ; 815F8F4 adds r0, r1 ldrh r0, [r0, 0x2] cmp r0, 0 - beq @0815FBBA + beq _0815FBBA ldr r1, =0x02020630 lsls r0, r5, 4 adds r0, r5 @@ -653241,7 +653241,7 @@ sub_815F8F4: ; 815F8F4 movs r1, 0x10 movs r2, 0x6 bl pal_fade_1 -@0815FBBA: +_0815FBBA: ldr r0, =0x03005e00 mov r3, r8 lsls r1, r3, 2 @@ -653249,9 +653249,9 @@ sub_815F8F4: ; 815F8F4 lsls r1, 3 adds r1, r0 strh r5, [r1, 0x26] - b @0815FD7E + b _0815FD7E .pool -@0815FBE8: +_0815FBE8: ldr r1, =0x03005e00 mov r0, r8 lsls r4, r0, 2 @@ -653273,7 +653273,7 @@ sub_815F8F4: ; 815F8F4 lsls r0, 24 mov r9, r4 cmp r0, 0 - bne @0815FC40 + bne _0815FC40 ldr r3, =0x02020630 lsls r4, r5, 4 adds r2, r4, r5 @@ -653287,9 +653287,9 @@ sub_815F8F4: ; 815F8F4 strh r0, [r2, 0x24] adds r2, r3, 0 adds r3, r4, 0 - b @0815FC56 + b _0815FC56 .pool -@0815FC40: +_0815FC40: ldr r2, =0x02020630 lsls r3, r5, 4 adds r1, r3, r5 @@ -653301,7 +653301,7 @@ sub_815F8F4: ; 815F8F4 ldrh r4, [r1, 0x24] adds r0, r4 strh r0, [r1, 0x24] -@0815FC56: +_0815FC56: ldr r1, =0x03005e00 mov r0, r9 add r0, r8 @@ -653320,13 +653320,13 @@ sub_815F8F4: ; 815F8F4 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 @@ -653336,10 +653336,10 @@ sub_815F8F4: ; 815F8F4 lsls r0, 24 lsrs r0, 24 cmp r4, r0 - bge @0815FCD6 - b @0815FCCA + bge _0815FCD6 + b _0815FCCA .pool -@0815FCB4: +_0815FCB4: lsls r4, r5, 16 asrs r4, 16 ldr r0, =0x02038437 @@ -653349,15 +653349,15 @@ sub_815F8F4: ; 815F8F4 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 @@ -653365,9 +653365,9 @@ sub_815F8F4: ; 815F8F4 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 @@ -653375,9 +653375,9 @@ sub_815F8F4: ; 815F8F4 adds r1, r0 movs r0, 0 strh r0, [r1, 0xA] - b @0815FD7E + b _0815FD7E .pool -@0815FD08: +_0815FD08: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -653403,7 +653403,7 @@ sub_815F8F4: ; 815F8F4 lsls r0, 24 mov r9, r4 cmp r0, 0 - bne @0815FD60 + bne _0815FD60 lsls r1, r7, 4 adds r1, r7 lsls r1, 2 @@ -653412,9 +653412,9 @@ sub_815F8F4: ; 815F8F4 negs r0, r0 subs r0, 0x20 strh r0, [r1, 0x24] - b @0815FD74 + b _0815FD74 .pool -@0815FD60: +_0815FD60: lsls r0, r7, 4 adds r0, r7 lsls r0, 2 @@ -653425,19 +653425,19 @@ sub_815F8F4: ; 815F8F4 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 .pool -@0815FD8C: +_0815FD8C: movs r0, 0 bl obj_id_for_side_relative_to_move lsls r0, 24 @@ -653463,7 +653463,7 @@ sub_815F8F4: ; 815F8F4 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 @@ -653488,12 +653488,12 @@ sub_815F8F4: ; 815F8F4 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 .pool -@0815FE0C: +_0815FE0C: ldr r1, =0x02020630 lsls r5, r7, 4 adds r0, r5, r7 @@ -653518,10 +653518,10 @@ sub_815F8F4: ; 815F8F4 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 @@ -653536,10 +653536,10 @@ sub_815F8F4: ; 815F8F4 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 @@ -653558,18 +653558,18 @@ sub_815FE80: ; 815FE80 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 @@ -653603,11 +653603,11 @@ sub_815FE80: ; 815FE80 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 @@ -653623,17 +653623,17 @@ sub_815FE80: ; 815FE80 adds r1, r4, 0 adds r1, 0x43 strb r0, [r1] - b @0815FFBC + b _0815FFBC .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 @@ -653646,7 +653646,7 @@ sub_815FE80: ; 815FE80 lsls r0, 16 asrs r0, 16 cmp r0, 0x7F - ble @0815FF6E + ble _0815FF6E movs r1, 0x2E ldrsh r0, [r4, r1] lsrs r1, r0, 31 @@ -653659,7 +653659,7 @@ sub_815FE80: ; 815FE80 adds r0, r2, 0 subs r0, 0x7A strh r0, [r4, 0x30] -@0815FF6E: +_0815FF6E: movs r2, 0x80 lsls r2, 1 adds r0, r2, 0 @@ -653671,7 +653671,7 @@ sub_815FE80: ; 815FE80 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 @@ -653679,26 +653679,26 @@ sub_815FE80: ; 815FE80 subs r0, r1 strh r0, [r4, 0x24] adds r1, r2, 0 - b @0815FFA8 + b _0815FFA8 .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 @@ -653718,23 +653718,23 @@ 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 .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 @@ -653757,18 +653757,18 @@ sub_815FFC4: ; 815FFC4 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 .pool -@08160058: +_08160058: ldr r1, =0x020241e4 ldr r0, =0x02038436 ldrb r0, [r0] @@ -653790,7 +653790,7 @@ sub_815FFC4: ; 815FFC4 movs r3, 0x8 ldrsh r0, [r2, r3] cmp r0, 0 - ble @081600A0 + ble _081600A0 movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -653798,9 +653798,9 @@ sub_815FFC4: ; 815FFC4 adds r0, r1 movs r3, 0xC ldrsh r1, [r2, r3] - b @08160126 + b _08160126 .pool -@081600A0: +_081600A0: movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -653809,9 +653809,9 @@ sub_815FFC4: ; 815FFC4 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 @@ -653823,8 +653823,8 @@ sub_815FFC4: ; 815FFC4 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] @@ -653846,7 +653846,7 @@ sub_815FFC4: ; 815FFC4 movs r3, 0x8 ldrsh r0, [r2, r3] cmp r0, 0 - bge @08160118 + bge _08160118 movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -653855,10 +653855,10 @@ sub_815FFC4: ; 815FFC4 movs r3, 0xA ldrsh r1, [r2, r3] cmp r0, r1 - bgt @08160150 - b @0816012A + bgt _08160150 + b _0816012A .pool -@08160118: +_08160118: movs r3, 0x20 ldrsh r0, [r1, r3] movs r3, 0x24 @@ -653866,15 +653866,15 @@ sub_815FFC4: ; 815FFC4 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] @@ -653889,7 +653889,7 @@ sub_815FFC4: ; 815FFC4 strh r1, [r0, 0x24] adds r0, r4, 0 bl move_anim_task_del -@08160150: +_08160150: pop {r4,r5} pop {r0} bx r0 @@ -653920,9 +653920,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 @@ -653965,18 +653965,18 @@ 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 .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 @@ -654023,7 +654023,7 @@ sub_81601DC: ; 81601DC 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 @@ -654032,9 +654032,9 @@ sub_81601DC: ; 81601DC adds r0, r5 ldrh r1, [r4, 0x12] strh r1, [r0, 0x20] - b @081602C4 + b _081602C4 .pool -@08160284: +_08160284: ldrh r0, [r4, 0x1E] adds r0, 0x8 movs r1, 0xFF @@ -654059,7 +654059,7 @@ sub_81601DC: ; 81601DC 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 @@ -654067,16 +654067,16 @@ sub_81601DC: ; 81601DC 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 .pool -@081602D4: +_081602D4: adds r0, r2, 0 bl move_anim_task_del -@081602DA: +_081602DA: pop {r4-r6} pop {r0} bx r0 @@ -654112,10 +654112,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] @@ -654134,7 +654134,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] @@ -654151,9 +654151,9 @@ sub_8160338: ; 8160338 adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim - b @08160396 + b _08160396 .pool -@0816037C: +_0816037C: movs r0, 0xB strh r0, [r4, 0x2E] movs r0, 0xC0 @@ -654167,7 +654167,7 @@ sub_8160338: ; 8160338 ldrh r1, [r4, 0x22] adds r0, r1 strh r0, [r4, 0x22] -@08160396: +_08160396: ldr r0, =sub_81602E0 str r0, [r4, 0x1C] pop {r4} @@ -654194,10 +654194,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 @@ -654220,49 +654220,49 @@ sub_81603F4: ; 81603F4 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] @@ -654276,9 +654276,9 @@ sub_81603F4: ; 81603F4 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 @@ -654286,42 +654286,42 @@ sub_81603F4: ; 81603F4 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] @@ -654335,16 +654335,16 @@ sub_81603F4: ; 81603F4 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 @@ -654363,33 +654363,33 @@ sub_81604F0: ; 81604F0 movs r0, 0x60 ands r0, r1 cmp r0, 0 - beq @08160514 + beq _08160514 movs r0, 0x1 - b @08160536 + b _08160536 .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} @@ -654445,14 +654445,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 @@ -654460,7 +654460,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] @@ -654470,9 +654470,9 @@ sub_816058C: ; 816058C adds r0, r2 ldr r1, =0x0000ffff strh r1, [r0, 0x24] - b @08160600 + b _08160600 .pool -@081605F0: +_081605F0: ldr r2, =0x02020630 movs r0, 0x26 ldrsh r1, [r3, r0] @@ -654481,7 +654481,7 @@ sub_816058C: ; 816058C lsls r0, 2 adds r0, r2 strh r5, [r0, 0x24] -@08160600: +_08160600: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -654489,10 +654489,10 @@ sub_816058C: ; 816058C 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 @@ -654540,7 +654540,7 @@ sub_8160664: ; 8160664 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08160688 + bne _08160688 ldr r0, =sub_81606A0 bl SetMainCallback2 ldr r1, =0x03005dac @@ -654548,7 +654548,7 @@ sub_8160664: ; 8160664 str r0, [r1] adds r0, r4, 0 bl remove_task -@08160688: +_08160688: pop {r4} pop {r0} bx r0 @@ -654732,52 +654732,52 @@ 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 .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 @@ -654789,69 +654789,69 @@ sub_8160868: ; 8160868 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 .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 .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 .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 @@ -654870,7 +654870,7 @@ sub_8160868: ; 8160868 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - beq @08160A04 + beq _08160A04 ldr r0, =gUnknown_085EF8E4 bl sub_816084C ldr r1, =0x020375e0 @@ -654878,142 +654878,142 @@ sub_8160868: ; 8160868 strh r0, [r1] ldr r1, [r5] movs r0, 0x1F - b @08160E88 + b _08160E88 .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 .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 .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 .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 .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 .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 .pool -@08160AB8: +_08160AB8: ldr r0, =gUnknown_085EF8F3 bl sub_816084C ldr r0, =0x0203bc34 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b @08160E88 + b _08160E88 .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 .pool -@08160AEC: +_08160AEC: bl sub_8198C58 lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - bne @08160B10 + bne _08160B10 ldr r0, =gUnknown_085EFA10 bl sub_816084C ldr r0, =0x0203bc34 ldr r1, [r0] movs r0, 0x13 - b @08160E88 + b _08160E88 .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 .pool -@08160B2C: +_08160B2C: ldr r4, =0x02021dc4 bl sub_8161054 movs r1, 0xD @@ -655028,102 +655028,102 @@ sub_8160868: ; 8160868 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b @08160E88 + b _08160E88 .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 .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 .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 .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 .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 FillWindowPixelBuffer 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 .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 .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 @@ -655134,17 +655134,17 @@ sub_8160868: ; 8160868 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @08160E8A + b _08160E8A .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 @@ -655163,27 +655163,27 @@ sub_8160868: ; 8160868 adds r0, r4, 0 bl sub_81BFA38 bl sub_8160EA0 - b @08160E8A + b _08160E8A .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 pal_fade_maybe - b @08160E8A -@08160CB8: + b _08160E8A +_08160CB8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -655195,23 +655195,23 @@ sub_8160868: ; 8160868 ldr r1, [r0] ldrb r0, [r1] adds r0, 0x1 - b @08160E88 + b _08160E88 .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 bl SetMainCallback2 - b @08160E8A + b _08160E8A .pool -@08160CFC: +_08160CFC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -655227,41 +655227,41 @@ sub_8160868: ; 8160868 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 .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 CopyWindowToVram - 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 .pool -@08160D6C: +_08160D6C: adds r0, r1, 0 adds r0, 0x44 ldrb r0, [r0] @@ -655321,13 +655321,13 @@ sub_8160868: ; 8160868 ldr r1, =0x020375e0 movs r0, 0x1 strh r0, [r1] - b @08160E8A + b _08160E8A .pool -@08160E0C: +_08160E0C: bl sub_81D2C3C lsls r0, 16 cmp r0, 0 - bne @08160E8A + bne _08160E8A ldr r0, =gUnknown_085EF9A6 bl sub_816084C ldr r0, =0x0203bc34 @@ -655336,46 +655336,46 @@ sub_8160868: ; 8160868 strb r0, [r1] ldr r0, =0x0000016f bl fanfare_play - b @08160E8A + b _08160E8A .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 .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 .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 @@ -655421,7 +655421,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 @@ -655436,9 +655436,9 @@ render_previous_quest_text: ; 8160EE0 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, =gUnknown_085EF8C2 adds r0, r4, 0 @@ -655455,7 +655455,7 @@ render_previous_quest_text: ; 8160EE0 adds r2, r4, 0 movs r3, 0 bl Print -@08160F38: +_08160F38: add sp, 0xC pop {r4-r6} pop {r0} @@ -655486,25 +655486,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 GetLRKeysState 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 PutWindowTilemap ldr r0, [r6] @@ -655512,9 +655512,9 @@ sub_8160F50: ; 8160F50 strb r1, [r0] movs r0, 0x1 strb r0, [r4, 0x4] - b @08160FD4 + b _08160FD4 .pool -@08160FC4: +_08160FC4: movs r0, 0 bl PutWindowTilemap ldr r0, [r6] @@ -655522,13 +655522,13 @@ sub_8160F50: ; 8160F50 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 @@ -655541,9 +655541,9 @@ sub_8160F50: ; 8160F50 bl ExpandStringRefs adds r0, r4, 0 bl sub_81D2BF4 - b @0816103E + b _0816103E .pool -@08161010: +_08161010: movs r0, 0x5 bl audio_play bl sub_8161234 @@ -655562,7 +655562,7 @@ sub_8160F50: ; 8160F50 bl ExpandStringRefs adds r0, r4, 0 bl sub_81D2BF4 -@0816103E: +_0816103E: pop {r4-r7} pop {r0} bx r0 @@ -655592,7 +655592,7 @@ sub_8161074: ; 8161074 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @081610A6 + bne _081610A6 ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EF8C2 adds r0, r4, 0 @@ -655609,7 +655609,7 @@ sub_8161074: ; 8161074 adds r2, r4, 0 movs r3, 0 bl Print -@081610A6: +_081610A6: add sp, 0xC pop {r4,r5} pop {r0} @@ -655636,12 +655636,12 @@ sub_81610B8: ; 81610B8 bl sub_81611AC movs r4, 0 ldr r5, =gUnknown_085CEC10 -@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 @@ -655665,16 +655665,16 @@ sub_81610B8: ; 81610B8 strb r0, [r1] adds r4, 0x1 cmp r4, 0x7 - ble @081610DC + ble _081610DC movs r4, 0 ldr r7, =gUnknown_085CEC10 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 @@ -655710,11 +655710,11 @@ sub_81610B8: ; 81610B8 bl StartObjectImageAnim 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 @@ -655729,7 +655729,7 @@ sub_81610B8: ; 81610B8 strb r1, [r0] adds r4, 0x1 cmp r4, 0xF - ble @08161176 + ble _08161176 pop {r4-r7} pop {r0} bx r0 @@ -655746,7 +655746,7 @@ sub_81611AC: ; 81611AC adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0xFF - bne @081611D4 + bne _081611D4 ldr r0, =gUnknown_085CEBC0 movs r3, 0x8B lsls r3, 1 @@ -655757,13 +655757,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, =gUnknown_085CEBD0 @@ -655787,7 +655787,7 @@ sub_81611AC: ; 81611AC ldr r6, =0x00000113 adds r1, r6 strb r0, [r1] -@08161210: +_08161210: pop {r4-r6} pop {r0} bx r0 @@ -655804,7 +655804,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 @@ -655812,20 +655812,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 @@ -655860,13 +655860,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, =gMoveNames mov r9, r2 -@081612C2: +_081612C2: mov r7, r8 ldr r4, [r7] lsls r3, r5, 3 @@ -655892,8 +655892,8 @@ sub_8161280: ; 8161280 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 @@ -655958,17 +655958,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 @@ -655985,10 +655985,10 @@ sub_816137C: ; 816137C lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xF - bls @0816139C - b @081614FE + bls _0816139C + b _081614FE .pool -@081613CC: +_081613CC: ldr r1, =gContestEffects ldr r0, =gContestMoves lsls r4, 3 @@ -656003,15 +656003,15 @@ sub_816137C: ; 816137C 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 @@ -656022,9 +656022,9 @@ sub_816137C: ; 816137C adds r0, r4 movs r1, 0x1 bl StartObjectImageAnim - b @08161436 + b _08161436 .pool -@08161420: +_08161420: ldr r0, [r7] adds r0, 0x1 adds r0, r5 @@ -656035,7 +656035,7 @@ sub_816137C: ; 816137C adds r0, r4 movs r1, 0 bl StartObjectImageAnim -@08161436: +_08161436: ldr r0, [r7] adds r0, 0x1 adds r0, r5 @@ -656055,7 +656055,7 @@ sub_816137C: ; 816137C lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls @081613F4 + bls _081613F4 ldr r1, =gContestEffects ldr r0, =gContestMoves add r0, r8 @@ -656068,16 +656068,16 @@ sub_816137C: ; 816137C 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 @@ -656091,9 +656091,9 @@ sub_816137C: ; 816137C adds r0, r7 movs r1, 0x3 bl StartObjectImageAnim - b @081614D4 + b _081614D4 .pool -@081614B8: +_081614B8: mov r3, r8 ldr r0, [r3] adds r4, r5, 0 @@ -656107,7 +656107,7 @@ sub_816137C: ; 816137C adds r0, r7 movs r1, 0x2 bl StartObjectImageAnim -@081614D4: +_081614D4: mov r1, r8 ldr r0, [r1] adds r0, 0x1 @@ -656128,8 +656128,8 @@ sub_816137C: ; 816137C lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x7 - bls @08161484 -@081614FE: + bls _08161484 +_081614FE: pop {r3} mov r8, r3 pop {r4-r7} @@ -656168,13 +656168,13 @@ 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 .pool -@08161558: +_08161558: movs r0, 0x1 -@0816155A: +_0816155A: pop {r4-r6} pop {r1} bx r1 @@ -656228,7 +656228,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 display_pokemon_menu_message @@ -656239,9 +656239,9 @@ sub_81615A8: ; 81615A8 adds r0, r1 ldr r1, =sub_81B1370 str r1, [r0] - b @08161658 + b _08161658 .pool -@081615EC: +_081615EC: movs r0, 0x64 mov r10, r0 mov r0, r10 @@ -656255,20 +656255,20 @@ sub_81615A8: ; 81615A8 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 .pool -@08161628: +_08161628: movs r0, 0x1 bl audio_play mov r1, r10 @@ -656289,7 +656289,7 @@ sub_81615A8: ; 81615A8 ldr r0, [sp, 0x4] mov r1, r8 bl sub_81B1F18 -@08161658: +_08161658: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -656383,7 +656383,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] @@ -656409,7 +656409,7 @@ sub_8161724: ; 8161724 adds r0, r1 ldr r1, =sub_81B1370 str r1, [r0] -@08161772: +_08161772: pop {r4,r5} pop {r0} bx r0 @@ -656425,7 +656425,7 @@ sub_8161784: ; 8161784 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081617AA + beq _081617AA movs r0, 0x5 bl display_pokemon_menu_message ldr r0, =0x03005e00 @@ -656435,7 +656435,7 @@ sub_8161784: ; 8161784 adds r1, r0 ldr r0, =sub_81B1370 str r0, [r1] -@081617AA: +_081617AA: pop {r4} pop {r0} bx r0 @@ -656539,10 +656539,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 @@ -656552,8 +656552,8 @@ sub_8161880: ; 8161880 lsrs r3, r1, 24 ldrb r0, [r0, 0x4] cmp r3, r0 - bcc @08161896 -@081618AA: + bcc _08161896 +_081618AA: pop {r4,r5} pop {r0} bx r0 @@ -656564,14 +656564,14 @@ sub_8161880: ; 8161880 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 @@ -656588,31 +656588,31 @@ 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 .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 @@ -656633,25 +656633,25 @@ 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 .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 @@ -656664,7 +656664,7 @@ sub_8161960: ; 8161960 lsrs r0, 24 adds r4, r0, 0 cmp r4, 0 - beq @081619A0 + beq _081619A0 ldr r1, =gUnknown_085A5C08 lsls r0, r4, 5 adds r0, r1 @@ -656676,7 +656676,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 @@ -656684,11 +656684,11 @@ sub_8161960: ; 8161960 adds r0, r2 strb r4, [r0] movs r0, 0x1 - b @081619A2 + b _081619A2 .pool -@081619A0: +_081619A0: movs r0, 0 -@081619A2: +_081619A2: pop {r4,r5} pop {r1} bx r1 @@ -656700,7 +656700,7 @@ sub_81619A8: ; 81619A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq @081619D4 + beq _081619D4 ldr r1, =gUnknown_085A5C08 lsls r0, 5 adds r0, r1 @@ -656711,13 +656711,13 @@ sub_81619A8: ; 81619A8 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @081619D4 + beq _081619D4 movs r0, 0x1 - b @081619D6 + b _081619D6 .pool -@081619D4: +_081619D4: movs r0, 0 -@081619D6: +_081619D6: pop {r1} bx r1 thumb_func_end sub_81619A8 @@ -656729,16 +656729,16 @@ sub_81619DC: ; 81619DC 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, =gUnknown_085A5C08 lsls r0, r5, 5 @@ -656748,24 +656748,24 @@ sub_81619DC: ; 81619DC 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 @@ -656787,12 +656787,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 @@ -656801,12 +656801,12 @@ sub_8161A38: ; 8161A38 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] @@ -656814,20 +656814,20 @@ sub_8161A38: ; 8161A38 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 @@ -656836,16 +656836,16 @@ sub_8161A38: ; 8161A38 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 @@ -656868,26 +656868,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} @@ -656900,7 +656900,7 @@ 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 @@ -656910,7 +656910,7 @@ sub_8161B10: ; 8161B10 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls @08161B16 + bls _08161B16 adds r0, r5, 0 pop {r4,r5} pop {r1} @@ -656945,7 +656945,7 @@ sub_8161B60: ; 8161B60 ldr r4, =0x0203bc80 movs r3, 0 adds r5, r4, 0x1 -@08161B6C: +_08161B6C: lsls r1, r2, 1 adds r0, r1, r4 strb r3, [r0] @@ -656955,7 +656955,7 @@ sub_8161B60: ; 8161B60 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls @08161B6C + bls _08161B6C movs r0, 0 strb r0, [r6] strb r0, [r6, 0x1] @@ -656973,22 +656973,22 @@ sub_8161B94: ; 8161B94 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 .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 @@ -657136,12 +657136,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, =gUnknown_085CEC30 adds r4, r0, 0 -@08161D1A: +_08161D1A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -657156,9 +657156,9 @@ sub_8161D00: ; 8161D00 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 @@ -657175,20 +657175,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, =gUnknown_085CEC30 -@08161D80: +_08161D80: lsls r0, r4, 1 adds r0, r4 lsls r2, r0, 1 @@ -657196,11 +657196,11 @@ sub_8161D54: ; 8161D54 ldrb r0, [r7, 0x1] ldrb r1, [r1] cmp r0, r1 - bne @08161DD8 + bne _08161DD8 ldr r6, =gUnknown_085CEC30 adds r5, r2, 0x1 ldr r4, =0x0203bc80 -@08161D96: +_08161D96: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -657213,23 +657213,23 @@ sub_8161D54: ; 8161D54 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 .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 @@ -657248,20 +657248,20 @@ 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 .pool -@08161E20: +_08161E20: movs r0, 0 -@08161E22: +_08161E22: pop {r1} bx r1 thumb_func_end sub_8161DE8 @@ -657343,21 +657343,21 @@ 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 .pool -@08161F10: +_08161F10: movs r0, 0 -@08161F12: +_08161F12: pop {r1} bx r1 thumb_func_end sub_8161EDC @@ -657476,7 +657476,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 @@ -657485,7 +657485,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] @@ -657522,25 +657522,25 @@ 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 .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 .pool -@081620A8: +_081620A8: ldr r4, =0x020375f0 ldr r2, [r5] ldr r0, =0x00000cdc @@ -657557,9 +657557,9 @@ sub_8162054: ; 8162054 orrs r0, r1 lsrs r0, 31 strh r0, [r4] - b @081620E8 + b _081620E8 .pool -@081620D8: +_081620D8: ldr r1, [r5] adds r0, r1, r4 ldrb r0, [r0] @@ -657568,7 +657568,7 @@ sub_8162054: ; 8162054 ldr r2, =0x00000d07 adds r1, r2 strb r0, [r1] -@081620E8: +_081620E8: pop {r4-r6} pop {r0} bx r0 @@ -657592,16 +657592,16 @@ 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 .pool -@08162134: +_08162134: ldr r2, [r6] lsls r0, r5, 1 lsls r1, r4, 2 @@ -657613,13 +657613,13 @@ sub_81620F4: ; 81620F4 ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b @081621B4 + b _081621B4 .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 @@ -657632,9 +657632,9 @@ sub_81620F4: ; 81620F4 ldr r1, [r1] orrs r0, r1 str r0, [r2] - b @081621B4 + b _081621B4 .pool -@08162180: +_08162180: ldr r2, [r6] ldr r1, =0x00000cdc adds r2, r1 @@ -657647,9 +657647,9 @@ sub_81620F4: ; 81620F4 ldr r1, [r1] ands r0, r1 str r0, [r2] - b @081621B4 + b _081621B4 .pool -@081621A4: +_081621A4: ldr r1, [r6] adds r0, r1, r7 ldrb r0, [r0] @@ -657658,7 +657658,7 @@ sub_81620F4: ; 81620F4 ldr r2, =0x00000d07 adds r1, r2 strb r0, [r1] -@081621B4: +_081621B4: pop {r4-r7} pop {r0} bx r0 @@ -657673,13 +657673,13 @@ sub_81621C0: ; 81621C0 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 @@ -657687,10 +657687,10 @@ sub_81621C0: ; 81621C0 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 @@ -657736,9 +657736,9 @@ sub_816222C: ; 816222C bl VarGet 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 @@ -657748,7 +657748,7 @@ sub_816222C: ; 816222C movs r7, 0 mov r2, sp str r2, [sp, 0x34] -@0816227A: +_0816227A: movs r3, 0xEC adds r0, r7, 0 muls r0, r3 @@ -657764,7 +657764,7 @@ sub_816222C: ; 816222C adds r3, r7, 0x1 str r3, [sp, 0x30] adds r1, r0 -@08162298: +_08162298: ldm r1!, {r0} mov r4, r8 orrs r4, r0 @@ -657772,13 +657772,13 @@ sub_816222C: ; 816222C 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 @@ -657789,7 +657789,7 @@ sub_816222C: ; 816222C adds r0, r1, r4 ldrh r0, [r0] cmp r0, 0 - beq @081622E4 + beq _081622E4 movs r0, 0xEF lsls r0, 3 adds r4, r1, r0 @@ -657801,18 +657801,18 @@ sub_816222C: ; 816222C 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, =gUnknown_085DF9F6 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 @@ -657824,22 +657824,22 @@ sub_816222C: ; 816222C 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 @@ -657849,13 +657849,13 @@ sub_816222C: ; 816222C 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 @@ -657867,22 +657867,22 @@ sub_816222C: ; 816222C 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 @@ -657890,20 +657890,20 @@ sub_816222C: ; 816222C 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 .pool -@081623C0: +_081623C0: ldr r4, =0x02038bca bl GenerateRandomNumber lsls r0, 16 @@ -657915,7 +657915,7 @@ sub_816222C: ; 816222C ldr r0, [r0] strh r0, [r4] movs r0, 0x1 -@081623DA: +_081623DA: add sp, 0x3C pop {r3-r5} mov r8, r3 @@ -657938,11 +657938,11 @@ sub_81623F0: ; 81623F0 lsls r0, 30 lsrs r0, 30 cmp r0, 0x2 - bne @08162414 + bne _08162414 bl sub_8165E18 - b @08162530 + b _08162530 .pool -@08162414: +_08162414: ldr r0, =0x000040ce bl VarGet adds r4, r0, 0 @@ -657958,7 +657958,7 @@ sub_81623F0: ; 81623F0 bl sub_8165C40 subs r4, 0x2 cmp r4, 0x1 - bhi @08162488 + bhi _08162488 ldr r1, [r6] ldr r2, =0x00000cb2 adds r0, r1, r2 @@ -657983,13 +657983,13 @@ sub_81623F0: ; 81623F0 ldrh r0, [r4] movs r1, 0x1 bl sub_8162614 - b @08162530 + b _08162530 .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 @@ -658000,13 +658000,13 @@ sub_81623F0: ; 81623F0 ldrh r0, [r0] lsls r0, 1 adds r2, 0x2 - b @08162528 + b _08162528 .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] @@ -658019,12 +658019,12 @@ sub_81623F0: ; 81623F0 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 @@ -658032,21 +658032,21 @@ sub_81623F0: ; 81623F0 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] @@ -658059,15 +658059,15 @@ sub_81623F0: ; 81623F0 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 @@ -658083,9 +658083,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, =gUnknown_085DFA1A lsls r1, r0, 2 adds r0, r2, 0x2 @@ -658093,9 +658093,9 @@ sub_8162548: ; 8162548 adds r1, r2 ldrh r0, [r0] ldrh r4, [r1] - b @0816258A + b _0816258A .pool -@08162570: +_08162570: ldr r2, =gUnknown_085DF9FA lsls r1, r3, 2 adds r0, r2, 0x2 @@ -658103,13 +658103,13 @@ sub_8162548: ; 8162548 adds r1, r2 ldrh r0, [r0] ldrh r4, [r1] - b @0816258A + b _0816258A .pool -@08162584: +_08162584: ldr r1, =gUnknown_085DF9FA ldrh r0, [r1, 0x1E] ldrh r4, [r1, 0x1C] -@0816258A: +_0816258A: subs r0, r4 adds r0, 0x1 lsls r0, 16 @@ -658139,17 +658139,17 @@ 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, =gUnknown_085DFA1A lsls r2, r0, 2 - b @081625D8 + b _081625D8 .pool -@081625D4: +_081625D4: ldr r1, =gUnknown_085DF9FA lsls r2, 2 -@081625D8: +_081625D8: adds r0, r1, 0x2 adds r0, r2, r0 adds r2, r1 @@ -658160,9 +658160,9 @@ sub_81625B4: ; 81625B4 lsls r0, 16 lsrs r1, r0, 16 ldrh r0, [r2] - b @08162604 + b _08162604 .pool -@081625F4: +_081625F4: ldr r0, =gUnknown_085DF9FA ldrh r1, [r0, 0x1E] ldrh r2, [r0, 0x1C] @@ -658171,7 +658171,7 @@ sub_81625B4: ; 81625B4 lsls r1, 16 lsrs r1, 16 ldrh r0, [r0, 0x1C] -@08162604: +_08162604: strh r0, [r4] strb r1, [r3] pop {r4} @@ -658192,35 +658192,35 @@ 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 .pool -@08162640: +_08162640: ldr r0, =0x000003fe cmp r4, r0 - bne @08162650 + bne _08162650 bl sub_81A4DD8 - b @08162788 + b _08162788 .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 .pool -@0816266C: +_0816266C: ldr r0, =0x0000018f cmp r4, r0 - bhi @08162698 + bhi _08162698 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -658230,9 +658230,9 @@ sub_8162614: ; 8162614 adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b @081626BA + b _081626BA .pool -@08162698: +_08162698: ldr r3, =gUnknown_08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -658250,99 +658250,99 @@ sub_8162614: ; 8162614 muls r0, r1 adds r0, r3 adds r0, 0x32 -@081626BA: +_081626BA: ldrb r2, [r0] movs r1, 0 ldr r3, =gUnknown_085DCEDC 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, =gUnknown_085DCF0E 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 .pool -@08162700: +_08162700: movs r1, 0 ldr r3, =gUnknown_085DCEFA 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, =gUnknown_085DCF2C 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 VarSet - b @08162788 + b _08162788 .pool -@08162744: +_08162744: ldr r0, =0x00004011 bl VarSet - b @08162788 + b _08162788 .pool -@08162750: +_08162750: ldr r0, =0x0000401e bl VarSet - b @08162788 + b _08162788 .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 .pool -@08162770: +_08162770: ldr r0, =0x00004011 -@08162772: +_08162772: movs r1, 0x7 bl VarSet - b @08162788 + b _08162788 .pool -@08162780: +_08162780: ldr r0, =0x0000401e movs r1, 0x7 bl VarSet -@08162788: +_08162788: pop {r4-r6} pop {r0} bx r0 @@ -658370,28 +658370,28 @@ 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 .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 .pool -@081627E8: +_081627E8: ldr r0, =0x0000018f cmp r4, r0 - bhi @08162814 + bhi _08162814 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -658401,9 +658401,9 @@ sub_81627A4: ; 81627A4 adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b @08162836 + b _08162836 .pool -@08162814: +_08162814: ldr r3, =gUnknown_08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -658421,53 +658421,53 @@ sub_81627A4: ; 81627A4 muls r0, r1 adds r0, r3 adds r0, 0x32 -@08162836: +_08162836: ldrb r2, [r0] movs r1, 0 ldr r3, =gUnknown_085DCEDC 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, =gUnknown_085DCF0E - b @08162892 + b _08162892 .pool -@0816286C: +_0816286C: movs r1, 0 ldr r3, =gUnknown_085DCEFA 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 .pool -@08162890: +_08162890: ldr r0, =gUnknown_085DCF2C -@08162892: +_08162892: adds r0, r1, r0 ldrb r0, [r0] -@08162896: +_08162896: pop {r4,r5} pop {r1} bx r1 @@ -658497,21 +658497,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 @@ -658522,10 +658522,10 @@ sub_81628A0: ; 81628A0 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] @@ -658537,30 +658537,30 @@ sub_81628A0: ; 81628A0 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 .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] @@ -658569,10 +658569,10 @@ sub_81628A0: ; 81628A0 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 @@ -658581,9 +658581,9 @@ sub_81628A0: ; 81628A0 movs r4, 0xE7 lsls r4, 3 adds r0, r4 - b @081629B2 + b _081629B2 .pool -@08162974: +_08162974: movs r5, 0 ldr r7, =0x03005d90 ldr r0, [r7] @@ -658591,24 +658591,24 @@ sub_81628A0: ; 81628A0 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 @@ -658617,13 +658617,13 @@ sub_81628A0: ; 81628A0 movs r2, 0xE7 lsls r2, 3 adds r0, r2 -@081629B2: +_081629B2: mov r1, r10 movs r2, 0xEC bl memcpy - b @08162A8A + b _08162A8A .pool -@081629C4: +_081629C4: mov r2, sp ldr r4, =0x03005d90 ldr r0, [r4] @@ -658640,11 +658640,11 @@ sub_81628A0: ; 81628A0 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 @@ -658654,31 +658654,31 @@ sub_81628A0: ; 81628A0 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 .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 @@ -658696,10 +658696,10 @@ sub_81628A0: ; 81628A0 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 @@ -658721,7 +658721,7 @@ sub_81628A0: ; 81628A0 mov r1, r10 movs r2, 0xEC bl memcpy -@08162A8A: +_08162A8A: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -658743,7 +658743,7 @@ sub_8162AA0: ; 8162AA0 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne @08162AD0 + bne _08162AD0 ldr r1, =gTrainerPicIndices ldr r0, =0x03005d90 ldr r0, [r0] @@ -658751,21 +658751,21 @@ sub_8162AA0: ; 8162AA0 adds r0, r2 ldrb r0, [r0] adds r0, r1 - b @08162BC8 + b _08162BC8 .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 .pool -@08162AE4: +_08162AE4: ldr r0, =0x0000012b cmp r4, r0 - bhi @08162B08 + bhi _08162B08 ldr r2, =gTrainerPicIndices ldr r0, =0x0203bc88 ldr r1, [r0] @@ -658774,27 +658774,27 @@ sub_8162AA0: ; 8162AA0 adds r0, r1 ldrb r0, [r0] adds r0, r2 - b @08162BC8 + b _08162BC8 .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, =gTrainerPicIndices bl sub_818649C lsls r0, 24 lsrs r0, 24 adds r0, r4 - b @08162BC8 + b _08162BC8 .pool -@08162B38: +_08162B38: ldr r3, =gTrainerPicIndices ldr r0, =0x03005d90 ldr r0, [r0] @@ -658807,16 +658807,16 @@ sub_8162AA0: ; 8162AA0 adds r0, r2 ldrb r0, [r0] adds r0, r3 - b @08162BC8 + b _08162BC8 .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, =gTrainerPicIndices ldr r3, =gUnknown_08610970 ldr r0, =0x03005d90 @@ -658837,9 +658837,9 @@ sub_8162AA0: ; 8162AA0 adds r0, 0x32 ldrb r0, [r0] adds r0, r4 - b @08162BC8 + b _08162BC8 .pool -@08162BB0: +_08162BB0: ldr r5, =gTrainerPicIndices ldr r4, =gUnknown_08610970 bl sub_81864A8 @@ -658851,9 +658851,9 @@ sub_8162AA0: ; 8162AA0 adds r0, 0x32 ldrb r0, [r0] adds r0, r5 -@08162BC8: +_08162BC8: ldrb r0, [r0] -@08162BCA: +_08162BCA: pop {r4,r5} pop {r1} bx r1 @@ -658870,39 +658870,39 @@ sub_8162BD8: ; 8162BD8 movs r0, 0xFA lsls r0, 1 cmp r4, r0 - bne @08162C08 + bne _08162C08 ldr r1, =gTrainerClassNameIndices ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000bed adds r0, r2 ldrb r0, [r0] - b @08162C26 + b _08162C26 .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 .pool -@08162C1C: +_08162C1C: ldr r0, =0x00000c03 cmp r4, r0 - bne @08162C38 + bne _08162C38 ldr r0, =gTrainers ldr r1, =0x00007da1 -@08162C26: +_08162C26: adds r0, r1 ldrb r0, [r0] - b @08162D1E + b _08162D1E .pool -@08162C38: +_08162C38: ldr r0, =0x0000012b cmp r4, r0 - bhi @08162C60 + bhi _08162C60 ldr r2, =gTrainerClassNameIndices ldr r0, =0x0203bc88 ldr r1, [r0] @@ -658912,28 +658912,28 @@ sub_8162BD8: ; 8162BD8 ldrb r0, [r0] adds r0, r2 ldrb r0, [r0] - b @08162D1E + b _08162D1E .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, =gTrainerClassNameIndices bl sub_818649C lsls r0, 24 lsrs r0, 24 adds r0, r4 ldrb r0, [r0] - b @08162D1E + b _08162D1E .pool -@08162C90: +_08162C90: ldr r3, =gTrainerClassNameIndices ldr r0, =0x03005d90 ldr r0, [r0] @@ -658947,16 +658947,16 @@ sub_8162BD8: ; 8162BD8 ldrb r0, [r0] adds r0, r3 ldrb r0, [r0] - b @08162D1E + b _08162D1E .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, =gTrainerClassNameIndices ldr r4, =gUnknown_08610970 bl sub_81864A8 @@ -658969,9 +658969,9 @@ sub_8162BD8: ; 8162BD8 ldrb r0, [r0] adds r0, r5 ldrb r0, [r0] - b @08162D1E + b _08162D1E .pool -@08162CF4: +_08162CF4: ldr r4, =gTrainerClassNameIndices ldr r3, =gUnknown_08610970 ldr r0, =0x03005d90 @@ -658993,7 +658993,7 @@ sub_8162BD8: ; 8162BD8 ldrb r0, [r0] adds r0, r4 ldrb r0, [r0] -@08162D1E: +_08162D1E: pop {r4,r5} pop {r1} bx r1 @@ -659010,41 +659010,41 @@ 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 .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 .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 .pool -@08162DA0: +_08162DA0: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -659054,16 +659054,16 @@ sub_8162D34: ; 8162D34 adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b @08162E0A + b _08162E0A .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, =gUnknown_08610970 bl sub_81864A8 lsls r0, 24 @@ -659071,9 +659071,9 @@ sub_8162D34: ; 8162D34 movs r1, 0x58 muls r0, r1 adds r0, r4 - b @08162E08 + b _08162E08 .pool -@08162DE8: +_08162DE8: ldr r3, =gUnknown_08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -659090,11 +659090,11 @@ sub_8162D34: ; 8162D34 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 @@ -659112,81 +659112,81 @@ 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 .pool -@08162E54: +_08162E54: ldr r0, =0x000003fe cmp r5, r0 - bne @08162E68 + bne _08162E68 adds r0, r6, 0 bl sub_81A4D50 - b @08162F62 + b _08162F62 .pool -@08162E68: +_08162E68: ldr r0, =0x00000c03 cmp r5, r0 - bne @08162E88 + bne _08162E88 ldr r2, =gTrainers + TRAINER_STEVEN * 0x28 + 0x4 ; Steven's name -@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 .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 .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 .pool -@08162ED8: +_08162ED8: ldr r2, =0x03005d90 movs r0, 0xEC adds r1, r5, 0 @@ -659200,25 +659200,25 @@ sub_8162E20: ; 8162E20 ldrb r2, [r0] adds r0, r6, 0 bl sub_81DB5E8 - b @08162F62 + b _08162F62 .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 .pool -@08162F24: +_08162F24: ldr r1, =0x03005d90 lsls r0, r5, 4 adds r0, r5 @@ -659232,7 +659232,7 @@ sub_8162E20: ; 8162E20 lsrs r5, r0, 27 adds r1, 0x3F ldrb r4, [r1] -@08162F3E: +_08162F3E: adds r0, r5, 0 adds r1, r4, 0 bl sub_81A1650 @@ -659240,13 +659240,13 @@ sub_8162E20: ; 8162E20 adds r0, r6, 0 adds r2, r4, 0 bl sub_81DB5E8 - b @08162F62 + b _08162F62 .pool -@08162F5C: +_08162F5C: adds r1, r6, r4 movs r0, 0xFF strb r0, [r1] -@08162F62: +_08162F62: pop {r4-r6} pop {r0} bx r0 @@ -659262,37 +659262,37 @@ 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 .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 .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 .pool -@08162FC0: +_08162FC0: ldr r0, =0x0000018f cmp r4, r0 - bhi @08162FEC + bhi _08162FEC ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -659302,9 +659302,9 @@ sub_8162F68: ; 8162F68 adds r0, r1 ldr r1, =0x00000739 adds r0, r1 - b @0816300E + b _0816300E .pool -@08162FEC: +_08162FEC: ldr r3, =gUnknown_08610970 ldr r0, =0x03005d90 ldr r1, [r0] @@ -659322,30 +659322,30 @@ sub_8162F68: ; 8162F68 muls r0, r1 adds r0, r3 adds r0, 0x32 -@0816300E: +_0816300E: ldrb r2, [r0] movs r1, 0 ldr r3, =gUnknown_085DCEFA 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 .pool -@08163040: +_08163040: movs r0, 0x1 -@08163042: +_08163042: pop {r4,r5} pop {r1} bx r1 @@ -659435,7 +659435,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 @@ -659456,24 +659456,24 @@ 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 .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 @@ -659492,28 +659492,28 @@ sub_81630C4: ; 81630C4 adds r0, r5, 0 adds r0, 0x3 cmp r7, r0 - blt @0816314C - b @08163426 + blt _0816314C + b _08163426 .pool -@08163180: +_08163180: ldr r0, =0x000003fe cmp r5, r0 - bne @08163190 + bne _08163190 bl sub_81A4E04 - b @08163426 + b _08163426 .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 @@ -659523,7 +659523,7 @@ sub_81630C4: ; 81630C4 muls r0, r5 ldr r5, =0xfffef2a8 adds r4, r0, r5 -@081631B6: +_081631B6: ldr r0, =0x03005d90 ldr r3, [r0] movs r0, 0x2C @@ -659536,13 +659536,13 @@ sub_81630C4: ; 81630C4 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 @@ -659552,23 +659552,23 @@ sub_81630C4: ; 81630C4 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 .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 @@ -659576,7 +659576,7 @@ sub_81630C4: ; 81630C4 ldr r1, =0xffff969c adds r5, r0, r1 movs r4, 0 -@08163230: +_08163230: movs r0, 0x64 muls r0, r7 ldr r1, =0x02024744 @@ -659592,10 +659592,10 @@ sub_81630C4: ; 81630C4 ldr r0, [sp, 0x18] adds r0, 0x3 cmp r7, r0 - blt @08163230 - b @08163426 + blt _08163230 + b _08163426 .pool -@08163260: +_08163260: ldr r0, [sp, 0x28] adds r0, 0x1 lsls r0, 24 @@ -659607,8 +659607,8 @@ sub_81630C4: ; 81630C4 ldrh r1, [r0] ldr r0, =0x0000ffff cmp r1, r0 - bne @08163260 -@08163278: + bne _08163260 +_08163278: movs r7, 0 bl GenerateRandomNumber adds r4, r0, 0 @@ -659620,9 +659620,9 @@ sub_81630C4: ; 81630C4 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 @@ -659634,26 +659634,26 @@ sub_81630C4: ; 81630C4 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 .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 @@ -659668,19 +659668,19 @@ sub_81630C4: ; 81630C4 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, =gBattleFrontierHeldItems mov r9, r5 movs r3, 0 -@08163308: +_08163308: ldr r0, =0x02024744 adds r5, r3, r0 adds r0, r5, 0 @@ -659690,7 +659690,7 @@ sub_81630C4: ; 81630C4 bl pokemon_getattr ldr r3, [sp, 0x38] cmp r0, 0 - beq @0816333E + beq _0816333E adds r0, r5, 0 movs r1, 0xC movs r2, 0 @@ -659705,34 +659705,34 @@ sub_81630C4: ; 81630C4 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 @@ -659770,7 +659770,7 @@ sub_81630C4: ; 81630C4 str r1, [sp, 0x3C] ldr r2, =0x02024744 mov r10, r2 -@081633B8: +_081633B8: ldr r0, [r5] ldr r7, [sp, 0x3C] adds r0, r7, r0 @@ -659792,14 +659792,14 @@ sub_81630C4: ; 81630C4 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 @@ -659820,12 +659820,12 @@ sub_81630C4: ; 81630C4 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 @@ -659860,10 +659860,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] @@ -659872,16 +659872,16 @@ sub_8163444: ; 8163444 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 @@ -659905,20 +659905,20 @@ sub_8163444: ; 8163444 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 @@ -659937,7 +659937,7 @@ sub_8163444: ; 8163444 bl pokemon_setattr mov r7, r8 cmp r7, 0x3 - bne @08163494 + bne _08163494 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -659966,20 +659966,20 @@ sub_8163524: ; 8163524 ldr r5, [r0, 0x30] movs r4, 0 ldrh r1, [r5] - b @08163558 + b _08163558 .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 @@ -659989,14 +659989,14 @@ sub_8163524: ; 8163524 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} @@ -660016,19 +660016,19 @@ 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 .pool -@081635C0: +_081635C0: ldr r0, =0x02038bca ldrh r0, [r0] movs r1, 0 bl sub_816379C -@081635CA: +_081635CA: pop {r0} bx r0 .pool @@ -660050,7 +660050,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 VarGet @@ -660070,34 +660070,34 @@ 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 .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 @@ -660118,19 +660118,19 @@ sub_81635D4: ; 81635D4 ldr r0, [sp, 0x10] adds r0, 0x3 cmp r7, r0 - blt @0816365E - b @08163776 + blt _0816365E + b _08163776 .pool -@08163694: +_08163694: ldr r0, =0x000003fe cmp r3, r0 - bne @081636A4 + bne _081636A4 bl sub_81A6CD0 - b @08163776 + b _08163776 .pool -@081636A4: +_081636A4: movs r0, 0x1F -@081636A6: +_081636A6: str r0, [sp, 0x18] bl sub_8165C40 lsls r0, 24 @@ -660150,7 +660150,7 @@ sub_81635D4: ; 81635D4 orrs r2, r0 mov r8, r2 movs r7, 0 -@081636CE: +_081636CE: ldr r1, =0x03006298 lsls r0, r7, 1 adds r0, r1 @@ -660187,7 +660187,7 @@ sub_81635D4: ; 81635D4 adds r7, 0x1 mov r10, r7 adds r7, r4, 0 -@08163718: +_08163718: ldr r0, =0x0203bc8c ldr r1, [r0] mov r2, r9 @@ -660207,7 +660207,7 @@ sub_81635D4: ; 81635D4 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls @08163718 + bls _08163718 movs r3, 0x64 adds r4, r5, 0 muls r4, r3 @@ -660231,8 +660231,8 @@ sub_81635D4: ; 81635D4 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 @@ -660272,7 +660272,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 @@ -660308,7 +660308,7 @@ sub_816379C: ; 816379C str r0, [sp, 0x14] mov r8, r4 mov r5, r8 -@08163818: +_08163818: ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r5, r0 @@ -660327,16 +660327,16 @@ sub_816379C: ; 816379C 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 @@ -660361,7 +660361,7 @@ sub_816379C: ; 816379C lsrs r0, 24 mov r8, r0 cmp r0, 0x2 - bls @081637D0 + bls _081637D0 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -660389,7 +660389,7 @@ ConvertBattleFrontierTrainerSpeechToString: ; 81638AC adds r1, r4, 0 bl GetStringWidth cmp r0, 0xCC - bls @0816390A + bls _0816390A adds r0, r4, 0 adds r1, r5, 0 movs r2, 0x2 @@ -660398,32 +660398,32 @@ ConvertBattleFrontierTrainerSpeechToString: ; 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 @@ -660437,27 +660437,27 @@ sub_8163914: ; 8163914 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq @08163930 + beq _08163930 ldr r0, =0x02038bcc - b @08163932 + b _08163932 .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 .pool -@08163950: +_08163950: ldr r0, =0x0000012b cmp r3, r0 - bhi @08163974 + bhi _08163974 ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 @@ -660466,30 +660466,30 @@ sub_8163914: ; 8163914 adds r0, r1 adds r0, 0xC bl ConvertBattleFrontierTrainerSpeechToString - b @081639A8 + b _081639A8 .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 ConvertBattleFrontierTrainerSpeechToString - b @081639A8 + b _081639A8 .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 @@ -660503,27 +660503,27 @@ 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 .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 @@ -660531,25 +660531,25 @@ sub_81639AC: ; 81639AC 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 .pool -@08163A2C: +_08163A2C: ldr r0, =0x00ffffff str r0, [r1] - b @08163A78 + b _08163A78 .pool -@08163A38: +_08163A38: movs r5, 0 ldr r6, =0x03005d8c -@08163A3C: +_08163A3C: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -660570,12 +660570,12 @@ sub_81639AC: ; 81639AC bl pokemon_setattr adds r5, 0x1 cmp r5, 0x5 - ble @08163A3C - b @08163A78 + ble _08163A3C + b _08163A78 .pool -@08163A74: +_08163A74: bl sub_816537C -@08163A78: +_08163A78: ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 add sp, 0x4 @@ -660594,7 +660594,7 @@ sub_8163A8C: ; 8163A8C lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08163AB0 + bne _08163AB0 ldr r0, =0x030022c0 ldr r1, =sub_81639AC str r1, [r0, 0x8] @@ -660602,7 +660602,7 @@ sub_8163A8C: ; 8163A8C bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@08163AB0: +_08163AB0: pop {r4} pop {r0} bx r0 @@ -660620,29 +660620,29 @@ 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 .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 @@ -660652,31 +660652,31 @@ sub_8163AC4: ; 8163AC4 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 .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 @@ -660692,28 +660692,28 @@ sub_8163AC4: ; 8163AC4 ldr r1, =0x00408041 orrs r0, r1 str r0, [r5] - b @08163BA6 + b _08163BA6 .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 movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0 - b @08163E10 + b _08163E10 .pool -@08163BC0: +_08163BC0: movs r5, 0 ldr r6, =0x03005d8c -@08163BC4: +_08163BC4: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -660733,20 +660733,20 @@ sub_8163AC4: ; 8163AC4 bl pokemon_setattr adds r5, 0x1 cmp r5, 0x5 - ble @08163BC4 + ble _08163BC4 ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0xC - b @08163E10 + b _08163E10 .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 @@ -660762,7 +660762,7 @@ sub_8163AC4: ; 8163AC4 bl sub_806819C adds r5, 0x1 cmp r5, 0x2 - ble @08163C18 + ble _08163C18 ldr r1, =0x02022fec ldr r0, =0x00000808 str r0, [r1] @@ -660775,9 +660775,9 @@ sub_8163AC4: ; 8163AC4 movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0xD - b @08163E10 + b _08163E10 .pool -@08163C70: +_08163C70: ldr r4, =0x02022fec ldr r0, =0x00010008 str r0, [r4] @@ -660786,28 +660786,28 @@ sub_8163AC4: ; 8163AC4 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 movs r1, 0x1 bl AddTask movs r0, 0 bl sub_806E694 movs r0, 0x3 - b @08163E10 + b _08163E10 .pool -@08163CC4: +_08163CC4: ldr r4, =0x02022fec ldr r0, =0x00020008 str r0, [r4] @@ -660816,11 +660816,11 @@ sub_8163AC4: ; 8163AC4 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 @@ -660829,24 +660829,24 @@ sub_8163AC4: ; 8163AC4 movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq @08163D0C + beq _08163D0C movs r0, 0x3 bl sub_8163048 - b @08163D12 + b _08163D12 .pool -@08163D0C: +_08163D0C: movs r0, 0x3 bl sub_81630A0 -@08163D12: +_08163D12: ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0x4 - b @08163E10 + b _08163E10 .pool -@08163D28: +_08163D28: ldr r1, =0x02022fec ldr r0, =0x00040008 str r0, [r1] @@ -660858,24 +660858,24 @@ sub_8163AC4: ; 8163AC4 movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq @08163D58 + beq _08163D58 movs r0, 0x3 bl sub_8163048 - b @08163D5E + b _08163D5E .pool -@08163D58: +_08163D58: movs r0, 0x3 bl sub_81630A0 -@08163D5E: +_08163D5E: ldr r0, =sub_8163A8C movs r1, 0x1 bl AddTask movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0x5 - b @08163E10 + b _08163E10 .pool -@08163D74: +_08163D74: ldr r4, =0x02022fec ldr r0, =0x00080008 str r0, [r4] @@ -660884,11 +660884,11 @@ sub_8163AC4: ; 8163AC4 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 movs r1, 0x1 @@ -660896,18 +660896,18 @@ sub_8163AC4: ; 8163AC4 movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0x6 - b @08163E10 + b _08163E10 .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 .pool -@08163DC8: +_08163DC8: ldr r1, =0x02022fec ldr r0, =0x00200008 str r0, [r1] @@ -660919,29 +660919,29 @@ sub_8163AC4: ; 8163AC4 movs r0, 0 bl current_map_music_set__default_for_battle movs r0, 0xA - b @08163E10 + b _08163E10 .pool -@08163DF4: +_08163DF4: ldr r1, =0x02022fec ldr r0, =0x00008109 str r0, [r1] movs r0, 0x1 bl sub_816306C -@08163E00: +_08163E00: ldr r0, =sub_8163A8C 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 .pool -@08163E2C: +_08163E2C: ldr r1, =0x02022fec ldr r0, =0x00408049 str r0, [r1] @@ -660966,7 +660966,7 @@ sub_8163AC4: ; 8163AC4 bl current_map_music_set__default_for_battle movs r0, 0x12 bl sub_8145EF4 -@08163E68: +_08163E68: add sp, 0x4 pop {r4-r6} pop {r0} @@ -661004,9 +661004,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 @@ -661038,7 +661038,7 @@ sub_8163EE4: ; 8163EE4 ldr r2, [r4] ldrb r0, [r2, 0x8] cmp r0, 0 - beq @08163F40 + beq _08163F40 ldr r4, =gUnknown_085DCEFA ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -661048,9 +661048,9 @@ sub_8163EE4: ; 8163EE4 ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x14 - b @08163F52 + b _08163F52 .pool -@08163F40: +_08163F40: ldr r4, =gUnknown_085DCEDC ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -661060,7 +661060,7 @@ sub_8163EE4: ; 8163EE4 ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x1E -@08163F52: +_08163F52: bl __umodsi3 adds r0, r4 ldrb r0, [r0] @@ -661091,7 +661091,7 @@ sub_8163EE4: ; 8163EE4 movs r0, 0xE4 adds r0, r5 mov r8, r0 -@08163F96: +_08163F96: lsls r2, r4, 1 mov r1, r12 adds r3, r1, r2 @@ -661117,9 +661117,9 @@ sub_8163EE4: ; 8163EE4 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 @@ -661128,7 +661128,7 @@ sub_8163EE4: ; 8163EE4 adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq @08163FF4 + beq _08163FF4 adds r1, r0, 0 movs r0, 0x64 muls r0, r1 @@ -661139,10 +661139,10 @@ sub_8163EE4: ; 8163EE4 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 @@ -661190,17 +661190,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 @@ -661269,19 +661269,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 @@ -661292,7 +661292,7 @@ sub_81640E0: ; 81640E0 add r0, sp ldr r0, [r0] strh r0, [r4] -@08164150: +_08164150: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -661306,7 +661306,7 @@ sub_81640E0: ; 81640E0 lsls r0, 16 lsrs r0, 16 cmp r1, r0 - beq @08164150 + beq _08164150 add sp, 0xC pop {r4-r7} pop {r0} @@ -661361,7 +661361,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 @@ -661372,10 +661372,10 @@ sub_8164188: ; 8164188 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 @@ -661389,13 +661389,13 @@ sub_8164188: ; 8164188 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 @@ -661403,10 +661403,10 @@ sub_8164188: ; 8164188 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 @@ -661417,7 +661417,7 @@ sub_8164188: ; 8164188 add r0, sp ldr r0, [r0] strh r0, [r4, 0x4] -@08164258: +_08164258: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -661431,7 +661431,7 @@ sub_8164188: ; 8164188 lsls r0, 16 lsrs r0, 16 cmp r1, r0 - beq @08164258 + beq _08164258 add sp, 0x1C pop {r3-r5} mov r8, r3 @@ -661500,9 +661500,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 @@ -661513,13 +661513,13 @@ sub_81642A0: ; 81642A0 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 @@ -661527,24 +661527,24 @@ sub_81642A0: ; 81642A0 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 @@ -661554,14 +661554,14 @@ sub_81642A0: ; 81642A0 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 @@ -661575,7 +661575,7 @@ sub_81642A0: ; 81642A0 ldr r4, [sp, 0x40] strb r0, [r4, 0x19] movs r7, 0 -@081643A8: +_081643A8: adds r0, r7, 0x1 str r0, [sp, 0x30] mov r1, r10 @@ -661588,7 +661588,7 @@ sub_81642A0: ; 81642A0 subs r0, 0x1 lsls r0, 1 str r0, [sp, 0x28] -@081643C0: +_081643C0: mov r0, r8 bl sub_8163524 lsls r0, 16 @@ -661596,7 +661596,7 @@ sub_81642A0: ; 81642A0 movs r0, 0x1 ands r0, r7 cmp r0, 0 - beq @081643F4 + beq _081643F4 ldr r3, =0x03005d90 ldr r0, [r3] ldr r4, =0x00000cb4 @@ -661613,11 +661613,11 @@ sub_81642A0: ; 81642A0 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 @@ -661628,27 +661628,27 @@ sub_81642A0: ; 81642A0 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 @@ -661660,7 +661660,7 @@ sub_81642A0: ; 81642A0 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] @@ -661668,7 +661668,7 @@ sub_81642A0: ; 81642A0 add r9, r1 mov r2, r9 cmp r2, 0x5 - ble @0816438C + ble _0816438C movs r3, 0 mov r10, r3 bl sub_8165B20 @@ -661680,12 +661680,12 @@ sub_81642A0: ; 81642A0 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, =gUnknown_085DF9EC ldrb r0, [r6, 0x1] adds r0, r1 @@ -661698,34 +661698,34 @@ sub_81642A0: ; 81642A0 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 @@ -661736,17 +661736,17 @@ sub_81642A0: ; 81642A0 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] @@ -661773,13 +661773,13 @@ sub_81642A0: ; 81642A0 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 @@ -661795,13 +661795,13 @@ sub_81642A0: ; 81642A0 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 @@ -661821,28 +661821,28 @@ sub_81642A0: ; 81642A0 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 @@ -661857,10 +661857,10 @@ sub_81642A0: ; 81642A0 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 @@ -661874,24 +661874,24 @@ sub_81642A0: ; 81642A0 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 .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 @@ -661900,16 +661900,16 @@ sub_81642A0: ; 81642A0 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] @@ -661934,7 +661934,7 @@ sub_81642A0: ; 81642A0 adds r0, r5 ldrh r0, [r0] bl sub_8164188 -@081646A0: +_081646A0: add sp, 0x4C pop {r3-r5} mov r8, r3 @@ -661964,10 +661964,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 @@ -661976,12 +661976,12 @@ sub_81646BC: ; 81646BC mov r9, r1 ldrh r0, [r0] mov r10, r0 - b @081647CE + b _081647CE .pool -@081646FC: +_081646FC: ldr r0, =0x0000018f cmp r5, r0 - bhi @08164750 + bhi _08164750 ldr r0, =0x03005d90 ldr r3, [r0] ldr r1, =0x03006298 @@ -662008,9 +662008,9 @@ sub_81646BC: ; 81646BC adds r3, r2 ldrh r3, [r3] mov r10, r3 - b @081647CE + b _081647CE .pool -@08164750: +_08164750: ldr r4, =0x03005d90 ldr r3, [r4] ldr r1, =0x03006298 @@ -662045,7 +662045,7 @@ sub_81646BC: ; 81646BC adds r4, r2, 0 movs r6, 0x8A lsls r6, 1 -@08164794: +_08164794: mov r1, r8 adds r2, r3, r1 mov r1, r12 @@ -662057,7 +662057,7 @@ sub_81646BC: ; 81646BC strb r0, [r2] adds r3, 0x1 cmp r3, 0x6 - ble @08164794 + ble _08164794 adds r1, r3, r7 movs r0, 0xFF strb r0, [r1] @@ -662074,7 +662074,7 @@ sub_81646BC: ; 81646BC ldrb r1, [r0] adds r0, r7, 0 bl StopMusicWhileStringIsPrinted -@081647CE: +_081647CE: ldr r0, =0x02021cc4 movs r1, 0xD mov r2, r9 @@ -662132,64 +662132,64 @@ sub_8164828: ; 8164828 str r3, [sp] ldr r4, =gUnknown_085DD500 lsls r6, r7, 16 - b @08164884 + b _08164884 .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 .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 .pool -@081648F4: +_081648F4: movs r3, 0 lsls r2, r7, 16 mov r10, r2 @@ -662204,7 +662204,7 @@ sub_8164828: ; 8164828 lsls r4, r0, 2 movs r5, 0x8A lsls r5, 1 -@08164910: +_08164910: mov r0, r9 adds r2, r3, r0 mov r1, r8 @@ -662216,7 +662216,7 @@ sub_8164828: ; 8164828 strb r0, [r2] adds r3, 0x1 cmp r3, 0x6 - ble @08164910 + ble _08164910 adds r1, r3, r6 movs r0, 0xFF strb r0, [r1] @@ -662246,36 +662246,36 @@ sub_8164828: ; 8164828 mov r3, r10 lsrs r1, r3, 16 bl sub_8162E20 - b @08164AC2 + b _08164AC2 .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 .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 .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 @@ -662296,12 +662296,12 @@ sub_8164828: ; 8164828 ldr r1, =0x00000cda adds r4, r1 strh r0, [r4] - b @08164A46 + b _08164A46 .pool -@08164A08: +_08164A08: ldr r0, =0x0000018f cmp r7, r0 - bgt @08164A30 + bgt _08164A30 ldr r0, =0x03005d90 ldr r1, [r0] ldr r3, =0x03006298 @@ -662310,9 +662310,9 @@ sub_8164828: ; 8164828 adds r0, r1, r4 strh r2, [r0] ldrh r0, [r3, 0x6] - b @08164A40 + b _08164A40 .pool -@08164A30: +_08164A30: ldr r0, =0x03005d90 ldr r1, [r0] ldr r3, =0x03006298 @@ -662321,16 +662321,16 @@ sub_8164828: ; 8164828 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 @@ -662340,7 +662340,7 @@ sub_8164828: ; 8164828 asrs r0, 1 lsls r0, 24 mov r8, r0 -@08164A60: +_08164A60: ldr r3, [sp, 0x4] lsrs r0, r3, 24 mov r4, r8 @@ -662351,32 +662351,32 @@ sub_8164828: ; 8164828 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 @@ -662385,33 +662385,33 @@ sub_8164828: ; 8164828 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, =gUnknown_085DD500 ldr r4, [sp] lsls r1, r4, 3 - b @08164B04 + b _08164B04 .pool -@08164AF8: +_08164AF8: ldr r0, =0x0000018f cmp r7, r0 - bgt @08164B28 + bgt _08164B28 ldr r0, =gUnknown_085DD500 ldr r5, [sp] lsls r1, r5, 3 -@08164B04: +_08164B04: adds r0, 0x4 adds r1, r0 ldr r0, =0x020375e2 @@ -662421,9 +662421,9 @@ sub_8164828: ; 8164828 adds r0, r1 ldr r0, [r0] bl box_related_two__2 - b @08164B54 + b _08164B54 .pool -@08164B28: +_08164B28: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0xfffffe70 @@ -662445,7 +662445,7 @@ sub_8164828: ; 8164828 adds r1, r0 ldr r0, [r1] bl box_related_two__2 -@08164B54: +_08164B54: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -662483,29 +662483,29 @@ 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 .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 @@ -662521,9 +662521,9 @@ sub_8164B74: ; 8164B74 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 @@ -662532,16 +662532,16 @@ sub_8164B74: ; 8164B74 bl link_0800A448 ldr r1, =0x020375f0 movs r0, 0x1 - b @08164DB4 + b _08164DB4 .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 @@ -662550,21 +662550,21 @@ sub_8164B74: ; 8164B74 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 @@ -662574,30 +662574,30 @@ sub_8164B74: ; 8164B74 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 @@ -662607,16 +662607,16 @@ sub_8164B74: ; 8164B74 strh r3, [r0] mov r4, r8 cmp r4, 0xD - ble @08164C68 + ble _08164C68 ldr r1, =0x020375f0 movs r0, 0x2 - b @08164DB4 + b _08164DB4 .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 @@ -662628,14 +662628,14 @@ sub_8164B74: ; 8164B74 bl link_0800A448 ldr r1, =0x020375f0 movs r0, 0x3 - b @08164DB4 + b _08164DB4 .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] @@ -662667,32 +662667,32 @@ sub_8164B74: ; 8164B74 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 .pool -@08164D98: +_08164D98: bl sub_800AC34 ldr r1, =0x020375f0 movs r0, 0x5 - b @08164DB4 + b _08164DB4 .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 @@ -662709,9 +662709,9 @@ sub_8164DCC: ; 8164DCC ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @08164DDA + beq _08164DDA bl sub_800AC34 -@08164DDA: +_08164DDA: pop {r0} bx r0 .pool @@ -662740,7 +662740,7 @@ sub_8164E04: ; 8164E04 bl VarGet lsls r0, 16 cmp r0, 0 - bne @08164E9A + bne _08164E9A ldr r5, =0x02038bca ldrh r1, [r5] mov r0, sp @@ -662787,7 +662787,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 @@ -662796,14 +662796,14 @@ sub_8164E04: ; 8164E04 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} @@ -662822,28 +662822,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 @@ -662854,12 +662854,12 @@ sub_8164ED8: ; 8164ED8 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 @@ -662870,16 +662870,16 @@ sub_8164ED8: ; 8164ED8 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} @@ -662897,14 +662897,14 @@ 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 @@ -662919,14 +662919,14 @@ 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 @@ -662937,11 +662937,11 @@ 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 @@ -662963,9 +662963,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 .pool @@ -662982,15 +662982,15 @@ sub_8164FFC: ; 8164FFC movs r2, 0x4 bl memcpy cmp r4, 0x3 - bls @0816501C + bls _0816501C movs r0, 0x3 - b @08165022 + b _08165022 .pool -@0816501C: +_0816501C: mov r1, sp adds r0, r1, r4 ldrb r0, [r0] -@08165022: +_08165022: add sp, 0x4 pop {r4} pop {r1} @@ -663025,10 +663025,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 @@ -663039,13 +663039,13 @@ sub_816502C: ; 816502C 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 @@ -663067,7 +663067,7 @@ sub_816502C: ; 816502C mov r1, r10 bl pokemon_getattr cmp r0, 0 - bne @081650D4 + bne _081650D4 movs r0, 0x1 mov r2, r9 strh r0, [r2] @@ -663079,44 +663079,44 @@ sub_816502C: ; 816502C 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] @@ -663129,7 +663129,7 @@ sub_816502C: ; 816502C adds r0, r1 mov r1, r10 bl sub_80EE4DC -@08165132: +_08165132: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -663154,7 +663154,7 @@ sub_816515C: ; 816515C ldrb r0, [r2, 0x8] adds r5, r1, 0 cmp r0, 0 - beq @08165194 + beq _08165194 ldr r4, =gUnknown_085DCEFA ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -663164,9 +663164,9 @@ sub_816515C: ; 816515C ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x14 - b @081651A6 + b _081651A6 .pool -@08165194: +_08165194: ldr r4, =gUnknown_085DCEDC ldrb r0, [r2, 0xA] ldrb r1, [r2, 0xB] @@ -663176,7 +663176,7 @@ sub_816515C: ; 816515C ldrb r1, [r2, 0xD] adds r0, r1 movs r1, 0x1E -@081651A6: +_081651A6: bl __umodsi3 adds r0, r4 ldrb r0, [r0] @@ -663203,7 +663203,7 @@ sub_816515C: ; 816515C adds r3, 0x28 adds r2, r7, 0 adds r2, 0x1C -@081651E0: +_081651E0: lsls r0, r4, 1 mov r9, r0 mov r1, r8 @@ -663221,9 +663221,9 @@ sub_816515C: ; 816515C 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 @@ -663235,7 +663235,7 @@ sub_816515C: ; 816515C bl sub_80686FC adds r4, 0x1 cmp r4, 0x2 - ble @08165206 + ble _08165206 adds r0, r7, 0 bl sub_8165328 pop {r3,r4} @@ -663285,14 +663285,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] @@ -663316,41 +663316,41 @@ 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 .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 @@ -663366,14 +663366,14 @@ 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 @@ -663384,11 +663384,11 @@ 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 @@ -663412,29 +663412,29 @@ sub_816537C: ; 816537C 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 .pool -@08165398: +_08165398: cmp r0, 0x1 - bne @081653B4 + bne _081653B4 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000c14 adds r0, r1 bl ConvertBattleFrontierTrainerSpeechToString - b @081653C0 + b _081653C0 .pool -@081653B4: +_081653B4: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000c08 adds r0, r1 bl ConvertBattleFrontierTrainerSpeechToString -@081653C0: +_081653C0: pop {r0} bx r0 .pool @@ -663449,19 +663449,19 @@ sub_81653CC: ; 81653CC adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne @081653E0 + bne _081653E0 bl sub_80F01B8 -@081653E0: +_081653E0: movs r0, 0x77 bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081653F8 + bne _081653F8 bl sub_80F01B8 movs r0, 0x77 bl FlagReset -@081653F8: +_081653F8: pop {r0} bx r0 .pool @@ -663480,15 +663480,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 @@ -663500,7 +663500,7 @@ sub_8165404: ; 8165404 lsls r0, 2 ldr r6, =gUnknown_085DD6D0 adds r5, r0, r6 -@08165440: +_08165440: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -663515,14 +663515,14 @@ sub_8165404: ; 8165404 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 @@ -663552,7 +663552,7 @@ sub_8165404: ; 8165404 mov r4, r8 ldr r0, =gUnknown_085DD6D5 adds r5, r0 -@081654B0: +_081654B0: adds r1, r3, 0 adds r1, 0x1A adds r2, r5, r3 @@ -663563,7 +663563,7 @@ sub_8165404: ; 8165404 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 @@ -663575,7 +663575,7 @@ sub_8165404: ; 8165404 mov r0, r9 add r0, r10 lsls r5, r0, 2 -@081654DE: +_081654DE: lsls r0, r1, 1 adds r0, r5 adds r0, r7 @@ -663589,7 +663589,7 @@ sub_8165404: ; 8165404 str r0, [sp, 0x44] adds r1, r0, 0 cmp r1, 0x3 - ble @081654DE + ble _081654DE movs r1, 0x64 mov r4, r10 muls r4, r1 @@ -663610,28 +663610,28 @@ sub_8165404: ; 8165404 ldr r2, [sp, 0x60] mov r10, r2 cmp r2, 0x2 - bgt @0816552E - b @0816542A -@0816552E: - b @0816585A + bgt _0816552E + b _0816542A +_0816552E: + b _0816585A .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 .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 @@ -663657,7 +663657,7 @@ sub_8165404: ; 8165404 mov r0, sp adds r0, 0x48 str r0, [sp, 0x5C] -@081655A6: +_081655A6: ldr r0, =0x03005d90 ldr r1, [r0] mov r0, r10 @@ -663704,7 +663704,7 @@ sub_8165404: ; 8165404 str r0, [sp, 0x60] mov r4, r8 mov r3, r9 -@08165604: +_08165604: ldr r0, [r6] adds r0, r5, r0 lsls r1, r2, 1 @@ -663725,15 +663725,15 @@ sub_8165404: ; 8165404 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 @@ -663764,7 +663764,7 @@ sub_8165404: ; 8165404 muls r0, r7 adds r0, r1 adds r3, r0, 0x4 -@0816567E: +_0816567E: mov r1, sp adds r1, r2 adds r1, 0x10 @@ -663776,7 +663776,7 @@ sub_8165404: ; 8165404 str r0, [sp, 0x44] adds r2, r0, 0 cmp r2, 0x7 - ble @0816567E + ble _0816567E movs r3, 0x64 mov r4, r10 muls r4, r3 @@ -663798,17 +663798,17 @@ sub_8165404: ; 8165404 ldr r6, [sp, 0x60] mov r10, r6 cmp r6, 0x1 - bgt @081656CA - b @081655A6 -@081656CA: - b @0816585A + bgt _081656CA + b _081655A6 +_081656CA: + b _0816585A .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 @@ -663825,7 +663825,7 @@ sub_8165404: ; 8165404 mov r8, r0 movs r1, 0x24 str r1, [sp, 0x6C] -@08165710: +_08165710: ldr r1, =0x03005d90 movs r0, 0xEC adds r4, r7, 0 @@ -663859,12 +663859,12 @@ sub_8165404: ; 8165404 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 @@ -663872,18 +663872,18 @@ sub_8165404: ; 8165404 add r0, sp, 0x38 movs r1, 0x1 bl StopMusicWhileStringIsPrinted - b @0816579C + b _0816579C .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 @@ -663917,10 +663917,10 @@ sub_8165404: ; 8165404 add r10, r6 mov r0, r10 cmp r0, 0x1 - ble @08165710 - b @0816585A + ble _08165710 + b _0816585A .pool -@081657F0: +_081657F0: ldr r1, =0xfffffe70 adds r0, r7, r1 lsls r0, 16 @@ -663938,7 +663938,7 @@ sub_8165404: ; 8165404 lsls r0, 2 adds r6, r0, 0 adds r6, 0xDC -@08165812: +_08165812: movs r0, 0x64 mov r4, r10 muls r4, r0 @@ -663971,8 +663971,8 @@ sub_8165404: ; 8165404 add r10, r0 mov r1, r10 cmp r1, 0x1 - ble @08165812 -@0816585A: + ble _08165812 +_0816585A: add sp, 0x70 pop {r3-r5} mov r8, r3 @@ -663998,24 +663998,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] @@ -664047,90 +664047,90 @@ sub_816587C: ; 816587C 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 .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, =gUnknown_085DFA46 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, =gUnknown_085DFA52 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 @@ -664146,7 +664146,7 @@ sub_816587C: ; 816587C adds r2, 0x2C adds r3, 0x2C cmp r2, r8 - ble @08165988 + ble _08165988 movs r0, 0 str r0, [sp] ldr r2, =0x0500000b @@ -664156,7 +664156,7 @@ sub_816587C: ; 816587C adds r0, r5, 0 bl sub_8164F70 movs r0, 0x1 -@081659BE: +_081659BE: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -664182,24 +664182,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] @@ -664224,67 +664224,67 @@ sub_81659DC: ; 81659DC 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 .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 @@ -664300,11 +664300,11 @@ sub_81659DC: ; 81659DC 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 @@ -664323,14 +664323,14 @@ sub_8165AE8: ; 8165AE8 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 @@ -664342,11 +664342,11 @@ sub_8165B08: ; 8165B08 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 @@ -664362,7 +664362,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 @@ -664374,12 +664374,12 @@ sub_8165B20: ; 8165B20 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 @@ -664390,15 +664390,15 @@ sub_8165B20: ; 8165B20 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 @@ -664418,32 +664418,32 @@ sub_8165B88: ; 8165B88 movs r0, 0xFA lsls r0, 1 cmp r2, r0 - bne @08165BA4 + bne _08165BA4 ldr r0, =gUnknown_82E9531 - b @08165C28 + b _08165C28 .pool -@08165BA4: +_08165BA4: ldr r0, =0x0000012b cmp r2, r0 - bhi @08165BB8 + bhi _08165BB8 ldr r0, =gUnknown_82E9531 - b @08165C28 + b _08165C28 .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 .pool -@08165BDC: +_08165BDC: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0xfffffed4 @@ -664453,20 +664453,20 @@ sub_8165B88: ; 8165B88 adds r0, r1 ldr r1, =0x0000081c adds r0, r1 - b @08165C28 + b _08165C28 .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 .pool -@08165C14: +_08165C14: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0xfffffe70 @@ -664477,9 +664477,9 @@ sub_8165B88: ; 8165B88 adds r2, r0 ldr r1, =0x0000011b adds r0, r2, r1 -@08165C28: +_08165C28: ldrb r0, [r0] -@08165C2A: +_08165C2A: strb r0, [r4] pop {r4} pop {r0} @@ -664498,7 +664498,7 @@ sub_8165C40: ; 8165C40 movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq @08165C84 + beq _08165C84 ldr r1, =0x0203bc88 ldr r0, =gBattleFrontierTrainers str r0, [r1] @@ -664509,11 +664509,11 @@ sub_8165C40: ; 8165C40 lsls r0, 30 lsrs r0, 30 bl sub_8165C90 - b @08165C88 + b _08165C88 .pool -@08165C84: +_08165C84: bl sub_8165D78 -@08165C88: +_08165C88: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -664526,20 +664526,20 @@ sub_8165C90: ; 8165C90 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 @@ -664549,7 +664549,7 @@ 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 @@ -664560,7 +664560,7 @@ sub_8165CB4: ; 8165CB4 movs r2, 0 bl pokemon_getattr cmp r0, 0 - beq @08165CF4 + beq _08165CF4 adds r0, r4, 0 movs r1, 0x41 movs r2, 0 @@ -664568,18 +664568,18 @@ sub_8165CB4: ; 8165CB4 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} @@ -664594,27 +664594,27 @@ sub_8165D08: ; 8165D08 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 @@ -664628,12 +664628,12 @@ sub_8165D40: ; 8165D40 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 @@ -664641,11 +664641,11 @@ sub_8165D40: ; 8165D40 bl __umodsi3 lsls r0, 16 lsrs r0, 16 - b @08165D72 + b _08165D72 .pool -@08165D70: +_08165D70: movs r0, 0 -@08165D72: +_08165D72: pop {r1} bx r1 thumb_func_end sub_8165D40 @@ -664658,49 +664658,49 @@ sub_8165D78: ; 8165D78 lsls r0, 16 lsrs r0, 16 cmp r0, 0x4 - bne @08165DA8 + bne _08165DA8 ldr r1, =0x0203bc88 ldr r0, =gSlateportBattleTentTrainers str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =gSlateportBattleTentMons - b @08165DF2 + b _08165DF2 .pool -@08165DA8: +_08165DA8: cmp r0, 0x2 - bne @08165DC8 + bne _08165DC8 ldr r1, =0x0203bc88 ldr r0, =gVerdanturfBattleTentTrainers str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =gVerdanturfBattleTentMons - b @08165DF2 + b _08165DF2 .pool -@08165DC8: +_08165DC8: cmp r0, 0x3 - bne @08165DE8 + bne _08165DE8 ldr r1, =0x0203bc88 ldr r0, =gFallarborBattleTentTrainers str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =gFallarborBattleTentMons - b @08165DF2 + b _08165DF2 .pool -@08165DE8: +_08165DE8: ldr r1, =0x0203bc88 ldr r0, =gBattleFrontierTrainers str r0, [r1] ldr r1, =0x0203bc8c ldr r0, =gBattleFrontierMons -@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 .pool @@ -664710,7 +664710,7 @@ sub_8165D78: ; 8165D78 sub_8165E18: ; 8165E18 push {r4,r5,lr} ldr r5, =0x03005d90 -@08165E1C: +_08165E1C: bl sub_8165D40 lsls r0, 16 lsrs r4, r0, 16 @@ -664720,12 +664720,12 @@ sub_8165E18: ; 8165E18 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 @@ -664733,21 +664733,21 @@ sub_8165E18: ; 8165E18 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] @@ -664760,14 +664760,14 @@ sub_8165E18: ; 8165E18 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 @@ -664805,9 +664805,9 @@ sub_8165EA4: ; 8165EA4 str r0, [sp, 0x24] ldr r2, [sp, 0x28] ldrh r1, [r2] - b @08165EFE + b _08165EFE .pool -@08165EEC: +_08165EEC: ldr r0, [sp, 0x24] adds r0, 0x1 lsls r0, 24 @@ -664817,10 +664817,10 @@ sub_8165EA4: ; 8165EA4 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 @@ -664831,9 +664831,9 @@ sub_8165EA4: ; 8165EA4 lsls r0, 16 orrs r4, r0 str r4, [sp, 0x2C] - b @08166092 + b _08166092 .pool -@08165F24: +_08165F24: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -664846,12 +664846,12 @@ sub_8165EA4: ; 8165EA4 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 @@ -664866,19 +664866,19 @@ sub_8165EA4: ; 8165EA4 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, =gBattleFrontierHeldItems mov r9, r0 movs r3, 0 -@08165F7A: +_08165F7A: ldr r1, =0x02024744 adds r5, r3, r1 adds r0, r5, 0 @@ -664888,7 +664888,7 @@ sub_8165EA4: ; 8165EA4 bl pokemon_getattr ldr r3, [sp, 0x34] cmp r0, 0 - beq @08165FB0 + beq _08165FB0 adds r0, r5, 0 movs r1, 0xC movs r2, 0 @@ -664903,34 +664903,34 @@ sub_8165EA4: ; 8165EA4 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 @@ -664970,7 +664970,7 @@ sub_8165EA4: ; 8165EA4 mov r5, r9 ldr r2, =0x02024744 mov r10, r2 -@0816602E: +_0816602E: ldr r0, [r3] adds r0, r5, r0 lsls r4, r6, 1 @@ -664990,14 +664990,14 @@ sub_8165EA4: ; 8165EA4 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 @@ -665019,12 +665019,12 @@ sub_8165EA4: ; 8165EA4 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 @@ -665045,51 +665045,51 @@ sub_81660B8: ; 81660B8 ldr r3, =gUnknown_085DCEDC 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, =gUnknown_085DCF0E - b @08166116 + b _08166116 .pool -@081660EC: +_081660EC: movs r1, 0 ldr r3, =gUnknown_085DCEFA 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 .pool -@08166114: +_08166114: ldr r0, =gUnknown_085DCF2C -@08166116: +_08166116: adds r0, r1, r0 ldrb r0, [r0] -@0816611A: +_0816611A: pop {r1} bx r1 .pool @@ -665111,18 +665111,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 @@ -665133,19 +665133,19 @@ sub_8166124: ; 8166124 adds r0, r1 ldr r0, [r0] cmp r0, r5 - bne @08166174 + bne _08166174 movs r0, 0x1 - b @08166182 + b _08166182 .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 @@ -665159,7 +665159,7 @@ sub_8166188: ; 8166188 ldr r1, =0x02000002 ands r0, r1 cmp r0, 0 - beq @081661E8 + beq _081661E8 bl sub_8165C40 lsls r0, 24 movs r5, 0 @@ -665167,7 +665167,7 @@ sub_8166188: ; 8166188 lsrs r0, 22 ldr r1, =gExperienceTables adds r6, r0, r1 -@081661A6: +_081661A6: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -665179,7 +665179,7 @@ sub_8166188: ; 8166188 bl pokemon_getattr adds r1, r0, 0 cmp r1, 0 - beq @081661E2 + beq _081661E2 lsls r0, r1, 3 subs r0, r1 lsls r0, 2 @@ -665195,11 +665195,11 @@ sub_8166188: ; 8166188 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 @@ -665257,9 +665257,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] @@ -665287,14 +665287,14 @@ sub_81662C0: ; 81662C0 ldr r1, [r4] ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive cmp r1, r0 - bne @081662F0 + bne _081662F0 adds r0, r4, 0 adds r0, 0x50 movs r1, 0 strb r1, [r0] ldr r0, =sub_8166304 bl SetMainCallback2 -@081662F0: +_081662F0: pop {r4} pop {r0} bx r0 @@ -665367,34 +665367,34 @@ 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 .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 @@ -665405,13 +665405,13 @@ sub_8166380: ; 8166380 ldr r2, =0x00007c58 adds r0, r2 bl sub_81D1ED4 - b @0816653C + b _0816653C .pool -@0816640C: +_0816640C: bl ResetAllObjectData bl ResetObjectPaletteAllocator - b @0816653C -@08166416: + b _0816653C +_08166416: movs r0, 0 bl SetVBlankCallback movs r0, 0 @@ -665421,9 +665421,9 @@ sub_8166380: ; 8166380 ldr r2, =0x05006000 mov r0, sp bl CpuSet - b @0816653C + b _0816653C .pool -@08166434: +_08166434: movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_085DFCCC @@ -665437,36 +665437,36 @@ sub_8166380: ; 8166380 movs r1, 0x97 movs r2, 0xE0 bl sub_809882C - b @0816653C + b _0816653C .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 .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 @@ -665474,13 +665474,13 @@ sub_8166380: ; 8166380 bl sub_81D312C lsls r0, 24 cmp r0, 0 - bne @08166556 - b @0816653C + bne _08166556 + b _0816653C .pool -@081664B8: +_081664B8: ldr r1, [r2] - b @08166540 -@081664BC: + b _08166540 +_081664BC: ldr r5, =0x0203bcac ldr r1, [r5] ldr r4, =0x00007c58 @@ -665491,9 +665491,9 @@ sub_8166380: ; 8166380 ldr r0, [r5] adds r0, r4 bl sub_81D20AC - b @0816653C + b _0816653C .pool -@081664E4: +_081664E4: ldr r4, =0x0203bcac ldr r0, [r4] ldr r1, =0x00007c58 @@ -665501,7 +665501,7 @@ sub_8166380: ; 8166380 bl sub_81D20BC lsls r0, 24 cmp r0, 0 - bne @08166556 + bne _08166556 ldr r2, [r4] ldr r1, =0x00007c58 adds r0, r2, r1 @@ -665509,17 +665509,17 @@ sub_8166380: ; 8166380 adds r2, r1 adds r1, r2, 0 bl sub_81D1F84 - b @0816653C + b _0816653C .pool -@08166510: +_08166510: ldr r0, =0x0203bcac ldr r0, [r0] ldr r2, =0x00007c58 adds r0, r2 bl sub_81D2230 - b @0816653C + b _0816653C .pool -@08166528: +_08166528: movs r0, 0 bl PutWindowTilemap movs r0, 0x1 @@ -665527,20 +665527,20 @@ sub_8166380: ; 8166380 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 .pool -@08166550: +_08166550: ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive bl launch_c3_walk_stairs_and_run_once -@08166556: +_08166556: add sp, 0x4 pop {r4,r5} pop {r0} @@ -665557,12 +665557,12 @@ 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 .pool -@08166580: +_08166580: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -665585,15 +665585,15 @@ map_warp_consider_1_to_outside_or_stair_or_dive: ; 8166564 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08166610 + b _08166610 .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 @@ -665608,7 +665608,7 @@ map_warp_consider_1_to_outside_or_stair_or_dive: ; 8166564 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq @0816660A + beq _0816660A ldr r1, =0x00007fb3 adds r0, r4, r1 movs r1, 0 @@ -665623,10 +665623,10 @@ map_warp_consider_1_to_outside_or_stair_or_dive: ; 8166564 adds r1, r4, r3 ldrb r1, [r1] bl sub_81D3480 -@0816660A: +_0816660A: ldr r0, =sub_8166634 bl launch_c3_walk_stairs_and_run_once -@08166610: +_08166610: add sp, 0x4 pop {r4} pop {r0} @@ -665642,32 +665642,32 @@ sub_8166634: ; 8166634 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 .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 @@ -665681,13 +665681,13 @@ sub_8166634: ; 8166634 ldr r0, [r0] adds r0, 0x50 movs r1, 0x1 - b @0816680C + b _0816680C .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 @@ -665701,29 +665701,29 @@ sub_8166634: ; 8166634 ldr r0, [r0] adds r0, 0x50 movs r1, 0x1 - b @0816680C + b _0816680C .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 .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 @@ -665736,21 +665736,21 @@ sub_8166634: ; 8166634 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 .pool -@0816674C: +_0816674C: ldr r0, =0x0203bc90 ldr r0, [r0] adds r0, 0x50 movs r1, 0x5 - b @0816680C + b _0816680C .pool -@0816675C: +_0816675C: ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00008044 @@ -665760,18 +665760,18 @@ sub_8166634: ; 8166634 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 .pool -@08166788: +_08166788: ldr r0, =sub_8166BEC bl launch_c3_walk_stairs_and_run_once - b @0816680E + b _0816680E .pool -@08166794: +_08166794: bl sub_8166D44 ldr r0, =0x0203bc90 ldr r1, [r0] @@ -665779,58 +665779,58 @@ sub_8166634: ; 8166634 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0816680E + b _0816680E .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 .pool -@081667E8: +_081667E8: ldr r0, =sub_816681C bl launch_c3_walk_stairs_and_run_once - b @0816680E + b _0816680E .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 .pool @@ -665845,12 +665845,12 @@ 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 .pool -@08166838: +_08166838: ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00008041 @@ -665878,9 +665878,9 @@ sub_816681C: ; 816681C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @081668D4 + b _081668D4 .pool -@08166888: +_08166888: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -665888,7 +665888,7 @@ sub_816681C: ; 816681C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @081668D4 + bne _081668D4 movs r0, 0 bl SetVBlankCallback ldr r4, =0x0203bca0 @@ -665912,7 +665912,7 @@ sub_816681C: ; 816681C ldr r0, =sub_816624C str r0, [r1, 0x8] bl sub_8179D70 -@081668D4: +_081668D4: add sp, 0x4 pop {r4,r5} pop {r0} @@ -665930,25 +665930,25 @@ 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 .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 @@ -665957,21 +665957,21 @@ sub_81668F8: ; 81668F8 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 .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 @@ -665981,21 +665981,21 @@ sub_81668F8: ; 81668F8 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 .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 ShowBg movs r0, 0x1 @@ -666004,8 +666004,8 @@ sub_81668F8: ; 81668F8 bl ShowBg movs r0, 0x2 bl ShowBg - b @081669DE -@081669C8: + b _081669DE +_081669C8: ldr r0, =sub_8166340 bl SetVBlankCallback movs r0, 0x1 @@ -666015,23 +666015,23 @@ sub_81668F8: ; 81668F8 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@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 .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 @@ -666041,7 +666041,7 @@ sub_81668F8: ; 81668F8 bl launch_c3_walk_stairs_and_run_once ldr r0, =sub_816631C bl SetMainCallback2 -@08166A18: +_08166A18: add sp, 0x4 pop {r4} pop {r0} @@ -666058,24 +666058,24 @@ 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 .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] @@ -666096,20 +666096,20 @@ sub_8166A34: ; 8166A34 ldr r3, =0x00007b1c adds r0, r3 bl sub_81D3520 - b @08166BAA + b _08166BAA .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 .pool -@08166AC0: +_08166AC0: bl sub_8167104 ldr r6, =0x0203bc90 ldr r0, [r6] @@ -666136,9 +666136,9 @@ sub_8166A34: ; 8166A34 bl sub_81D1F84 bl sub_8167338 ldr r1, [r6] - b @08166BAC + b _08166BAC .pool -@08166B14: +_08166B14: ldr r5, =0x0203bcac ldr r0, [r5] ldr r1, =0x00007c58 @@ -666147,7 +666147,7 @@ sub_8166A34: ; 8166A34 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne @08166BDA + bne _08166BDA ldr r0, [r5] ldr r4, =0x00008041 adds r0, r4 @@ -666164,7 +666164,7 @@ sub_8166A34: ; 8166A34 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq @08166B6C + beq _08166B6C ldr r4, =0x00007fb3 adds r0, r3, r4 movs r1, 0 @@ -666179,15 +666179,15 @@ sub_8166A34: ; 8166A34 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 .pool -@08166B94: +_08166B94: ldr r1, [r5] adds r1, 0x52 ldrb r0, [r1] @@ -666196,33 +666196,33 @@ sub_8166A34: ; 8166A34 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 bl launch_c3_walk_stairs_and_run_once -@08166BDA: +_08166BDA: pop {r4-r6} pop {r0} bx r0 @@ -666239,20 +666239,20 @@ 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 .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] @@ -666260,32 +666260,32 @@ sub_8166BEC: ; 8166BEC movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - 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 .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 .pool -@08166C5C: +_08166C5C: ldr r0, [r0, 0x4] bl SetMainCallback2 ldr r0, =0x0203bcac @@ -666294,7 +666294,7 @@ sub_8166BEC: ; 8166BEC adds r0, r1 bl sub_81D354C movs r4, 0 -@08166C70: +_08166C70: ldr r5, =0x0203bcac ldr r0, [r5] ldr r2, =0x00007b06 @@ -666311,7 +666311,7 @@ sub_8166BEC: ; 8166BEC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @08166C70 + bls _08166C70 movs r0, 0 bl FreeObjectTilesByTag movs r0, 0x1 @@ -666321,7 +666321,7 @@ sub_8166BEC: ; 8166BEC movs r0, 0x1 bl FreeObjectPaletteByTag movs r4, 0 -@08166CAE: +_08166CAE: ldr r0, [r5] lsls r1, r4, 2 ldr r2, =0x00007b44 @@ -666333,14 +666333,14 @@ sub_8166BEC: ; 8166BEC 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 @@ -666348,7 +666348,7 @@ sub_8166BEC: ; 8166BEC ldr r1, =0x02020630 adds r0, r1 bl RemoveObjectAndFreeTiles -@08166CE6: +_08166CE6: movs r0, 0 bl SetVBlankCallback ldr r4, =0x0203bca0 @@ -666368,7 +666368,7 @@ sub_8166BEC: ; 8166BEC bl Free str r5, [r6] bl FreeAllWindowBuffers -@08166D18: +_08166D18: add sp, 0x4 pop {r4-r6} pop {r0} @@ -666446,25 +666446,25 @@ sub_8166DE4: ; 8166DE4 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 ClearWindowTilemap -@08166E18: +_08166E18: lsls r0, r4, 24 asrs r0, 24 pop {r4} @@ -666492,7 +666492,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] @@ -666500,9 +666500,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] @@ -666513,30 +666513,30 @@ sub_8166E24: ; 8166E24 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 .pool -@08166EA8: +_08166EA8: ldr r0, =0x02021fc4 ldr r1, =0x0203bc90 ldr r1, [r1] @@ -666544,7 +666544,7 @@ sub_8166E24: ; 8166E24 ldrb r1, [r1] movs r2, 0 bl sub_8166FD4 -@08166EB8: +_08166EB8: ldr r0, =0x02021fc4 bl sub_8166FB0 movs r0, 0x2 @@ -666567,7 +666567,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] @@ -666578,21 +666578,21 @@ sub_8166EDC: ; 8166EDC 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 .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 @@ -666609,7 +666609,7 @@ sub_8166EDC: ; 8166EDC movs r1, 0x2 bl CopyWindowToVram movs r0, 0x1 -@08166F44: +_08166F44: pop {r4,r5} pop {r1} bx r1 @@ -666692,11 +666692,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, =gUnknown_085DFD04 lsls r0, r3, 2 @@ -666707,13 +666707,13 @@ sub_8166FD4: ; 8166FD4 ldr r1, =gUnknown_085EC7E1 adds r0, r4, 0 bl AppendString - b @08167018 + b _08167018 .pool -@08167010: +_08167010: ldr r1, =gUnknown_085EC7EF adds r0, r4, 0 bl CopyString -@08167018: +_08167018: pop {r4} pop {r0} bx r0 @@ -666727,7 +666727,7 @@ sub_8167024: ; 8167024 adds r5, r1, 0 movs r4, 0 ldr r7, =gUnknown_085DFCB0 -@0816702E: +_0816702E: lsls r0, r4, 2 adds r0, r7 ldr r1, [r0] @@ -666739,7 +666739,7 @@ sub_8167024: ; 8167024 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls @0816702E + bls _0816702E pop {r4-r7} pop {r0} bx r0 @@ -666758,13 +666758,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, =gUnknown_085DFCB0 lsls r0, r4, 2 adds r0, r1 @@ -666785,15 +666785,15 @@ sub_8167054: ; 8167054 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 @@ -666803,7 +666803,7 @@ sub_8167054: ; 8167054 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls @08167078 + bls _08167078 adds r0, r5, 0 movs r1, 0x30 bl pokemon_getattr @@ -666815,16 +666815,16 @@ sub_8167054: ; 8167054 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 @@ -666865,7 +666865,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 @@ -666883,7 +666883,7 @@ sub_8167104: ; 8167104 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x4 - bls @08167144 + bls _08167144 pop {r4,r5} pop {r0} bx r0 @@ -666924,21 +666924,21 @@ sub_8167184: ; 8167184 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - ble @081671D4 + ble _081671D4 movs r0, 0x1 - b @081671DA + b _081671DA .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 @@ -666959,13 +666959,13 @@ sub_8167184: ; 8167184 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, =gUnknown_085DFCC4 adds r0, r6, r0 ldrb r1, [r0] @@ -666974,7 +666974,7 @@ sub_8167184: ; 8167184 lsls r0, 24 asrs r2, r0, 24 cmp r0, r9 - bne @08167244 + bne _08167244 mov r1, r8 ldr r0, [r1] adds r0, 0x66 @@ -666985,14 +666985,14 @@ sub_8167184: ; 8167184 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 @@ -667023,13 +667023,13 @@ sub_8167268: ; 8167268 movs r3, 0 bl sub_81D2C68 cmp r0, 0xFF - beq @0816729C + beq _0816729C movs r0, 0 - b @0816729E + b _0816729E .pool -@0816729C: +_0816729C: movs r0, 0x1 -@0816729E: +_0816729E: pop {r1} bx r1 thumb_func_end sub_8167268 @@ -667040,7 +667040,7 @@ sub_81672A4: ; 81672A4 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 -@081672AC: +_081672AC: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -667048,24 +667048,24 @@ sub_81672A4: ; 81672A4 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 .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 @@ -667079,8 +667079,8 @@ sub_81672E4: ; 81672E4 movs r4, 0 movs r6, 0 cmp r6, r5 - bcs @08167314 -@081672F2: + bcs _08167314 +_081672F2: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -667088,17 +667088,17 @@ sub_81672E4: ; 81672E4 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 @@ -667140,13 +667140,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 @@ -667160,31 +667160,31 @@ sub_8167338: ; 8167338 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 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} @@ -667200,25 +667200,25 @@ sub_81673DC: ; 81673DC 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 RemoveObjectAndFreeTiles ldr r0, =0x0203bc90 @@ -667227,7 +667227,7 @@ sub_81673DC: ; 81673DC ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] -@08167418: +_08167418: pop {r0} bx r0 .pool @@ -667239,9 +667239,9 @@ sub_8167420: ; 8167420 movs r4, 0 movs r5, 0 ldr r6, =0x0203bcac - b @08167472 + b _08167472 .pool -@08167430: +_08167430: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -667250,7 +667250,7 @@ sub_8167420: ; 8167420 bl pokemon_getattr adds r3, r0, 0 cmp r3, 0 - bne @0816746C + bne _0816746C ldr r1, [r6] lsls r2, r5, 2 adds r1, r2 @@ -667271,16 +667271,16 @@ sub_8167420: ; 8167420 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 @@ -667332,18 +667332,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 @@ -667463,7 +667463,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 @@ -667507,7 +667507,7 @@ sub_8167608: ; 8167608 adds r0, r2 strb r1, [r0] cmp r1, 0x40 - bne @081676AC + bne _081676AC movs r0, 0x64 bl FreeObjectTilesByTag movs r0, 0x64 @@ -667516,9 +667516,9 @@ sub_8167608: ; 8167608 add r0, r8 movs r1, 0xFF strb r1, [r0] - b @08167742 + b _08167742 .pool -@081676AC: +_081676AC: ldr r0, [r7] add r0, r8 strb r1, [r0] @@ -667560,9 +667560,9 @@ sub_8167608: ; 8167608 lsls r1, 1 adds r0, r1 strh r0, [r2] - b @08167742 + b _08167742 .pool -@08167714: +_08167714: lsls r1, r6, 13 movs r0, 0xC1 lsls r0, 2 @@ -667585,7 +667585,7 @@ sub_8167608: ; 8167608 ldrh r1, [r1] movs r2, 0x20 bl gpu_pal_apply -@08167742: +_08167742: add sp, 0x28 pop {r3} mov r8, r3 @@ -667626,13 +667626,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 @@ -667647,7 +667647,7 @@ sub_8167760: ; 8167760 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @081677FC + beq _081677FC ldr r0, [r5] ldr r2, =0x00007b06 adds r0, r2 @@ -667661,16 +667661,16 @@ sub_8167760: ; 8167760 add r0, r8 ldr r1, =sub_8168180 str r1, [r0] - b @08167808 + b _08167808 .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 @@ -667680,15 +667680,15 @@ sub_8167760: ; 8167760 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 @@ -667703,7 +667703,7 @@ sub_8167760: ; 8167760 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @08167874 + beq _08167874 ldr r0, [r5] ldr r1, =0x00007b06 adds r0, r1 @@ -667717,22 +667717,22 @@ sub_8167760: ; 8167760 movs r0, 0x3F ands r0, r2 strb r0, [r1, 0x3] - b @08167880 + b _08167880 .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 @@ -667751,7 +667751,7 @@ sub_8167760: ; 8167760 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @081678F4 + beq _081678F4 ldr r0, =0x0203bcac ldr r0, [r0] ldr r1, =0x00007b06 @@ -667775,9 +667775,9 @@ sub_8167760: ; 8167760 movs r0, 0x80 orrs r1, r0 strb r1, [r2, 0x3] - b @08167902 + b _08167902 .pool -@081678F4: +_081678F4: ldr r0, =0x0203bcac ldr r0, [r0] ldr r2, =0x00007b06 @@ -667785,7 +667785,7 @@ sub_8167760: ; 8167760 adds r0, r4 movs r1, 0xFF strb r1, [r0] -@08167902: +_08167902: mov r0, r9 mov r1, r10 bl sub_81D32B0 @@ -667814,30 +667814,30 @@ 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 .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 @@ -667881,9 +667881,9 @@ sub_8167930: ; 8167930 ldr r1, =0x0000040b movs r0, 0x52 bl SetGpuReg - b @08167B7E + b _08167B7E .pool -@08167A04: +_08167A04: ldr r4, =0x0203bca4 movs r0, 0xD0 lsls r0, 5 @@ -667899,22 +667899,22 @@ sub_8167930: ; 8167930 adds r0, r4, 0 bl Alloc str r0, [r5] - b @08167B7E + b _08167B7E .pool -@08167A38: +_08167A38: ldr r0, =gUnknown_085DFB60 ldr r1, =0x0203bca8 - b @08167AA0 + b _08167AA0 .pool -@08167A48: +_08167A48: ldr r1, =gUnknown_085DFA80 movs r0, 0x3 movs r2, 0xE0 movs r3, 0 bl LoadBgTiles - b @08167B7E + b _08167B7E .pool -@08167A5C: +_08167A5C: ldr r0, =0x0203bca8 ldr r1, [r0] movs r2, 0xA0 @@ -667922,9 +667922,9 @@ sub_8167930: ; 8167930 movs r0, 0x3 movs r3, 0 bl LoadBgTilemap - b @08167B7E + b _08167B7E .pool -@08167A74: +_08167A74: ldr r0, =gUnknown_085DFA60 movs r1, 0xD0 movs r2, 0x20 @@ -667935,17 +667935,17 @@ sub_8167930: ; 8167930 adds r0, r1 ldr r1, =0x0000ffb0 strh r1, [r0] - b @08167B7E + b _08167B7E .pool -@08167A9C: +_08167A9C: ldr r0, =gUnknown_08DCCF7C ldr r1, =0x0203bca4 -@08167AA0: +_08167AA0: ldr r1, [r1] bl LZ77UnCompVram - b @08167B7E + b _08167B7E .pool -@08167AB0: +_08167AB0: ldr r0, =gUnknown_08DCD81C ldr r1, =0x0203bca0 ldr r1, [r1] @@ -667954,9 +667954,9 @@ sub_8167930: ; 8167930 movs r1, 0x20 movs r2, 0x20 bl gpu_pal_apply - b @08167B7E + b _08167B7E .pool -@08167AD4: +_08167AD4: ldr r0, =0x0203bca4 ldr r1, [r0] movs r2, 0xD0 @@ -667965,9 +667965,9 @@ sub_8167930: ; 8167930 lsls r3, 2 movs r0, 0x1 bl LoadBgTiles - b @08167B7E + b _08167B7E .pool -@08167AEC: +_08167AEC: ldr r0, =0x0203bca0 ldr r1, [r0] movs r0, 0x1 @@ -667983,18 +667983,18 @@ sub_8167930: ; 8167930 bl CopyToBgTilemapBufferRect movs r0, 0x1 bl CopyBgTilemapBufferToVram - b @08167B7E + b _08167B7E .pool -@08167B1C: +_08167B1C: ldr r0, =gUnknown_085DFC0C ldr r1, =0x0203bcac ldr r1, [r1] ldr r2, =0x00007304 adds r1, r2 bl LZ77UnCompVram - b @08167B7E + b _08167B7E .pool -@08167B38: +_08167B38: ldr r0, =0x0203bcac ldr r1, [r0] ldr r0, =0x00007304 @@ -668014,13 +668014,13 @@ sub_8167930: ; 8167930 bl gpu_pal_apply movs r0, 0x2 bl sub_81D21DC - b @08167B7E + b _08167B7E .pool -@08167B78: +_08167B78: movs r0, 0 strb r0, [r1] - b @08167B8E -@08167B7E: + b _08167B8E +_08167B7E: ldr r0, =0x0203bcac ldr r1, [r0] ldr r2, =0x00008048 @@ -668029,7 +668029,7 @@ sub_8167930: ; 8167930 adds r0, 0x1 strb r0, [r1] movs r0, 0x1 -@08167B8E: +_08167B8E: add sp, 0x8 pop {r4,r5} pop {r1} @@ -668064,7 +668064,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 @@ -668114,26 +668114,26 @@ 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 CopyWindowToVram movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram - b @08167C94 + b _08167C94 .pool -@08167C84: +_08167C84: movs r0, 0 movs r1, 0x2 bl CopyWindowToVram movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram -@08167C94: +_08167C94: add sp, 0xC pop {r3} mov r8, r3 @@ -668150,19 +668150,19 @@ sub_8167CA0: ; 8167CA0 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 .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 @@ -668203,7 +668203,7 @@ sub_8167CA0: ; 8167CA0 lsrs r0, 31 mov r8, r0 cmp r7, 0 - beq @08167D98 + beq _08167D98 ldr r3, =0x00007fb4 adds r0, r4, r3 ldrb r1, [r0] @@ -668230,11 +668230,11 @@ sub_8167CA0: ; 8167CA0 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 @@ -668245,15 +668245,15 @@ sub_8167CA0: ; 8167CA0 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 .pool -@08167D98: +_08167D98: ldr r3, =0x00007fb5 adds r0, r4, r3 ldrb r1, [r0] @@ -668284,13 +668284,13 @@ sub_8167CA0: ; 8167CA0 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bge @08167DEC + bge _08167DEC adds r3, r1, 0x1 - b @08167DEE + b _08167DEE .pool -@08167DEC: +_08167DEC: movs r3, 0 -@08167DEE: +_08167DEE: ldr r1, =0x00008041 adds r0, r2, r1 strb r3, [r0] @@ -668304,13 +668304,13 @@ sub_8167CA0: ; 8167CA0 subs r0, 0x1 adds r6, r2, 0 cmp r1, r0 - bge @08167E1C + bge _08167E1C adds r1, 0x1 - b @08167E1E + b _08167E1E .pool -@08167E1C: +_08167E1C: movs r1, 0 -@08167E1E: +_08167E1E: ldr r2, =0x00007b4c adds r0, r3, r2 strb r1, [r0] @@ -668332,28 +668332,28 @@ sub_8167CA0: ; 8167CA0 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 - b @08167E90 + b _08167E90 .pool -@08167E70: +_08167E70: cmp r4, 0 - bne @08167E88 + bne _08167E88 ldr r0, [r5] ldr r4, =0x00008044 adds r0, r4 ldr r1, =sub_8167FA4 - b @08167E90 + b _08167E90 .pool -@08167E88: +_08167E88: ldr r0, [r6] ldr r1, =0x00008044 adds r0, r1 ldr r1, =sub_8168048 -@08167E90: +_08167E90: str r1, [r0] pop {r3} mov r8, r3 @@ -668372,27 +668372,27 @@ 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 .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 .pool -@08167EE4: +_08167EE4: ldr r6, =0x00007fb3 adds r0, r1, r6 ldrb r0, [r0] @@ -668405,9 +668405,9 @@ sub_8167EA4: ; 8167EA4 ldr r1, [r4] ldr r0, =0x00008048 adds r1, r0 - b @08167F30 + b _08167F30 .pool -@08167F08: +_08167F08: ldr r2, =0x00007c58 adds r0, r1, r2 ldr r6, =0x00007b0e @@ -668415,7 +668415,7 @@ sub_8167EA4: ; 8167EA4 bl sub_81D3178 lsls r0, 24 cmp r0, 0 - bne @08167F9C + bne _08167F9C ldr r1, [r4] ldr r2, =0x00007b4c adds r0, r1, r2 @@ -668424,16 +668424,16 @@ sub_8167EA4: ; 8167EA4 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 .pool -@08167F48: +_08167F48: ldr r2, =0x00007b1c adds r0, r1, r2 bl sub_81D3464 @@ -668446,7 +668446,7 @@ sub_8167EA4: ; 8167EA4 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq @08167F82 + beq _08167F82 subs r6, 0x8E adds r0, r3, r6 movs r1, 0 @@ -668461,17 +668461,17 @@ sub_8167EA4: ; 8167EA4 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 .pool -@08167F9C: +_08167F9C: movs r0, 0x1 -@08167F9E: +_08167F9E: pop {r4-r6} pop {r1} bx r1 @@ -668486,20 +668486,20 @@ 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 .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 @@ -668507,10 +668507,10 @@ sub_8167FA4: ; 8167FA4 bl sub_81D31A4 lsls r0, 24 cmp r0, 0 - bne @0816803E - b @08168024 + bne _0816803E + b _08168024 .pool -@08167FF0: +_08167FF0: ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] @@ -668523,9 +668523,9 @@ sub_8167FA4: ; 8167FA4 ldr r1, [r4] ldr r0, =0x00008048 adds r1, r0 - b @08168028 + b _08168028 .pool -@08168014: +_08168014: ldr r2, =0x00007b4c adds r0, r1, r2 ldrb r0, [r0] @@ -668533,22 +668533,22 @@ sub_8167FA4: ; 8167FA4 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 .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 @@ -668563,20 +668563,20 @@ 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 .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 @@ -668586,15 +668586,15 @@ sub_8168048: ; 8168048 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 .pool -@081680A8: +_081680A8: ldr r2, =0x00007fb3 adds r0, r1, r2 ldrb r0, [r0] @@ -668607,9 +668607,9 @@ sub_8168048: ; 8168048 ldr r1, [r4] ldr r6, =0x00008048 adds r1, r6 - b @081680F4 + b _081680F4 .pool -@081680CC: +_081680CC: ldr r2, =0x00007c58 adds r0, r1, r2 ldr r6, =0x00007b0e @@ -668617,7 +668617,7 @@ sub_8168048: ; 8168048 bl sub_81D3178 lsls r0, 24 cmp r0, 0 - bne @08168160 + bne _08168160 ldr r1, [r4] ldr r2, =0x00007b4c adds r0, r1, r2 @@ -668626,16 +668626,16 @@ sub_8168048: ; 8168048 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 .pool -@0816810C: +_0816810C: ldr r2, =0x00007b1c adds r0, r1, r2 bl sub_81D3464 @@ -668648,7 +668648,7 @@ sub_8168048: ; 8168048 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - beq @08168146 + beq _08168146 subs r6, 0x8E adds r0, r3, r6 movs r1, 0 @@ -668663,17 +668663,17 @@ sub_8168048: ; 8168048 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 .pool -@08168160: +_08168160: movs r0, 0x1 -@08168162: +_08168162: pop {r4-r6} pop {r1} bx r1 @@ -668704,17 +668704,17 @@ sub_8168180: ; 8168180 adds r0, r3 ldrb r0, [r0] cmp r1, r0 - bne @081681A8 + bne _081681A8 adds r0, r2, 0 movs r1, 0 bl StartObjectImageAnim - b @081681B0 + b _081681B0 .pool -@081681A8: +_081681A8: adds r0, r2, 0 movs r1, 0x1 bl StartObjectImageAnim -@081681B0: +_081681B0: pop {r0} bx r0 thumb_func_end sub_8168180 @@ -668733,13 +668733,13 @@ sub_81681B4: ; 81681B4 ldrb r0, [r0] subs r0, 0x1 cmp r1, r0 - bne @081681DC + bne _081681DC movs r0, 0x65 - b @081681DE + b _081681DE .pool -@081681DC: +_081681DC: movs r0, 0x66 -@081681DE: +_081681DE: bl IndexOfObjectPaletteTag lsls r0, 4 ldrb r2, [r4, 0x5] @@ -668776,15 +668776,15 @@ 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 .pool -@0816823C: +_0816823C: movs r0, 0x9 -@0816823E: +_0816823E: strb r0, [r4] pop {r4} pop {r0} @@ -668842,7 +668842,7 @@ sub_8168294: ; 8168294 movs r0, 0x60 negs r0, r0 mov r8, r0 -@081682B6: +_081682B6: mov r5, r9 muls r5, r6 mov r0, r8 @@ -668858,7 +668858,7 @@ sub_8168294: ; 8168294 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x40 - beq @081682FE + beq _081682FE ldr r0, =0x02020630 lsls r4, r1, 4 adds r4, r1 @@ -668877,12 +668877,12 @@ sub_8168294: ; 8168294 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 @@ -668902,12 +668902,12 @@ 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 .pool -@08168348: +_08168348: bl sub_8168248 ldr r1, [r4] ldr r0, =0x00008048 @@ -668916,17 +668916,17 @@ sub_8168328: ; 8168328 adds r0, 0x1 strb r0, [r1] movs r0, 0x1 - b @0816836E + b _0816836E .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 @@ -668945,24 +668945,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, =DummyObjectCallback str r0, [r2, 0x1C] -@081683A8: +_081683A8: pop {r4} pop {r0} bx r0 @@ -669014,24 +669014,24 @@ 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, =gUnknown_085DFDC0 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @08168440 + b _08168440 .pool -@0816843C: +_0816843C: bl dp01_tbl5_exec_completed -@08168440: +_08168440: pop {r0} bx r0 thumb_func_end bx_exec_buffer_A_ch0_tbl2 @@ -669045,24 +669045,24 @@ 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 .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 @@ -669072,7 +669072,7 @@ sub_8168444: ; 8168444 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@08168492: +_08168492: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -669081,13 +669081,13 @@ sub_8168444: ; 8168444 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] @@ -669096,13 +669096,13 @@ sub_8168444: ; 8168444 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] @@ -669111,10 +669111,10 @@ sub_8168444: ; 8168444 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 @@ -669130,8 +669130,8 @@ sub_8168444: ; 8168444 adds r0, 0x96 movs r1, 0x40 strb r1, [r0] - b @08168564 -@08168508: + b _08168564 +_08168508: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -669139,7 +669139,7 @@ sub_8168444: ; 8168444 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne @08168564 + bne _08168564 movs r0, 0x5 bl audio_play movs r0, 0 @@ -669156,8 +669156,8 @@ sub_8168444: ; 8168444 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08168564 -@08168540: + b _08168564 +_08168540: ldr r1, [r4] adds r1, 0x96 ldrb r0, [r1] @@ -669165,7 +669165,7 @@ sub_8168444: ; 8168444 strb r0, [r1] lsls r0, 24 cmp r0, 0 - bne @08168564 + bne _08168564 movs r0, 0x5 bl audio_play movs r0, 0x1 @@ -669173,7 +669173,7 @@ sub_8168444: ; 8168444 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb bl dp01_tbl5_exec_completed -@08168564: +_08168564: pop {r4,r5} pop {r0} bx r0 @@ -669196,9 +669196,9 @@ sub_816856C: ; 816856C ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08168590 + bne _08168590 bl dp01_tbl5_exec_completed -@08168590: +_08168590: pop {r0} bx r0 .pool @@ -669211,9 +669211,9 @@ sub_81685A4: ; 81685A4 bl IsTextPrinterActive 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 @@ -669224,9 +669224,9 @@ bx_wait_t5: ; 81685BC ldr r0, =0x020244b9 ldrb r0, [r0] cmp r0, 0 - bne @081685CA + bne _081685CA bl dp01_tbl5_exec_completed -@081685CA: +_081685CA: pop {r0} bx r0 .pool @@ -669240,7 +669240,7 @@ sub_81685D4: ; 81685D4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081685FC + bne _081685FC ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -669251,7 +669251,7 @@ sub_81685D4: ; 81685D4 bl nullsub_35 bl FreeAllWindowBuffers bl sub_81ADD70 -@081685FC: +_081685FC: pop {r0} bx r0 .pool @@ -669264,19 +669264,19 @@ sub_8168610: ; 8168610 ldr r1, [r0, 0x4] ldr r0, =sub_8038420 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 .pool @@ -669301,7 +669301,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] @@ -669311,7 +669311,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 @@ -669326,7 +669326,7 @@ sub_816864C: ; 816864C adds r0, r7, 0 ands r0, r1 cmp r0, 0 - bne @081686B6 + bne _081686B6 ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -669336,7 +669336,7 @@ sub_816864C: ; 816864C adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -@081686B6: +_081686B6: ldr r0, [r4] ldrb r2, [r5] ldr r3, [r0, 0x4] @@ -669349,9 +669349,9 @@ sub_816864C: ; 816864C 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 @@ -669362,7 +669362,7 @@ sub_816864C: ; 816864C adds r0, r4, 0 ands r0, r1 cmp r0, 0 - bne @081687DC + bne _081687DC ldr r0, =0x02020630 mov r8, r0 ldr r7, =0x03005d7c @@ -669377,7 +669377,7 @@ sub_816864C: ; 816864C ldr r3, [r0] ldr r0, =DummyObjectCallback cmp r3, r0 - bne @081687DC + bne _081687DC ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] @@ -669387,17 +669387,17 @@ sub_816864C: ; 816864C 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 @@ -669431,7 +669431,7 @@ sub_816864C: ; 816864C adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@0816877A: +_0816877A: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -669477,7 +669477,7 @@ sub_816864C: ; 816864C adds r0, r1 ldr r1, =sub_8168818 str r1, [r0] -@081687DC: +_081687DC: pop {r3} mov r8, r3 pop {r4-r7} @@ -669507,11 +669507,11 @@ sub_8168818: ; 8168818 ldr r1, [r0] ldr r0, =DummyObjectCallback 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] @@ -669524,7 +669524,7 @@ sub_8168818: ; 8168818 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq @08168904 + beq _08168904 movs r6, 0x2 adds r1, r6, 0 eors r1, r3 @@ -669536,7 +669536,7 @@ sub_8168818: ; 8168818 adds r0, r5, 0 ands r0, r1 cmp r0, 0 - beq @08168904 + beq _08168904 ldrb r1, [r2] movs r3, 0x7F adds r0, r3, 0 @@ -669602,7 +669602,7 @@ sub_8168818: ; 8168818 adds r0, r2 bl sub_805E990 bl dp01_tbl5_exec_completed -@08168904: +_08168904: pop {r3} mov r8, r3 pop {r4-r7} @@ -669634,15 +669634,15 @@ 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 .pool -@0816897C: +_0816897C: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -669654,7 +669654,7 @@ sub_8168934: ; 8168934 adds r0, r2 bl sub_805E990 bl dp01_tbl5_exec_completed -@08168996: +_08168996: pop {r4-r6} pop {r0} bx r0 @@ -669677,7 +669677,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] @@ -669690,14 +669690,14 @@ bx_blink_t5: ; 81689A4 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl5_exec_completed - b @08168A1A + b _08168A1A .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] @@ -669711,11 +669711,11 @@ bx_blink_t5: ; 81689A4 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 @@ -669737,7 +669737,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] @@ -669761,7 +669761,7 @@ sub_8168A20: ; 8168A20 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl5_exec_completed -@08168A74: +_08168A74: pop {r4-r6} pop {r0} bx r0 @@ -669785,9 +669785,9 @@ sub_8168A90: ; 8168A90 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08168AB4 + bne _08168AB4 bl dp01_tbl5_exec_completed -@08168AB4: +_08168AB4: pop {r0} bx r0 .pool @@ -669809,9 +669809,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 .pool @@ -669833,7 +669833,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] @@ -669847,9 +669847,9 @@ dp01_tbl5_exec_completed: ; 8168AF8 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @08168B5E + b _08168B5E .pool -@08168B4C: +_08168B4C: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -669859,7 +669859,7 @@ dp01_tbl5_exec_completed: ; 8168AF8 ldr r0, [r2] bics r0, r1 str r0, [r2] -@08168B5E: +_08168B5E: add sp, 0x4 pop {r4} pop {r0} @@ -669883,9 +669883,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 .pool @@ -669904,7 +669904,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 @@ -669912,28 +669912,28 @@ dp01t_00_5_getattr: ; 8168BA0 mov r1, sp bl sub_8168C14 adds r6, r0, 0 - b @08168BFA + b _08168BFA .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 @@ -669966,78 +669966,78 @@ 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 .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 @@ -670074,7 +670074,7 @@ sub_8168C14: ; 8168C14 str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@08168D90: +_08168D90: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -670090,7 +670090,7 @@ sub_8168C14: ; 8168C14 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @08168D90 + ble _08168D90 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -670268,33 +670268,33 @@ sub_8168C14: ; 8168C14 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 .pool -@08168F68: +_08168F68: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b @081692E2 + b _081692E2 .pool -@08168F78: +_08168F78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b @081692E2 + b _081692E2 .pool -@08168F88: +_08168F88: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -670306,7 +670306,7 @@ sub_8168C14: ; 8168C14 ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -@08168F9E: +_08168F9E: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -670324,7 +670324,7 @@ sub_8168C14: ; 8168C14 add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @08168F9E + ble _08168F9E movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -670335,17 +670335,17 @@ sub_8168C14: ; 8168C14 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 .pool -@08168FF0: +_08168FF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -670356,16 +670356,16 @@ sub_8168C14: ; 8168C14 adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @081692E2 + b _081692E2 .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 @@ -670375,7 +670375,7 @@ sub_8168C14: ; 8168C14 strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @08169018 + ble _08169018 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -670385,9 +670385,9 @@ sub_8168C14: ; 8168C14 adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @081693AA + b _081693AA .pool -@08169048: +_08169048: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -670398,23 +670398,23 @@ sub_8168C14: ; 8168C14 adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @081693A2 + b _081693A2 .pool -@08169064: +_08169064: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b @0816907E + b _0816907E .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] @@ -670429,105 +670429,105 @@ sub_8168C14: ; 8168C14 lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @081693AA + b _081693AA .pool -@081690A4: +_081690A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b @081693A2 + b _081693A2 .pool -@081690B4: +_081690B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b @081693A2 + b _081693A2 .pool -@081690C4: +_081690C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b @081693A2 + b _081693A2 .pool -@081690D4: +_081690D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b @081693A2 + b _081693A2 .pool -@081690E4: +_081690E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b @081693A2 + b _081693A2 .pool -@081690F4: +_081690F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b @081693A2 + b _081693A2 .pool -@08169104: +_08169104: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b @081693A2 + b _081693A2 .pool -@08169114: +_08169114: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b @081693A2 + b _081693A2 .pool -@08169124: +_08169124: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b @081693A2 + b _081693A2 .pool -@08169134: +_08169134: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b @081693A2 + b _081693A2 .pool -@08169144: +_08169144: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b @081693A2 + b _081693A2 .pool -@08169154: +_08169154: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b @081693A2 + b _081693A2 .pool -@08169164: +_08169164: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -670558,79 +670558,79 @@ sub_8168C14: ; 8168C14 bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @081693AA + b _081693AA .pool -@081691B4: +_081691B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b @081693A2 + b _081693A2 .pool -@081691C4: +_081691C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b @081693A2 + b _081693A2 .pool -@081691D4: +_081691D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b @081693A2 + b _081693A2 .pool -@081691E4: +_081691E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b @081693A2 + b _081693A2 .pool -@081691F4: +_081691F4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b @081693A2 + b _081693A2 .pool -@08169204: +_08169204: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b @081693A2 + b _081693A2 .pool -@08169214: +_08169214: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b @0816923E + b _0816923E .pool -@08169224: +_08169224: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b @081692E2 + b _081692E2 .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] @@ -670647,71 +670647,71 @@ sub_8168C14: ; 8168C14 lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @081693AA + b _081693AA .pool -@08169268: +_08169268: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b @081693A2 + b _081693A2 .pool -@08169278: +_08169278: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b @081692E2 + b _081692E2 .pool -@08169288: +_08169288: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b @081692E2 + b _081692E2 .pool -@08169298: +_08169298: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b @081692E2 + b _081692E2 .pool -@081692A8: +_081692A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b @081692E2 + b _081692E2 .pool -@081692B8: +_081692B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b @081692E2 + b _081692E2 .pool -@081692C8: +_081692C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b @081692E2 + b _081692E2 .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 @@ -670719,99 +670719,99 @@ sub_8168C14: ; 8168C14 lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @081693AA + b _081693AA .pool -@081692F8: +_081692F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b @081693A2 + b _081693A2 .pool -@08169308: +_08169308: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b @081693A2 + b _081693A2 .pool -@08169318: +_08169318: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b @081693A2 + b _081693A2 .pool -@08169328: +_08169328: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b @081693A2 + b _081693A2 .pool -@08169338: +_08169338: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b @081693A2 + b _081693A2 .pool -@08169348: +_08169348: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b @081693A2 + b _081693A2 .pool -@08169358: +_08169358: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b @081693A2 + b _081693A2 .pool -@08169368: +_08169368: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b @081693A2 + b _081693A2 .pool -@08169378: +_08169378: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b @081693A2 + b _081693A2 .pool -@08169388: +_08169388: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b @081693A2 + b _081693A2 .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} @@ -670843,32 +670843,32 @@ 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 .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} @@ -670896,78 +670896,78 @@ 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 .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 @@ -671017,7 +671017,7 @@ sub_8169424: ; 8169424 adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -@081695BE: +_081695BE: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -671034,7 +671034,7 @@ sub_8169424: ; 8169424 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @081695BE + ble _081695BE movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -671146,9 +671146,9 @@ sub_8169424: ; 8169424 movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@081696F0: +_081696F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671159,9 +671159,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0xB bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169710: +_08169710: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671172,9 +671172,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0xC bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169730: +_08169730: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -671188,7 +671188,7 @@ sub_8169424: ; 8169424 adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -@0816974A: +_0816974A: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -671205,7 +671205,7 @@ sub_8169424: ; 8169424 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @0816974A + ble _0816974A movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671213,9 +671213,9 @@ sub_8169424: ; 8169424 movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169788: +_08169788: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671228,9 +671228,9 @@ sub_8169424: ; 8169424 adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @0816982C + b _0816982C .pool -@081697B0: +_081697B0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -671271,9 +671271,9 @@ sub_8169424: ; 8169424 adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169814: +_08169814: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671286,13 +671286,13 @@ sub_8169424: ; 8169424 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 .pool -@08169844: +_08169844: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671303,9 +671303,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169864: +_08169864: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671316,9 +671316,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169884: +_08169884: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671329,9 +671329,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@081698A4: +_081698A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671342,9 +671342,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@081698C4: +_081698C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671355,9 +671355,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@081698E4: +_081698E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671368,9 +671368,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169904: +_08169904: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671381,9 +671381,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169924: +_08169924: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671394,9 +671394,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169944: +_08169944: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671407,9 +671407,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169964: +_08169964: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671420,9 +671420,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169984: +_08169984: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671433,9 +671433,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@081699A4: +_081699A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671446,9 +671446,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@081699C4: +_081699C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671459,9 +671459,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@081699E4: +_081699E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671472,9 +671472,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169A04: +_08169A04: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -671520,9 +671520,9 @@ sub_8169424: ; 8169424 adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b @08169B24 + b _08169B24 .pool -@08169A74: +_08169A74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671533,9 +671533,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169A94: +_08169A94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671546,9 +671546,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169AB4: +_08169AB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671559,9 +671559,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169AD4: +_08169AD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671572,9 +671572,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169AF4: +_08169AF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671585,9 +671585,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169B14: +_08169B14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671596,12 +671596,12 @@ sub_8169424: ; 8169424 ldrb r2, [r1] lsls r2, 9 adds r2, r7 -@08169B24: +_08169B24: movs r1, 0x2C bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169B34: +_08169B34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671612,9 +671612,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169B54: +_08169B54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671625,9 +671625,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169B74: +_08169B74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671638,9 +671638,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169B94: +_08169B94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671651,9 +671651,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169BB4: +_08169BB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671664,9 +671664,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169BD4: +_08169BD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671677,9 +671677,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169BF4: +_08169BF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671690,9 +671690,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169C14: +_08169C14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671703,9 +671703,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169C34: +_08169C34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671716,9 +671716,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169C54: +_08169C54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671729,9 +671729,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169C74: +_08169C74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671742,9 +671742,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169C94: +_08169C94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671755,9 +671755,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169CB4: +_08169CB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671768,9 +671768,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169CD4: +_08169CD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671781,9 +671781,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169CF4: +_08169CF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671794,9 +671794,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169D14: +_08169D14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671807,9 +671807,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169D34: +_08169D34: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671820,9 +671820,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169D54: +_08169D54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671833,9 +671833,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169D74: +_08169D74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671846,9 +671846,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169D94: +_08169D94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671859,9 +671859,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169DB4: +_08169DB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671872,9 +671872,9 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b @08169DEA + b _08169DEA .pool -@08169DD4: +_08169DD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -671885,7 +671885,7 @@ sub_8169424: ; 8169424 adds r2, r7 movs r1, 0x36 bl pokemon_setattr -@08169DEA: +_08169DEA: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -671943,7 +671943,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 @@ -671954,9 +671954,9 @@ sub_8169E44: ; 8169E44 adds r1, r0 ldr r0, =sub_8168A20 str r0, [r1] - b @08169EB6 + b _08169EB6 .pool -@08169E80: +_08169E80: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -671980,7 +671980,7 @@ sub_8169E44: ; 8169E44 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl5_exec_completed -@08169EB6: +_08169EB6: pop {r4-r6} pop {r0} bx r0 @@ -672365,11 +672365,11 @@ 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 .pool -@0816A23C: +_0816A23C: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -672385,7 +672385,7 @@ sub_816A144: ; 816A144 adds r0, r1 ldr r1, =bx_move_anim_5 str r1, [r0] -@0816A25A: +_0816A25A: pop {r4-r6} pop {r0} bx r0 @@ -672421,20 +672421,20 @@ 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 .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 @@ -672442,13 +672442,13 @@ bx_move_anim_5: ; 816A26C 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] @@ -672458,13 +672458,13 @@ bx_move_anim_5: ; 816A26C 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 @@ -672478,15 +672478,15 @@ bx_move_anim_5: ; 816A26C 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] @@ -672498,12 +672498,12 @@ bx_move_anim_5: ; 816A26C 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] @@ -672513,16 +672513,16 @@ bx_move_anim_5: ; 816A26C adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @0816A3AC + b _0816A3AC .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 @@ -672543,7 +672543,7 @@ bx_move_anim_5: ; 816A26C adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl5_exec_completed -@0816A3AC: +_0816A3AC: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -672590,13 +672590,13 @@ dp01t_11_5_message_for_player_only: ; 816A40C bl battle_side_get_owner lsls r0, 24 cmp r0, 0 - bne @0816A428 + bne _0816A428 bl sub_816A3B8 - b @0816A42C + b _0816A42C .pool -@0816A428: +_0816A428: bl dp01_tbl5_exec_completed -@0816A42C: +_0816A42C: pop {r0} bx r0 thumb_func_end dp01t_11_5_message_for_player_only @@ -672608,7 +672608,7 @@ sub_816A430: ; 816A430 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @0816A456 + bne _0816A456 ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -672621,7 +672621,7 @@ sub_816A430: ; 816A430 adds r0, r1 ldr r1, =sub_8168444 str r1, [r0] -@0816A456: +_0816A456: pop {r0} bx r0 .pool @@ -672641,13 +672641,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] @@ -672683,18 +672683,18 @@ 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 .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 @@ -672705,13 +672705,13 @@ sub_816A4E4: ; 816A4E4 adds r0, 0x97 movs r1, 0x50 strb r1, [r0] - b @0816A574 -@0816A522: + b _0816A574 +_0816A522: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @0816A574 + bne _0816A574 ldr r0, =0x02022e14 strh r1, [r0] ldr r1, =0x02022e16 @@ -672724,16 +672724,16 @@ sub_816A4E4: ; 816A4E4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @0816A574 + b _0816A574 .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 @@ -672742,7 +672742,7 @@ sub_816A4E4: ; 816A4E4 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb bl dp01_tbl5_exec_completed -@0816A574: +_0816A574: pop {r4} pop {r0} bx r0 @@ -672817,7 +672817,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 @@ -672847,9 +672847,9 @@ sub_816A5D4: ; 816A5D4 str r7, [sp] mov r2, r8 bl sub_807294C - b @0816A69E + b _0816A69E .pool -@0816A664: +_0816A664: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -672876,7 +672876,7 @@ sub_816A5D4: ; 816A5D4 movs r1, 0 movs r2, 0 bl heathbar_draw_hp -@0816A69E: +_0816A69E: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -673039,11 +673039,11 @@ 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 .pool -@0816A7C8: +_0816A7C8: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -673064,7 +673064,7 @@ sub_816A794: ; 816A794 adds r0, r1 ldr r1, =bx_blink_t5 str r1, [r0] -@0816A7F2: +_0816A7F2: pop {r4} pop {r0} bx r0 @@ -673112,7 +673112,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 @@ -673125,9 +673125,9 @@ sub_816A840: ; 816A840 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @0816A890 + b _0816A890 .pool -@0816A87C: +_0816A87C: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -673137,7 +673137,7 @@ sub_816A840: ; 816A840 lsls r1, 8 orrs r0, r1 bl fanfare_play -@0816A890: +_0816A890: bl dp01_tbl5_exec_completed pop {r4,r5} pop {r0} @@ -673317,7 +673317,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] @@ -673327,7 +673327,7 @@ sub_816A90C: ; 816A90C adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@0816AA24: +_0816AA24: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -673526,12 +673526,12 @@ 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 .pool -@0816AC28: +_0816AC28: ldr r4, =0x02024064 ldrb r5, [r4] ldrh r0, [r1, 0x8] @@ -673557,7 +673557,7 @@ sub_816AC04: ; 816AC04 strb r5, [r4] adds r0, r6, 0 bl remove_task -@0816AC5E: +_0816AC5E: pop {r4-r6} pop {r0} bx r0 @@ -673575,16 +673575,16 @@ 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 .pool -@0816ACA8: +_0816ACA8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r5, =0x02024064 @@ -673614,7 +673614,7 @@ sub_816AC78: ; 816AC78 adds r1, r2 strb r0, [r1] bl dp01_tbl5_exec_completed -@0816ACE6: +_0816ACE6: pop {r4,r5} pop {r0} bx r0 @@ -673670,18 +673670,18 @@ 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 .pool -@0816AD60: +_0816AD60: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_8168AC8 str r0, [r1] -@0816AD6C: +_0816AD6C: add sp, 0x4 pop {r4-r6} pop {r0} @@ -673727,14 +673727,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 str r0, [r1] -@0816ADD0: +_0816ADD0: pop {r4} pop {r0} bx r0 @@ -673760,13 +673760,13 @@ sub_816ADF4: ; 816ADF4 ldr r1, =gUnknown_085DFEFC 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] @@ -673776,7 +673776,7 @@ sub_816ADF4: ; 816ADF4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0816AE48 + bne _0816AE48 adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -673784,12 +673784,12 @@ sub_816ADF4: ; 816ADF4 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 @@ -673857,17 +673857,17 @@ sub_816AED8: ; 816AED8 ldrb r1, [r0] mov r8, r0 cmp r1, 0x3 - bne @0816AF0C + bne _0816AF0C ldr r0, =gUnknown_085DFF24 ldr r1, [r0, 0x4] ldr r0, [r0] - b @0816AF12 + b _0816AF12 .pool -@0816AF0C: +_0816AF0C: ldr r0, =gUnknown_085DFF24 ldr r1, [r0, 0xC] ldr r0, [r0, 0x8] -@0816AF12: +_0816AF12: str r0, [sp] str r1, [sp, 0x4] ldr r5, =gUnknown_085DFEB4 @@ -673932,13 +673932,13 @@ sub_816AF98: ; 816AF98 ldr r0, =0x0203bcb4 ldrb r0, [r0] cmp r0, 0x3 - bls @0816AFC0 + bls _0816AFC0 bl ProcessMenuInput - b @0816AFC4 + b _0816AFC4 .pool -@0816AFC0: +_0816AFC0: bl ProcessMenuInputNoWrapAround -@0816AFC4: +_0816AFC4: lsls r0, 24 lsrs r0, 24 lsls r0, 24 @@ -673946,10 +673946,10 @@ sub_816AF98: ; 816AF98 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] @@ -673968,9 +673968,9 @@ sub_816AF98: ; 816AF98 adds r0, r1 ldr r1, =sub_816B148 str r1, [r0] - b @0816B04C + b _0816B04C .pool -@0816B014: +_0816B014: ldrb r0, [r4, 0x8] movs r1, 0 bl sub_8198070 @@ -673995,7 +673995,7 @@ sub_816AF98: ; 816AF98 adds r0, r2 ldr r0, [r0] str r0, [r1] -@0816B04C: +_0816B04C: pop {r4-r6} pop {r0} bx r0 @@ -674049,14 +674049,14 @@ sub_816B0A8: ; 816B0A8 strb r0, [r5, 0x5] lsls r0, 24 cmp r0, 0 - bne @0816B0D8 + bne _0816B0D8 ldr r1, =gUnknown_085EAC4B ldr r2, =sub_816B060 adds r0, r4, 0 bl DisplayItemMessageOnField - b @0816B12A + b _0816B12A .pool -@0816B0D8: +_0816B0D8: strh r1, [r5] strh r1, [r5, 0x2] movs r0, 0xFF @@ -674069,7 +674069,7 @@ sub_816B0A8: ; 816B0A8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0816B120 + bne _0816B120 movs r0, 0 movs r1, 0 bl sub_8197434 @@ -674082,14 +674082,14 @@ sub_816B0A8: ; 816B0A8 adds r1, r0 ldr r0, =sub_816B674 str r0, [r1] - b @0816B12A + b _0816B12A .pool -@0816B120: +_0816B120: ldr r1, =gUnknown_085EAC4B ldr r2, =sub_816B060 adds r0, r6, 0 bl DisplayItemMessageOnField -@0816B12A: +_0816B12A: pop {r4-r6} pop {r0} bx r0 @@ -674114,24 +674114,24 @@ sub_816B148: ; 816B148 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, =gUnknown_081F863F bl script_env_1_execute_new_script - b @0816B184 + b _0816B184 .pool -@0816B174: +_0816B174: ldr r0, =gUnknown_081F958F bl script_env_1_execute_new_script - b @0816B184 + b _0816B184 .pool -@0816B180: +_0816B180: bl script_env_2_enable_and_set_ctx_running -@0816B184: +_0816B184: adds r0, r4, 0 bl remove_task pop {r4} @@ -674240,10 +674240,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, =gUnknown_085DFEDC @@ -674253,27 +674253,27 @@ sub_816B248: ; 816B248 ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 - b @0816B2C0 + b _0816B2C0 .pool -@0816B298: +_0816B298: lsls r1, r5, 24 lsls r0, r2, 24 asrs r2, r0, 24 cmp r1, r0 - beq @0816B2C0 + beq _0816B2C0 ldr r0, =gUnknown_085DFEA4 lsls r1, r2, 2 adds r1, r0 ldr r0, [r1] bl sub_816B21C - b @0816B2C0 + b _0816B2C0 .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 @@ -674309,12 +674309,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 @@ -674363,7 +674363,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 @@ -674371,7 +674371,7 @@ sub_816B368: ; 816B368 adds r1, r0 ldr r0, =sub_816B248 str r0, [r1] -@0816B388: +_0816B388: pop {r4} pop {r0} bx r0 @@ -674393,20 +674393,20 @@ 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 .pool -@0816B3C4: +_0816B3C4: adds r0, r5, 0 bl sub_816B4DC ldr r1, =gUnknown_085EABD1 ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl DisplayItemMessageOnField -@0816B3D4: +_0816B3D4: pop {r4,r5} pop {r0} bx r0 @@ -674428,20 +674428,20 @@ 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 .pool -@0816B410: +_0816B410: adds r0, r5, 0 bl sub_816B4DC ldr r1, =gUnknown_085EABD1 ldr r2, =task_pc_itemstorage adds r0, r5, 0 bl DisplayItemMessageOnField -@0816B420: +_0816B420: pop {r4,r5} pop {r0} bx r0 @@ -674516,13 +674516,13 @@ sub_816B4C0: ; 816B4C0 ldr r1, =0x0203bcb8 ldrb r0, [r1, 0x5] cmp r0, 0x7 - bls @0816B4D4 + bls _0816B4D4 movs r0, 0x8 - b @0816B4D6 + b _0816B4D6 .pool -@0816B4D4: +_0816B4D4: adds r0, 0x1 -@0816B4D6: +_0816B4D6: strb r0, [r1, 0x4] pop {r0} bx r0 @@ -674562,7 +674562,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 @@ -674570,16 +674570,16 @@ sub_816B510: ; 816B510 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} @@ -674596,13 +674596,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 @@ -674610,7 +674610,7 @@ sub_816B54C: ; 816B54C lsls r0, 2 mov r12, r0 ldr r6, =0x00002be0 -@0816B574: +_0816B574: mov r1, r10 ldr r1, [r1] mov r9, r1 @@ -674621,7 +674621,7 @@ sub_816B54C: ; 816B54C adds r0, r2, r3 ldrh r0, [r0] cmp r0, 0 - bne @0816B5CA + bne _0816B5CA adds r2, r6 mov r1, sp adds r0, r2, 0 @@ -674654,18 +674654,18 @@ sub_816B54C: ; 816B54C 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 @@ -674752,7 +674752,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 @@ -674766,13 +674766,13 @@ 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 .pool -@0816B6D4: +_0816B6D4: movs r0, 0x5 bl audio_play mov r1, r8 @@ -674780,8 +674780,8 @@ sub_816B674: ; 816B674 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 @@ -674802,7 +674802,7 @@ sub_816B674: ; 816B674 add r0, r9 ldr r1, =sub_816B730 str r1, [r0] -@0816B71E: +_0816B71E: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -674928,16 +674928,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, =gUnknown_085DFF04 @@ -674947,7 +674947,7 @@ sub_816B82C: ; 816B82C ldr r1, [r1] adds r0, r6, 0 bl _call_via_r1 -@0816B86E: +_0816B86E: pop {r4-r6} pop {r0} bx r0 @@ -674986,7 +674986,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 @@ -675007,7 +675007,7 @@ sub_816B8A4: ; 816B8A4 bl sub_8121478 adds r0, r4, 0 bl remove_task -@0816B8E6: +_0816B8E6: pop {r4} pop {r0} bx r0 @@ -675042,15 +675042,15 @@ 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 .pool -@0816B954: +_0816B954: adds r0, r4, 0 bl remove_task -@0816B95A: +_0816B95A: bl pal_fill_black pop {r4} pop {r0} @@ -675066,7 +675066,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 @@ -675074,7 +675074,7 @@ task00_080EBBDC: ; 816B964 adds r1, r0 ldr r0, =sub_816B674 str r0, [r1] -@0816B984: +_0816B984: pop {r4} pop {r0} bx r0 @@ -675125,25 +675125,25 @@ 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 @@ -675172,14 +675172,14 @@ sub_816BA18: ; 816BA18 bl bag_add_item lsls r0, 24 cmp r0, 0 - bne @0816BA68 + bne _0816BA68 ldr r1, =gUnknown_085EACB5 ldr r2, =sub_816BBD4 adds r0, r6, 0 bl DisplayItemMessageOnField - b @0816BA9C + b _0816BA9C .pool -@0816BA68: +_0816BA68: ldr r1, =gUnknown_085EACC8 ldr r2, =sub_816BBD4 adds r0, r6, 0 @@ -675195,15 +675195,15 @@ sub_816BA18: ; 816BA18 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 @@ -675228,11 +675228,11 @@ sub_816BABC: ; 816BABC 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 @@ -675243,7 +675243,7 @@ sub_816BABC: ; 816BABC adds r1, r0 ldr r0, =sub_816BAF8 str r0, [r1] -@0816BAEA: +_0816BAEA: pop {r4} pop {r0} bx r0 @@ -675260,13 +675260,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 @@ -675301,18 +675301,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 @@ -675322,15 +675322,15 @@ sub_816BB48: ; 816BB48 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @0816BBA8 + bne _0816BBA8 adds r0, r6, 0 bl sub_816B5F8 - b @0816BBAE + b _0816BBAE .pool -@0816BBA8: +_0816BBA8: adds r0, r6, 0 bl remove_task -@0816BBAE: +_0816BBAE: bl pal_fill_black pop {r4-r6} pop {r0} @@ -675413,13 +675413,13 @@ sub_816BC14: ; 816BC14 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 @@ -675442,7 +675442,7 @@ sub_816BC7C: ; 816BC7C adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne @0816BCB4 + bne _0816BCB4 lsls r0, r2, 3 ldr r1, =gUnknown_085DFF5C adds r0, r1 @@ -675456,7 +675456,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} @@ -675477,7 +675477,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] @@ -675488,7 +675488,7 @@ sub_816BCC4: ; 816BCC4 bl RemoveWindow movs r0, 0xFF strb r0, [r4] -@0816BCF8: +_0816BCF8: pop {r4} pop {r0} bx r0 @@ -675503,9 +675503,9 @@ sub_816BD04: ; 816BD04 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 @@ -675538,8 +675538,8 @@ sub_816BD04: ; 816BD04 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 @@ -675603,22 +675603,22 @@ sub_816BDDC: ; 816BDDC 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 @@ -675628,15 +675628,15 @@ sub_816BDDC: ; 816BDDC adds r0, r1 ldrh r0, [r0] bl sub_816C060 - b @0816BE32 + b _0816BE32 .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 @@ -675655,30 +675655,30 @@ 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 .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] @@ -675710,7 +675710,7 @@ fish4_goto_x5_or_x6: ; 816BE44 movs r1, 0x7 adds r2, r4, 0 bl Print -@0816BED4: +_0816BED4: add sp, 0xC pop {r4-r6} pop {r0} @@ -675731,7 +675731,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 @@ -675741,12 +675741,12 @@ sub_816BEF0: ; 816BEF0 adds r0, r1 ldrh r0, [r0] bl itemid_get_description - b @0816BF32 + b _0816BF32 .pool -@0816BF2C: +_0816BF2C: ldr r0, =0x0000ffff bl sub_816C228 -@0816BF32: +_0816BF32: adds r4, r0, 0 adds r0, r5, 0 movs r1, 0x11 @@ -675775,7 +675775,7 @@ sub_816BF60: ; 816BF60 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 @@ -675791,7 +675791,7 @@ sub_816BF60: ; 816BF60 movs r3, 0x94 bl sub_81AF4A0 strb r0, [r4, 0x9] -@0816BF8C: +_0816BF8C: add sp, 0x10 pop {r4} pop {r0} @@ -675805,11 +675805,11 @@ sub_816BF9C: ; 816BF9C 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 @@ -675855,7 +675855,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 @@ -675874,9 +675874,9 @@ sub_816BFE0: ; 816BFE0 movs r2, 0 adds r3, r6, 0 bl FillWindowPixelRect - b @0816C050 + b _0816C050 .pool -@0816C030: +_0816C030: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -675892,7 +675892,7 @@ sub_816BFE0: ; 816BFE0 movs r2, 0 adds r3, r6, 0 bl AddTextPrinterParametrized2 -@0816C050: +_0816C050: add sp, 0x14 pop {r4-r6} pop {r0} @@ -675911,7 +675911,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 FreeObjectTilesByTag @@ -675924,7 +675924,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 @@ -675940,7 +675940,7 @@ sub_816C060: ; 816C060 strh r0, [r1, 0x24] movs r0, 0x50 strh r0, [r1, 0x26] -@0816C0B2: +_0816C0B2: pop {r4-r6} pop {r0} bx r0 @@ -675956,7 +675956,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 FreeObjectTilesByTag @@ -675971,7 +675971,7 @@ sub_816C0C8: ; 816C0C8 bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] -@0816C0FA: +_0816C0FA: pop {r4,r5} pop {r0} bx r0 @@ -676025,20 +676025,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, =gUnknown_085EAB71 cmp r0, 0 - bne @0816C186 + bne _0816C186 ldr r5, =gUnknown_085EAB63 -@0816C186: +_0816C186: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x68 @@ -676101,64 +676101,64 @@ sub_816C228: ; 816C228 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 .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, =gUnknown_085E8D62 - b @0816C2BA + b _0816C2BA .pool -@0816C274: +_0816C274: ldr r0, =gUnknown_085EAC09 - b @0816C2BA + b _0816C2BA .pool -@0816C27C: +_0816C27C: ldr r0, =gUnknown_085EAC22 - b @0816C2BA + b _0816C2BA .pool -@0816C284: +_0816C284: ldr r0, =gUnknown_085E8EE0 - b @0816C2BA + b _0816C2BA .pool -@0816C28C: +_0816C28C: ldr r0, =gUnknown_085E8EF9 - b @0816C2BA + b _0816C2BA .pool -@0816C294: +_0816C294: ldr r0, =gUnknown_085EABE7 - b @0816C2BA + b _0816C2BA .pool -@0816C29C: +_0816C29C: ldr r0, =gUnknown_085E8EB9 - b @0816C2BA + b _0816C2BA .pool -@0816C2A4: +_0816C2A4: ldr r0, =gUnknown_085E8F0E - b @0816C2BA + b _0816C2BA .pool -@0816C2AC: +_0816C2AC: ldr r0, =gUnknown_085E8DFE - b @0816C2BA + b _0816C2BA .pool -@0816C2B4: +_0816C2B4: adds r0, r1, 0 bl itemid_get_description -@0816C2BA: +_0816C2BA: pop {r1} bx r1 thumb_func_end sub_816C228 @@ -676212,7 +676212,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 @@ -676224,14 +676224,14 @@ 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 .pool -@0816C35C: +_0816C35C: ldrb r0, [r4, 0xA] bl sub_81AE604 adds r6, r0, 0 @@ -676242,24 +676242,24 @@ sub_816C30C: ; 816C30C 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 .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 @@ -676278,24 +676278,24 @@ bx_battle_menu_t3: ; 816C3A4 bl IsDma3ManagerBusyWithBgCopy 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 .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 @@ -676303,7 +676303,7 @@ bx_battle_menu_t3: ; 816C3A4 adds r1, r0 ldr r0, =sub_816B248 str r0, [r1] -@0816C3F2: +_0816C3F2: pop {r4,r5} pop {r0} bx r0 @@ -676428,14 +676428,14 @@ 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 .pool -@0816C530: +_0816C530: ldrb r0, [r4, 0xA] bl sub_81AE604 adds r6, r0, 0 @@ -676457,33 +676457,33 @@ sub_816C4FC: ; 816C4FC 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 .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 @@ -676519,7 +676519,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 @@ -676527,10 +676527,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 @@ -676540,7 +676540,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 @@ -676548,12 +676548,12 @@ sub_816C5A0: ; 816C5A0 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 @@ -676681,7 +676681,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 @@ -676690,12 +676690,12 @@ 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 .pool -@0816C774: +_0816C774: movs r2, 0x93 lsls r2, 3 adds r0, r1, r2 @@ -676705,9 +676705,9 @@ sub_816C71C: ; 816C71C ldr r0, =0x0000fffe bl sub_816C228 bl sub_816C2C0 - b @0816C7D4 + b _0816C7D4 .pool -@0816C798: +_0816C798: ldr r0, =0x03005d8c ldr r1, [r0] lsls r0, r4, 2 @@ -676716,12 +676716,12 @@ sub_816C71C: ; 816C71C 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 .pool -@0816C7BC: +_0816C7BC: movs r2, 0x93 lsls r2, 3 adds r0, r1, r2 @@ -676731,7 +676731,7 @@ sub_816C71C: ; 816C71C ldr r0, =0x0000fffc bl sub_816C228 bl sub_816C2C0 -@0816C7D4: +_0816C7D4: movs r0, 0x4 bl sub_816BC7C lsls r0, 24 @@ -676751,7 +676751,7 @@ sub_816C71C: ; 816C71C adds r0, r1 ldr r1, =sub_816C818 str r1, [r0] -@0816C7FE: +_0816C7FE: add sp, 0x8 pop {r4-r6} pop {r0} @@ -676792,7 +676792,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 @@ -676804,15 +676804,15 @@ sub_816C818: ; 816C818 movs r2, 0x2 movs r3, 0x8 bl sub_816C6BC - b @0816C8EC + b _0816C8EC .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 @@ -676820,20 +676820,20 @@ sub_816C818: ; 816C818 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 .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 @@ -676849,7 +676849,7 @@ sub_816C818: ; 816C818 bl sub_816C2C0 mov r0, r9 bl sub_816CBC0 -@0816C8EC: +_0816C8EC: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -676890,7 +676890,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 @@ -676912,9 +676912,9 @@ sub_816C8FC: ; 816C8FC subs r0, 0x8 adds r0, r6, r0 ldr r1, =sub_816CB04 - b @0816C9A2 + b _0816C9A2 .pool -@0816C98C: +_0816C98C: movs r0, 0 strh r0, [r4, 0x4] ldr r0, =0x0000fffa @@ -676924,7 +676924,7 @@ sub_816C8FC: ; 816C8FC subs r0, 0x8 adds r0, r6, r0 ldr r1, =sub_816CB74 -@0816C9A2: +_0816C9A2: str r1, [r0] pop {r3} mov r8, r3 @@ -676967,7 +676967,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 @@ -676999,9 +676999,9 @@ sub_816C9B8: ; 816C9B8 movs r2, 0x1 movs r3, 0 bl sub_8121F94 - b @0816CA7C + b _0816CA7C .pool -@0816CA64: +_0816CA64: movs r0, 0 strh r0, [r7, 0x4] ldr r0, =0x0000fff9 @@ -677012,7 +677012,7 @@ sub_816C9B8: ; 816C9B8 add r0, r8 ldr r1, =sub_816CB74 str r1, [r0] -@0816CA7C: +_0816CA7C: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -677088,7 +677088,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] @@ -677113,7 +677113,7 @@ sub_816CB04: ; 816CB04 strh r0, [r5, 0xA] adds r0, r6, 0 bl sub_816CBC0 -@0816CB5E: +_0816CB5E: pop {r4-r6} pop {r0} bx r0 @@ -677130,7 +677130,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 @@ -677147,7 +677147,7 @@ sub_816CB74: ; 816CB74 bl sub_816C2C0 adds r0, r4, 0 bl sub_816CBC0 -@0816CBAC: +_0816CBAC: pop {r4} pop {r0} bx r0 @@ -677195,27 +677195,27 @@ 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 bl SetMainCallback2 - b @0816CC4C + b _0816CC4C .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 .pool @@ -677227,10 +677227,10 @@ sub_816CC54: ; 816CC54 bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne @0816CC66 + bne _0816CC66 ldr r0, =c2_title_screen_1 bl SetMainCallback2 -@0816CC66: +_0816CC66: pop {r0} bx r0 .pool @@ -677289,22 +677289,22 @@ 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 .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 @@ -677383,7 +677383,7 @@ do_copyright_screen: ; 816CCC8 bl SetSerialCallback ldr r0, =0x030062b0 bl GameCubeMultiBoot_Init -@0816CDBC: +_0816CDBC: bl fade_and_return_progress_probably ldr r0, =0x030022c0 movs r1, 0x87 @@ -677394,15 +677394,15 @@ do_copyright_screen: ; 816CCC8 strb r1, [r0] ldr r0, =0x030062b0 bl GameCubeMultiBoot_Main - b @0816CEA0 + b _0816CEA0 .pool -@0816CE00: +_0816CE00: ldr r4, =0x030062b0 adds r0, r4, 0 bl GameCubeMultiBoot_Main ldrb r0, [r4, 0x2] cmp r0, 0x1 - beq @0816CEA0 + beq _0816CEA0 movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -677413,13 +677413,13 @@ do_copyright_screen: ; 816CCC8 ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] - b @0816CEA0 + b _0816CEA0 .pool -@0816CE2C: +_0816CE2C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne @0816CEA0 + bne _0816CEA0 ldr r0, =task_intro_1 movs r1, 0 bl AddTask @@ -677428,15 +677428,15 @@ do_copyright_screen: ; 816CCC8 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, =gMultiBootProgram_PokemonColosseum_Start movs r1, 0x80 lsls r1, 18 @@ -677444,22 +677444,22 @@ do_copyright_screen: ; 816CCC8 lsls r2, 9 bl CpuSet str r4, [r6] -@0816CE6C: +_0816CE6C: adds r0, r5, 0 bl GameCubeMultiBoot_ExecuteProgram - b @0816CE96 + b _0816CE96 .pool -@0816CE8C: +_0816CE8C: bl GameCubeMultiBoot_Quit ldr r0, =sub_800BA38 bl SetSerialCallback -@0816CE96: +_0816CE96: movs r0, 0 - b @0816CEA2 + b _0816CEA2 .pool -@0816CEA0: +_0816CEA0: movs r0, 0x1 -@0816CEA2: +_0816CEA2: add sp, 0x10 pop {r4-r6} pop {r1} @@ -677472,7 +677472,7 @@ c2_copyright_1: ; 816CEAC bl do_copyright_screen lsls r0, 24 cmp r0, 0 - bne @0816CEFA + bne _0816CEFA bl sub_815355C lsls r0, 16 lsrs r0, 16 @@ -677484,12 +677484,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] @@ -677500,7 +677500,7 @@ c2_copyright_1: ; 816CEAC movs r1, 0xE0 lsls r1, 9 bl InitHeap -@0816CEFA: +_0816CEFA: pop {r0} bx r0 .pool @@ -677749,7 +677749,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 @@ -677764,17 +677764,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 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 @@ -677789,21 +677789,21 @@ task_intro_3: ; 816D190 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 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 @@ -677814,12 +677814,12 @@ task_intro_3: ; 816D190 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 @@ -677830,19 +677830,19 @@ task_intro_3: ; 816D190 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 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 @@ -677860,7 +677860,7 @@ task_intro_3: ; 816D190 strh r2, [r0, 0x14] ldr r1, =task_intro_4 str r1, [r0] -@0816D27A: +_0816D27A: add sp, 0x8 pop {r4-r6} pop {r0} @@ -677884,20 +677884,20 @@ 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 .pool -@0816D2D8: +_0816D2D8: ldr r0, =gUnknown_085E4AB8 ldr r2, =gUnknown_085E4AD0 movs r1, 0x8 @@ -677922,25 +677922,25 @@ task_intro_3_3: ; 816D2A0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0816D324 + b _0816D324 .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 @@ -677956,10 +677956,10 @@ sub_816D338: ; 816D338 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne @0816D350 + bne _0816D350 adds r0, r1, 0 bl RemoveObjectAndFreeTiles -@0816D350: +_0816D350: pop {r0} bx r0 thumb_func_end sub_816D338 @@ -677975,7 +677975,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 @@ -678024,7 +678024,7 @@ task_intro_4: ; 816D354 movs r0, 0xD0 lsls r0, 2 cmp r1, r0 - bne @0816D43E + bne _0816D43E ldr r0, =gUnknown_085E4FC4 movs r1, 0x78 movs r2, 0xA0 @@ -678042,12 +678042,12 @@ task_intro_4: ; 816D354 movs r2, 0x4 orrs r0, r2 strb r0, [r1] - b @0816D43E + b _0816D43E .pool -@0816D418: +_0816D418: ldr r0, =0x000003ef cmp r2, r0 - bls @0816D43E + bls _0816D43E movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -678063,7 +678063,7 @@ task_intro_4: ; 816D354 adds r0, r1 ldr r1, =task_intro_5 str r1, [r0] -@0816D43E: +_0816D43E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -678080,7 +678080,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 @@ -678088,7 +678088,7 @@ task_intro_5: ; 816D458 adds r1, r0 ldr r0, =task_intro_6 str r0, [r1] -@0816D476: +_0816D476: pop {r0} bx r0 .pool @@ -678136,15 +678136,15 @@ task_intro_7: ; 816D4E4 ldr r0, =0x0203bcc8 ldrh r0, [r0] cmp r0, 0 - bne @0816D504 + bne _0816D504 ldr r0, =gUnknown_085F52BC bl LoadCompressedObjectPic - b @0816D50A + b _0816D50A .pool -@0816D504: +_0816D504: ldr r0, =gUnknown_085F52CC bl LoadCompressedObjectPic -@0816D50A: +_0816D50A: ldr r0, =gUnknown_085F52DC bl LoadCompressedObjectPic ldr r0, =gUnknown_085F52FC @@ -678152,7 +678152,7 @@ task_intro_7: ; 816D4E4 movs r6, 0 lsls r7, r4, 2 ldr r5, =gUnknown_085E4AE8 -@0816D51C: +_0816D51C: lsls r0, r6, 3 adds r0, r5 bl LoadCompressedObjectPic @@ -678160,7 +678160,7 @@ task_intro_7: ; 816D4E4 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls @0816D51C + bls _0816D51C ldr r0, =gUnknown_085F530C bl LoadTaggedObjectPalettes ldr r0, =gUnknown_085E4B08 @@ -678181,17 +678181,17 @@ task_intro_7: ; 816D4E4 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 .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 @@ -678275,7 +678275,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] @@ -678286,11 +678286,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 @@ -678306,12 +678306,12 @@ task_intro_8: ; 816D650 adds r0, r1 ldr r1, =task_intro_9 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 @@ -678325,11 +678325,11 @@ task_intro_8: ; 816D650 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 @@ -678343,11 +678343,11 @@ task_intro_8: ; 816D650 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 @@ -678361,11 +678361,11 @@ task_intro_8: ; 816D650 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 @@ -678379,12 +678379,12 @@ task_intro_8: ; 816D650 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 @@ -678398,11 +678398,11 @@ task_intro_8: ; 816D650 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 @@ -678416,7 +678416,7 @@ task_intro_8: ; 816D650 adds r0, r2 movs r1, 0x4 strh r1, [r0, 0x2E] -@0816D774: +_0816D774: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 @@ -678435,10 +678435,10 @@ task_intro_8: ; 816D650 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 @@ -678457,7 +678457,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 @@ -678465,7 +678465,7 @@ task_intro_9: ; 816D7E8 adds r1, r0 ldr r0, =task_intro_10 str r0, [r1] -@0816D806: +_0816D806: pop {r0} bx r0 .pool @@ -678481,57 +678481,57 @@ 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 .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] @@ -678541,32 +678541,32 @@ sub_816D81C: ; 816D81C 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] @@ -678576,15 +678576,15 @@ sub_816D81C: ; 816D81C 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] @@ -678597,7 +678597,7 @@ sub_816D81C: ; 816D81C ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@0816D912: +_0816D912: ldrh r0, [r4, 0x36] lsls r0, 24 lsrs r0, 24 @@ -678619,7 +678619,7 @@ sub_816D81C: ; 816D81C movs r0, 0xFF ands r1, r0 cmp r1, 0x40 - bne @0816D9BA + bne _0816D9BA adds r2, r4, 0 adds r2, 0x3F ldrb r0, [r2] @@ -678633,7 +678633,7 @@ sub_816D81C: ; 816D81C 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 @@ -678641,8 +678641,8 @@ sub_816D81C: ; 816D81C 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] @@ -678660,11 +678660,11 @@ sub_816D81C: ; 816D81C movs r0, 0x10 negs r0, r0 cmp r1, r0 - bge @0816D9BA + bge _0816D9BA adds r0, r4, 0 bl RemoveObjectAndFreeTiles - b @0816D9BA -@0816D99C: + b _0816D9BA +_0816D99C: ldrh r0, [r4, 0x34] lsls r0, 24 lsrs r0, 24 @@ -678676,11 +678676,11 @@ sub_816D81C: ; 816D81C 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 @@ -678693,49 +678693,49 @@ sub_816D9C0: ; 816D9C0 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 .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 .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 .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 @@ -678746,12 +678746,12 @@ sub_816D9C0: ; 816D9C0 lsls r1, 8 ands r0, r1 cmp r0, 0 - beq @0816DADA + beq _0816DADA ldrh r0, [r4, 0x20] adds r0, 0x1 - b @0816DA8A + b _0816DA8A .pool -@0816DA50: +_0816DA50: adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim @@ -678760,15 +678760,15 @@ sub_816D9C0: ; 816D9C0 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 @@ -678779,56 +678779,56 @@ sub_816D9C0: ; 816D9C0 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 StartObjectImageAnim 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 @@ -678842,29 +678842,29 @@ sub_816DAE8: ; 816DAE8 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 .pool -@0816DB1C: +_0816DB1C: ldrh r0, [r4, 0x20] subs r0, 0x2 strh r0, [r4, 0x20] @@ -678873,7 +678873,7 @@ sub_816DAE8: ; 816DAE8 movs r0, 0x92 lsls r0, 3 cmp r1, r0 - bne @0816DBA4 + bne _0816DBA4 ldrh r0, [r4, 0x22] subs r0, 0xC strh r0, [r4, 0x22] @@ -678884,7 +678884,7 @@ sub_816DAE8: ; 816DAE8 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] -@0816DB42: +_0816DB42: movs r2, 0x20 ldrsh r0, [r4, r2] movs r2, 0x24 @@ -678893,33 +678893,33 @@ sub_816DAE8: ; 816DAE8 movs r1, 0x20 negs r1, r1 cmp r0, r1 - bgt @0816DB60 + bgt _0816DB60 adds r0, r4, 0 bl RemoveObjectAndFreeTiles - b @0816DBA4 + b _0816DBA4 .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] @@ -678934,7 +678934,7 @@ sub_816DAE8: ; 816DAE8 ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] -@0816DBA4: +_0816DBA4: pop {r4} pop {r0} bx r0 @@ -679027,18 +679027,18 @@ 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 .pool -@0816DCA4: +_0816DCA4: ldr r0, =task_intro_12 str r0, [r3] -@0816DCA8: +_0816DCA8: lsls r4, r5, 2 adds r4, r5 lsls r4, 3 @@ -679058,7 +679058,7 @@ task_intro_11: ; 816DC64 ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x1C - bne @0816DCE6 + bne _0816DCE6 movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -679067,7 +679067,7 @@ task_intro_11: ; 816DC64 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@0816DCE6: +_0816DCE6: add sp, 0x4 pop {r4,r5} pop {r0} @@ -679083,7 +679083,7 @@ task_intro_12: ; 816DCFC ldr r0, =0x030062a0 ldr r0, [r0] cmp r0, 0x2B - bls @0816DD18 + bls _0816DD18 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -679091,7 +679091,7 @@ task_intro_12: ; 816DCFC adds r1, r0 ldr r0, =task_intro_13 str r0, [r1] -@0816DD18: +_0816DD18: pop {r0} bx r0 .pool @@ -679107,7 +679107,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 ResetAllObjectData bl ResetObjectPaletteAllocator @@ -679143,7 +679143,7 @@ task_intro_13: ; 816DD28 adds r0, r1 ldr r1, =task_intro_14 str r1, [r0] -@0816DD94: +_0816DD94: pop {r4} pop {r0} bx r0 @@ -679225,7 +679225,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 @@ -679238,16 +679238,16 @@ task_intro_15: ; 816DE7C lsrs r1, 16 movs r0, 0x44 bl SetGpuReg - b @0816DEC6 + b _0816DEC6 .pool -@0816DEB8: +_0816DEB8: movs r1, 0x82 lsls r1, 6 movs r0, 0x44 bl SetGpuReg ldr r0, =task_intro_16 str r0, [r4] -@0816DEC6: +_0816DEC6: pop {r4} pop {r0} bx r0 @@ -679319,17 +679319,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] @@ -679342,37 +679342,37 @@ task_intro_18: ; 816DF2C 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 .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] @@ -679384,16 +679384,16 @@ task_intro_18: ; 816DF2C 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 @@ -679410,32 +679410,32 @@ task_intro_18: ; 816DF2C movs r1, 0xF6 lsls r1, 17 cmp r0, r1 - beq @0816E01A - b @0816E176 -@0816E01A: - b @0816E14E + beq _0816E01A + b _0816E176 +_0816E01A: + b _0816E14E .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 @@ -679452,20 +679452,20 @@ task_intro_18: ; 816DF2C 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 .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 @@ -679474,15 +679474,15 @@ task_intro_18: ; 816DF2C 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 @@ -679495,21 +679495,21 @@ task_intro_18: ; 816DF2C movs r2, 0x64 movs r3, 0xA bl sub_80A344C - b @0816E14E + b _0816E14E .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] @@ -679537,7 +679537,7 @@ task_intro_18: ; 816DF2C movs r2, 0x2 ldrsh r0, [r4, r2] cmp r0, 0x78 - bne @0816E176 + bne _0816E176 movs r0, 0x2 negs r0, r0 ldr r1, =0x00007fff @@ -679549,30 +679549,30 @@ task_intro_18: ; 816DF2C strh r5, [r4, 0x6] movs r0, 0 strh r0, [r4, 0x8] - b @0816E14E + b _0816E14E .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 @@ -679583,7 +679583,7 @@ task_intro_18: ; 816DF2C ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -@0816E176: +_0816E176: add sp, 0x4 pop {r4,r5} pop {r0} @@ -679599,7 +679599,7 @@ sub_816E190: ; 816E190 movs r4, 0 ldr r6, =0x02020630 ldr r5, =gUnknown_085E4C64 -@0816E19C: +_0816E19C: movs r0, 0 ldrsh r1, [r5, r0] lsls r3, r4, 24 @@ -679632,7 +679632,7 @@ sub_816E190: ; 816E190 adds r5, 0x6 adds r4, 0x1 cmp r4, 0x5 - ble @0816E19C + ble _0816E19C pop {r4-r7} pop {r0} bx r0 @@ -679650,20 +679650,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, =gUnknown_085E4C64 movs r0, 0x30 ldrsh r1, [r3, r0] @@ -679698,36 +679698,36 @@ sub_816E1F8: ; 816E1F8 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 .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 @@ -679819,44 +679819,44 @@ 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 .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] @@ -679885,9 +679885,9 @@ task_intro_20: ; 816E358 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 @@ -679897,17 +679897,17 @@ task_intro_20: ; 816E358 strh r0, [r5] movs r0, 0 bl sub_816E6D4 - b @0816E6BC + b _0816E6BC .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 @@ -679932,17 +679932,17 @@ task_intro_20: ; 816E358 movs r0, 0 bl sub_816E6D4 bl sub_816E74C - b @0816E6BC + b _0816E6BC .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 @@ -679961,17 +679961,17 @@ task_intro_20: ; 816E358 strh r0, [r1, 0xC] movs r0, 0x8 strh r0, [r5, 0xC] - b @0816E690 + b _0816E690 .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 @@ -679982,17 +679982,17 @@ task_intro_20: ; 816E358 strh r1, [r0, 0xC] movs r0, 0x8 strh r0, [r5, 0xC] - b @0816E690 + b _0816E690 .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 @@ -680005,16 +680005,16 @@ task_intro_20: ; 816E358 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 .pool -@0816E528: +_0816E528: movs r0, 0x1 strh r0, [r5, 0xC] ldrh r0, [r5] @@ -680027,32 +680027,32 @@ task_intro_20: ; 816E358 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 @@ -680069,34 +680069,34 @@ task_intro_20: ; 816E358 movs r1, 0xF0 lsls r1, 17 cmp r0, r1 - beq @0816E594 - b @0816E6BC -@0816E594: - b @0816E690 + beq _0816E594 + b _0816E6BC +_0816E594: + b _0816E690 .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 @@ -680113,27 +680113,27 @@ task_intro_20: ; 816E358 movs r1, 0xF7 lsls r1, 17 cmp r0, r1 - bne @0816E6BC + bne _0816E6BC movs r0, 0x10 strh r0, [r5, 0xC] - b @0816E690 + b _0816E690 .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] @@ -680154,7 +680154,7 @@ task_intro_20: ; 816E358 movs r2, 0xC ldrsh r0, [r5, r2] cmp r0, 0x40 - bne @0816E6BC + bne _0816E6BC movs r0, 0x2 negs r0, r0 ldr r1, =0x00007fff @@ -680163,9 +680163,9 @@ task_intro_20: ; 816E358 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @0816E690 + b _0816E690 .pool -@0816E664: +_0816E664: ldrh r0, [r5, 0xC] adds r0, 0x4 strh r0, [r5, 0xC] @@ -680186,20 +680186,20 @@ task_intro_20: ; 816E358 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 .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 @@ -680210,7 +680210,7 @@ task_intro_20: ; 816E358 ldr r1, =0x02039b28 movs r0, 0x3 strb r0, [r1, 0x15] -@0816E6BC: +_0816E6BC: add sp, 0x4 pop {r4-r6} pop {r0} @@ -680233,7 +680233,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 @@ -680266,7 +680266,7 @@ sub_816E6D4: ; 816E6D4 adds r6, 0x6 adds r5, 0x1 cmp r5, 0x5 - ble @0816E6EE + ble _0816E6EE pop {r3,r4} mov r8, r3 mov r9, r4 @@ -680287,7 +680287,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 @@ -680318,7 +680318,7 @@ sub_816E74C: ; 816E74C adds r6, 0x6 adds r5, 0x1 cmp r5, 0x5 - ble @0816E75E + ble _0816E75E pop {r3} mov r8, r3 pop {r4-r7} @@ -680334,16 +680334,16 @@ sub_816E7B4: ; 816E7B4 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 @@ -680367,16 +680367,16 @@ sub_816E7B4: ; 816E7B4 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @0816E82A + beq _0816E82A adds r0, r4, 0 bl RemoveObjectAndFreeTiles - 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 StartObjectImageAnim @@ -680387,7 +680387,7 @@ sub_816E7B4: ; 816E7B4 negs r0, r0 ands r0, r1 strb r0, [r2] -@0816E82A: +_0816E82A: ldr r2, =0x03005e00 movs r0, 0x38 ldrsh r1, [r4, r0] @@ -680398,44 +680398,44 @@ sub_816E7B4: ; 816E7B4 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 .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 RemoveObjectAndFreeTiles -@0816E882: +_0816E882: pop {r4} pop {r0} bx r0 @@ -680598,18 +680598,18 @@ 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 .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 @@ -680625,15 +680625,15 @@ task_intro_24: ; 816E9DC ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] - b @0816EAA6 + b _0816EAA6 .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] @@ -680641,30 +680641,30 @@ task_intro_24: ; 816E9DC movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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 .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 str r1, [r0] -@0816EAA6: +_0816EAA6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -680730,24 +680730,24 @@ 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 .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, =gUnknown_085E4C4C adds r0, r4, 0 movs r1, 0xC8 @@ -680786,15 +680786,15 @@ task_intro_26: ; 816EB44 strh r0, [r6] movs r0, 0x48 strh r0, [r6, 0xC] - b @0816EC62 + b _0816EC62 .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, =gUnknown_085E4C4C adds r0, r4, 0 movs r1, 0x28 @@ -680833,21 +680833,21 @@ task_intro_26: ; 816EB44 strh r0, [r6] movs r0, 0x30 strh r0, [r6, 0xC] - b @0816EC62 + b _0816EC62 .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 str r1, [r0] -@0816EC62: +_0816EC62: pop {r4-r6} pop {r0} bx r0 @@ -680863,35 +680863,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, =gUnknown_08D85CD0 @@ -680906,7 +680906,7 @@ sub_816EC6C: ; 816EC6C movs r1, 0xE7 lsls r1, 17 cmp r0, r1 - bne @0816ED12 + bne _0816ED12 movs r0, 0xE6 lsls r0, 1 strh r0, [r4, 0x30] @@ -680915,13 +680915,13 @@ sub_816EC6C: ; 816EC6C 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 @@ -680938,10 +680938,10 @@ sub_816EC6C: ; 816EC6C movs r1, 0xE0 lsls r1, 17 cmp r0, r1 - bne @0816ED12 + bne _0816ED12 adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0816ED12: +_0816ED12: pop {r4} pop {r0} bx r0 @@ -681017,35 +681017,35 @@ 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 .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] @@ -681058,24 +681058,24 @@ task_intro_28: ; 816EDB4 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] @@ -681093,27 +681093,27 @@ task_intro_28: ; 816EDB4 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 .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 str r1, [r0] -@0816EE86: +_0816EE86: pop {r4-r6} pop {r0} bx r0 @@ -681150,29 +681150,29 @@ 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 .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 @@ -681184,31 +681184,31 @@ sub_816EEA8: ; 816EEA8 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 .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 @@ -681220,32 +681220,32 @@ sub_816EEA8: ; 816EEA8 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 .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 @@ -681257,13 +681257,13 @@ sub_816EEA8: ; 816EEA8 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, =gUnknown_085E5030 movs r1, 0x78 movs r2, 0x58 @@ -681292,25 +681292,25 @@ sub_816EEA8: ; 816EEA8 strh r0, [r5] movs r0, 0x10 strh r0, [r5, 0x6] - b @0816F0B2 + b _0816F0B2 .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 @@ -681334,22 +681334,22 @@ sub_816EEA8: ; 816EEA8 adds r1, r5, 0 movs r2, 0x1 bl CpuSet - b @0816F0B2 + b _0816F0B2 .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 @@ -681361,18 +681361,18 @@ sub_816EEA8: ; 816EEA8 ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] - b @0816F0B2 + b _0816F0B2 .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} @@ -681437,12 +681437,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 @@ -681455,14 +681455,14 @@ task_intro_3_1: ; 816F128 movs r1, 0 bl SetGpuReg movs r0, 0x40 - b @0816F1AC + b _0816F1AC .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 @@ -681477,22 +681477,22 @@ task_intro_3_1: ; 816F128 ldrh r1, [r0] movs r0, 0x52 bl SetGpuReg - b @0816F1DA + b _0816F1DA .pool -@0816F1A0: +_0816F1A0: ldr r0, =gUnknown_0853FF70 ldrh r1, [r0] movs r0, 0x52 bl SetGpuReg movs r0, 0x10 -@0816F1AC: +_0816F1AC: strh r0, [r4, 0xA] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0816F1DA + b _0816F1DA .pool -@0816F1BC: +_0816F1BC: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -681504,7 +681504,7 @@ task_intro_3_1: ; 816F128 bl SetGpuReg adds r0, r5, 0 bl remove_task -@0816F1DA: +_0816F1DA: pop {r4,r5} pop {r0} bx r0 @@ -681523,12 +681523,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 @@ -681541,14 +681541,14 @@ task_intro_3_2: ; 816F1E0 movs r1, 0 bl SetGpuReg movs r0, 0 - b @0816F264 + b _0816F264 .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 @@ -681563,31 +681563,31 @@ task_intro_3_2: ; 816F1E0 ldrh r1, [r0] movs r0, 0x52 bl SetGpuReg - b @0816F2A2 + b _0816F2A2 .pool -@0816F258: +_0816F258: ldr r0, =gUnknown_0853FF70 ldrh r1, [r0, 0x3E] movs r0, 0x52 bl SetGpuReg movs r0, 0x10 -@0816F264: +_0816F264: strh r0, [r4, 0xA] ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0816F2A2 + b _0816F2A2 .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 SetGpuReg @@ -681599,7 +681599,7 @@ task_intro_3_2: ; 816F1E0 bl SetGpuReg adds r0, r5, 0 bl remove_task -@0816F2A2: +_0816F2A2: pop {r4,r5} pop {r0} bx r0 @@ -681664,16 +681664,16 @@ sub_816F318: ; 816F318 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] @@ -681703,28 +681703,28 @@ sub_816F318: ; 816F318 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 RemoveObjectAndFreeTiles -@0816F39A: +_0816F39A: add sp, 0x4 pop {r4} pop {r0} @@ -681745,7 +681745,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] @@ -681788,9 +681788,9 @@ sub_816F3A4: ; 816F3A4 movs r2, 0x3 movs r3, 0x2 bl CalcVecFromObjectCenterToObjectUpperLeft - b @0816F44C + b _0816F44C .pool -@0816F420: +_0816F420: ldrh r0, [r1, 0x24] strh r0, [r4, 0x24] movs r0, 0x3C @@ -681813,7 +681813,7 @@ sub_816F3A4: ; 816F3A4 adds r0, r2 ldrh r0, [r0, 0x22] strh r0, [r4, 0x22] -@0816F44C: +_0816F44C: pop {r4} pop {r0} bx r0 @@ -681826,10 +681826,10 @@ sub_816F454: ; 816F454 movs r2, 0x2E ldrsh r0, [r1, r2] cmp r0, 0 - beq @0816F464 + beq _0816F464 ldr r0, =sub_816F46C str r0, [r1, 0x1C] -@0816F464: +_0816F464: pop {r0} bx r0 .pool @@ -681848,7 +681848,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 @@ -681863,9 +681863,9 @@ sub_816F46C: ; 816F46C strh r0, [r7, 0x36] ldr r0, =sub_816F5B4 str r0, [r7, 0x1C] - b @0816F59E + b _0816F59E .pool -@0816F4AC: +_0816F4AC: ldrh r1, [r7, 0x36] ldr r5, =gUnknown_08329F40 lsls r0, r1, 24 @@ -681883,9 +681883,9 @@ sub_816F46C: ; 816F46C 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 @@ -681893,18 +681893,18 @@ sub_816F46C: ; 816F46C 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] @@ -681924,9 +681924,9 @@ sub_816F46C: ; 816F46C 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 @@ -681935,26 +681935,26 @@ sub_816F46C: ; 816F46C 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] @@ -681991,7 +681991,7 @@ sub_816F46C: ; 816F46C mov r2, r9 adds r3, r5, 0 bl SetSpriteTransformationMatrix -@0816F59E: +_0816F59E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -682047,7 +682047,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] @@ -682061,9 +682061,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 @@ -682072,19 +682072,19 @@ sub_816F5B4: ; 816F5B4 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 .pool -@0816F64C: +_0816F64C: movs r0, 0 strh r0, [r4, 0x36] ldr r0, =sub_816F660 str r0, [r4, 0x1C] -@0816F654: +_0816F654: add sp, 0x4 pop {r4} pop {r0} @@ -682099,7 +682099,7 @@ sub_816F660: ; 816F660 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] @@ -682110,9 +682110,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 @@ -682125,9 +682125,9 @@ sub_816F660: ; 816F660 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 @@ -682136,17 +682136,17 @@ sub_816F660: ; 816F660 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 .pool -@0816F6C0: +_0816F6C0: ldr r0, =sub_816F6D0 str r0, [r1, 0x1C] -@0816F6C4: +_0816F6C4: pop {r4} pop {r0} bx r0 @@ -682163,11 +682163,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 @@ -682212,7 +682212,7 @@ sub_816F6D0: ; 816F6D0 movs r2, 0x3 movs r3, 0x2 bl CalcVecFromObjectCenterToObjectUpperLeft -@0816F744: +_0816F744: pop {r4} pop {r0} bx r0 @@ -682229,11 +682229,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 @@ -682278,7 +682278,7 @@ sub_816F750: ; 816F750 movs r2, 0x3 movs r3, 0x2 bl CalcVecFromObjectCenterToObjectUpperLeft -@0816F7C4: +_0816F7C4: pop {r4} pop {r0} bx r0 @@ -682371,19 +682371,19 @@ sub_816F7D0: ; 816F7D0 bl StartObjectImageAnim mov r1, r8 cmp r1, 0 - bne @0816F898 + bne _0816F898 mov r0, r9 adds r0, 0x1C adds r0, r5, r0 ldr r1, =sub_816F454 - b @0816F8A0 + b _0816F8A0 .pool -@0816F898: +_0816F898: mov r0, r9 adds r0, 0x1C adds r0, r5, r0 ldr r1, =sub_816F750 -@0816F8A0: +_0816F8A0: str r1, [r0] str r7, [sp, 0x10] mov r2, r10 @@ -682530,28 +682530,28 @@ sub_816F9D4: ; 816F9D4 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 .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 StartObjectImageAnimIfDifferent ldrh r0, [r4, 0x20] subs r0, 0x1 - b @0816FA60 -@0816FA12: + b _0816FA60 +_0816FA12: adds r0, r4, 0 movs r1, 0 bl StartObjectImageAnimIfDifferent @@ -682560,78 +682560,78 @@ sub_816F9D4: ; 816F9D4 movs r1, 0x7 ands r0, r1 cmp r0, 0 - bne @0816FAAA + bne _0816FAAA ldrh r0, [r4, 0x20] adds r0, 0x1 - b @0816FA60 + b _0816FA60 .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 .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 .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 .pool -@0816FAA8: +_0816FAA8: strh r1, [r4, 0x26] -@0816FAAA: +_0816FAAA: pop {r4,r5} pop {r0} bx r0 @@ -682644,15 +682644,15 @@ sub_816FAB0: ; 816FAB0 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 @@ -682660,40 +682660,40 @@ sub_816FAB0: ; 816FAB0 adds r0, r1 ldr r1, =0x0000012f cmp r0, r1 - bgt @0816FAE4 + bgt _0816FAE4 ldrh r0, [r4, 0x24] adds r0, 0x8 - b @0816FB10 + b _0816FB10 .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 @@ -682719,33 +682719,33 @@ sub_816FB38: ; 816FB38 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 .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] @@ -682756,14 +682756,14 @@ sub_816FB38: ; 816FB38 adds r0, r6, 0 movs r1, 0x1 bl StartObjectRotScalAnim - 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] @@ -682771,20 +682771,20 @@ sub_816FB38: ; 816FB38 strh r0, [r6, 0x30] movs r0, 0x2 strh r0, [r6, 0x34] - b @0816FD38 + b _0816FD38 .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, =gUnknown_08D85C50 adds r0, r4 @@ -682814,9 +682814,9 @@ sub_816FB38: ; 816FB38 ldrh r0, [r6, 0x30] subs r0, 0x1 strh r0, [r6, 0x30] - b @0816FD38 + b _0816FD38 .pool -@0816FC14: +_0816FC14: movs r1, 0x30 ldrsh r0, [r6, r1] lsls r0, 1 @@ -682845,25 +682845,25 @@ sub_816FB38: ; 816FB38 adds r1, r5, 0 movs r2, 0x1 bl CpuSet - b @0816FCE6 + b _0816FCE6 .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, =gUnknown_08D85C50 adds r0, r4 @@ -682893,15 +682893,15 @@ sub_816FB38: ; 816FB38 ldrh r0, [r6, 0x30] adds r0, 0x1 strh r0, [r6, 0x30] - b @0816FD38 + b _0816FD38 .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 StartObjectRotScalAnim @@ -682912,13 +682912,13 @@ sub_816FB38: ; 816FB38 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 .pool -@0816FCF4: +_0816FCF4: ldr r1, =gUnknown_085E4F48 movs r2, 0x32 ldrsh r0, [r6, r2] @@ -682938,22 +682938,22 @@ sub_816FB38: ; 816FB38 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 RemoveObjectAndFreeTiles -@0816FD38: +_0816FD38: pop {r4-r6} pop {r0} bx r0 @@ -682967,21 +682967,21 @@ sub_816FD44: ; 816FD44 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] @@ -682989,35 +682989,35 @@ sub_816FD44: ; 816FD44 negs r1, r1 ands r1, r0 strb r1, [r2] - b @0816FD90 + b _0816FD90 .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 StartObjectRotScalAnim -@0816FD90: +_0816FD90: ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b @0816FDB0 + b _0816FDB0 .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 RemoveObjectAndFreeTiles -@0816FDB0: +_0816FDB0: pop {r4} pop {r0} bx r0 @@ -683038,7 +683038,7 @@ sub_816FDB8: ; 816FDB8 lsrs r1, 16 str r1, [sp, 0x4] movs r7, 0 -@0816FDD2: +_0816FDD2: lsls r5, r7, 2 ldr r0, =gUnknown_085E4E94 adds r0, 0x2 @@ -683109,7 +683109,7 @@ sub_816FDB8: ; 816FDB8 lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x8 - bls @0816FDD2 + bls _0816FDD2 ldr r0, =gUnknown_085E4F8C ldr r2, [sp, 0x8] subs r2, 0x6 @@ -683168,7 +683168,7 @@ sub_816FEDC: ; 816FEDC movs r1, 0x2E ldrsh r0, [r4, r1] cmp r0, 0 - beq @0816FF48 + beq _0816FF48 ldr r2, =gUnknown_08329F40 ldrh r1, [r4, 0x32] lsls r0, r1, 24 @@ -683187,9 +683187,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 @@ -683197,17 +683197,17 @@ sub_816FEDC: ; 816FEDC 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 @@ -683215,16 +683215,16 @@ sub_816FEDC: ; 816FEDC str r1, [sp] movs r0, 0x1 bl SetSpriteTransformationMatrix -@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 @@ -683255,9 +683255,9 @@ sub_816FEDC: ; 816FEDC strh r0, [r4, 0x30] strh r1, [r4, 0x32] strh r1, [r4, 0x34] - b @08170038 + b _08170038 .pool -@0816FF9C: +_0816FF9C: ldrh r0, [r4, 0x34] lsls r0, 24 lsrs r0, 24 @@ -683286,7 +683286,7 @@ sub_816FEDC: ; 816FEDC movs r1, 0x10 negs r1, r1 cmp r0, r1 - bgt @08170038 + bgt _08170038 ldrb r0, [r4, 0x5] movs r1, 0xC orrs r0, r1 @@ -683304,8 +683304,8 @@ sub_816FEDC: ; 816FEDC 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 @@ -683328,12 +683328,12 @@ sub_816FEDC: ; 816FEDC 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} @@ -683348,12 +683348,12 @@ sub_8170040: ; 8170040 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] @@ -683381,20 +683381,20 @@ sub_8170040: ; 8170040 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 @@ -683404,10 +683404,10 @@ sub_8170040: ; 8170040 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, =gUnknown_08329F40 ldrh r0, [r5, 0x30] lsls r0, 24 @@ -683468,12 +683468,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] @@ -683604,25 +683604,25 @@ 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 .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 @@ -683636,9 +683636,9 @@ sub_8170290: ; 8170290 ldr r1, [r4] ldr r0, =0x0000088c adds r1, r0 - b @081703D8 + b _081703D8 .pool -@08170300: +_08170300: movs r0, 0x1 movs r1, 0 movs r2, 0x27 @@ -683674,9 +683674,9 @@ sub_8170290: ; 8170290 movs r1, 0 movs r2, 0x10 movs r3, 0 - b @081703CC + b _081703CC .pool -@08170358: +_08170358: movs r1, 0x82 lsls r1, 5 movs r0, 0 @@ -683689,58 +683689,58 @@ sub_8170290: ; 8170290 ldr r1, [r0] ldr r0, =0x0000088c adds r1, r0 - b @081703D8 + b _081703D8 .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 .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 .pool -@081703C0: +_081703C0: movs r0, 0x1 negs r0, r0 movs r1, 0 str r1, [sp] movs r2, 0 movs r3, 0x10 -@081703CC: +_081703CC: bl pal_fade_maybe 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 .pool -@081703E8: +_081703E8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -683748,7 +683748,7 @@ sub_8170290: ; 8170290 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @08170416 + bne _08170416 bl sub_812305C ldr r4, =0x0203bcd0 ldr r0, [r4] @@ -683756,12 +683756,12 @@ sub_8170290: ; 8170290 bl SetMainCallback2 ldr r0, [r4] cmp r0, 0 - beq @08170412 + beq _08170412 bl Free str r5, [r4] -@08170412: +_08170412: bl FreeAllWindowBuffers -@08170416: +_08170416: add sp, 0xC pop {r4,r5} pop {r0} @@ -683777,7 +683777,7 @@ sub_8170428: ; 8170428 ldr r0, [r4] ldrb r0, [r0, 0xA] cmp r0, 0 - beq @08170460 + beq _08170460 movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer @@ -683793,16 +683793,16 @@ sub_8170428: ; 8170428 bl Print movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - b @08170470 + b _08170470 .pool -@08170460: +_08170460: movs r0, 0 movs r1, 0x11 bl FillWindowPixelBuffer movs r0, 0 movs r1, 0x3 bl CopyWindowToVram -@08170470: +_08170470: add sp, 0xC pop {r4} pop {r0} @@ -684041,27 +684041,27 @@ 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 .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 @@ -684077,32 +684077,32 @@ sub_8170660: ; 8170660 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 @@ -684118,7 +684118,7 @@ sub_8170660: ; 8170660 movs r0, 0x20 ldrsh r4, [r5, r0] cmp r4, 0 - bne @08170814 + bne _08170814 movs r0, 0 bl sub_80A477C ldr r0, =0x02022e24 @@ -684135,12 +684135,12 @@ sub_8170660: ; 8170660 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 GetGpuReg adds r1, r0, 0 @@ -684217,7 +684217,7 @@ sub_8170660: ; 8170660 strb r2, [r0, 0x5] adds r0, r7, 0 bl move_anim_task_del -@08170814: +_08170814: pop {r3} mov r8, r3 pop {r4-r7} @@ -684483,7 +684483,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 IndexOfObjectPaletteTag @@ -684493,28 +684493,28 @@ 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 .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 @@ -684527,21 +684527,21 @@ sub_8170A38: ; 8170A38 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 .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 @@ -684554,10 +684554,10 @@ sub_8170A38: ; 8170A38 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 @@ -684582,26 +684582,26 @@ 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 .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] @@ -684617,14 +684617,14 @@ sub_8170B04: ; 8170B04 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 .pool -@08170B84: +_08170B84: adds r0, r5, 0 bl sub_80A7344 ldr r1, =0x02020630 @@ -684639,7 +684639,7 @@ sub_8170B04: ; 8170B04 strb r1, [r0] adds r0, r6, 0 bl move_anim_task_del -@08170BA4: +_08170BA4: pop {r4-r6} pop {r0} bx r0 @@ -684664,7 +684664,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 @@ -684673,9 +684673,9 @@ sub_8170BB0: ; 8170BB0 movs r0, 0x64 muls r0, r1 ldr r1, =0x020244ec - b @08170C08 + b _08170C08 .pool -@08170BF8: +_08170BF8: ldr r1, =0x0202406e ldrb r0, [r4] lsls r0, 1 @@ -684684,7 +684684,7 @@ sub_8170BB0: ; 8170BB0 movs r0, 0x64 muls r0, r1 ldr r1, =0x02024744 -@08170C08: +_08170C08: adds r0, r1 movs r1, 0x26 bl pokemon_getattr @@ -684702,12 +684702,12 @@ sub_8170BB0: ; 8170BB0 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 .pool -@08170C44: +_08170C44: ldr r5, =0x02038436 ldrb r0, [r5] movs r1, 0 @@ -684761,9 +684761,9 @@ sub_8170BB0: ; 8170BB0 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b @08170CEE + b _08170CEE .pool -@08170CC4: +_08170CC4: movs r1, 0x1C ldrsh r0, [r6, r1] lsls r1, r0, 2 @@ -684772,7 +684772,7 @@ sub_8170BB0: ; 8170BB0 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 @@ -684781,10 +684781,10 @@ sub_8170BB0: ; 8170BB0 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 @@ -684844,15 +684844,15 @@ 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 .pool -@08170D70: +_08170D70: ldr r1, =0x0203841e movs r0, 0 -@08170D74: +_08170D74: strh r0, [r1, 0xE] adds r0, r2, 0 bl move_anim_task_del @@ -684868,63 +684868,63 @@ ball_number_to_ball_processing_index: ; 8170D84 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 .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 @@ -685048,10 +685048,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 .pool @@ -685071,15 +685071,15 @@ 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 .pool -@08170F50: +_08170F50: movs r6, 0x17 movs r5, 0x5 -@08170F54: +_08170F54: ldr r0, =0x02024208 ldrh r0, [r0] bl ball_number_to_ball_processing_index @@ -685188,7 +685188,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 @@ -685212,7 +685212,7 @@ sub_8171030: ; 8171030 bl AddTask ldr r0, =sub_8170EF0 str r0, [r4] -@0817108A: +_0817108A: pop {r4-r6} pop {r0} bx r0 @@ -685240,7 +685240,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 @@ -685255,7 +685255,7 @@ sub_81710A8: ; 81710A8 bl StartObjectImageAnim adds r0, r5, 0 bl remove_task -@081710F4: +_081710F4: pop {r4-r6} pop {r0} bx r0 @@ -685294,18 +685294,18 @@ sub_8171134: ; 8171134 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 str r0, [r4, 0x1C] - b @081711D2 + b _081711D2 .pool -@08171160: +_08171160: adds r0, r4, 0 movs r1, 0x1 bl StartObjectImageAnim @@ -685325,11 +685325,11 @@ sub_8171134: ; 8171134 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 @@ -685340,9 +685340,9 @@ sub_8171134: ; 8171134 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 @@ -685360,7 +685360,7 @@ sub_8171134: ; 8171134 movs r2, 0xE adds r3, r5, 0 bl sub_81729E8 -@081711D2: +_081711D2: add sp, 0x4 pop {r4,r5} pop {r0} @@ -685378,7 +685378,7 @@ sub_81711E8: ; 81711E8 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne @08171224 + bne _08171224 ldr r0, =nullsub_4 movs r1, 0x32 bl AddTask @@ -685399,7 +685399,7 @@ sub_81711E8: ; 81711E8 adds r0, r2 movs r1, 0 strh r1, [r0, 0x30] -@08171224: +_08171224: pop {r4} pop {r0} bx r0 @@ -685429,25 +685429,25 @@ 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 .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 @@ -685478,9 +685478,9 @@ sub_8171240: ; 8171240 bl __udivsi3 strh r0, [r4] strh r0, [r5, 0xC] - b @08171346 + b _08171346 .pool -@081712E8: +_081712E8: ldrh r0, [r5, 0x1C] adds r0, 0x20 strh r0, [r5, 0x1C] @@ -685508,10 +685508,10 @@ sub_8171240: ; 8171240 ldrsh r1, [r5, r0] ldr r0, =0x0000047f cmp r1, r0 - ble @0817137C - b @08171346 + ble _0817137C + b _08171346 .pool -@0817132C: +_0817132C: adds r0, r4, 0 bl sub_80A7344 ldr r1, =0x02020630 @@ -685524,13 +685524,13 @@ sub_8171240: ; 8171240 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 .pool -@08171354: +_08171354: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -685539,7 +685539,7 @@ sub_8171240: ; 8171240 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 @@ -685549,7 +685549,7 @@ sub_8171240: ; 8171240 strh r0, [r7, 0x38] ldr r0, =sub_817138C str r0, [r7, 0x1C] -@0817137C: +_0817137C: pop {r4-r7} pop {r0} bx r0 @@ -685565,7 +685565,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 @@ -685585,7 +685585,7 @@ sub_817138C: ; 817138C strh r0, [r4, 0x26] ldr r0, =sub_81713D0 str r0, [r4, 0x1C] -@081713C6: +_081713C6: pop {r4} pop {r0} bx r0 @@ -685601,11 +685601,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 @@ -685623,7 +685623,7 @@ sub_81713D0: ; 81713D0 lsls r1, 16 asrs r1, 16 cmp r1, 0x3F - ble @08171486 + ble _08171486 ldrh r0, [r4, 0x36] subs r0, 0xA strh r0, [r4, 0x36] @@ -685633,38 +685633,38 @@ sub_81713D0: ; 81713D0 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 .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 @@ -685681,14 +685681,14 @@ sub_81713D0: ; 81713D0 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 @@ -685703,19 +685703,19 @@ sub_81713D0: ; 81713D0 ldr r0, [r0, 0x8] ldrb r0, [r0, 0x8] cmp r0, 0 - bne @081714C0 + bne _081714C0 strh r5, [r4, 0x38] ldr r0, =sub_81717B4 str r0, [r4, 0x1C] - b @081714CA + b _081714CA .pool -@081714C0: +_081714C0: ldr r0, =sub_81714D4 str r0, [r4, 0x1C] movs r0, 0x1 strh r0, [r4, 0x36] strh r5, [r4, 0x38] -@081714CA: +_081714CA: pop {r4,r5} pop {r0} bx r0 @@ -685733,7 +685733,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 @@ -685752,7 +685752,7 @@ sub_81714D4: ; 81714D4 str r0, [r4, 0x1C] movs r0, 0x17 bl audio_play -@08171510: +_08171510: pop {r4,r5} pop {r0} bx r0 @@ -685767,25 +685767,25 @@ sub_8171520: ; 8171520 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 .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] @@ -685794,7 +685794,7 @@ sub_8171520: ; 8171520 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 @@ -685802,13 +685802,13 @@ sub_8171520: ; 8171520 ldr r1, [r5, 0x8] ldrb r0, [r1, 0xC] strh r0, [r1, 0xC] - b @0817158A + b _0817158A .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 @@ -685824,18 +685824,18 @@ sub_8171520: ; 8171520 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] @@ -685853,17 +685853,17 @@ sub_8171520: ; 8171520 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] @@ -685872,7 +685872,7 @@ sub_8171520: ; 8171520 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 @@ -685880,13 +685880,13 @@ sub_8171520: ; 8171520 ldr r1, [r5, 0x8] ldrb r0, [r1, 0xC] strh r0, [r1, 0xC] - b @08171622 + b _08171622 .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 @@ -685902,9 +685902,9 @@ sub_8171520: ; 8171520 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] @@ -685912,23 +685912,23 @@ sub_8171520: ; 8171520 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] @@ -685946,16 +685946,16 @@ sub_8171520: ; 8171520 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] @@ -685964,7 +685964,7 @@ sub_8171520: ; 8171520 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 @@ -685972,13 +685972,13 @@ sub_8171520: ; 8171520 ldr r1, [r5, 0x8] ldrb r0, [r1, 0xC] strh r0, [r1, 0xC] - b @081716D2 + b _081716D2 .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 @@ -685994,7 +685994,7 @@ sub_8171520: ; 8171520 lsls r0, 16 lsrs r0, 16 cmp r0, 0x8 - bls @081717AE + bls _081717AE ldr r0, [r6] ldr r0, [r0, 0x8] strh r3, [r0, 0xC] @@ -686005,8 +686005,8 @@ sub_8171520: ; 8171520 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 @@ -686020,7 +686020,7 @@ sub_8171520: ; 8171520 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] @@ -686029,37 +686029,37 @@ sub_8171520: ; 8171520 strb r0, [r2] ldr r0, =sub_81717B4 str r0, [r4, 0x1C] - b @081717AE + b _081717AE .pool -@08171740: +_08171740: cmp r0, 0x4 - bne @08171754 + bne _08171754 cmp r1, 0x3 - bne @08171754 + bne _08171754 ldr r0, =sub_81717D8 str r0, [r4, 0x1C] - b @0817175A + b _0817175A .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] @@ -686072,20 +686072,20 @@ sub_8171520: ; 8171520 movs r6, 0x36 ldrsh r0, [r4, r6] cmp r0, 0 - bge @081717A0 + bge _081717A0 adds r0, r4, 0 movs r1, 0x2 bl StartObjectRotScalAnim - b @081717A8 + b _081717A8 .pool -@081717A0: +_081717A0: adds r0, r4, 0 movs r1, 0x1 bl StartObjectRotScalAnim -@081717A8: +_081717A8: movs r0, 0x17 bl audio_play -@081717AE: +_081717AE: pop {r4-r6} pop {r0} bx r0 @@ -686101,12 +686101,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 str r0, [r1, 0x1C] -@081717CE: +_081717CE: pop {r0} bx r0 .pool @@ -686146,7 +686146,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] @@ -686159,11 +686159,11 @@ sub_81717F8: ; 81717F8 bl sub_80A2A20 adds r0, r6, 0 bl sub_81719EC - b @081718BC + b _081718BC .pool -@0817183C: +_0817183C: cmp r1, 0x3C - bne @0817185A + bne _0817185A ldrb r1, [r6, 0x5] lsrs r1, 4 movs r0, 0x80 @@ -686175,10 +686175,10 @@ sub_81717F8: ; 81717F8 movs r2, 0x6 movs r3, 0 bl pal_fade_maybe - b @081718BC -@0817185A: + b _081718BC +_0817185A: cmp r1, 0x5F - bne @08171880 + bne _08171880 ldr r0, =0x020244b9 movs r1, 0 strb r1, [r0] @@ -686187,12 +686187,12 @@ sub_81717F8: ; 81717F8 bl m4aMPlayAllStop ldr r0, =0x00000213 bl audio_play - b @081718BC + b _081718BC .pool -@08171880: +_08171880: ldr r0, =0x0000013b cmp r1, r0 - bne @081718BC + bne _081718BC ldr r5, =0x02020630 ldr r4, =0x020241e4 ldrb r0, [r7] @@ -686218,7 +686218,7 @@ sub_81717F8: ; 81717F8 strh r0, [r6, 0x2E] ldr r0, =sub_81718D8 str r0, [r6, 0x1C] -@081718BC: +_081718BC: add sp, 0x4 pop {r3} mov r8, r3 @@ -686236,17 +686236,17 @@ sub_81718D8: ; 81718D8 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] @@ -686278,15 +686278,15 @@ sub_81718D8: ; 81718D8 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @08171982 + b _08171982 .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] @@ -686303,21 +686303,21 @@ sub_81718D8: ; 81718D8 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 @@ -686325,7 +686325,7 @@ sub_81718D8: ; 81718D8 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @081719B0 + bne _081719B0 movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -686335,7 +686335,7 @@ sub_81718D8: ; 81718D8 strh r5, [r4, 0x2E] ldr r0, =sub_81719C0 str r0, [r4, 0x1C] -@081719B0: +_081719B0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -686351,17 +686351,17 @@ sub_81719C0: ; 81719C0 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 .pool -@081719D8: +_081719D8: adds r0, r4, 0 bl obj_free_rotscale_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@081719E4: +_081719E4: pop {r4} pop {r0} bx r0 @@ -686379,18 +686379,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 @@ -686399,7 +686399,7 @@ sub_81719EC: ; 81719EC movs r0, 0x1C add r0, r9 mov r10, r0 -@08171A26: +_08171A26: movs r2, 0x20 ldrsh r1, [r6, r2] movs r0, 0x22 @@ -686410,7 +686410,7 @@ sub_81719EC: ; 81719EC lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @08171A82 + beq _08171A82 lsls r4, r0, 4 adds r4, r0 lsls r4, 2 @@ -686443,10 +686443,10 @@ sub_81719EC: ; 81719EC ldrb r1, [r0, 0x4] adds r0, r5, 0 bl StartObjectImageAnim -@08171A82: +_08171A82: adds r7, 0x1 cmp r7, 0x2 - bls @08171A26 + bls _08171A26 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -686478,10 +686478,10 @@ sub_8171AAC: ; 8171AAC bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @08171ADC + beq _08171ADC adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@08171ADC: +_08171ADC: pop {r4} pop {r0} bx r0 @@ -686505,9 +686505,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 @@ -686525,7 +686525,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 @@ -686586,14 +686586,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 @@ -686609,14 +686609,14 @@ sub_8171BAC: ; 8171BAC ldrb r0, [r0] lsls r0, 26 cmp r0, 0 - bge @08171C04 + bge _08171C04 adds r0, r1, 0 movs r1, 0 bl StartObjectRotScalAnim movs r5, 0x1 - b @08171C24 + b _08171C24 .pool -@08171C04: +_08171C04: ldr r6, =0xfffffee0 adds r0, r6, 0 ldrh r6, [r1, 0x30] @@ -686633,16 +686633,16 @@ sub_8171BAC: ; 8171BAC 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 @@ -686684,7 +686684,7 @@ sub_8171BAC: ; 8171BAC strb r6, [r0] movs r0, 0x1 bl sub_8072A88 -@08171C8A: +_08171C8A: pop {r4-r7} pop {r0} bx r0 @@ -686711,12 +686711,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} @@ -686759,7 +686759,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 @@ -686768,8 +686768,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 @@ -686779,7 +686779,7 @@ sub_8171CE8: ; 8171CE8 strb r0, [r1] movs r0, 0x1 bl sub_8072A88 -@08171D52: +_08171D52: pop {r4} pop {r0} bx r0 @@ -686798,13 +686798,13 @@ sub_8171D60: ; 8171D60 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne @08171D86 + bne _08171D86 adds r0, r4, 0 bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_085E50F4 adds r0, r5, r0 bl LoadCompressedObjectPaletteUsingHeap -@08171D86: +_08171D86: pop {r4,r5} pop {r0} bx r0 @@ -686886,14 +686886,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 .pool @@ -686923,7 +686923,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] @@ -686940,7 +686940,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 @@ -686970,14 +686970,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 @@ -686988,7 +686988,7 @@ sub_8171E50: ; 8171E50 ldrsh r1, [r1, r2] adds r2, r0, 0 cmp r1, 0xF - bne @08171F48 + bne _08171F48 ldr r0, =0x030022c0 ldr r4, =0x00000439 adds r0, r4 @@ -686996,7 +686996,7 @@ sub_8171E50: ; 8171E50 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @08171F22 + bne _08171F22 ldr r0, =0x02020630 mov r2, r10 lsls r1, r2, 4 @@ -687005,12 +687005,12 @@ sub_8171E50: ; 8171E50 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@08171F22: +_08171F22: mov r0, r8 bl remove_task - b @08171F58 + b _08171F58 .pool -@08171F48: +_08171F48: mov r4, r8 lsls r0, r4, 2 add r0, r8 @@ -687019,7 +687019,7 @@ sub_8171E50: ; 8171E50 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] -@08171F58: +_08171F58: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -687038,15 +687038,15 @@ sub_8171F68: ; 8171F68 movs r3, 0x30 ldrsh r0, [r1, r3] cmp r0, 0 - bne @08171F80 + bne _08171F80 ldr r0, =sub_8171F88 str r0, [r1, 0x1C] - b @08171F84 + b _08171F84 .pool -@08171F80: +_08171F80: subs r0, r2, 0x1 strh r0, [r1, 0x30] -@08171F84: +_08171F84: pop {r0} bx r0 thumb_func_end sub_8171F68 @@ -687073,10 +687073,10 @@ 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 @@ -687119,7 +687119,7 @@ sub_8171FC4: ; 8171FC4 add r0, r8 lsls r0, 3 str r0, [sp, 0x10] -@0817200A: +_0817200A: ldr r0, =gUnknown_085E51F0 ldr r2, [sp, 0x10] adds r0, r2, r0 @@ -687130,7 +687130,7 @@ sub_8171FC4: ; 8171FC4 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @0817206A + beq _0817206A bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -687165,12 +687165,12 @@ sub_8171FC4: ; 8171FC4 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 @@ -687178,7 +687178,7 @@ sub_8171FC4: ; 8171FC4 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @08172092 + bne _08172092 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -687186,7 +687186,7 @@ sub_8171FC4: ; 8171FC4 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@08172092: +_08172092: mov r0, r9 bl remove_task add sp, 0x14 @@ -687237,7 +687237,7 @@ sub_81720C8: ; 81720C8 add r0, r8 lsls r0, 3 str r0, [sp, 0x10] -@0817210E: +_0817210E: ldr r0, =gUnknown_085E51F0 ldr r2, [sp, 0x10] adds r0, r2, r0 @@ -687248,7 +687248,7 @@ sub_81720C8: ; 81720C8 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @0817216E + beq _0817216E bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -687283,12 +687283,12 @@ sub_81720C8: ; 81720C8 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 @@ -687296,7 +687296,7 @@ sub_81720C8: ; 81720C8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @08172196 + bne _08172196 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -687304,7 +687304,7 @@ sub_81720C8: ; 81720C8 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@08172196: +_08172196: mov r0, r9 bl remove_task add sp, 0x14 @@ -687355,7 +687355,7 @@ sub_81721CC: ; 81721CC ldr r0, =gUnknown_085E51B4 adds r1, r0 mov r10, r1 -@08172212: +_08172212: ldr r0, =gUnknown_085E51F0 ldr r1, [sp, 0x10] adds r0, r1, r0 @@ -687366,7 +687366,7 @@ sub_81721CC: ; 81721CC lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @0817226E + beq _0817226E bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -687399,12 +687399,12 @@ sub_81721CC: ; 81721CC 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 @@ -687412,7 +687412,7 @@ sub_81721CC: ; 81721CC movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @08172296 + bne _08172296 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -687420,7 +687420,7 @@ sub_81721CC: ; 81721CC adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@08172296: +_08172296: mov r0, r9 bl remove_task add sp, 0x14 @@ -687471,7 +687471,7 @@ sub_81722CC: ; 81722CC add r0, r8 lsls r0, 3 str r0, [sp, 0x10] -@08172312: +_08172312: ldr r0, =gUnknown_085E51F0 ldr r2, [sp, 0x10] adds r0, r2, r0 @@ -687482,7 +687482,7 @@ sub_81722CC: ; 81722CC lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @08172376 + beq _08172376 bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -687519,12 +687519,12 @@ sub_81722CC: ; 81722CC 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 @@ -687532,7 +687532,7 @@ sub_81722CC: ; 81722CC movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @0817239E + bne _0817239E ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -687540,7 +687540,7 @@ sub_81722CC: ; 81722CC adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@0817239E: +_0817239E: mov r0, r9 bl remove_task add sp, 0x14 @@ -687574,12 +687574,12 @@ 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 .pool -@08172404: +_08172404: ldrh r0, [r3, 0x26] lsls r0, 24 lsrs r0, 24 @@ -687602,7 +687602,7 @@ sub_81723D4: ; 81723D4 ldr r1, =gUnknown_085E51B4 adds r0, r1 mov r10, r0 -@08172430: +_08172430: ldr r0, =gUnknown_085E51F0 ldr r4, [sp, 0x10] adds r0, r4, r0 @@ -687613,7 +687613,7 @@ sub_81723D4: ; 81723D4 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @0817248C + beq _0817248C bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -687646,12 +687646,12 @@ sub_81723D4: ; 81723D4 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 @@ -687665,7 +687665,7 @@ sub_81723D4: ; 81723D4 lsls r0, 16 asrs r2, r0, 16 cmp r2, 0x2 - bne @081724D6 + bne _081724D6 ldr r0, =0x030022c0 ldr r4, =0x00000439 adds r0, r4 @@ -687673,7 +687673,7 @@ sub_81723D4: ; 81723D4 adds r0, r2, 0 ands r0, r1 cmp r0, 0 - bne @081724D0 + bne _081724D0 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -687681,10 +687681,10 @@ sub_81723D4: ; 81723D4 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 @@ -687732,10 +687732,10 @@ 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 @@ -687778,7 +687778,7 @@ sub_8172560: ; 8172560 ldr r0, =gUnknown_085E51B4 adds r1, r0 mov r10, r1 -@081725A6: +_081725A6: ldr r0, =gUnknown_085E51F0 ldr r1, [sp, 0x10] adds r0, r1, r0 @@ -687789,7 +687789,7 @@ sub_8172560: ; 8172560 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @081725FE + beq _081725FE bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -687820,12 +687820,12 @@ sub_8172560: ; 8172560 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 @@ -687833,7 +687833,7 @@ sub_8172560: ; 8172560 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @08172626 + bne _08172626 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -687841,7 +687841,7 @@ sub_8172560: ; 8172560 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@08172626: +_08172626: mov r0, r9 bl remove_task add sp, 0x14 @@ -687894,10 +687894,10 @@ 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 @@ -687939,12 +687939,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, =gUnknown_085E51F0 ldr r3, [sp, 0x14] adds r0, r3, r0 @@ -687955,7 +687955,7 @@ sub_81726BC: ; 81726BC lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @08172790 + beq _08172790 bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -687988,30 +687988,30 @@ sub_81726BC: ; 81726BC 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 .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 @@ -688019,7 +688019,7 @@ sub_81726BC: ; 81726BC movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @081727C4 + bne _081727C4 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -688027,7 +688027,7 @@ sub_81726BC: ; 81726BC adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@081727C4: +_081727C4: ldr r0, [sp] bl remove_task add sp, 0x18 @@ -688078,7 +688078,7 @@ sub_81727E8: ; 81727E8 ldr r0, =gUnknown_085E51B4 adds r1, r0 mov r10, r1 -@0817282E: +_0817282E: ldr r0, =gUnknown_085E51F0 ldr r1, [sp, 0x10] adds r0, r1, r0 @@ -688089,7 +688089,7 @@ sub_81727E8: ; 81727E8 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x40 - beq @08172880 + beq _08172880 bl sub_8171E20 lsls r4, r6, 4 adds r4, r6 @@ -688117,12 +688117,12 @@ sub_81727E8: ; 81727E8 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 @@ -688130,7 +688130,7 @@ sub_81727E8: ; 81727E8 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @081728A8 + bne _081728A8 ldr r0, =0x02020630 lsls r1, r6, 4 adds r1, r6 @@ -688138,7 +688138,7 @@ sub_81727E8: ; 81727E8 adds r1, r0 movs r0, 0x1 strh r0, [r1, 0x3C] -@081728A8: +_081728A8: mov r0, r9 bl remove_task add sp, 0x14 @@ -688193,10 +688193,10 @@ 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 @@ -688213,16 +688213,16 @@ 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 RemoveObjectAndFreeResources - b @081729E2 + b _081729E2 .pool -@08172970: +_08172970: ldr r2, =0x020244d0 ldr r0, [r2] ldr r1, [r0, 0x8] @@ -688233,30 +688233,30 @@ sub_8172944: ; 8172944 ldr r0, [r0, 0x8] ldrb r0, [r0, 0xA] cmp r0, 0 - bne @081729DC + bne _081729DC movs r4, 0 ldr r5, =gUnknown_085E51C0 - b @08172998 + b _08172998 .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, =gUnknown_085E5094 ldr r4, =gUnknown_085E50F4 -@081729B4: +_081729B4: ldrh r0, [r5, 0x6] bl FreeObjectTilesByTag ldrh r0, [r4, 0x4] @@ -688265,16 +688265,16 @@ sub_8172944: ; 8172944 adds r4, 0x8 adds r6, 0x1 cmp r6, 0xB - ble @081729B4 -@081729CA: + ble _081729B4 +_081729CA: adds r0, r7, 0 bl RemoveObjectAndFreeTiles - b @081729E2 + b _081729E2 .pool -@081729DC: +_081729DC: adds r0, r7, 0 bl RemoveObjectAndFreeTiles -@081729E2: +_081729E2: pop {r4-r7} pop {r0} bx r0 @@ -688314,7 +688314,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 @@ -688329,9 +688329,9 @@ sub_81729E8: ; 81729E8 bl pal_fade_1 movs r0, 0x1 strh r0, [r5, 0xA] - b @08172A7E + b _08172A7E .pool -@08172A58: +_08172A58: lsls r0, r6, 20 movs r1, 0x80 lsls r1, 17 @@ -688350,7 +688350,7 @@ sub_81729E8: ; 81729E8 strh r0, [r5, 0xA] ldr r0, =sub_8172B40 str r0, [r5] -@08172A7E: +_08172A7E: ldr r0, =0x00007fff str r0, [sp] mov r0, r9 @@ -688387,7 +688387,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 @@ -688409,15 +688409,15 @@ sub_8172AB0: ; 8172AB0 ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] - b @08172B30 + b _08172B30 .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 @@ -688430,7 +688430,7 @@ sub_8172AB0: ; 8172AB0 bl pal_fade_maybe adds r0, r5, 0 bl remove_task -@08172B30: +_08172B30: add sp, 0x4 pop {r4,r5} pop {r0} @@ -688449,7 +688449,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 @@ -688467,7 +688467,7 @@ sub_8172B40: ; 8172B40 bl pal_fade_maybe ldr r0, =sub_8172B90 str r0, [r4] -@08172B78: +_08172B78: add sp, 0x4 pop {r4} pop {r0} @@ -688491,7 +688491,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 @@ -688513,12 +688513,12 @@ sub_8172B90: ; 8172B90 ldrh r0, [r4, 0xC] adds r0, 0x1 strh r0, [r4, 0xC] - b @08172BEA + b _08172BEA .pool -@08172BE4: +_08172BE4: adds r0, r2, 0 bl remove_task -@08172BEA: +_08172BEA: pop {r4} pop {r0} bx r0 @@ -688546,18 +688546,18 @@ 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 .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] @@ -688571,7 +688571,7 @@ sub_8172BF0: ; 8172BF0 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 @@ -688584,9 +688584,9 @@ sub_8172BF0: ; 8172BF0 adds r0, r4 strh r0, [r1, 0x24] adds r4, r3, 0 - b @08172C90 + b _08172C90 .pool -@08172C78: +_08172C78: ldr r3, =0x02020630 lsls r4, r6, 4 adds r2, r4, r6 @@ -688599,7 +688599,7 @@ sub_8172BF0: ; 8172BF0 subs r0, r1 strh r0, [r2, 0x24] adds r2, r3, 0 -@08172C90: +_08172C90: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -688619,13 +688619,13 @@ sub_8172BF0: ; 8172BF0 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 .pool -@08172CC8: +_08172CC8: ldrb r1, [r5, 0x1E] adds r0, r2, 0 adds r2, r6, 0 @@ -688633,8 +688633,8 @@ sub_8172BF0: ; 8172BF0 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 @@ -688645,7 +688645,7 @@ sub_8172BF0: ; 8172BF0 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 @@ -688658,9 +688658,9 @@ sub_8172BF0: ; 8172BF0 subs r0, r1 strh r0, [r2, 0x24] adds r4, r3, 0 - b @08172D28 + b _08172D28 .pool -@08172D10: +_08172D10: ldr r0, =0x02020630 lsls r2, r6, 4 adds r1, r2, r6 @@ -688673,7 +688673,7 @@ sub_8172BF0: ; 8172BF0 adds r0, r3 strh r0, [r1, 0x24] adds r4, r2, 0 -@08172D28: +_08172D28: ldr r1, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -688687,7 +688687,7 @@ sub_8172BF0: ; 8172BF0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq @08172D68 + beq _08172D68 ldr r0, =0x02020630 adds r1, r4, r6 lsls r1, 2 @@ -688695,12 +688695,12 @@ sub_8172BF0: ; 8172BF0 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 .pool -@08172D68: +_08172D68: ldr r0, =0x02020630 adds r1, r4, r6 lsls r1, 2 @@ -688708,18 +688708,18 @@ sub_8172BF0: ; 8172BF0 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} @@ -688741,35 +688741,35 @@ 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 .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 SetGpuReg - b @08172DF0 + b _08172DF0 .pool -@08172DE8: +_08172DE8: ldr r1, =0x00003f44 movs r0, 0x50 bl SetGpuReg -@08172DF0: +_08172DF0: movs r0, 0x52 movs r1, 0x10 bl SetGpuReg @@ -688781,16 +688781,16 @@ sub_8172D98: ; 8172D98 ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b @08172E84 + b _08172E84 .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] @@ -688807,12 +688807,12 @@ sub_8172D98: ; 8172D98 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] @@ -688837,7 +688837,7 @@ sub_8172D98: ; 8172D98 bl sub_805E974 adds r0, r5, 0 bl move_anim_task_del -@08172E84: +_08172E84: pop {r4,r5} pop {r0} bx r0 @@ -688915,7 +688915,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 @@ -688925,24 +688925,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 GetObjectTileRangeStartByTag lsls r0, 16 lsrs r0, 16 cmp r0, r7 - bne @08172F6E + bne _08172F6E ldr r0, =gUnknown_0852528C bl LoadCompressedObjectPicUsingHeap ldr r0, =gUnknown_08525B94 bl LoadCompressedObjectPaletteUsingHeap -@08172F6E: +_08172F6E: ldr r5, =sub_8172FEC adds r0, r5, 0 movs r1, 0xA @@ -688970,9 +688970,9 @@ sub_8172EF0: ; 8172EF0 strh r4, [r2, 0xA] movs r0, 0x1 strh r0, [r1, 0xA] - b @08172FDE + b _08172FDE .pool -@08172FC8: +_08172FC8: ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0, 0x4] @@ -688984,7 +688984,7 @@ sub_8172EF0: ; 8172EF0 movs r2, 0x1 orrs r1, r2 strb r1, [r0, 0x1] -@08172FDE: +_08172FDE: pop {r3} mov r8, r3 pop {r4-r7} @@ -689010,20 +689010,20 @@ 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 .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] @@ -689032,9 +689032,9 @@ sub_8172FEC: ; 8172FEC 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 @@ -689049,20 +689049,20 @@ sub_8172FEC: ; 8172FEC movs r1, 0x1E ldrsh r0, [r4, r1] cmp r0, 0 - bne @08173074 + bne _08173074 ldr r0, =gUnknown_085CE388 adds r1, r5, 0 movs r3, 0x5 bl AddObjectToFront lsls r0, 24 lsrs r5, r0, 24 - b @081730D6 + b _081730D6 .pool -@08173074: +_08173074: cmp r0, 0 - blt @081730A8 + blt _081730A8 cmp r0, 0x3 - bgt @081730A8 + bgt _081730A8 ldr r0, =gUnknown_085CE3A0 adds r1, r5, 0 movs r3, 0x5 @@ -689078,9 +689078,9 @@ sub_8172FEC: ; 8172FEC lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x4 - b @081730C8 + b _081730C8 .pool -@081730A8: +_081730A8: ldr r0, =gUnknown_085CE3A0 adds r1, r5, 0 movs r3, 0x5 @@ -689096,7 +689096,7 @@ sub_8172FEC: ; 8172FEC lsls r1, r3, 22 lsrs r1, 22 adds r1, 0x5 -@081730C8: +_081730C8: ldr r4, =0x000003ff adds r0, r4, 0 ands r1, r0 @@ -689104,7 +689104,7 @@ sub_8172FEC: ; 8172FEC ands r0, r3 orrs r0, r1 strh r0, [r2, 0x4] -@081730D6: +_081730D6: ldr r2, =0x03005e00 lsls r1, r7, 2 adds r0, r1, r7 @@ -689114,7 +689114,7 @@ sub_8172FEC: ; 8172FEC 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 @@ -689124,9 +689124,9 @@ sub_8172FEC: ; 8172FEC ldr r1, =sub_81731FC str r1, [r0] adds r4, r2, 0 - b @08173160 + b _08173160 .pool -@08173118: +_08173118: ldr r3, =0x02020630 lsls r4, r5, 4 adds r1, r4, r5 @@ -689149,20 +689149,20 @@ sub_8172FEC: ; 8172FEC 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 @@ -689177,18 +689177,18 @@ sub_8172FEC: ; 8172FEC 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 str r0, [r1] -@08173190: +_08173190: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -689212,11 +689212,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] @@ -689229,10 +689229,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 .pool @@ -689258,7 +689258,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] @@ -689273,7 +689273,7 @@ sub_81731FC: ; 81731FC bl obj_free_rotscale_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@08173246: +_08173246: pop {r4} pop {r0} bx r0 @@ -689288,11 +689288,11 @@ sub_8173250: ; 8173250 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] @@ -689309,7 +689309,7 @@ sub_8173250: ; 8173250 lsls r1, 16 asrs r1, 16 cmp r1, 0x20 - ble @081732A6 + ble _081732A6 ldr r2, =0x03005e00 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -689324,7 +689324,7 @@ sub_8173250: ; 8173250 bl obj_free_rotscale_entry adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@081732A6: +_081732A6: pop {r4} pop {r0} bx r0 @@ -689443,10 +689443,10 @@ sub_817339C: ; 817339C adds r0, 0x2B ldrb r0, [r0] cmp r0, 0x1 - bne @081733C0 + bne _081733C0 ldr r0, =sub_81733D4 str r0, [r3, 0x1C] -@081733C0: +_081733C0: pop {r0} bx r0 .pool @@ -689459,7 +689459,7 @@ sub_81733D4: ; 81733D4 bl sub_80A6900 lsls r0, 24 cmp r0, 0 - beq @081733F6 + beq _081733F6 movs r0, 0 strh r0, [r4, 0x2E] adds r2, r4, 0 @@ -689470,7 +689470,7 @@ sub_81733D4: ; 81733D4 strb r0, [r2] ldr r0, =sub_8173400 str r0, [r4, 0x1C] -@081733F6: +_081733F6: pop {r4} pop {r0} bx r0 @@ -689495,13 +689495,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] @@ -689513,7 +689513,7 @@ sub_8173400: ; 8173400 bl StartObjectImageAnim adds r0, r4, 0 bl move_anim_8072740 -@08173448: +_08173448: pop {r4,r5} pop {r0} bx r0 @@ -689529,30 +689529,30 @@ 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 .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 .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} @@ -689571,38 +689571,38 @@ 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 .pool -@081734D4: +_081734D4: cmp r1, 0xFA - bne @081734E4 + bne _081734E4 ldr r1, =0x0203841e movs r0, 0x2 - b @0817350C + b _0817350C .pool -@081734E4: +_081734E4: cmp r1, 0x80 - bne @081734F4 + bne _081734F4 ldr r1, =0x0203841e movs r0, 0x3 - b @0817350C + b _0817350C .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 .pool -@08173508: +_08173508: ldr r1, =0x0203841e movs r0, 0 -@0817350C: +_0817350C: strh r0, [r1] adds r0, r2, 0 bl move_anim_task_del @@ -689665,23 +689665,23 @@ 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 .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 @@ -689695,12 +689695,12 @@ sub_817357C: ; 817357C adds r0, r1 movs r1, 0x1 strb r1, [r0] - b @08173688 + b _08173688 .pool -@081735E8: +_081735E8: bl sub_8174F70 - b @08173642 -@081735EE: + b _08173642 +_081735EE: ldr r1, =0x00003f42 movs r0, 0x50 bl SetGpuReg @@ -689716,14 +689716,14 @@ sub_817357C: ; 817357C ldr r1, [r0] movs r0, 0 strh r0, [r1] - b @08173642 + b _08173642 .pool -@08173620: +_08173620: bl sub_8175024 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @08173688 + bne _08173688 ldr r0, =sub_817354C bl SetVBlankCallback movs r0, 0x1 @@ -689733,7 +689733,7 @@ sub_817357C: ; 817357C movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@08173642: +_08173642: ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 @@ -689741,27 +689741,27 @@ sub_817357C: ; 817357C ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08173688 + b _08173688 .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 bl SetMainCallback2 movs r0, 0xDA lsls r0, 1 bl song_play_for_text movs r0, 0 - b @0817368A + b _0817368A .pool -@08173688: +_08173688: movs r0, 0x1 -@0817368A: +_0817368A: add sp, 0x4 pop {r4} pop {r1} @@ -689775,7 +689775,7 @@ sub_8173694: ; 8173694 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0 - bne @081736C4 + bne _081736C4 ldr r0, =sub_817371C movs r1, 0 bl AddTask @@ -689791,7 +689791,7 @@ sub_8173694: ; 8173694 movs r0, 0x78 bl AllocZeroed str r0, [r4] -@081736C4: +_081736C4: pop {r4} pop {r0} bx r0 @@ -689804,7 +689804,7 @@ sub_81736D8: ; 81736D8 bl sub_817357C lsls r0, 24 cmp r0, 0 - bne @08173708 + bne _08173708 ldr r0, =sub_817371C movs r1, 0 bl AddTask @@ -689821,7 +689821,7 @@ sub_81736D8: ; 81736D8 movs r0, 0x78 bl AllocZeroed str r0, [r4] -@08173708: +_08173708: pop {r4} pop {r0} bx r0 @@ -689848,7 +689848,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 @@ -689859,7 +689859,7 @@ sub_817371C: ; 817371C bl pokemon_getattr adds r5, r0, 0 cmp r5, 0 - beq @0817380C + beq _0817380C adds r0, r6, 0 movs r1, 0x41 bl pokemon_getattr @@ -689912,7 +689912,7 @@ sub_817371C: ; 817371C mov r6, r8 lsls r5, r6, 2 ldr r3, =0x0203bcd8 -@081737CA: +_081737CA: ldr r0, [r3] adds r1, r2, r4 adds r0, 0xA @@ -689925,7 +689925,7 @@ sub_817371C: ; 817371C lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x9 - bls @081737CA + bls _081737CA ldr r0, =0x03005e00 mov r2, r8 adds r1, r5, r2 @@ -689934,9 +689934,9 @@ sub_817371C: ; 817371C ldrh r0, [r1, 0xC] adds r0, 0x1 strh r0, [r1, 0xC] - b @08173840 + b _08173840 .pool -@0817380C: +_0817380C: mov r6, r9 ldr r3, [r6] lsls r2, r7, 2 @@ -689963,14 +689963,14 @@ sub_817371C: ; 817371C 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] @@ -689986,7 +689986,7 @@ sub_817371C: ; 817371C adds r3, r4, 0 adds r3, 0x8 movs r2, 0xFF -@0817386A: +_0817386A: adds r0, r7, 0x5 lsls r0, 1 adds r0, r1 @@ -689996,7 +689996,7 @@ sub_817371C: ; 817371C lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x5 - bls @0817386A + bls _0817386A mov r1, r8 adds r0, r5, r1 lsls r0, 3 @@ -690004,13 +690004,13 @@ sub_817371C: ; 817371C movs r2, 0x8 ldrsh r0, [r1, r2] cmp r0, 0 - beq @081738A4 + beq _081738A4 ldr r0, =sub_8173A8C - b @081738A6 + b _081738A6 .pool -@081738A4: +_081738A4: ldr r0, =sub_81738BC -@081738A6: +_081738A6: str r0, [r1] add sp, 0xC pop {r3,r4} @@ -690036,27 +690036,27 @@ 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 .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 @@ -690066,29 +690066,29 @@ sub_81738BC: ; 81738BC 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 @@ -690099,8 +690099,8 @@ sub_81738BC: ; 81738BC 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 @@ -690155,11 +690155,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 UnsetBgTilemap movs r0, 0x3 @@ -690168,24 +690168,24 @@ 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 .pool -@08173A34: +_08173A34: movs r0, 0x37 bl audio_play ldr r1, =0x03005e00 @@ -690197,7 +690197,7 @@ sub_81739C4: ; 81739C4 str r1, [r0] movs r1, 0x20 strh r1, [r0, 0xE] -@08173A4C: +_08173A4C: pop {r4,r5} pop {r0} bx r0 @@ -690218,15 +690218,15 @@ 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 .pool -@08173A80: +_08173A80: ldr r0, =sub_8173A8C str r0, [r1] -@08173A84: +_08173A84: pop {r0} bx r0 .pool @@ -690273,13 +690273,13 @@ sub_8173AA8: ; 8173AA8 movs r2, 0xC ldrsh r0, [r1, r2] cmp r0, 0x3 - ble @08173AEC + ble _08173AEC ldr r1, =gUnknown_085E53B4 - b @08173AEE + b _08173AEE .pool -@08173AEC: +_08173AEC: ldr r1, =gUnknown_085E53E4 -@08173AEE: +_08173AEE: lsls r2, r6, 3 adds r0, r2, r1 ldrh r3, [r0] @@ -690299,13 +690299,13 @@ sub_8173AA8: ; 8173AA8 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] @@ -690405,7 +690405,7 @@ sub_8173BC0: ; 8173BC0 ldr r1, [r3, 0x1C] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08173C1A + bne _08173C1A ldrb r1, [r3, 0x1] movs r0, 0x4 negs r0, r0 @@ -690419,7 +690419,7 @@ sub_8173BC0: ; 8173BC0 strh r0, [r5, 0xE] ldr r0, =sub_8173C34 str r0, [r5] -@08173C1A: +_08173C1A: pop {r4,r5} pop {r0} bx r0 @@ -690453,12 +690453,12 @@ 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 .pool -@08173C78: +_08173C78: ldr r2, =0x0203bcd4 ldr r0, =0x02020630 mov r8, r0 @@ -690486,13 +690486,13 @@ sub_8173C34: ; 8173C34 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 @@ -690517,16 +690517,16 @@ sub_8173C34: ; 8173C34 strb r1, [r0, 0x5] ldr r0, =sub_8173AA8 str r0, [r4] - b @08173D10 + b _08173D10 .pool -@08173D04: +_08173D04: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 add r0, r12 ldr r1, =sub_8173D24 str r1, [r0] -@08173D10: +_08173D10: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -690561,7 +690561,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 @@ -690570,7 +690570,7 @@ sub_8173D24: ; 8173D24 movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0xFF - beq @08173D74 + beq _08173D74 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -690579,12 +690579,12 @@ sub_8173D24: ; 8173D24 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 @@ -690628,21 +690628,21 @@ 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 .pool -@08173E04: +_08173E04: movs r3, 0 mov r9, r4 ldr r0, =0x0203bcd4 @@ -690655,7 +690655,7 @@ sub_8173DC0: ; 8173DC0 negs r1, r1 mov r12, r1 movs r5, 0x4 -@08173E1C: +_08173E1C: adds r0, r3, 0x5 lsls r0, 1 adds r0, r4 @@ -690664,7 +690664,7 @@ sub_8173DC0: ; 8173DC0 movs r2, 0 ldrsh r0, [r1, r2] cmp r0, 0xFF - beq @08173E40 + beq _08173E40 lsls r1, r0, 4 adds r1, r0 lsls r1, 2 @@ -690674,12 +690674,12 @@ sub_8173DC0: ; 8173DC0 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 @@ -690703,7 +690703,7 @@ sub_8173DC0: ; 8173DC0 strh r1, [r0, 0xE] ldr r1, =sub_8173EA4 str r1, [r0] -@08173E7E: +_08173E7E: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -690729,12 +690729,12 @@ sub_8173EA4: ; 8173EA4 movs r3, 0xE ldrsh r0, [r1, r3] cmp r0, 0xF - ble @08173ECC + ble _08173ECC ldr r0, =sub_8173EE4 str r0, [r1] - b @08173EDE + b _08173EDE .pool -@08173ECC: +_08173ECC: adds r0, r2, 0x1 strh r0, [r1, 0xE] movs r0, 0xE @@ -690743,7 +690743,7 @@ sub_8173EA4: ; 8173EA4 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@08173EDE: +_08173EDE: pop {r0} bx r0 thumb_func_end sub_8173EA4 @@ -690826,12 +690826,12 @@ 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 .pool -@08173FAC: +_08173FAC: ldr r2, =0x02020630 movs r3, 0x10 ldrsh r1, [r4, r3] @@ -690843,12 +690843,12 @@ sub_8173F84: ; 8173F84 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 .pool -@08173FD0: +_08173FD0: movs r0, 0x20 str r0, [sp] str r0, [sp, 0x4] @@ -690880,7 +690880,7 @@ sub_8173F84: ; 8173F84 bl CopyWindowToVram ldr r0, =sub_8174028 str r0, [r4] -@08174018: +_08174018: add sp, 0x10 pop {r4,r5} pop {r0} @@ -690898,7 +690898,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 @@ -690908,7 +690908,7 @@ sub_8174028: ; 8174028 adds r1, r0 ldr r0, =sub_8174060 str r0, [r1] -@0817404E: +_0817404E: pop {r4} pop {r0} bx r0 @@ -690962,7 +690962,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 @@ -690973,10 +690973,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 @@ -690987,11 +690987,11 @@ sub_81740B0: ; 81740B0 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 @@ -691017,21 +691017,21 @@ sub_81740B0: ; 81740B0 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 @@ -691060,22 +691060,22 @@ 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 .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 @@ -691089,17 +691089,17 @@ sub_8174194: ; 8174194 adds r0, r2 movs r1, 0x1 strb r1, [r0] - b @08174308 + b _08174308 .pool -@08174200: +_08174200: bl sub_8174F70 ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @081742A2 + b _081742A2 .pool -@08174214: +_08174214: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -691114,13 +691114,13 @@ sub_8174194: ; 8174194 movs r4, 0x87 lsls r4, 3 adds r1, r4 - b @081742A2 + b _081742A2 .pool -@08174240: +_08174240: bl sub_8175024 lsls r0, 24 cmp r0, 0 - bne @08174308 + bne _08174308 ldr r1, =0x0201c000 ldr r0, =gUnknown_085E56D4 ldm r0!, {r2-r4} @@ -691137,9 +691137,9 @@ sub_8174194: ; 8174194 movs r4, 0x87 lsls r4, 3 adds r1, r4 - b @081742A2 + b _081742A2 .pool -@08174280: +_08174280: bl run_active_tasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad @@ -691147,18 +691147,18 @@ sub_8174194: ; 8174194 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 .pool -@081742B0: +_081742B0: ldr r1, =0x00003f42 movs r0, 0x50 bl SetGpuReg @@ -691180,7 +691180,7 @@ sub_8174194: ; 8174194 lsls r1, 3 ldr r4, =0x03005e08 movs r3, 0xFF -@081742E2: +_081742E2: adds r0, r2, 0x5 lsls r0, 1 adds r0, r1 @@ -691190,7 +691190,7 @@ sub_8174194: ; 8174194 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls @081742E2 + bls _081742E2 ldr r4, =0x0203bcd8 movs r0, 0x80 lsls r0, 6 @@ -691198,7 +691198,7 @@ sub_8174194: ; 8174194 str r0, [r4] ldr r0, =sub_8173560 bl SetMainCallback2 -@08174308: +_08174308: pop {r4} pop {r0} bx r0 @@ -691223,16 +691223,16 @@ 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 - b @081743DA + b _081743DA .pool -@08174364: +_08174364: ldr r0, =0x0201c000 ldr r4, =0x0203bcd8 ldr r1, [r4] @@ -691247,36 +691247,36 @@ sub_8174324: ; 8174324 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 .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 @@ -691286,7 +691286,7 @@ sub_8174324: ; 8174324 adds r1, r2 strh r0, [r1, 0xA] ldr r0, =sub_81743EC -@081743DA: +_081743DA: str r0, [r1] add sp, 0x4 pop {r4-r6} @@ -691320,16 +691320,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] @@ -691344,22 +691344,22 @@ sub_81743EC: ; 81743EC 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 @@ -691371,18 +691371,18 @@ sub_81743EC: ; 81743EC 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, =gUnknown_085E53B4 adds r0, 0x4 @@ -691391,9 +691391,9 @@ sub_81743EC: ; 81743EC ldr r0, =gUnknown_085E53BA adds r1, r0 ldrh r4, [r1] - b @081744C8 + b _081744C8 .pool -@081744B8: +_081744B8: ldr r0, =gUnknown_085E53E4 lsls r2, r5, 3 adds r1, r0, 0x4 @@ -691402,19 +691402,19 @@ sub_81743EC: ; 81743EC 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] @@ -691453,9 +691453,9 @@ sub_81743EC: ; 81743EC ldr r2, =0x03005e08 adds r1, r2 strh r0, [r1] - b @0817454E + b _0817454E .pool -@08174540: +_08174540: adds r0, r5, 0x5 lsls r0, 1 add r0, r9 @@ -691463,13 +691463,13 @@ sub_81743EC: ; 81743EC 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 @@ -691492,7 +691492,7 @@ sub_81743EC: ; 81743EC movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - bgt @081745C0 + bgt _081745C0 ldr r1, =gUnknown_085E8574 movs r0, 0x1 str r0, [sp] @@ -691500,9 +691500,9 @@ sub_81743EC: ; 81743EC movs r2, 0 movs r3, 0 bl sub_8198204 - b @081745D0 + b _081745D0 .pool -@081745C0: +_081745C0: ldr r1, =gUnknown_085E855C movs r0, 0x1 str r0, [sp] @@ -691510,7 +691510,7 @@ sub_81743EC: ; 81743EC movs r2, 0 movs r3, 0 bl sub_8198204 -@081745D0: +_081745D0: ldr r0, =0x03005e00 ldr r1, [sp, 0x14] add r1, r8 @@ -691549,16 +691549,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 @@ -691572,14 +691572,14 @@ sub_81745FC: ; 81745FC 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 @@ -691590,12 +691590,12 @@ sub_81745FC: ; 81745FC 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 @@ -691642,14 +691642,14 @@ sub_81745FC: ; 81745FC 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 @@ -691680,7 +691680,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 @@ -691693,7 +691693,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 @@ -691701,7 +691701,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 @@ -691709,16 +691709,16 @@ sub_8174728: ; 8174728 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 @@ -691728,46 +691728,46 @@ sub_8174728: ; 8174728 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 str r0, [r1] - b @08174884 + b _08174884 .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 str r0, [r4] - b @08174884 + b _08174884 .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 @@ -691775,13 +691775,13 @@ sub_8174728: ; 8174728 adds r1, r0 ldr r0, =sub_8174898 str r0, [r1] - b @08174884 + b _08174884 .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 @@ -691791,19 +691791,19 @@ sub_8174728: ; 8174728 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 str r0, [r1] - b @08174884 + b _08174884 .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 @@ -691815,13 +691815,13 @@ sub_8174728: ; 8174728 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 str r0, [r2] -@08174884: +_08174884: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -691875,14 +691875,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 @@ -691890,16 +691890,16 @@ sub_81748F0: ; 81748F0 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 HideBg movs r0, 0x1 @@ -691919,21 +691919,21 @@ sub_81748F0: ; 81748F0 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} @@ -691996,7 +691996,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 @@ -692004,7 +692004,7 @@ sub_8174A08: ; 8174A08 adds r1, r0 ldr r0, =sub_8174898 str r0, [r1] -@08174A28: +_08174A28: pop {r0} bx r0 .pool @@ -692061,7 +692061,7 @@ sub_8174A88: ; 8174A88 movs r0, 0xCE lsls r0, 1 cmp r1, r0 - beq @08174B30 + beq _08174B30 ldr r1, =gUnknown_085E8C36 add r0, sp, 0xC bl CopyString @@ -692074,7 +692074,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 @@ -692094,15 +692094,15 @@ sub_8174A88: ; 8174A88 movs r1, 0xA bl __modsi3 subs r0, 0x5F - b @08174B0E + b _08174B0E .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 @@ -692119,7 +692119,7 @@ sub_8174A88: ; 8174A88 movs r2, 0x10 movs r3, 0x1 bl box_print -@08174B30: +_08174B30: adds r1, r7, 0 adds r1, 0xA add r0, sp, 0xC @@ -692135,7 +692135,7 @@ sub_8174A88: ; 8174A88 movs r1, 0xCE lsls r1, 1 cmp r0, r1 - bne @08174B8C + bne _08174B8C movs r0, 0x1 add r1, sp, 0xC movs r2, 0xD0 @@ -692156,9 +692156,9 @@ sub_8174A88: ; 8174A88 movs r0, 0 movs r1, 0x3 bl CopyWindowToVram - b @08174C82 + b _08174C82 .pool -@08174B8C: +_08174B8C: movs r0, 0x1 add r1, sp, 0xC movs r2, 0x80 @@ -692194,9 +692194,9 @@ sub_8174A88: ; 8174A88 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] @@ -692204,20 +692204,20 @@ sub_8174A88: ; 8174A88 lsls r0, 24 lsrs r0, 24 cmp r0, 0 - beq @08174C00 + beq _08174C00 cmp r0, 0xFE - beq @08174C04 - b @08174C0A + beq _08174C04 + b _08174C0A .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, =gUnknown_085E5388 @@ -692270,7 +692270,7 @@ sub_8174A88: ; 8174A88 movs r0, 0 movs r1, 0x3 bl CopyWindowToVram -@08174C82: +_08174C82: add sp, 0x2C pop {r4-r7} pop {r0} @@ -692449,20 +692449,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] @@ -692538,7 +692538,7 @@ sub_8174EC4: ; 8174EC4 movs r0, 0x81 lsls r0, 24 mov r12, r0 -@08174EEA: +_08174EEA: strh r6, [r2] mov r0, sp str r0, [r1] @@ -692548,7 +692548,7 @@ sub_8174EC4: ; 8174EC4 adds r3, r5 subs r4, r5 cmp r4, r5 - bhi @08174EEA + bhi _08174EEA strh r6, [r2] mov r2, sp str r2, [r1] @@ -692678,21 +692678,21 @@ sub_8175024: ; 8175024 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 .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, =gUnknown_085E5508 movs r0, 0 str r0, [sp] @@ -692700,15 +692700,15 @@ sub_8175024: ; 8175024 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @08175108 + b _08175108 .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 @@ -692745,12 +692745,12 @@ sub_8175024: ; 8175024 bl CopyBgTilemapBufferToVram movs r0, 0x3 bl CopyBgTilemapBufferToVram - 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 @@ -692765,17 +692765,17 @@ sub_8175024: ; 8175024 ldr r1, [r0] movs r0, 0 strh r0, [r1] - b @08175114 + b _08175114 .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} @@ -692790,67 +692790,67 @@ sub_8175120: ; 8175120 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 @@ -692864,11 +692864,11 @@ sub_81751A4: ; 81751A4 movs r2, 0x26 ldrsh r0, [r5, r2] cmp r0, 0x78 - ble @081751BA + ble _081751BA adds r0, r5, 0 bl RemoveObjectAndFreeTiles - b @081751F2 -@081751BA: + b _081751F2 +_081751BA: adds r0, r1, 0x1 ldrh r1, [r5, 0x30] adds r0, r1 @@ -692889,15 +692889,15 @@ sub_81751A4: ; 81751A4 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 @@ -692951,13 +692951,13 @@ sub_81751FC: ; 81751FC movs r1, 0x3 ands r1, r0 cmp r1, 0 - beq @08175274 + beq _08175274 movs r0, 0 - b @08175276 + b _08175276 .pool -@08175274: +_08175274: movs r0, 0x1 -@08175276: +_08175276: strh r0, [r4, 0x30] movs r0, 0 pop {r4} @@ -692977,7 +692977,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 @@ -692987,7 +692987,7 @@ sub_8175280: ; 8175280 strh r1, [r0, 0xA] ldr r0, =0x020375e2 strh r2, [r0] -@081752AA: +_081752AA: pop {r4} pop {r0} bx r0 @@ -693002,9 +693002,9 @@ sub_81752C0: ; 81752C0 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 @@ -693025,7 +693025,7 @@ sub_81752F4: ; 81752F4 movs r2, 0xE ldrsh r0, [r5, r2] cmp r0, 0x6E - ble @08175324 + ble _08175324 ldr r2, =0x03005e00 movs r0, 0x28 ldrsh r1, [r5, r0] @@ -693038,9 +693038,9 @@ sub_81752F4: ; 81752F4 strh r1, [r0, 0x26] ldrb r0, [r5, 0x16] bl sub_81525D0 - b @08175358 + b _08175358 .pool -@08175324: +_08175324: adds r0, r1, 0x1 ldrh r1, [r5, 0x1C] adds r0, r1 @@ -693059,15 +693059,15 @@ sub_81752F4: ; 81752F4 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 @@ -693091,24 +693091,24 @@ 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 .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 @@ -693117,7 +693117,7 @@ sub_8175364: ; 8175364 ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] -@081753B8: +_081753B8: ldr r0, =gUnknown_085E5394 bl LoadCompressedObjectPic ldr r0, =gUnknown_085E53A4 @@ -693125,17 +693125,17 @@ sub_8175364: ; 8175364 ldrh r0, [r6] adds r0, 0x1 strh r0, [r6] - b @081754B0 + b _081754B0 .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 @@ -693172,7 +693172,7 @@ sub_8175364: ; 8175364 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0xFF - beq @08175478 + beq _08175478 adds r4, r7, 0 ldr r1, =sub_81752F4 adds r0, r4, 0 @@ -693181,12 +693181,12 @@ sub_8175364: ; 8175364 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 @@ -693194,23 +693194,23 @@ sub_8175364: ; 8175364 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 .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] @@ -693218,7 +693218,7 @@ sub_8175364: ; 8175364 ldr r2, =0x0000ffff adds r0, r2, 0 strh r0, [r1] -@081754B0: +_081754B0: add sp, 0xC pop {r3} mov r8, r3 @@ -693248,11 +693248,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] @@ -693263,14 +693263,14 @@ sub_81754DC: ; 81754DC ldr r1, [r0] ldr r0, =sub_8175774 cmp r1, r0 - bne @08175522 + bne _08175522 bl sub_81754C8 bl run_active_tasks bl CallObjectCallbacks ldr r1, =0x0203bce5 movs r0, 0x1 strb r0, [r1] -@08175522: +_08175522: bl PrepareSpritesForOamLoad bl fade_and_return_progress_probably pop {r0} @@ -693319,9 +693319,9 @@ sub_81755A4: ; 81755A4 movs r0, 0 bl GetBgTilemap cmp r0, 0 - beq @081755B8 + beq _081755B8 bl Free -@081755B8: +_081755B8: pop {r0} bx r0 thumb_func_end sub_81755A4 @@ -693339,17 +693339,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 @@ -693411,13 +693411,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 @@ -693501,7 +693501,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 @@ -693509,7 +693509,7 @@ sub_8175744: ; 8175744 adds r1, r0 ldr r0, =sub_8175774 str r0, [r1] -@08175764: +_08175764: pop {r0} bx r0 .pool @@ -693529,7 +693529,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 @@ -693542,16 +693542,16 @@ sub_8175774: ; 8175774 lsls r0, 1 strh r0, [r4, 0x20] ldr r0, =sub_8175A9C - b @081757FA + b _081757FA .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 @@ -693562,11 +693562,11 @@ sub_8175774: ; 8175774 movs r3, 0x10 bl pal_fade_maybe ldr r0, =sub_8175808 - b @081757FA + b _081757FA .pool -@081757E0: +_081757E0: cmp r0, 0x2 - bne @081757FC + bne _081757FC strh r2, [r4, 0x22] strh r1, [r4, 0x1E] movs r0, 0x1 @@ -693577,9 +693577,9 @@ sub_8175774: ; 8175774 movs r3, 0x10 bl pal_fade_maybe ldr r0, =sub_81758A4 -@081757FA: +_081757FA: str r0, [r4] -@081757FC: +_081757FC: add sp, 0x4 pop {r4} pop {r0} @@ -693597,7 +693597,7 @@ sub_8175808: ; 8175808 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08175836 + bne _08175836 movs r0, 0 movs r1, 0 bl SetGpuReg @@ -693610,7 +693610,7 @@ sub_8175808: ; 8175808 adds r1, r0 ldr r0, =c2_080C9BFC str r0, [r1] -@08175836: +_08175836: pop {r4} pop {r0} bx r0 @@ -693636,7 +693636,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 @@ -693650,7 +693650,7 @@ c2_080C9BFC: ; 8175848 bl SetVBlankCallback ldr r0, =sub_8175744 str r0, [r5] -@08175890: +_08175890: add sp, 0x4 pop {r4,r5} pop {r0} @@ -693668,7 +693668,7 @@ sub_81758A4: ; 81758A4 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081758D2 + bne _081758D2 movs r0, 0 movs r1, 0 bl SetGpuReg @@ -693681,7 +693681,7 @@ sub_81758A4: ; 81758A4 adds r1, r0 ldr r0, =sub_81758E4 str r0, [r1] -@081758D2: +_081758D2: pop {r4} pop {r0} bx r0 @@ -693704,10 +693704,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 ResetAllObjectData bl dp13_810BB8C bl ResetObjectPaletteAllocator @@ -693729,14 +693729,14 @@ sub_81758E4: ; 81758E4 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, =gUnknown_085E701C @@ -693744,26 +693744,26 @@ sub_81758E4: ; 81758E4 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 @@ -693786,9 +693786,9 @@ sub_81758E4: ; 81758E4 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08175A7A + b _08175A7A .pool -@081759F0: +_081759F0: ldr r0, =sub_81760FC movs r1, 0 bl AddTask @@ -693852,7 +693852,7 @@ sub_81758E4: ; 81758E4 strh r5, [r0] ldr r0, =sub_8175744 str r0, [r4] -@08175A7A: +_08175A7A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -693878,12 +693878,12 @@ 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 .pool -@08175AC4: +_08175AC4: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -693893,7 +693893,7 @@ sub_8175A9C: ; 8175A9C bl pal_fade_maybe ldr r0, =sub_8175AE4 str r0, [r4] -@08175AD8: +_08175AD8: add sp, 0x4 pop {r4} pop {r0} @@ -693911,7 +693911,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 @@ -693921,7 +693921,7 @@ sub_8175AE4: ; 8175AE4 adds r1, r0 ldr r0, =sub_8175B1C str r0, [r1] -@08175B0A: +_08175B0A: pop {r4} pop {r0} bx r0 @@ -693993,12 +693993,12 @@ 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 .pool -@08175BB8: +_08175BB8: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -694008,7 +694008,7 @@ sub_8175B90: ; 8175B90 bl pal_fade_maybe ldr r0, =sub_8175BD8 str r0, [r4] -@08175BCC: +_08175BCC: add sp, 0x4 pop {r4} pop {r0} @@ -694029,7 +694029,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 @@ -694051,7 +694051,7 @@ sub_8175BD8: ; 8175BD8 strh r1, [r0, 0x8] ldr r1, =sub_8175C34 str r1, [r0] -@08175C1E: +_08175C1E: add sp, 0x4 pop {r4,r5} pop {r0} @@ -694070,7 +694070,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 @@ -694079,12 +694079,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 @@ -694097,28 +694097,28 @@ sub_8175C34: ; 8175C34 bl pal_fade_maybe ldr r0, =sub_8175CC8 str r0, [r4] - b @08175CB8 + b _08175CB8 .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} @@ -694134,10 +694134,10 @@ sub_8175CC8: ; 8175CC8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08175CDC + bne _08175CDC movs r0, 0xFF bl SoftReset -@08175CDC: +_08175CDC: pop {r0} bx r0 .pool @@ -694237,27 +694237,27 @@ 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 .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 @@ -694265,9 +694265,9 @@ sub_8175DA0: ; 8175DA0 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 @@ -694285,9 +694285,9 @@ sub_8175DA0: ; 8175DA0 strh r2, [r0, 0x24] ldr r0, =0x0203bce0 strh r2, [r0] - b @0817602A + b _0817602A .pool -@08175E40: +_08175E40: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -694296,16 +694296,16 @@ sub_8175DA0: ; 8175DA0 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 @@ -694320,18 +694320,18 @@ sub_8175DA0: ; 8175DA0 ldr r0, =sub_8175774 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, =gUnknown_085E6AF4 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 @@ -694349,7 +694349,7 @@ sub_8175DA0: ; 8175DA0 adds r6, r0 adds r5, 0x1 cmp r5, 0x4 - ble @08175E92 + ble _08175E92 movs r0, 0 movs r1, 0x2 bl CopyWindowToVram @@ -694381,39 +694381,39 @@ sub_8175DA0: ; 8175DA0 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 .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 pal_fade_maybe - b @0817602A + b _0817602A .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 @@ -694423,9 +694423,9 @@ sub_8175DA0: ; 8175DA0 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @0817602A + b _0817602A .pool -@08175F5C: +_08175F5C: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -694434,22 +694434,22 @@ sub_8175DA0: ; 8175DA0 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] @@ -694462,31 +694462,31 @@ sub_8175DA0: ; 8175DA0 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 .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 pal_fade_maybe - b @0817602A + b _0817602A .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 FillWindowPixelBuffer @@ -694500,9 +694500,9 @@ sub_8175DA0: ; 8175DA0 adds r1, r0 movs r0, 0x2 strh r0, [r1, 0x8] - b @0817602A + b _0817602A .pool -@08175FFC: +_08175FFC: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -694523,7 +694523,7 @@ sub_8175DA0: ; 8175DA0 ldr r0, [r4] bl Free str r5, [r4] -@0817602A: +_0817602A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -694545,16 +694545,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 @@ -694562,18 +694562,18 @@ sub_817603C: ; 817603C 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 @@ -694582,18 +694582,18 @@ sub_817603C: ; 817603C 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 @@ -694602,18 +694602,18 @@ sub_817603C: ; 817603C 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 @@ -694622,7 +694622,7 @@ sub_817603C: ; 817603C strh r1, [r0, 0x16] movs r1, 0x1 strh r1, [r0, 0x1E] -@081760DA: +_081760DA: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -694630,13 +694630,13 @@ sub_817603C: ; 817603C movs r1, 0x1E ldrsh r0, [r0, r1] cmp r0, 0 - bne @081760F4 + bne _081760F4 movs r0, 0 - b @081760F6 + b _081760F6 .pool -@081760F4: +_081760F4: movs r0, 0x1 -@081760F6: +_081760F6: pop {r4-r6} pop {r1} bx r1 @@ -694655,26 +694655,26 @@ 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 .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 @@ -694684,21 +694684,21 @@ sub_81760FC: ; 81760FC 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 .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 @@ -694708,7 +694708,7 @@ sub_81760FC: ; 81760FC ldr r1, [r0] ldr r0, =sub_8175774 cmp r1, r0 - bne @08176244 + bne _08176244 adds r0, r3, 0 adds r0, 0x92 ldrh r0, [r0] @@ -694736,7 +694736,7 @@ sub_81760FC: ; 81760FC ldrh r0, [r0] subs r0, 0x1 cmp r3, r0 - bge @081761D8 + bge _081761D8 adds r0, r3, 0x1 strh r0, [r1] ldr r1, =0x02020630 @@ -694745,9 +694745,9 @@ sub_81760FC: ; 81760FC lsls r0, 2 adds r0, r1 movs r1, 0x32 - b @081761EA + b _081761EA .pool -@081761D8: +_081761D8: movs r0, 0 strh r0, [r1] ldr r1, =0x02020630 @@ -694757,7 +694757,7 @@ sub_81760FC: ; 81760FC adds r0, r1 movs r1, 0x80 lsls r1, 2 -@081761EA: +_081761EA: strh r1, [r0, 0x34] ldr r0, =0x0203bce8 ldr r1, [r0] @@ -694769,13 +694769,13 @@ sub_81760FC: ; 81760FC adds r1, 0x90 ldrh r0, [r1] cmp r0, 0x2 - bne @08176210 + bne _08176210 movs r0, 0 - b @08176212 + b _08176212 .pool -@08176210: +_08176210: adds r0, 0x1 -@08176212: +_08176212: strh r0, [r1] ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -694787,22 +694787,22 @@ sub_81760FC: ; 81760FC ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @08176244 + b _08176244 .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 @@ -694822,69 +694822,69 @@ 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 .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 @@ -694898,14 +694898,14 @@ sub_817624C: ; 817624C bl sine ldr r1, =0x0203bd26 strh r0, [r1] - b @08176390 + b _08176390 .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 @@ -694918,13 +694918,13 @@ sub_817624C: ; 817624C 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 .pool -@0817639C: +_0817639C: ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 @@ -694939,9 +694939,9 @@ sub_817624C: ; 817624C movs r2, 0x2 strh r2, [r0, 0x2E] strh r4, [r1, 0x12] - b @08176430 + b _08176430 .pool -@081763C0: +_081763C0: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -694950,11 +694950,11 @@ sub_817624C: ; 817624C 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 @@ -694981,9 +694981,9 @@ sub_817624C: ; 817624C ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b @08176514 + b _08176514 .pool -@08176414: +_08176414: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -694992,19 +694992,19 @@ sub_817624C: ; 817624C 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 @@ -695013,19 +695013,19 @@ sub_817624C: ; 817624C 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 .pool -@08176464: +_08176464: ldr r2, =0x02020630 movs r3, 0xC ldrsh r1, [r4, r3] @@ -695038,16 +695038,16 @@ sub_817624C: ; 817624C ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @08176514 + b _08176514 .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 @@ -695060,9 +695060,9 @@ sub_817624C: ; 817624C lsls r0, 2 adds r0, r3 movs r2, 0x2 - b @081764C8 + b _081764C8 .pool -@081764B0: +_081764B0: ldr r3, =0x02020630 lsls r1, r5, 2 adds r1, r5 @@ -695075,13 +695075,13 @@ sub_817624C: ; 817624C 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 .pool -@081764D4: +_081764D4: ldr r3, =0x02020630 lsls r2, r5, 2 adds r2, r5 @@ -695105,17 +695105,17 @@ sub_817624C: ; 817624C strh r1, [r0, 0x2E] movs r0, 0x32 strh r0, [r2, 0x8] - b @08176514 + b _08176514 .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 @@ -695135,21 +695135,21 @@ 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 .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 @@ -695158,7 +695158,7 @@ sub_817651C: ; 817651C 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 @@ -695174,7 +695174,7 @@ sub_817651C: ; 817651C 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 @@ -695184,12 +695184,12 @@ sub_817651C: ; 817651C movs r0, 0x14 strh r0, [r1, 0x8] strh r5, [r2, 0xA] -@081765A0: +_081765A0: movs r0, 0 bl sub_817B540 - b @08176646 + b _08176646 .pool -@081765AC: +_081765AC: lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -695198,7 +695198,7 @@ sub_817651C: ; 817651C 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 @@ -695218,13 +695218,13 @@ sub_817651C: ; 817651C 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 .pool -@081765F4: +_081765F4: lsls r0, r2, 2 adds r0, r2 lsls r0, 3 @@ -695234,11 +695234,11 @@ sub_817651C: ; 817651C 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 @@ -695254,19 +695254,19 @@ sub_817651C: ; 817651C movs r1, 0xA strh r1, [r0, 0x8] strh r5, [r2, 0xA] - b @08176638 + b _08176638 .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 @@ -695283,23 +695283,23 @@ 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 .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 @@ -695379,9 +695379,9 @@ sub_817664C: ; 817664C lsls r1, 6 movs r0, 0 movs r2, 0x20 - b @081769D4 + b _081769D4 .pool -@0817672C: +_0817672C: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -695462,9 +695462,9 @@ sub_817664C: ; 817664C lsls r1, 6 movs r0, 0 movs r2, 0x20 - b @081769D4 + b _081769D4 .pool -@081767D8: +_081767D8: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -695546,9 +695546,9 @@ sub_817664C: ; 817664C movs r2, 0x80 lsls r2, 2 movs r0, 0x1 - b @081769D4 + b _081769D4 .pool -@08176884: +_08176884: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -695629,9 +695629,9 @@ sub_817664C: ; 817664C movs r2, 0x80 lsls r2, 2 movs r0, 0x1 - b @081769D4 + b _081769D4 .pool -@08176934: +_08176934: ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r7, 2 @@ -695712,13 +695712,13 @@ sub_817664C: ; 817664C 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 movs r1, 0 bl AddTask @@ -695798,7 +695798,7 @@ sub_817664C: ; 817664C 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 @@ -695807,7 +695807,7 @@ sub_817664C: ; 817664C adds r1, r6 movs r0, 0x45 strh r0, [r1, 0x12] -@08176A94: +_08176A94: pop {r3} mov r8, r3 pop {r4-r7} @@ -695829,15 +695829,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 SetGpuReg @@ -695869,9 +695869,9 @@ sub_8176AB0: ; 8176AB0 bl ResetObjectPaletteAllocator movs r0, 0x1 strb r0, [r6] - b @08176C96 + b _08176C96 .pool -@08176B30: +_08176B30: ldr r1, =0x0203bd24 movs r0, 0x22 strh r0, [r1] @@ -695883,14 +695883,14 @@ sub_8176AB0: ; 8176AB0 ldrb r0, [r6] adds r0, 0x1 strb r0, [r6] - b @08176C96 + b _08176C96 .pool -@08176B54: +_08176B54: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - bne @08176BD8 + bne _08176BD8 ldr r0, =gUnknown_085F5334 bl LoadCompressedObjectPic ldr r0, =gUnknown_085F53BC @@ -695927,9 +695927,9 @@ sub_8176AB0: ; 8176AB0 lsls r0, 1 movs r1, 0x2E bl sub_817B88C - b @08176C2C + b _08176C2C .pool -@08176BD8: +_08176BD8: ldr r0, =gUnknown_085F5344 bl LoadCompressedObjectPic ldr r0, =gUnknown_085F53AC @@ -695966,7 +695966,7 @@ sub_8176AB0: ; 8176AB0 lsls r0, 1 movs r1, 0x2E bl sub_817B834 -@08176C2C: +_08176C2C: lsls r0, 24 lsrs r2, r0, 24 strh r2, [r4, 0x14] @@ -695986,9 +695986,9 @@ sub_8176AB0: ; 8176AB0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08176C96 + b _08176C96 .pool -@08176C80: +_08176C80: adds r0, r4, 0 adds r1, r5, 0 bl sub_817664C @@ -695997,10 +695997,10 @@ sub_8176AB0: ; 8176AB0 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 @@ -696020,46 +696020,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] @@ -696096,7 +696096,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 @@ -696105,7 +696105,7 @@ sub_8176D1C: ; 8176D1C lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bls @08176D52 + bls _08176D52 pop {r4-r7} pop {r0} bx r0 @@ -696123,32 +696123,32 @@ 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 @@ -696178,7 +696178,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] @@ -696188,7 +696188,7 @@ sub_8176DBC: ; 8176DBC lsls r0, 6 ldr r1, [sp, 0x8] adds r6, r0, r1 -@08176DFC: +_08176DFC: adds r0, r7, r5 adds r0, r4 ldr r2, [sp] @@ -696208,12 +696208,12 @@ sub_8176DBC: ; 8176DBC 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 @@ -696241,7 +696241,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 @@ -696250,7 +696250,7 @@ sub_8176E40: ; 8176E40 lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - bls @08176E5E + bls _08176E5E str r6, [sp] adds r0, r7, 0 movs r1, 0x3 @@ -696303,50 +696303,50 @@ sub_8176EE8: ; 8176EE8 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq @08176F04 + beq _08176F04 adds r0, r4, 0 bl RemoveObjectAndFreeTiles - b @08176F88 + b _08176F88 .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 .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 StartObjectImageAnimIfDifferent - 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 StartObjectImageAnimIfDifferent - b @08176F88 -@08176F4E: + b _08176F88 +_08176F4E: adds r0, r4, 0 movs r1, 0x3 bl StartObjectImageAnimIfDifferent - b @08176F88 -@08176F58: + b _08176F88 +_08176F58: adds r0, r4, 0 movs r1, 0 bl StartObjectImageAnimIfDifferent @@ -696354,13 +696354,13 @@ sub_8176EE8: ; 8176EE8 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 StartObjectImageAnimIfDifferent ldrh r2, [r4, 0x20] movs r0, 0x20 @@ -696368,11 +696368,11 @@ sub_8176EE8: ; 8176EE8 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 @@ -696386,64 +696386,64 @@ sub_8176F90: ; 8176F90 movs r1, 0 ldrsh r0, [r0, r1] cmp r0, 0 - beq @08176FAC + beq _08176FAC adds r0, r4, 0 bl RemoveObjectAndFreeTiles - b @08177048 + b _08177048 .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 StartObjectImageAnimIfDifferent - 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 StartObjectImageAnimIfDifferent - b @08176FEE -@08176FE6: + b _08176FEE +_08176FE6: adds r0, r4, 0 movs r1, 0x2 bl StartObjectImageAnimIfDifferent -@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 .pool -@08177010: +_08177010: ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] @@ -696454,11 +696454,11 @@ sub_8176F90: ; 8176F90 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 StartObjectImageAnimIfDifferent @@ -696468,11 +696468,11 @@ sub_8176F90: ; 8176F90 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 @@ -696487,39 +696487,39 @@ 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 .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 .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 @@ -696562,13 +696562,13 @@ sub_8177050: ; 8177050 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] @@ -696588,62 +696588,62 @@ sub_8177050: ; 8177050 movs r2, 0 movs r3, 0 bl SetSpriteTransformationMatrix - 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 @@ -696660,13 +696660,13 @@ sub_8177050: ; 8177050 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 @@ -696679,8 +696679,8 @@ sub_8177050: ; 8177050 lsrs r1, 16 movs r0, 0x52 bl SetGpuReg - b @0817721C -@081771EC: + b _0817721C +_081771EC: adds r2, r5, 0 adds r2, 0x3E ldrb r0, [r2] @@ -696689,13 +696689,13 @@ sub_8177050: ; 8177050 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 SetGpuReg @@ -696704,7 +696704,7 @@ sub_8177050: ; 8177050 bl SetGpuReg ldrh r0, [r5, 0x3A] bl sub_818D820 -@0817721C: +_0817721C: add sp, 0x4 pop {r4,r5} pop {r0} @@ -696795,18 +696795,18 @@ 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 RemoveObjectAndFreeTiles - b @08177380 + b _08177380 .pool -@081772EC: +_081772EC: adds r0, r1, 0 adds r0, 0x3E ldrb r0, [r0] @@ -696881,7 +696881,7 @@ sub_81772B8: ; 81772B8 adds r0, r4 ldrh r0, [r0, 0x22] strh r0, [r3, 0x22] -@08177380: +_08177380: pop {r4} pop {r0} bx r0 @@ -696908,13 +696908,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 @@ -696924,23 +696924,23 @@ sub_8177388: ; 8177388 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 @@ -696950,8 +696950,8 @@ sub_8177388: ; 8177388 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 @@ -696959,29 +696959,29 @@ sub_8177388: ; 8177388 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 .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 .pool -@0817744C: +_0817744C: cmp r6, 0x46 - bhi @081774AC -@08177450: + bhi _081774AC +_08177450: bl GenerateRandomNumber mov r2, r9 ldr r4, [r2] @@ -697010,7 +697010,7 @@ sub_8177388: ; 8177388 lsls r0, 16 lsrs r0, 16 cmp r3, r0 - beq @081774A0 + beq _081774A0 ldrh r0, [r5] lsls r0, 1 adds r0, r4, r0 @@ -697020,14 +697020,14 @@ sub_8177388: ; 8177388 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 @@ -697035,13 +697035,13 @@ sub_8177388: ; 8177388 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 @@ -697055,26 +697055,26 @@ sub_8177388: ; 8177388 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 .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 @@ -697082,10 +697082,10 @@ sub_8177388: ; 8177388 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 @@ -697093,7 +697093,7 @@ sub_8177388: ; 8177388 ldrh r0, [r0] subs r0, 0x1 cmp r4, r0 - bge @08177536 + bge _08177536 lsls r0, r4, 1 adds r0, r2, r0 adds r2, 0x8C @@ -697101,14 +697101,14 @@ sub_8177388: ; 8177388 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 @@ -697156,11 +697156,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 @@ -697168,8 +697168,8 @@ sub_8177584: ; 8177584 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} @@ -697205,7 +697205,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 @@ -697215,12 +697215,12 @@ sub_81775E0: ; 81775E0 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 @@ -697235,32 +697235,32 @@ sub_81775E0: ; 81775E0 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 @@ -697276,7 +697276,7 @@ sub_81775E0: ; 81775E0 movs r1, 0xB bl pokemon_getattr_encrypted cmp r0, 0 - beq @081776D2 + beq _081776D2 mov r1, r9 ldr r0, [r1] adds r0, r5 @@ -697284,7 +697284,7 @@ sub_81775E0: ; 81775E0 movs r1, 0x2D bl pokemon_getattr_encrypted cmp r0, 0 - bne @081776D2 + bne _081776D2 mov r2, r9 ldr r0, [r2] adds r0, r5 @@ -697302,28 +697302,28 @@ sub_81775E0: ; 81775E0 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, =gUnknown_085E7080 subs r0, 0x1 @@ -697333,7 +697333,7 @@ sub_81775E0: ; 81775E0 strh r0, [r2] ldr r2, [sp] cmp r2, 0xE - bne @0817773C + bne _0817773C ldr r1, =0x020375e4 movs r0, 0 strh r0, [r1] @@ -697345,9 +697345,9 @@ sub_81775E0: ; 81775E0 ldr r2, =0x02021cc4 movs r1, 0x2 bl pokemon_getattr - b @08177768 + b _08177768 .pool -@0817773C: +_0817773C: ldr r1, =0x020375e4 movs r0, 0x1 strh r0, [r1] @@ -697369,10 +697369,10 @@ sub_81775E0: ; 81775E0 ldr r2, =0x02021cc4 movs r1, 0x2 bl pokemon_getattr_encrypted -@08177768: +_08177768: ldr r0, =0x02021cc4 bl GetStringEnd_Limit7 -@0817776E: +_0817776E: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -697402,7 +697402,7 @@ sub_817778C: ; 817778C mov r10, r1 ldr r0, =0x0203bcee mov r9, r0 -@081777AC: +_081777AC: adds r0, r6, 0 movs r1, 0xA bl __umodsi3 @@ -697417,7 +697417,7 @@ sub_817778C: ; 817778C lsls r4, 16 lsls r0, 16 cmp r4, r0 - bne @081777FA + bne _081777FA adds r0, r6, 0 movs r1, 0xA bl __udivsi3 @@ -697437,8 +697437,8 @@ sub_817778C: ; 817778C 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 @@ -697605,12 +697605,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, =gUnknown_085E70C8 ldr r1, =0x0203bcf0 ldr r1, [r1] @@ -697667,7 +697667,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 @@ -697675,7 +697675,7 @@ sub_8177A20: ; 8177A20 adds r1, r0 ldr r0, =sub_8177A50 str r0, [r1] -@08177A40: +_08177A40: pop {r0} bx r0 .pool @@ -697692,7 +697692,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 @@ -697707,7 +697707,7 @@ sub_8177A50: ; 8177A50 adds r0, r1 ldr r1, =sub_8177A98 str r1, [r0] -@08177A82: +_08177A82: add sp, 0x4 pop {r4} pop {r0} @@ -697725,7 +697725,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 @@ -697734,7 +697734,7 @@ sub_8177A98: ; 8177A98 bl remove_task ldr r0, =sub_80861E8 bl SetMainCallback2 -@08177AC2: +_08177AC2: pop {r4} pop {r0} bx r0 @@ -697747,7 +697747,7 @@ pokedex_diploma_something: ; 8177AD4 bl sub_80C0944 lsls r0, 16 cmp r0, 0 - beq @08177AFC + beq _08177AFC movs r1, 0x80 lsls r1, 1 movs r0, 0x14 @@ -697755,16 +697755,16 @@ pokedex_diploma_something: ; 8177AD4 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EE855 bl CopyString - b @08177B0C + b _08177B0C .pool -@08177AFC: +_08177AFC: movs r0, 0x14 movs r1, 0 bl SetGpuReg ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EE84F bl CopyString -@08177B0C: +_08177B0C: ldr r4, =0x02021fc4 ldr r1, =gUnknown_085EE85E adds r0, r4, 0 @@ -697925,23 +697925,23 @@ sub_8177C70: ; 8177C70 thumb_func_start sub_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 @@ -697956,63 +697956,63 @@ 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 .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 .pool -@08177D40: +_08177D40: bl ResetAllObjectData - b @08177DDC -@08177D46: + b _08177DDC +_08177D46: bl ResetObjectPaletteAllocator - 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] @@ -698020,44 +698020,44 @@ sub_8177CB0: ; 8177CB0 adds r0, r1 movs r1, 0 strh r1, [r0] - b @08177DDC + b _08177DDC .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 movs r1, 0 bl AddTask - b @08177DDC + b _08177DDC .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 @@ -698069,9 +698069,9 @@ sub_8177CB0: ; 8177CB0 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 @@ -698079,19 +698079,19 @@ sub_8177CB0: ; 8177CB0 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08177E0C + b _08177E0C .pool -@08177DF4: +_08177DF4: ldr r0, =sub_8177C70 bl SetVBlankCallback ldr r0, =sub_8177C54 bl SetMainCallback2 movs r0, 0x1 - b @08177E0E + b _08177E0E .pool -@08177E0C: +_08177E0C: movs r0, 0 -@08177E0E: +_08177E0E: add sp, 0x4 pop {r1} bx r1 @@ -698153,24 +698153,24 @@ 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 .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, =gUnknown_08D9BB44 movs r0, 0 @@ -698183,24 +698183,24 @@ sub_8177E88: ; 8177E88 ldr r1, [r0] ldr r0, =0x00001808 adds r1, r0 - b @08177FD6 + b _08177FD6 .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, =gUnknown_08D9BF98 ldr r4, =0x0203bcf4 ldr r1, [r4] bl LZDecompressWram ldr r1, [r4] - b @08177FD2 + b _08177FD2 .pool -@08177F1C: +_08177F1C: ldr r0, =gUnknown_08D9C13C ldr r1, [r7] movs r2, 0x80 @@ -698210,21 +698210,21 @@ sub_8177E88: ; 8177E88 ldr r1, [r7] ldr r0, =0x00001808 adds r1, r0 - b @08177FD6 + b _08177FD6 .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 @@ -698234,17 +698234,17 @@ sub_8177E88: ; 8177E88 lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - bls @08177F52 - b @08177F98 + bls _08177F52 + b _08177F98 .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 @@ -698254,12 +698254,12 @@ sub_8177E88: ; 8177E88 lsls r0, 16 lsrs r2, r0, 16 cmp r2, r3 - bls @08177F84 -@08177F98: + bls _08177F84 +_08177F98: ldr r1, [r7] - b @08177FD2 + b _08177FD2 .pool -@08177FA8: +_08177FA8: ldr r0, =gUnknown_08D9BEF0 movs r1, 0 movs r2, 0xC0 @@ -698268,31 +698268,31 @@ sub_8177E88: ; 8177E88 ldr r1, [r0] ldr r0, =0x00001808 adds r1, r0 - b @08177FD6 + b _08177FD6 .pool -@08177FC8: +_08177FC8: ldr r0, =gUnknown_0857FDEC bl LoadCompressedObjectPic 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 .pool -@08177FEC: +_08177FEC: ldr r0, =gUnknown_0857FDF4 bl LoadCompressedObjectPalette movs r0, 0x1 - b @08177FFE + b _08177FFE .pool -@08177FFC: +_08177FFC: movs r0, 0 -@08177FFE: +_08177FFE: add sp, 0x4 pop {r4-r7} pop {r1} @@ -698310,7 +698310,7 @@ sub_8178008: ; 8178008 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -@08178020: +_08178020: lsls r0, r4, 24 lsrs r0, 24 bl PutWindowTilemap @@ -698318,7 +698318,7 @@ sub_8178008: ; 8178008 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 @@ -698485,7 +698485,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 @@ -698498,9 +698498,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 @@ -698533,9 +698533,9 @@ sub_8178174: ; 8178174 adds r2, r4, 0 movs r3, 0x28 bl Print - b @08178242 + b _08178242 .pool -@08178230: +_08178230: ldr r2, =gUnknown_085E8D34 str r7, [sp] str r0, [sp, 0x4] @@ -698544,7 +698544,7 @@ sub_8178174: ; 8178174 movs r1, 0x1 movs r3, 0x28 bl Print -@08178242: +_08178242: add sp, 0xC pop {r4-r7} pop {r0} @@ -698577,7 +698577,7 @@ itemid_copy_name: ; 8178250 bl Print ldrb r0, [r6, 0x7] cmp r0, 0 - beq @081782B0 + beq _081782B0 ldr r0, =gBerryFirmnessStringPointers ldrb r1, [r6, 0x7] subs r1, 0x1 @@ -698591,9 +698591,9 @@ itemid_copy_name: ; 8178250 movs r1, 0x1 movs r3, 0x28 bl Print - b @081782C2 + b _081782C2 .pool -@081782B0: +_081782B0: ldr r2, =gUnknown_085E8D34 str r5, [sp] str r0, [sp, 0x4] @@ -698602,7 +698602,7 @@ itemid_copy_name: ; 8178250 movs r1, 0x1 movs r3, 0x28 bl Print -@081782C2: +_081782C2: add sp, 0xC pop {r4-r6} pop {r0} @@ -698762,7 +698762,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 @@ -698777,9 +698777,9 @@ sub_8178404: ; 8178404 movs r1, 0x5 negs r1, r1 ands r1, r2 - b @08178462 + b _08178462 .pool -@08178448: +_08178448: ldr r3, =0x02020630 ldr r0, [r4] ldr r1, =0x00001803 @@ -698793,12 +698793,12 @@ sub_8178404: ; 8178404 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 @@ -698813,9 +698813,9 @@ sub_8178404: ; 8178404 movs r1, 0x5 negs r1, r1 ands r1, r2 - b @081784B6 + b _081784B6 .pool -@0817849C: +_0817849C: ldr r3, =0x0203bcf4 ldr r0, [r3] ldr r1, =0x00001804 @@ -698829,11 +698829,11 @@ sub_8178404: ; 8178404 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 @@ -698847,9 +698847,9 @@ sub_8178404: ; 8178404 movs r1, 0x5 negs r1, r1 ands r1, r2 - b @08178500 + b _08178500 .pool -@081784E8: +_081784E8: ldr r0, [r3] ldr r1, =0x00001805 adds r0, r1 @@ -698862,11 +698862,11 @@ sub_8178404: ; 8178404 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 @@ -698880,9 +698880,9 @@ sub_8178404: ; 8178404 movs r1, 0x5 negs r1, r1 ands r1, r2 - b @08178544 + b _08178544 .pool -@0817852C: +_0817852C: ldr r0, [r3] ldr r1, =0x00001806 adds r0, r1 @@ -698895,11 +698895,11 @@ sub_8178404: ; 8178404 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 @@ -698913,9 +698913,9 @@ sub_8178404: ; 8178404 movs r1, 0x5 negs r1, r1 ands r1, r2 - b @08178588 + b _08178588 .pool -@08178570: +_08178570: ldr r0, [r3] ldr r1, =0x00001807 adds r0, r1 @@ -698928,7 +698928,7 @@ sub_8178404: ; 8178404 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 -@08178588: +_08178588: strb r1, [r0] pop {r4,r5} pop {r0} @@ -698940,7 +698940,7 @@ sub_8178404: ; 8178404 sub_8178594: ; 8178594 push {r4,lr} movs r4, 0 -@08178598: +_08178598: ldr r0, =0x0203bcf4 ldr r0, [r0] ldr r1, =0x00001803 @@ -698957,7 +698957,7 @@ sub_8178594: ; 8178594 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls @08178598 + bls _08178598 pop {r4} pop {r0} bx r0 @@ -699004,7 +699004,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 @@ -699015,7 +699015,7 @@ sub_8178610: ; 8178610 bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@08178642: +_08178642: pop {r4} pop {r0} bx r0 @@ -699033,35 +699033,35 @@ 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 .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 @@ -699088,22 +699088,22 @@ 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 .pool -@081786F4: +_081786F4: movs r0, 0x1 -@081786F6: +_081786F6: strh r0, [r4, 0x2] movs r0, 0 strh r0, [r4] @@ -699119,7 +699119,7 @@ sub_81786AC: ; 81786AC adds r0, r1 ldr r1, =sub_81787AC str r1, [r0] -@08178718: +_08178718: pop {r4-r7} pop {r0} bx r0 @@ -699135,10 +699135,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 @@ -699147,31 +699147,31 @@ 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 .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 @@ -699217,134 +699217,134 @@ 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 .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 FillWindowPixelBuffer - 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] @@ -699359,7 +699359,7 @@ sub_81787AC: ; 81787AC movs r4, 0 adds r7, r2, 0 ldr r2, =0x00001803 -@081788D6: +_081788D6: ldr r0, [r3] adds r0, r2 adds r0, r4 @@ -699373,7 +699373,7 @@ sub_81787AC: ; 81787AC lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls @081788D6 + bls _081788D6 movs r4, 0x80 lsls r4, 5 ldrb r2, [r6, 0x2] @@ -699387,7 +699387,7 @@ sub_81787AC: ; 81787AC movs r2, 0 ldrsh r0, [r6, r2] cmp r0, 0 - bne @08178922 + bne _08178922 ldr r0, =0x03005e00 mov r2, r8 lsls r1, r2, 2 @@ -699396,7 +699396,7 @@ sub_81787AC: ; 81787AC adds r1, r0 ldr r0, =sub_8178654 str r0, [r1] -@08178922: +_08178922: pop {r3} mov r8, r3 pop {r4-r7} @@ -699423,9 +699423,9 @@ sub_8178958: ; 8178958 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 @@ -699451,17 +699451,17 @@ sub_8178974: ; 8178974 bl InitWindows lsls r0, 16 cmp r0, 0 - beq @08178A22 + beq _08178A22 bl DeactivateAllTextPrinters movs r4, 0 -@081789AC: +_081789AC: lsls r0, r4, 24 lsrs r0, 24 movs r1, 0 bl FillWindowPixelBuffer adds r4, 0x1 cmp r4, 0x1 - ble @081789AC + ble _081789AC movs r0, 0x1E str r0, [sp] movs r0, 0x14 @@ -699499,7 +699499,7 @@ sub_8178974: ; 8178974 bl rboxid_80040B8 ldr r0, =sub_8178A78 bl SetMainCallback2 -@08178A22: +_08178A22: add sp, 0x8 pop {r4} pop {r0} @@ -699514,21 +699514,21 @@ sub_8178A40: ; 8178A40 adds r4, r1, 0 movs r5, 0x1 cmp r4, 0 - bne @08178A54 + bne _08178A54 ldr r1, =gUnknown_085EE80A bl CopyString 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, =gUnknown_085EE827 adds r0, r6, 0 bl CopyString -@08178A66: +_08178A66: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -699547,35 +699547,35 @@ 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 .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 @@ -699594,16 +699594,16 @@ sub_8178A78: ; 8178A78 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, =gUnknown_085EE765 movs r0, 0x1 str r0, [sp] @@ -699615,16 +699615,16 @@ sub_8178A78: ; 8178A78 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @08178E3C + b _08178E3C .pool -@08178B48: +_08178B48: movs r0, 0 bl IsTextPrinterActive 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 @@ -699637,23 +699637,23 @@ sub_8178A78: ; 8178A78 adds r0, r2, 0 strh r0, [r1] bl sub_8009734 - b @08178E58 + b _08178E58 .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, =gUnknown_085EE788 @@ -699670,29 +699670,29 @@ sub_8178A78: ; 8178A78 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @08178D00 + b _08178D00 .pool -@08178BCC: +_08178BCC: movs r0, 0 bl IsTextPrinterActive 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 @@ -699716,40 +699716,40 @@ sub_8178A78: ; 8178A78 movs r2, 0x87 lsls r2, 3 adds r1, r4, r2 - b @08178E3C + b _08178E3C .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 @@ -699766,13 +699766,13 @@ sub_8178A78: ; 8178A78 movs r2, 0x87 lsls r2, 3 adds r0, r2 - b @08178CF2 + b _08178CF2 .pool -@08178CAC: +_08178CAC: bl sub_8178958 lsls r0, 24 cmp r0, 0 - beq @08178CCC + beq _08178CCC ldr r1, =gUnknown_085EE7CE movs r0, 0x1 str r0, [sp] @@ -699780,11 +699780,11 @@ sub_8178A78: ; 8178A78 movs r2, 0x1 movs r3, 0x2 bl sub_8178EC4 - b @08178E34 + b _08178E34 .pool -@08178CCC: +_08178CCC: bl sub_80097E8 -@08178CD0: +_08178CD0: ldr r4, =0x02021fc4 adds r0, r4, 0 movs r1, 0x1 @@ -699800,72 +699800,72 @@ sub_8178A78: ; 8178A78 movs r1, 0x87 lsls r1, 3 adds r0, r1 -@08178CF2: +_08178CF2: movs r1, 0xD strb r1, [r0] - b @08178E58 + b _08178E58 .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 .pool -@08178D28: +_08178D28: movs r0, 0 bl IsTextPrinterActive 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 .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 .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 @@ -699882,12 +699882,12 @@ sub_8178A78: ; 8178A78 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 .pool -@08178DBC: +_08178DBC: ldr r1, =0x02021fc4 movs r0, 0x1 str r0, [sp] @@ -699899,15 +699899,15 @@ sub_8178A78: ; 8178A78 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @08178E3C + b _08178E3C .pool -@08178DE0: +_08178DE0: movs r0, 0 bl IsTextPrinterActive lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - bne @08178E58 + bne _08178E58 ldr r0, =0x030022c0 movs r1, 0x87 lsls r1, 3 @@ -699917,59 +699917,59 @@ sub_8178A78: ; 8178A78 strb r1, [r0] ldr r0, =0x0203bcf8 strb r2, [r0] - b @08178E58 + b _08178E58 .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 pal_fade_maybe -@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 .pool -@08178E48: +_08178E48: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08178E58 + bne _08178E58 bl 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 @@ -699988,7 +699988,7 @@ sub_8178A78: ; 8178A78 adds r0, r1 movs r1, 0xD strb r1, [r0] -@08178E98: +_08178E98: bl run_active_tasks bl CallObjectCallbacks bl PrepareSpritesForOamLoad @@ -700151,11 +700151,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 @@ -700358,18 +700358,18 @@ sub_8178FDC: ; 8178FDC ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] - b @08179272 + b _08179272 .pool -@0817925C: +_0817925C: bl fade_and_return_progress_probably lsls r0, 24 cmp r0, 0 - bne @08179272 + bne _08179272 ldr r0, =sub_8179288 bl SetMainCallback2 ldr r0, =sub_8179454 bl SetVBlankCallback -@08179272: +_08179272: add sp, 0xC pop {r3} mov r8, r3 @@ -700389,14 +700389,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 @@ -700410,7 +700410,7 @@ sub_8179288: ; 8179288 bl calls_flash_erase_block_3 ldr r0, [r6] cmp r0, 0 - beq @081792DC + beq _081792DC ldrb r0, [r4] movs r1, 0x11 bl FillWindowPixelBuffer @@ -700418,26 +700418,26 @@ sub_8179288: ; 8179288 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 FillWindowPixelBuffer ldr r0, =gUnknown_085EC86F - b @08179330 + b _08179330 .pool -@0817931C: +_0817931C: ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 @@ -700445,15 +700445,15 @@ sub_8179288: ; 8179288 ldr r0, =0x03006214 ldr r0, [r0] cmp r0, 0 - bne @08179370 + bne _08179370 ldr r0, =gUnknown_085EC94F -@08179330: +_08179330: movs r1, 0x1 movs r2, 0 bl sub_8178F44 - b @0817937A + b _0817937A .pool -@08179348: +_08179348: ldr r0, =0x0203bd0e ldrb r0, [r0] movs r1, 0x11 @@ -700464,17 +700464,17 @@ sub_8179288: ; 8179288 bl sub_8178F44 ldr r0, =sub_8179390 bl SetMainCallback2 - b @08179380 + b _08179380 .pool -@08179370: +_08179370: ldr r0, =gUnknown_085EC9A2 movs r1, 0x1 movs r2, 0 bl sub_8178F44 -@0817937A: +_0817937A: ldr r0, =sub_81793E0 bl SetMainCallback2 -@08179380: +_08179380: pop {r4-r6} pop {r0} bx r0 @@ -700492,7 +700492,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 @@ -700505,7 +700505,7 @@ sub_8179390: ; 8179390 bl SetVBlankCallback ldr r0, =sub_81793E0 bl SetMainCallback2 -@081793C4: +_081793C4: pop {r0} bx r0 .pool @@ -700523,7 +700523,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] @@ -700534,7 +700534,7 @@ sub_81793E0: ; 81793E0 bl SetVBlankCallback ldr r0, =sub_8179428 bl SetMainCallback2 -@08179410: +_08179410: add sp, 0x4 pop {r0} bx r0 @@ -700548,18 +700548,18 @@ sub_8179428: ; 8179428 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 Reset - b @0817944E + b _0817944E .pool -@08179448: +_08179448: bl SetMainCallback2 str r4, [r5] -@0817944E: +_0817944E: pop {r4,r5} pop {r0} bx r0 @@ -700591,7 +700591,7 @@ sub_8179454: ; 8179454 ldr r0, =0x0203bcfe ldrh r0, [r0] cmp r0, 0 - beq @081794DC + beq _081794DC ldr r3, =gUnknown_085EFDAC lsls r2, r4, 1 adds r2, r4 @@ -700622,16 +700622,16 @@ sub_8179454: ; 8179454 ands r0, r2 orrs r0, r1 strb r0, [r3] - b @081794E8 + b _081794E8 .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 @@ -700640,10 +700640,10 @@ sub_8179454: ; 8179454 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 @@ -700663,22 +700663,22 @@ 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 .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 @@ -700695,10 +700695,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 @@ -700708,7 +700708,7 @@ sub_8179554: ; 8179554 lsls r0, 16 lsrs r4, r0, 16 cmp r4, r8 - bls @0817956A + bls _0817956A adds r0, r6, 0 bl sub_8179514 lsls r0, 24 @@ -700716,10 +700716,10 @@ sub_8179554: ; 8179554 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 @@ -700734,32 +700734,32 @@ 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 @@ -700772,30 +700772,30 @@ sub_81795E8: ; 81795E8 bl FlagGet 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 .pool -@08179634: +_08179634: movs r0, 0 -@08179636: +_08179636: pop {r1} bx r1 thumb_func_end sub_81795E8 @@ -700850,7 +700850,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] @@ -700864,13 +700864,13 @@ sub_81796AC: ; 81796AC bl pokemon_getattr ldr r1, =0x0000017d cmp r0, r1 - bne @081796F4 + bne _081796F4 movs r0, 0x1 - b @081796F6 + b _081796F6 .pool -@081796F4: +_081796F4: movs r0, 0 -@081796F6: +_081796F6: pop {r4} pop {r1} bx r1 @@ -700958,7 +700958,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 @@ -700975,12 +700975,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 InstallCameraPanAheadCallback -@081797D0: +_081797D0: pop {r4,r5} pop {r0} bx r0 @@ -700996,33 +700996,33 @@ 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 .pool -@0817982C: +_0817982C: movs r0, 0 -@0817982E: +_0817982E: pop {r1} bx r1 thumb_func_end sub_81797DC @@ -701099,26 +701099,26 @@ sub_81798D0: ; 81798D0 bl FlagGet 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 .pool -@08179910: +_08179910: movs r0, 0 -@08179912: +_08179912: pop {r1} bx r1 thumb_func_end sub_81798D0 @@ -701201,23 +701201,23 @@ 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 - b @081799F0 + b _081799F0 .pool -@081799E4: +_081799E4: ldr r1, =0x03005e00 lsls r0, r2, 2 adds r0, r2 lsls r0, 3 adds r0, r1 ldr r2, =sub_8179850 -@081799F0: +_081799F0: lsrs r1, r2, 16 strh r1, [r0, 0x18] strh r2, [r0, 0x1A] @@ -701238,35 +701238,35 @@ 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 FlagGet lsls r0, 24 cmp r0, 0 - beq @08179A28 - b @08179B5A -@08179A28: + beq _08179A28 + b _08179B5A +_08179A28: movs r0, 0x2 bl FlagGet lsls r0, 24 cmp r0, 0 - bne @08179A36 - b @08179B5A -@08179A36: + bne _08179A36 + b _08179B5A +_08179A36: movs r0, 0x3 bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08179A58 - b @08179B5A + bne _08179A58 + b _08179B5A .pool -@08179A54: +_08179A54: movs r0, 0x1 - b @08179B5C -@08179A58: + b _08179B5C +_08179A58: movs r5, 0 mov r8, r4 ldr r4, =gUnknown_085EFE74 @@ -701275,7 +701275,7 @@ sub_8179A04: ; 8179A04 ldr r6, =0x0000403b ldr r1, =0x0000403c mov r9, r1 -@08179A68: +_08179A68: lsls r0, r5, 1 adds r1, r0, r4 add r0, r12 @@ -701286,13 +701286,13 @@ sub_8179A04: ; 8179A04 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 VarGet lsls r0, 16 @@ -701303,11 +701303,11 @@ sub_8179A04: ; 8179A04 lsrs r1, 16 adds r0, r6, 0 bl VarSet - b @08179AF0 + b _08179AF0 .pool -@08179AB0: +_08179AB0: cmp r5, 0x1F - bhi @08179AD2 + bhi _08179AD2 mov r0, r9 bl VarGet lsls r0, 16 @@ -701320,8 +701320,8 @@ sub_8179A04: ; 8179A04 lsrs r1, 16 mov r0, r9 bl VarSet - b @08179AF0 -@08179AD2: + b _08179AF0 +_08179AD2: ldr r4, =0x0000403d adds r0, r4, 0 bl VarGet @@ -701335,47 +701335,47 @@ sub_8179A04: ; 8179A04 lsrs r1, 16 adds r0, r4, 0 bl VarSet -@08179AF0: +_08179AF0: ldr r0, =0x0000403b bl VarGet lsls r0, 16 lsrs r4, r0, 16 ldr r0, =0x0000ffff cmp r4, r0 - bne @08179B5A + bne _08179B5A ldr r0, =0x0000403c bl VarGet lsls r0, 16 lsrs r0, 16 cmp r0, r4 - bne @08179B5A + bne _08179B5A ldr r0, =0x0000403d bl VarGet 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 .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 FlagSet movs r0, 0x2 bl FlagReset -@08179B5A: +_08179B5A: movs r0, 0 -@08179B5C: +_08179B5C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -701416,32 +701416,32 @@ 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 .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 AllocZeroed @@ -701452,47 +701452,47 @@ sub_8179B98: ; 8179B98 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @08179D3A + b _08179D3A .pool -@08179C20: +_08179C20: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 - b @08179D30 + b _08179D30 .pool -@08179C34: +_08179C34: bl ResetAllObjectData ldr r1, =0x030022c0 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @08179D3A + b _08179D3A .pool -@08179C48: +_08179C48: bl ResetObjectPaletteAllocator - 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 .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 .pool -@08179C78: +_08179C78: ldr r0, =0x0203bc9c ldrb r1, [r0] movs r0, 0x64 @@ -701502,19 +701502,19 @@ sub_8179B98: ; 8179B98 bl sub_8179DF4 lsls r0, 24 cmp r0, 0 - beq @08179D64 - b @08179D32 + beq _08179D64 + b _08179D32 .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 .pool -@08179CB0: +_08179CB0: ldr r0, =0x0203bc9c ldrb r1, [r0] movs r0, 0x64 @@ -701527,9 +701527,9 @@ sub_8179B98: ; 8179B98 ldr r2, =0x0000105d adds r1, r2 strb r0, [r1] - b @08179D32 + b _08179D32 .pool -@08179CDC: +_08179CDC: movs r0, 0 movs r1, 0x1 movs r2, 0x1 @@ -701539,12 +701539,12 @@ sub_8179B98: ; 8179B98 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @08179D3A + b _08179D3A .pool -@08179CF8: +_08179CF8: bl sub_817A168 - b @08179D32 -@08179CFE: + b _08179D32 +_08179CFE: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -701554,9 +701554,9 @@ sub_8179B98: ; 8179B98 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @08179D3A + b _08179D3A .pool -@08179D18: +_08179D18: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -701568,30 +701568,30 @@ sub_8179B98: ; 8179B98 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 .pool -@08179D4C: +_08179D4C: ldr r0, =sub_8179B84 bl SetVBlankCallback ldr r0, =sub_8179B68 bl SetMainCallback2 movs r0, 0x1 - b @08179D66 + b _08179D66 .pool -@08179D64: +_08179D64: movs r0, 0 -@08179D66: +_08179D66: add sp, 0x4 pop {r4} pop {r1} @@ -701601,23 +701601,23 @@ sub_8179B98: ; 8179B98 thumb_func_start sub_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 @@ -701668,27 +701668,27 @@ 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 .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 @@ -701709,9 +701709,9 @@ sub_8179DF4: ; 8179DF4 bl DecompressMonPic_DetectFrontOrBack_2 ldr r0, =0x0203bd18 ldr r1, [r0] - b @08179F5E + b _08179F5E .pool -@08179E84: +_08179E84: adds r0, r6, 0 movs r1, 0x41 bl pokemon_getattr @@ -701735,30 +701735,30 @@ sub_8179DF4: ; 8179DF4 bl sub_806A068 ldr r0, =0x0203bd18 ldr r1, [r0] - b @08179F5E + b _08179F5E .pool -@08179EC4: +_08179EC4: ldr r0, =gUnknown_085B26F4 bl LoadCompressedObjectPic ldr r0, =0x0203bd18 ldr r1, [r0] - b @08179F5E + b _08179F5E .pool -@08179ED8: +_08179ED8: ldr r0, =gUnknown_085B26FC bl LoadCompressedObjectPalette ldr r0, =0x0203bd18 ldr r1, [r0] - b @08179F5E + b _08179F5E .pool -@08179EEC: +_08179EEC: ldr r0, =gUnknown_085F06A0 bl LoadCompressedObjectPic ldr r0, =0x0203bd18 ldr r1, [r0] - b @08179F5E + b _08179F5E .pool -@08179F00: +_08179F00: ldr r0, =0x0203ce7c ldrb r0, [r0] bl sub_8179FEC @@ -701766,9 +701766,9 @@ sub_8179DF4: ; 8179DF4 bl LoadCompressedObjectPalette ldr r0, =0x0203bd18 ldr r1, [r0] - b @08179F5E + b _08179F5E .pool -@08179F20: +_08179F20: bl reset_temp_tile_data_buffers ldr r1, =gUnknown_08D7C440 movs r0, 0 @@ -701779,29 +701779,29 @@ sub_8179DF4: ; 8179DF4 bl decompress_and_copy_tile_data_to_vram ldr r0, =0x0203bd18 ldr r1, [r0] - b @08179F5E + b _08179F5E .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, =gUnknown_08D9BA44 ldr r4, =0x0203bd18 ldr r1, [r4] adds r1, 0x48 bl LZDecompressWram ldr r1, [r4] -@08179F5E: +_08179F5E: ldr r0, =0x0000107e adds r1, r0 ldrh r0, [r1] adds r0, 0x1 strh r0, [r1] - b @08179FA0 + b _08179FA0 .pool -@08179F78: +_08179F78: ldr r0, =gUnknown_08D7C9EC movs r1, 0x20 movs r2, 0x60 @@ -701813,11 +701813,11 @@ sub_8179DF4: ; 8179DF4 movs r1, 0 strh r1, [r0] movs r0, 0x1 - b @08179FA2 + b _08179FA2 .pool -@08179FA0: +_08179FA0: movs r0, 0 -@08179FA2: +_08179FA2: add sp, 0x4 pop {r4-r6} pop {r1} @@ -701888,9 +701888,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 @@ -701901,25 +701901,25 @@ sub_817A030: ; 817A030 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 .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 .pool -@0817A088: +_0817A088: ldr r0, =0x0203bd18 ldr r1, [r0] ldr r2, =0x00001050 @@ -701930,9 +701930,9 @@ sub_817A030: ; 817A030 adds r0, r1 strh r3, [r0] bl sub_817A5CC - b @0817A104 + b _0817A104 .pool -@0817A0AC: +_0817A0AC: ldr r0, =0x0203bd18 ldr r0, [r0] ldr r2, =0x0000105e @@ -701940,32 +701940,32 @@ sub_817A030: ; 817A030 ldrb r0, [r0] ldrb r1, [r1, 0xA] bl sub_817A4F8 - b @0817A104 + b _0817A104 .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 .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 .pool -@0817A0F8: +_0817A0F8: ldr r0, =sub_817A1C4 str r0, [r1] - b @0817A154 + b _0817A154 .pool -@0817A104: +_0817A104: ldr r0, =0x0203bd18 ldr r0, [r0] ldr r2, =0x00001058 @@ -701975,20 +701975,20 @@ sub_817A030: ; 817A030 ldrh r1, [r1] ldrh r0, [r0] cmp r1, r0 - bcs @0817A128 + bcs _0817A128 bl sub_817A634 - b @0817A138 + b _0817A138 .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 @@ -702003,7 +702003,7 @@ sub_817A030: ; 817A030 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@0817A154: +_0817A154: pop {r4,r5} pop {r0} bx r0 @@ -702042,7 +702042,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 @@ -702050,7 +702050,7 @@ sub_817A194: ; 817A194 adds r1, r0 ldr r0, =sub_817A320 str r0, [r1] -@0817A1B6: +_0817A1B6: pop {r4} pop {r0} bx r0 @@ -702095,25 +702095,25 @@ sub_817A1C4: ; 817A1C4 movs r1, 0 ldrsh r0, [r6, r1] cmp r0, 0 - bne @0817A248 + bne _0817A248 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E937F bl ExpandStringRefs - b @0817A268 + b _0817A268 .pool -@0817A248: +_0817A248: cmp r0, 0 - ble @0817A260 + ble _0817A260 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9390 bl ExpandStringRefs - b @0817A268 + b _0817A268 .pool -@0817A260: +_0817A260: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E93A9 bl ExpandStringRefs -@0817A268: +_0817A268: ldr r2, =0x03003014 ldrb r0, [r2] movs r1, 0x1 @@ -702159,7 +702159,7 @@ sub_817A2C0: ; 817A2C0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0817A304 + bne _0817A304 bl ResetAllObjectData bl ResetObjectPaletteAllocator ldr r0, =0x03007420 @@ -702177,7 +702177,7 @@ sub_817A2C0: ; 817A2C0 ldr r0, [r0] bl Free bl sub_805F094 -@0817A304: +_0817A304: pop {r4} pop {r0} bx r0 @@ -702271,7 +702271,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 @@ -702294,7 +702294,7 @@ sub_817A358: ; 817A358 adds r0, r1 movs r1, 0 strb r1, [r0] -@0817A402: +_0817A402: mov r0, r8 pop {r3,r4} mov r8, r3 @@ -702346,18 +702346,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, =DummyObjectCallback str r0, [r4, 0x1C] -@0817A49A: +_0817A49A: pop {r4} pop {r0} bx r0 @@ -702429,19 +702429,19 @@ 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, =gUnknown_085F0668 - b @0817A548 + b _0817A548 .pool -@0817A540: +_0817A540: mov r0, r8 adds r0, 0x10 adds r0, r6, r0 ldr r1, =gUnknown_085F066C -@0817A548: +_0817A548: str r1, [r0] lsls r0, r7, 4 adds r0, r7 @@ -702498,10 +702498,10 @@ sub_817A5A0: ; 817A5A0 lsls r0, 16 asrs r0, 16 cmp r0, 0xA - bne @0817A5C6 + bne _0817A5C6 adds r0, r2, 0 bl RemoveObjectAndFreeTiles -@0817A5C6: +_0817A5C6: pop {r0} bx r0 thumb_func_end sub_817A5A0 @@ -702526,7 +702526,7 @@ sub_817A5CC: ; 817A5CC ldr r5, =gUnknown_085EFF00 adds r6, r5, 0 subs r6, 0xA -@0817A5F0: +_0817A5F0: lsls r1, r2, 2 adds r1, r2 lsls r1, 2 @@ -702539,7 +702539,7 @@ sub_817A5CC: ; 817A5CC 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 @@ -702547,8 +702547,8 @@ sub_817A5CC: ; 817A5CC lsls r0, 24 lsrs r2, r0, 24 cmp r4, 0x7 - bls @0817A5F0 -@0817A61A: + bls _0817A5F0 +_0817A61A: pop {r4-r7} pop {r0} bx r0 @@ -702564,109 +702564,109 @@ 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 .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, =gUnknown_085EFEBC ldr r2, =0x0000105a adds r0, r4, r2 @@ -702693,9 +702693,9 @@ sub_817A634: ; 817A634 adds r1, r4, r2 movs r0, 0xA strb r0, [r1] - b @0817A90E + b _0817A90E .pool -@0817A818: +_0817A818: bl sub_817A91C ldr r1, =gUnknown_085EFEBC ldr r3, =0x0000105a @@ -702706,7 +702706,7 @@ sub_817A634: ; 817A634 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @0817A850 + beq _0817A850 ldr r2, [r4] ldrb r0, [r2, 0x1] movs r1, 0x3 @@ -702722,12 +702722,12 @@ sub_817A634: ; 817A634 ldr r1, =gUnknown_085F04FC 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, =gUnknown_085EFEBC ldr r2, =0x0000105a adds r0, r4, r2 @@ -702737,50 +702737,50 @@ sub_817A634: ; 817A634 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 StartObjectRotScalAnim - b @0817A8C8 + b _0817A8C8 .pool -@0817A898: +_0817A898: ldr r0, [r4] ldrb r1, [r2] bl StartObjectRotScalAnim - 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 .pool -@0817A8E0: +_0817A8E0: ldr r0, [r4] ldrb r0, [r0, 0x3] lsls r0, 26 @@ -702790,9 +702790,9 @@ sub_817A634: ; 817A634 adds r1, r4, r2 movs r0, 0x46 strb r0, [r1] - b @0817A90E + b _0817A90E .pool -@0817A8FC: +_0817A8FC: bl sub_817AA3C ldr r3, =0x00001051 adds r0, r4, r3 @@ -702801,7 +702801,7 @@ sub_817A634: ; 817A634 ldr r2, =0x00001050 adds r0, r4, r2 strb r1, [r0] -@0817A90E: +_0817A90E: pop {r4} pop {r0} bx r0 @@ -702821,7 +702821,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] @@ -702836,13 +702836,13 @@ sub_817A91C: ; 817A91C 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 @@ -702887,11 +702887,11 @@ sub_817A91C: ; 817A91C ldrh r0, [r4] strh r0, [r6] movs r0, 0 - b @0817A9DE + b _0817A9DE .pool -@0817A9DC: +_0817A9DC: movs r0, 0x1 -@0817A9DE: +_0817A9DE: pop {r4-r7} pop {r1} bx r1 @@ -702930,13 +702930,13 @@ sub_817A9E4: ; 817A9E4 strh r0, [r4] lsls r0, 16 cmp r0, 0 - beq @0817AA34 + beq _0817AA34 movs r0, 0 - b @0817AA36 + b _0817AA36 .pool -@0817AA34: +_0817AA34: movs r0, 0x1 -@0817AA36: +_0817AA36: pop {r4,r5} pop {r1} bx r1 @@ -703001,7 +703001,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 @@ -703010,7 +703010,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 @@ -703057,8 +703057,8 @@ sub_817AA54: ; 817AA54 mov r0, r8 subs r0, 0x1 cmp r5, r0 - blt @0817AABE -@0817AB20: + blt _0817AABE +_0817AB20: mov r0, r9 add r0, r8 subs r0, 0x1 @@ -703127,15 +703127,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 @@ -703150,10 +703150,10 @@ sub_817AB68: ; 817AB68 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] @@ -703163,10 +703163,10 @@ sub_817AB68: ; 817AB68 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] @@ -703188,9 +703188,9 @@ sub_817AB68: ; 817AB68 ldrsh r0, [r1, r2] ldrh r1, [r7] adds r1, r4 - b @0817AC80 + b _0817AC80 .pool -@0817AC54: +_0817AC54: mov r1, r8 movs r3, 0 ldrsh r0, [r1, r3] @@ -703212,7 +703212,7 @@ sub_817AB68: ; 817AB68 ldrsh r0, [r1, r2] ldrh r1, [r7] subs r1, r4 -@0817AC80: +_0817AC80: lsls r1, 16 asrs r1, 16 bl cosine @@ -703236,9 +703236,9 @@ sub_817AB68: ; 817AB68 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] - b @0817ABB2 + b _0817ABB2 .pool -@0817ACB8: +_0817ACB8: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -703255,11 +703255,11 @@ c2_clear_save_data_screen_2: ; 817ACC8 bl sub_817AE00 lsls r0, 24 cmp r0, 0 - beq @0817ACDC + beq _0817ACDC ldr r0, =sub_817ACE4 movs r1, 0 bl AddTask -@0817ACDC: +_0817ACDC: pop {r0} bx r0 .pool @@ -703315,19 +703315,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 FillWindowPixelBuffer @@ -703347,16 +703347,16 @@ sub_817AD40: ; 817AD40 adds r0, r1 ldr r1, =sub_817ADC0 str r1, [r0] - b @0817ADB2 + b _0817ADB2 .pool -@0817ADA0: +_0817ADA0: movs r0, 0x5 bl audio_play adds r0, r5, 0 bl remove_task ldr r0, =sub_817AFD4 bl SetMainCallback2 -@0817ADB2: +_0817ADB2: add sp, 0xC pop {r4,r5} pop {r0} @@ -703408,11 +703408,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 @@ -703493,7 +703493,7 @@ sub_817AE00: ; 817AE00 ldr r3, =0x06000020 ldr r0, =0x00001111 adds r2, r0, 0 -@0817AED4: +_0817AED4: lsls r0, r1, 1 adds r0, r3 strh r2, [r0] @@ -703501,12 +703501,12 @@ sub_817AE00: ; 817AE00 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] @@ -703514,7 +703514,7 @@ sub_817AE00: ; 817AE00 lsls r0, 16 lsrs r1, r0, 16 cmp r1, r2 - bls @0817AEEC + bls _0817AEEC bl clear_tasks bl ResetAllObjectData movs r0, 0 @@ -703551,24 +703551,24 @@ sub_817AE00: ; 817AE00 adds r0, r1 movs r1, 0x1 strb r1, [r0] - b @0817AFC8 + b _0817AFC8 .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 bl SetMainCallback2 movs r0, 0x1 - b @0817AFCA + b _0817AFCA .pool -@0817AFC8: +_0817AFC8: movs r0, 0 -@0817AFCA: +_0817AFCA: add sp, 0xC pop {r4} pop {r1} @@ -703585,10 +703585,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 @@ -703597,19 +703597,19 @@ sub_817AFD4: ; 817AFD4 bl pal_fade_maybe movs r0, 0x1 strb r0, [r4] - b @0817B020 + b _0817B020 .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 FreeAllWindowBuffers bl Reset -@0817B020: +_0817B020: add sp, 0x4 pop {r4} pop {r0} @@ -703656,10 +703656,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, =gUnknown_085F0DBC movs r1, 0xC0 lsls r1, 19 @@ -703679,9 +703679,9 @@ load_intro_part2_graphics: ; 817B064 movs r2, 0x20 bl gpu_pal_apply bl sub_817B76C - b @0817B11E + b _0817B11E .pool -@0817B0EC: +_0817B0EC: ldr r0, =gUnknown_085F1824 movs r1, 0xC0 lsls r1, 19 @@ -703701,7 +703701,7 @@ load_intro_part2_graphics: ; 817B064 movs r2, 0x20 bl gpu_pal_apply bl sub_817B788 -@0817B11E: +_0817B11E: ldr r1, =0x0203bd28 movs r0, 0 strh r0, [r1] @@ -703720,12 +703720,12 @@ sub_817B150: ; 817B150 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 SetGpuReg @@ -703739,9 +703739,9 @@ sub_817B150: ; 817B150 lsls r1, 5 movs r0, 0 bl SetGpuReg - b @0817B1B6 + b _0817B1B6 .pool -@0817B194: +_0817B194: ldr r1, =0x00000603 movs r0, 0xE bl SetGpuReg @@ -703755,7 +703755,7 @@ sub_817B150: ; 817B150 lsls r1, 5 movs r0, 0 bl SetGpuReg -@0817B1B6: +_0817B1B6: pop {r0} bx r0 .pool @@ -703773,21 +703773,21 @@ 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 .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, =gUnknown_085F06E0 movs r1, 0xF0 movs r2, 0x20 @@ -703809,9 +703809,9 @@ sub_817B1C8: ; 817B1C8 ldr r1, =0x06010000 bl LZ77UnCompVram ldr r0, =gUnknown_085F1668 - b @0817B2A6 + b _0817B2A6 .pool -@0817B270: +_0817B270: ldr r0, =gUnknown_085F0700 movs r1, 0xF0 movs r2, 0x20 @@ -703833,15 +703833,15 @@ sub_817B1C8: ; 817B1C8 ldr r1, =0x06010000 bl LZ77UnCompVram ldr r0, =gUnknown_085F1688 -@0817B2A6: +_0817B2A6: movs r1, 0x80 lsls r1, 1 movs r2, 0x20 bl gpu_pal_apply bl sub_817B76C - b @0817B370 + b _0817B370 .pool -@0817B2DC: +_0817B2DC: ldr r0, =gUnknown_085F0700 movs r1, 0xF0 movs r2, 0x20 @@ -703866,9 +703866,9 @@ sub_817B1C8: ; 817B1C8 movs r2, 0x20 bl gpu_pal_apply bl sub_817B788 - b @0817B370 + b _0817B370 .pool -@0817B334: +_0817B334: ldr r0, =gUnknown_085F0720 movs r1, 0xF0 movs r2, 0x20 @@ -703892,7 +703892,7 @@ sub_817B1C8: ; 817B1C8 movs r2, 0x20 bl gpu_pal_apply bl sub_817B7A4 -@0817B370: +_0817B370: ldr r1, =0x0300301c movs r0, 0x8 strb r0, [r1] @@ -704000,7 +704000,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 @@ -704023,11 +704023,11 @@ sub_817B458: ; 817B458 lsrs r1, 16 movs r0, 0x16 bl SetGpuReg -@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 @@ -704044,7 +704044,7 @@ sub_817B458: ; 817B458 movs r1, 0x8 ldrsh r0, [r4, r1] cmp r0, 0 - beq @0817B4F0 + beq _0817B4F0 ldr r2, =0x0203bd24 ldr r0, =0x0203bd26 ldrh r1, [r0] @@ -704054,14 +704054,14 @@ sub_817B458: ; 817B458 lsrs r1, 16 movs r0, 0x1A bl SetGpuReg - b @0817B4FA + b _0817B4FA .pool -@0817B4F0: +_0817B4F0: ldr r0, =0x0203bd24 ldrh r1, [r0] movs r0, 0x1A bl SetGpuReg -@0817B4FA: +_0817B4FA: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -704070,7 +704070,7 @@ sub_817B458: ; 817B458 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 @@ -704088,7 +704088,7 @@ sub_817B458: ; 817B458 ldrh r1, [r0] movs r0, 0x1E bl SetGpuReg -@0817B532: +_0817B532: pop {r4,r5} pop {r0} bx r0 @@ -704102,42 +704102,42 @@ sub_817B540: ; 817B540 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 .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 @@ -704149,34 +704149,34 @@ sub_817B540: ; 817B540 movs r1, 0xA movs r2, 0x2 bl gpu_pal_apply - b @0817B620 + b _0817B620 .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 .pool -@0817B5F8: +_0817B5F8: mov r1, sp movs r2, 0xC7 lsls r2, 2 @@ -704184,7 +704184,7 @@ sub_817B540: ; 817B540 strh r0, [r1] adds r1, 0x2 ldr r2, =0x00003d27 -@0817B606: +_0817B606: adds r0, r2, 0 strh r0, [r1] adds r4, r1, 0 @@ -704196,7 +704196,7 @@ sub_817B540: ; 817B540 movs r1, 0xD movs r2, 0x2 bl gpu_pal_apply -@0817B620: +_0817B620: add sp, 0x4 pop {r4} pop {r0} @@ -704212,14 +704212,14 @@ sub_817B62C: ; 817B62C 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 RemoveObjectAndFreeTiles - b @0817B690 + b _0817B690 .pool -@0817B64C: +_0817B64C: movs r1, 0x20 ldrsh r0, [r2, r1] lsls r0, 16 @@ -704231,28 +704231,28 @@ sub_817B62C: ; 817B62C 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 .pool -@0817B688: +_0817B688: ldr r0, =0x0203bd24 ldrh r0, [r0] -@0817B68C: +_0817B68C: negs r0, r0 strh r0, [r2, 0x26] -@0817B690: +_0817B690: pop {r0} bx r0 .pool @@ -704276,12 +704276,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 @@ -704348,8 +704348,8 @@ sub_817B698: ; 817B698 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 @@ -704720,7 +704720,7 @@ sub_817BA44: ; 817BA44 sub sp, 0x4 movs r4, 0 ldr r5, =gUnknown_085F5458 -@0817BA4C: +_0817BA4C: adds r0, r4, 0 adds r0, 0x14 lsls r0, 24 @@ -704736,7 +704736,7 @@ sub_817BA44: ; 817BA44 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0xB - bls @0817BA4C + bls _0817BA4C add sp, 0x4 pop {r4,r5} pop {r0} @@ -704751,7 +704751,7 @@ sub_817BA7C: ; 817BA7C 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 @@ -704771,9 +704771,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] @@ -704790,42 +704790,42 @@ sub_817BA7C: ; 817BA7C 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 @@ -704835,11 +704835,11 @@ sub_817BA7C: ; 817BA7C ands r0, r1 orrs r0, r2 strb r0, [r4, 0x3] - b @0817BB30 -@0817BB2A: + b _0817BB30 +_0817BB2A: adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0817BB30: +_0817BB30: pop {r4} pop {r0} bx r0 @@ -704858,7 +704858,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 @@ -704883,7 +704883,7 @@ sub_817BB38: ; 817BB38 adds r3, r4 ldr r0, =sub_817BA7C str r0, [r3] -@0817BB82: +_0817BB82: pop {r4,r5} pop {r0} bx r0 @@ -704897,7 +704897,7 @@ sub_817BB94: ; 817BB94 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 @@ -704916,9 +704916,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] @@ -704939,11 +704939,11 @@ sub_817BB94: ; 817BB94 ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] - b @0817BC00 -@0817BBFA: + b _0817BC00 +_0817BBFA: adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0817BC00: +_0817BC00: pop {r4} pop {r0} bx r0 @@ -704962,7 +704962,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 @@ -704993,7 +704993,7 @@ sub_817BC08: ; 817BC08 adds r3, r4 ldr r0, =sub_817BB94 str r0, [r3] -@0817BC5E: +_0817BC5E: pop {r4,r5} pop {r0} bx r0 @@ -705007,7 +705007,7 @@ sub_817BC70: ; 817BC70 movs r1, 0x38 ldrsh r0, [r4, r1] cmp r0, 0x8 - ble @0817BCAC + ble _0817BCAC ldrh r0, [r4, 0x3A] lsls r0, 24 lsrs r0, 24 @@ -705029,11 +705029,11 @@ 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 RemoveObjectAndFreeTiles -@0817BCB2: +_0817BCB2: pop {r4} pop {r0} bx r0 @@ -705054,7 +705054,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 @@ -705083,7 +705083,7 @@ sub_817BCB8: ; 817BCB8 adds r3, r4 ldr r0, =sub_817BC70 str r0, [r3] -@0817BD0E: +_0817BD0E: pop {r4-r6} pop {r0} bx r0 @@ -705098,16 +705098,16 @@ sub_817BD20: ; 817BD20 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 @@ -705133,9 +705133,9 @@ sub_817BD20: ; 817BD20 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 @@ -705144,13 +705144,13 @@ sub_817BD20: ; 817BD20 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] @@ -705166,20 +705166,20 @@ sub_817BD20: ; 817BD20 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 @@ -705192,11 +705192,11 @@ sub_817BD20: ; 817BD20 ldrh r0, [r4, 0x3C] adds r0, 0x1 strh r0, [r4, 0x3C] - b @0817BDEA -@0817BDE4: + b _0817BDEA +_0817BDE4: adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0817BDEA: +_0817BDEA: pop {r4,r5} pop {r0} bx r0 @@ -705215,7 +705215,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 @@ -705256,7 +705256,7 @@ sub_817BDF0: ; 817BDF0 adds r5, r6 ldr r0, =sub_817BD20 str r0, [r5] -@0817BE60: +_0817BE60: pop {r3} mov r8, r3 pop {r4-r6} @@ -705350,15 +705350,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 @@ -705372,8 +705372,8 @@ sub_817BF14: ; 817BF14 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 @@ -705381,14 +705381,14 @@ sub_817BF14: ; 817BF14 ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b @0817BF78 + b _0817BF78 .pool -@0817BF70: +_0817BF70: movs r0, 0x60 strh r0, [r1, 0x26] ldr r0, =sub_817BF84 str r0, [r1] -@0817BF78: +_0817BF78: pop {r4-r7} pop {r0} bx r0 @@ -705409,15 +705409,15 @@ 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 .pool -@0817BFA8: +_0817BFA8: adds r0, r2, 0 bl remove_task -@0817BFAE: +_0817BFAE: pop {r4} pop {r0} bx r0 @@ -705473,12 +705473,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 @@ -705486,8 +705486,8 @@ sub_817C000: ; 817C000 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 @@ -705495,12 +705495,12 @@ sub_817C000: ; 817C000 ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b @0817C04C + b _0817C04C .pool -@0817C048: +_0817C048: ldr r0, =sub_817C058 str r0, [r1] -@0817C04C: +_0817C04C: pop {r4-r6} pop {r0} bx r0 @@ -705567,12 +705567,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 @@ -705581,8 +705581,8 @@ sub_817C0B4: ; 817C0B4 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 @@ -705590,9 +705590,9 @@ sub_817C0B4: ; 817C0B4 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 @@ -705601,8 +705601,8 @@ sub_817C0B4: ; 817C0B4 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 @@ -705610,12 +705610,12 @@ sub_817C0B4: ; 817C0B4 ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b @0817C128 + b _0817C128 .pool -@0817C124: +_0817C124: ldr r0, =sub_817C134 str r0, [r1] -@0817C128: +_0817C128: pop {r4-r6} pop {r0} bx r0 @@ -705706,32 +705706,32 @@ 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 .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] @@ -705739,7 +705739,7 @@ sub_817C1D4: ; 817C1D4 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@0817C234: +_0817C234: ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 @@ -705747,12 +705747,12 @@ sub_817C1D4: ; 817C1D4 ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b @0817C254 + b _0817C254 .pool -@0817C250: +_0817C250: ldr r0, =sub_817C260 str r0, [r1] -@0817C254: +_0817C254: add sp, 0x4 pop {r4-r6} pop {r0} @@ -705770,10 +705770,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 .pool @@ -705853,32 +705853,32 @@ 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 .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] @@ -705886,7 +705886,7 @@ sub_817C310: ; 817C310 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@0817C370: +_0817C370: ldr r0, =0x03005e00 adds r1, r5, r6 lsls r1, 3 @@ -705894,12 +705894,12 @@ sub_817C310: ; 817C310 ldrh r0, [r1, 0x26] adds r0, 0x1 strh r0, [r1, 0x26] - b @0817C390 + b _0817C390 .pool -@0817C38C: +_0817C38C: ldr r0, =sub_817C260 str r0, [r1] -@0817C390: +_0817C390: add sp, 0x4 pop {r4-r6} pop {r0} @@ -705927,7 +705927,7 @@ sub_817C3A0: ; 817C3A0 movs r1, 0 ldr r3, =sub_817C4EC ldr r2, =0x00007fff -@0817C3BA: +_0817C3BA: lsls r0, r1, 1 add r0, sp adds r0, 0x4 @@ -705936,7 +705936,7 @@ sub_817C3A0: ; 817C3A0 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xF - bls @0817C3BA + bls _0817C3BA adds r0, r3, 0 movs r1, 0 bl AddTask @@ -706098,21 +706098,21 @@ 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 .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] @@ -706121,7 +706121,7 @@ sub_817C510: ; 817C510 strh r0, [r2, 0x12] ldr r0, =sub_817C560 str r0, [r2] -@0817C556: +_0817C556: pop {r4} pop {r0} bx r0 @@ -706143,17 +706143,17 @@ sub_817C560: ; 817C560 ldrsh r0, [r2, r3] adds r5, r1, 0 cmp r0, 0 - beq @0817C58C + beq _0817C58C ldr r0, =sub_817C72C str r0, [r2] - b @0817C670 + b _0817C670 .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 @@ -706162,16 +706162,16 @@ sub_817C560: ; 817C560 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 @@ -706182,17 +706182,17 @@ sub_817C560: ; 817C560 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 @@ -706201,16 +706201,16 @@ sub_817C560: ; 817C560 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 @@ -706221,20 +706221,20 @@ sub_817C560: ; 817C560 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 @@ -706265,10 +706265,10 @@ sub_817C560: ; 817C560 movs r3, 0 bl SetSpriteTransformationMatrix cmp r6, 0x2 - bne @0817C670 + bne _0817C670 ldr r0, =sub_817C510 str r0, [r5] -@0817C670: +_0817C670: add sp, 0x4 pop {r4-r7} pop {r0} @@ -706475,45 +706475,45 @@ sub_817C7F4: ; 817C7F4 bl sub_811EB10 lsls r0, 24 cmp r0, 0 - beq @0817C810 + beq _0817C810 ldr r0, =gUnknown_0860A3AC - b @0817C84E + b _0817C84E .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 .pool -@0817C828: +_0817C828: cmp r0, 0x15 - bne @0817C83C -@0817C82C: + bne _0817C83C +_0817C82C: ldr r1, =gUnknown_085F5494 - b @0817C844 + b _0817C844 .pool -@0817C834: +_0817C834: ldr r1, =gUnknown_085FA1D8 - b @0817C844 + b _0817C844 .pool -@0817C83C: +_0817C83C: ldr r1, =gUnknown_0860A168 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 @@ -706535,13 +706535,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 @@ -706558,11 +706558,11 @@ sub_817C858: ; 817C858 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] @@ -706583,11 +706583,11 @@ sub_817C8BC: ; 817C8BC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @0817C8D8 + beq _0817C8D8 movs r0, 0 - b @0817C8E6 + b _0817C8E6 .pool -@0817C8D8: +_0817C8D8: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] @@ -706595,7 +706595,7 @@ sub_817C8BC: ; 817C8BC ldr r0, =hm_teleport_run_dp02scr str r0, [r1] movs r0, 0x1 -@0817C8E6: +_0817C8E6: pop {r1} bx r1 .pool @@ -706666,14 +706666,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 @@ -706703,7 +706703,7 @@ sub_817C95C: ; 817C95C lsrs r0, 24 str r0, [sp, 0x4] cmp r4, 0 - bne @0817CA00 + bne _0817CA00 ldr r2, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -706712,9 +706712,9 @@ sub_817C95C: ; 817C95C movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @0817CA10 + b _0817CA10 .pool -@0817CA00: +_0817CA00: ldr r2, =0x0202406e ldrb r0, [r5] lsls r0, 1 @@ -706723,11 +706723,11 @@ sub_817C95C: ; 817C95C 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 @@ -706736,9 +706736,9 @@ sub_817C95C: ; 817C95C movs r0, 0x64 muls r1, r0 ldr r0, =0x020244ec - b @0817CA4C + b _0817CA4C .pool -@0817CA3C: +_0817CA3C: ldr r0, =0x0202420c ldrb r0, [r0] lsls r0, 1 @@ -706747,7 +706747,7 @@ sub_817C95C: ; 817C95C movs r0, 0x64 muls r1, r0 ldr r0, =0x02024744 -@0817CA4C: +_0817CA4C: adds r1, r0 str r1, [sp, 0xC] ldr r0, =0x0202420b @@ -706760,15 +706760,15 @@ sub_817C95C: ; 817C95C 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 @@ -706776,9 +706776,9 @@ sub_817C95C: ; 817C95C adds r0, 0x57 ldrb r1, [r0] movs r2, 0x1E - bl @0817E0A2 + bl _0817E0A2 .pool -@0817CA9C: +_0817CA9C: ldr r0, =0x0202420b ldrb r0, [r0] bl battle_get_per_side_status @@ -706800,371 +706800,371 @@ sub_817C95C: ; 817C95C 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 .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 @@ -707175,13 +707175,13 @@ sub_817C95C: ; 817C95C 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 .pool -@0817D098: +_0817D098: movs r0, 0x1 mov r1, r10 movs r2, 0x1 @@ -707192,26 +707192,26 @@ sub_817C95C: ; 817C95C 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 .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 @@ -707239,9 +707239,9 @@ sub_817C95C: ; 817C95C ldrb r2, [r3] movs r0, 0xD negs r0, r0 - bl @0817DC0C + bl _0817DC0C .pool -@0817D124: +_0817D124: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -707272,9 +707272,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r2] movs r0, 0x31 negs r0, r0 - bl @0817DFAA + bl _0817DFAA .pool -@0817D16C: +_0817D16C: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -707307,15 +707307,15 @@ sub_817C95C: ; 817C95C adds r2, 0x58 ldrb r0, [r2] movs r1, 0x40 - bl @0817DFAC + bl _0817DFAC .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 @@ -707326,9 +707326,9 @@ sub_817C95C: ; 817C95C negs r1, r1 ands r1, r2 movs r2, 0x14 - bl @0817E0A2 + bl _0817E0A2 .pool -@0817D1E0: +_0817D1E0: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -707339,9 +707339,9 @@ sub_817C95C: ; 817C95C 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 @@ -707354,8 +707354,8 @@ sub_817C95C: ; 817C95C 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 @@ -707386,9 +707386,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r2] movs r0, 0xD negs r0, r0 - bl @0817DFAA + bl _0817DFAA .pool -@0817D260: +_0817D260: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -707399,9 +707399,9 @@ sub_817C95C: ; 817C95C 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 @@ -707414,8 +707414,8 @@ sub_817C95C: ; 817C95C 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 @@ -707446,9 +707446,9 @@ sub_817C95C: ; 817C95C ands r0, r3 orrs r0, r1 strh r0, [r2] - bl @0817E0A6 + bl _0817E0A6 .pool -@0817D2E4: +_0817D2E4: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -707458,9 +707458,9 @@ sub_817C95C: ; 817C95C 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 @@ -707471,8 +707471,8 @@ sub_817C95C: ; 817C95C 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 @@ -707499,9 +707499,9 @@ sub_817C95C: ; 817C95C lsls r1, 3 movs r2, 0x19 negs r2, r2 - bl @0817DC0C + bl _0817DC0C .pool -@0817D354: +_0817D354: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -707512,12 +707512,12 @@ sub_817C95C: ; 817C95C 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 @@ -707527,11 +707527,11 @@ sub_817C95C: ; 817C95C 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 @@ -707542,119 +707542,119 @@ sub_817C95C: ; 817C95C 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 .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 .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 .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 .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 .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 @@ -707684,17 +707684,17 @@ sub_817C95C: ; 817C95C ldrb r3, [r2] movs r0, 0xD negs r0, r0 - bl @0817DFAA + bl _0817DFAA .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 @@ -707706,9 +707706,9 @@ sub_817C95C: ; 817C95C 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 @@ -707730,8 +707730,8 @@ sub_817C95C: ; 817C95C 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 @@ -707762,9 +707762,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r2] movs r0, 0x31 negs r0, r0 - bl @0817DFAA + bl _0817DFAA .pool -@0817D584: +_0817D584: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -707776,9 +707776,9 @@ sub_817C95C: ; 817C95C 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 @@ -707800,8 +707800,8 @@ sub_817C95C: ; 817C95C 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 @@ -707822,17 +707822,17 @@ sub_817C95C: ; 817C95C orrs r0, r1 strh r0, [r2, 0x30] adds r2, 0x32 - bl @0817DF0A + bl _0817DF0A .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 @@ -707842,9 +707842,9 @@ sub_817C95C: ; 817C95C 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 @@ -707865,8 +707865,8 @@ sub_817C95C: ; 817C95C 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 @@ -707890,17 +707890,17 @@ sub_817C95C: ; 817C95C orrs r0, r1 strb r0, [r4] adds r2, 0x33 - bl @0817DF9E + bl _0817DF9E .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 @@ -707912,9 +707912,9 @@ sub_817C95C: ; 817C95C 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 @@ -707936,7 +707936,7 @@ sub_817C95C: ; 817C95C negs r0, r0 ands r0, r2 movs r2, 0xC -@0817D6F2: +_0817D6F2: orrs r0, r2 mov r2, r8 lsls r3, r2, 5 @@ -707944,8 +707944,8 @@ sub_817C95C: ; 817C95C ands r0, r2 orrs r0, r3 strb r0, [r1] - bl @0817E0A6 -@0817D704: + bl _0817E0A6 +_0817D704: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -707987,17 +707987,17 @@ sub_817C95C: ; 817C95C ands r0, r2 orrs r0, r3 strb r0, [r1, 0x2] - bl @0817E0A6 + bl _0817E0A6 .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] @@ -708014,7 +708014,7 @@ sub_817C95C: ; 817C95C lsls r0, 23 lsrs r0, 29 cmp r0, 0 - beq @0817D7B2 + beq _0817D7B2 subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -708023,7 +708023,7 @@ sub_817C95C: ; 817C95C movs r0, 0x8 movs r1, 0x4 bl sub_817E684 -@0817D7B2: +_0817D7B2: lsls r3, r4, 2 adds r3, r7, r3 adds r3, 0x57 @@ -708037,9 +708037,9 @@ sub_817C95C: ; 817C95C ldrb r0, [r5] lsls r0, 1 adds r0, r6 - b @0817D934 + b _0817D934 .pool -@0817D7D8: +_0817D7D8: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -708081,9 +708081,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r1, 0x2] movs r0, 0xD negs r0, r0 - b @0817D88C + b _0817D88C .pool -@0817D838: +_0817D838: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -708126,21 +708126,21 @@ sub_817C95C: ; 817C95C 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 .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 @@ -708158,7 +708158,7 @@ sub_817C95C: ; 817C95C lsls r0, 29 lsrs r0, 29 cmp r0, 0 - beq @0817D8EE + beq _0817D8EE subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -708168,7 +708168,7 @@ sub_817C95C: ; 817C95C movs r0, 0x8 movs r1, 0x2 bl sub_817E684 -@0817D8EE: +_0817D8EE: ldrb r0, [r6] lsls r0, 1 add r0, r8 @@ -708180,7 +708180,7 @@ sub_817C95C: ; 817C95C lsls r0, 26 lsrs r0, 29 cmp r0, 0 - beq @0817D91A + beq _0817D91A subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -708190,7 +708190,7 @@ sub_817C95C: ; 817C95C movs r0, 0x8 movs r1, 0x3 bl sub_817E684 -@0817D91A: +_0817D91A: lsls r3, r5, 2 adds r3, r7, r3 adds r3, 0x57 @@ -708204,16 +708204,16 @@ sub_817C95C: ; 817C95C 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 .pool -@0817D94C: +_0817D94C: lsls r2, r5, 3 lsls r0, r6, 4 adds r2, r0 @@ -708244,9 +708244,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r2] movs r0, 0xD negs r0, r0 - b @0817DFAA + b _0817DFAA .pool -@0817D994: +_0817D994: mov r1, r8 lsls r0, r1, 3 lsls r1, r4, 4 @@ -708258,9 +708258,9 @@ sub_817C95C: ; 817C95C 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 @@ -708270,8 +708270,8 @@ sub_817C95C: ; 817C95C lsls r3, 28 lsrs r3, 30 movs r0, 0x9 - b @0817E086 -@0817D9C2: + b _0817E086 +_0817D9C2: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -708313,9 +708313,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r1, 0x3] movs r0, 0x4 negs r0, r0 - b @0817DB76 + b _0817DB76 .pool -@0817DA24: +_0817DA24: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -708332,9 +708332,9 @@ sub_817C95C: ; 817C95C 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 @@ -708344,9 +708344,9 @@ sub_817C95C: ; 817C95C movs r0, 0x9 movs r1, 0x2 bl sub_817E684 - b @0817E0A6 + b _0817E0A6 .pool -@0817DA68: +_0817DA68: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -708389,9 +708389,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r1, 0x3] movs r0, 0xD negs r0, r0 - b @0817DB76 + b _0817DB76 .pool -@0817DACC: +_0817DACC: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -708408,20 +708408,20 @@ sub_817C95C: ; 817C95C 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 @@ -708429,12 +708429,12 @@ sub_817C95C: ; 817C95C lsls r3, 28 lsrs r3, 30 movs r0, 0x9 -@0817DB10: +_0817DB10: movs r1, 0x3 bl sub_817E684 - b @0817E0A6 + b _0817E0A6 .pool -@0817DB24: +_0817DB24: ldr r5, =0x0202406e ldr r6, =0x0202420e ldrb r0, [r6] @@ -708476,13 +708476,13 @@ sub_817C95C: ; 817C95C 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 .pool -@0817DB90: +_0817DB90: ldr r1, =0x0202406e ldr r0, =0x0202420b ldrb r0, [r0] @@ -708499,9 +708499,9 @@ sub_817C95C: ; 817C95C 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 @@ -708509,12 +708509,12 @@ sub_817C95C: ; 817C95C lsls r3, 26 lsrs r3, 30 movs r0, 0x9 -@0817DBC2: +_0817DBC2: movs r1, 0x4 bl sub_817E684 - b @0817E0A6 + b _0817E0A6 .pool -@0817DBD4: +_0817DBD4: lsls r3, 3 mov r1, r9 lsls r0, r1, 4 @@ -708543,13 +708543,13 @@ sub_817C95C: ; 817C95C ldrb r2, [r3] movs r0, 0x31 negs r0, r0 -@0817DC0C: +_0817DC0C: ands r0, r2 orrs r0, r1 strb r0, [r3] - b @0817E0A6 + b _0817E0A6 .pool -@0817DC20: +_0817DC20: mov r2, r8 lsls r0, r2, 3 lsls r1, r4, 4 @@ -708559,7 +708559,7 @@ sub_817C95C: ; 817C95C lsls r0, 14 lsrs r0, 29 cmp r0, 0 - beq @0817DC4C + beq _0817DC4C subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -708571,7 +708571,7 @@ sub_817C95C: ; 817C95C movs r0, 0x9 movs r1, 0x1 bl sub_817E684 -@0817DC4C: +_0817DC4C: lsls r0, r4, 1 adds r0, r4 lsls r0, 2 @@ -708582,8 +708582,8 @@ sub_817C95C: ; 817C95C 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 @@ -708606,9 +708606,9 @@ sub_817C95C: ; 817C95C orrs r0, r1 strb r0, [r4] adds r2, 0x54 - b @0817DF9E + b _0817DF9E .pool -@0817DC98: +_0817DC98: ldr r1, [sp, 0x4] lsls r0, r1, 1 adds r0, r1 @@ -708620,9 +708620,9 @@ sub_817C95C: ; 817C95C 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 @@ -708642,8 +708642,8 @@ sub_817C95C: ; 817C95C 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 @@ -708659,8 +708659,8 @@ sub_817C95C: ; 817C95C 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 @@ -708686,9 +708686,9 @@ sub_817C95C: ; 817C95C adds r2, 0x33 mov r1, r10 lsls r3, r1, 6 - b @0817DF0E + b _0817DF0E .pool -@0817DD38: +_0817DD38: mov r0, r8 lsls r2, r0, 3 lsls r0, r4, 4 @@ -708713,20 +708713,20 @@ sub_817C95C: ; 817C95C mov r1, r10 lsls r3, r1, 6 movs r1, 0x3F - b @0817DF12 + b _0817DF12 .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 @@ -708735,7 +708735,7 @@ sub_817C95C: ; 817C95C ldrb r5, [r4] lsls r0, r5, 29 cmp r0, 0 - beq @0817DDAE + beq _0817DDAE movs r0, 0x8 negs r0, r0 ands r0, r5 @@ -708746,22 +708746,22 @@ sub_817C95C: ; 817C95C 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 @@ -708792,9 +708792,9 @@ sub_817C95C: ; 817C95C ldrb r3, [r2] movs r0, 0xD negs r0, r0 - b @0817DFAA + b _0817DFAA .pool -@0817DE10: +_0817DE10: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -708824,13 +708824,13 @@ sub_817C95C: ; 817C95C ldrb r3, [r2] movs r0, 0x31 negs r0, r0 - b @0817DFAA + b _0817DFAA .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 @@ -708848,11 +708848,11 @@ sub_817C95C: ; 817C95C 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 @@ -708869,13 +708869,13 @@ sub_817C95C: ; 817C95C 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 @@ -708891,9 +708891,9 @@ sub_817C95C: ; 817C95C ldrb r2, [r1] movs r0, 0x4 negs r0, r0 - b @0817DF6A + b _0817DF6A .pool -@0817DEDC: +_0817DEDC: lsls r2, r4, 1 adds r2, r4 lsls r2, 2 @@ -708917,19 +708917,19 @@ sub_817C95C: ; 817C95C 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 .pool -@0817DF24: +_0817DF24: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -708940,9 +708940,9 @@ sub_817C95C: ; 817C95C 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 @@ -708951,8 +708951,8 @@ sub_817C95C: ; 817C95C 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 @@ -708967,11 +708967,11 @@ sub_817C95C: ; 817C95C 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 @@ -708995,21 +708995,21 @@ sub_817C95C: ; 817C95C 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 .pool -@0817DFBC: +_0817DFBC: lsls r0, r6, 1 adds r0, r6 lsls r0, 2 @@ -709020,7 +709020,7 @@ sub_817C95C: ; 817C95C lsls r0, 25 lsrs r0, 29 cmp r0, 0 - beq @0817E0A6 + beq _0817E0A6 subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -709030,8 +709030,8 @@ sub_817C95C: ; 817C95C 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 @@ -709068,9 +709068,9 @@ sub_817C95C: ; 817C95C movs r1, 0 mov r3, r10 bl sub_817E684 - b @0817E0A6 + b _0817E0A6 .pool -@0817E040: +_0817E040: lsls r0, r4, 4 adds r4, r7, r0 adds r0, r4, 0 @@ -709078,7 +709078,7 @@ sub_817C95C: ; 817C95C ldrb r0, [r0] lsrs r0, 5 cmp r0, 0 - beq @0817E068 + beq _0817E068 subs r2, r0, 0x1 lsls r2, 24 lsrs r2, 24 @@ -709090,13 +709090,13 @@ sub_817C95C: ; 817C95C 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 @@ -709106,11 +709106,11 @@ sub_817C95C: ; 817C95C 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 @@ -709121,11 +709121,11 @@ sub_817C95C: ; 817C95C 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 @@ -709146,29 +709146,29 @@ 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 .pool -@0817E0F4: +_0817E0F4: movs r0, 0x1 -@0817E0F6: +_0817E0F6: pop {r4-r6} pop {r1} bx r1 @@ -709193,9 +709193,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 @@ -709221,7 +709221,7 @@ sub_817E0FC: ; 817E0FC lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x3 - bls @0817E184 + bls _0817E184 mov r2, r9 lsls r0, r2, 1 add r0, r9 @@ -709233,9 +709233,9 @@ sub_817E0FC: ; 817E0FC movs r2, 0x1E orrs r1, r2 strb r1, [r0] - b @0817E310 + b _0817E310 .pool -@0817E184: +_0817E184: mov r2, r10 ldrb r0, [r2] bl battle_get_per_side_status @@ -709317,16 +709317,16 @@ sub_817E0FC: ; 817E0FC 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 @@ -709351,12 +709351,12 @@ sub_817E0FC: ; 817E0FC 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 @@ -709401,7 +709401,7 @@ sub_817E0FC: ; 817E0FC movs r1, 0x1 orrs r0, r1 strb r0, [r4] -@0817E2D2: +_0817E2D2: ldr r1, =gBattleMoves ldr r2, [sp, 0x10] adds r0, r2, r7 @@ -709429,7 +709429,7 @@ sub_817E0FC: ; 817E0FC movs r2, 0 movs r3, 0 bl sub_817E684 -@0817E310: +_0817E310: add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -709451,7 +709451,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 @@ -709463,12 +709463,12 @@ 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 .pool -@0817E36C: +_0817E36C: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -709477,7 +709477,7 @@ sub_817E32C: ; 817E32C lsls r0, 14 lsrs r0, 29 cmp r0, 0 - beq @0817E3EE + beq _0817E3EE subs r0, 0x1 lsls r0, 2 adds r1, r4, 0 @@ -709498,8 +709498,8 @@ sub_817E32C: ; 817E32C 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 @@ -709510,7 +709510,7 @@ sub_817E32C: ; 817E32C lsls r0, 27 lsrs r0, 29 cmp r0, 0 - beq @0817E3EE + beq _0817E3EE subs r0, 0x1 lsls r0, 2 adds r1, r4, 0 @@ -709531,10 +709531,10 @@ sub_817E32C: ; 817E32C 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 @@ -709567,15 +709567,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 @@ -709585,45 +709585,45 @@ sub_817E3F4: ; 817E3F4 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 @@ -709637,19 +709637,19 @@ sub_817E3F4: ; 817E3F4 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] @@ -709659,19 +709659,19 @@ sub_817E3F4: ; 817E3F4 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 @@ -709686,13 +709686,13 @@ sub_817E3F4: ; 817E3F4 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 @@ -709705,7 +709705,7 @@ sub_817E3F4: ; 817E3F4 mov r3, r10 adds r1, r0, r3 movs r3, 0x3 -@0817E534: +_0817E534: lsls r0, r4, 16 asrs r0, 16 ldrh r4, [r1] @@ -709715,12 +709715,12 @@ sub_817E3F4: ; 817E3F4 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 @@ -709738,25 +709738,25 @@ sub_817E3F4: ; 817E3F4 movs r2, 0 bl pokemon_getattr cmp r4, r0 - bls @0817E5A0 - b @0817E594 + bls _0817E5A0 + b _0817E594 .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 @@ -709765,20 +709765,20 @@ sub_817E3F4: ; 817E3F4 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 @@ -709791,42 +709791,42 @@ sub_817E3F4: ; 817E3F4 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 .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 @@ -709839,9 +709839,9 @@ sub_817E3F4: ; 817E3F4 ldr r2, [sp] ldr r3, [sp, 0x4] bl sub_80ECB00 - b @0817E670 + b _0817E670 .pool -@0817E65C: +_0817E65C: ldr r0, =0x02024474 adds r0, 0x25 ldrb r1, [r0] @@ -709851,7 +709851,7 @@ sub_817E3F4: ; 817E3F4 ldr r2, [sp] ldr r3, [sp, 0x4] bl sub_80ECB00 -@0817E670: +_0817E670: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -709901,47 +709901,47 @@ 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 mov pc, r1 .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] @@ -709964,9 +709964,9 @@ sub_817E684: ; 817E684 ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b @0817EA6A + b _0817EA6A .pool -@0817E79C: +_0817E79C: ldr r1, =gUnknown_0860A834 add r1, r12 ldr r7, =0x0202406e @@ -709978,7 +709978,7 @@ sub_817E684: ; 817E684 ldr r3, =0x0202420b ldrh r0, [r1] cmp r6, r0 - bne @0817E7E0 + bne _0817E7E0 ldrb r0, [r3] lsls r0, 1 adds r0, r7 @@ -709992,17 +709992,17 @@ sub_817E684: ; 817E684 ldrh r2, [r0] adds r1, r2 strh r1, [r0] - b @0817EA6C + b _0817EA6C .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 @@ -710016,8 +710016,8 @@ sub_817E684: ; 817E684 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 @@ -710046,9 +710046,9 @@ sub_817E684: ; 817E684 ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b @0817EA6A + b _0817EA6A .pool -@0817E848: +_0817E848: lsls r0, r5, 1 adds r0, r5 lsls r0, 2 @@ -710059,7 +710059,7 @@ sub_817E684: ; 817E684 negs r1, r1 ands r1, r2 strb r1, [r0] -@0817E85C: +_0817E85C: mov r0, r9 lsls r1, r0, 1 lsls r0, r5, 1 @@ -710075,9 +710075,9 @@ sub_817E684: ; 817E684 ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b @0817EA6A + b _0817EA6A .pool -@0817E880: +_0817E880: lsls r1, r5, 2 add r1, r9 lsls r1, 1 @@ -710091,9 +710091,9 @@ sub_817E684: ; 817E684 ldr r2, [r0] lsls r0, r6, 1 adds r0, r2 - b @0817EA64 + b _0817EA64 .pool -@0817E8A0: +_0817E8A0: lsls r2, r5, 2 add r2, r9 lsls r2, 1 @@ -710113,9 +710113,9 @@ sub_817E684: ; 817E684 ldrh r1, [r2] adds r0, r1 strh r0, [r2] - b @0817EA6C + b _0817EA6C .pool -@0817E8CC: +_0817E8CC: lsls r1, r5, 2 add r1, r9 lsls r1, 1 @@ -710130,9 +710130,9 @@ sub_817E684: ; 817E684 ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b @0817EA6A + b _0817EA6A .pool -@0817E8F0: +_0817E8F0: lsls r0, r3, 4 adds r2, r7, r0 adds r0, r2, 0 @@ -710146,15 +710146,15 @@ sub_817E684: ; 817E684 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 @@ -710175,14 +710175,14 @@ sub_817E684: ; 817E684 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 @@ -710202,9 +710202,9 @@ sub_817E684: ; 817E684 ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b @0817EA6A + b _0817EA6A .pool -@0817E978: +_0817E978: lsls r1, r3, 4 adds r1, r7, r1 adds r0, r1, 0 @@ -710218,11 +710218,11 @@ sub_817E684: ; 817E684 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 @@ -710240,12 +710240,12 @@ sub_817E684: ; 817E684 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 @@ -710254,13 +710254,13 @@ sub_817E684: ; 817E684 lsls r0, r3, 1 adds r0, r3 lsls r0, 4 - b @0817EA5A + b _0817EA5A .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 @@ -710271,7 +710271,7 @@ sub_817E684: ; 817E684 lsls r0, 26 lsrs r0, 29 cmp r0, 0 - beq @0817EA6C + beq _0817EA6C subs r1, r0, 0x1 lsls r1, 2 adds r0, r2, 0 @@ -710290,13 +710290,13 @@ sub_817E684: ; 817E684 ldrh r0, [r0] ldrh r2, [r1] adds r0, r2 - b @0817EA6A + b _0817EA6A .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 @@ -710307,7 +710307,7 @@ sub_817E684: ; 817E684 lsls r0, 23 lsrs r0, 29 cmp r0, 0 - beq @0817EA6C + beq _0817EA6C subs r1, r0, 0x1 lsls r1, 2 adds r0, r2, 0 @@ -710318,19 +710318,19 @@ sub_817E684: ; 817E684 adds r1, r0 lsls r1, 1 lsls r0, r3, 4 -@0817EA5A: +_0817EA5A: adds r1, r0 add r1, r8 ldr r0, =gUnknown_0860A834 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 @@ -710375,38 +710375,38 @@ 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 .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 @@ -710417,9 +710417,9 @@ sub_817EA80: ; 817EA80 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 @@ -710429,8 +710429,8 @@ sub_817EA80: ; 817EA80 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 @@ -710441,9 +710441,9 @@ sub_817EA80: ; 817EA80 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 @@ -710453,8 +710453,8 @@ sub_817EA80: ; 817EA80 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 @@ -710465,7 +710465,7 @@ sub_817EA80: ; 817EA80 lsls r0, 29 lsrs r1, r0, 29 cmp r1, 0 - beq @0817EBB4 + beq _0817EBB4 movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -710480,14 +710480,14 @@ sub_817EA80: ; 817EA80 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 @@ -710497,8 +710497,8 @@ sub_817EA80: ; 817EA80 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 @@ -710509,9 +710509,9 @@ sub_817EA80: ; 817EA80 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 @@ -710520,8 +710520,8 @@ sub_817EA80: ; 817EA80 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 @@ -710530,9 +710530,9 @@ sub_817EA80: ; 817EA80 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 @@ -710542,8 +710542,8 @@ sub_817EA80: ; 817EA80 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 @@ -710554,9 +710554,9 @@ sub_817EA80: ; 817EA80 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 @@ -710564,8 +710564,8 @@ sub_817EA80: ; 817EA80 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 @@ -710576,13 +710576,13 @@ sub_817EA80: ; 817EA80 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 @@ -710591,9 +710591,9 @@ sub_817EA80: ; 817EA80 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 @@ -710606,8 +710606,8 @@ sub_817EA80: ; 817EA80 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 @@ -710618,9 +710618,9 @@ sub_817EA80: ; 817EA80 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 @@ -710633,8 +710633,8 @@ sub_817EA80: ; 817EA80 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 @@ -710644,7 +710644,7 @@ sub_817EA80: ; 817EA80 ldrb r0, [r0] lsls r0, 25 cmp r0, 0 - bge @0817ED14 + bge _0817ED14 adds r0, r3, 0 adds r0, 0x52 ldrb r0, [r0] @@ -710657,7 +710657,7 @@ sub_817EA80: ; 817EA80 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 @@ -710670,7 +710670,7 @@ sub_817EA80: ; 817EA80 movs r0, 0x13 movs r1, 0 bl sub_817E684 -@0817ED14: +_0817ED14: movs r1, 0x1 eors r1, r4 lsls r0, r1, 1 @@ -710682,9 +710682,9 @@ sub_817EA80: ; 817EA80 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 @@ -710698,9 +710698,9 @@ sub_817EA80: ; 817EA80 ldrb r3, [r1] lsrs r3, 6 adds r3, r0 - b @0817EE88 + b _0817EE88 .pool -@0817ED54: +_0817ED54: movs r0, 0x1 eors r0, r4 lsls r1, r0, 1 @@ -710712,9 +710712,9 @@ sub_817EA80: ; 817EA80 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 @@ -710724,8 +710724,8 @@ sub_817EA80: ; 817EA80 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 @@ -710735,12 +710735,12 @@ sub_817EA80: ; 817EA80 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] @@ -710753,13 +710753,13 @@ sub_817EA80: ; 817EA80 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 @@ -710768,7 +710768,7 @@ sub_817EA80: ; 817EA80 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 @@ -710782,7 +710782,7 @@ sub_817EA80: ; 817EA80 movs r0, 0x13 movs r1, 0 bl sub_817E684 -@0817EDF0: +_0817EDF0: movs r0, 0x1 eors r0, r4 lsls r1, r0, 1 @@ -710793,7 +710793,7 @@ sub_817EA80: ; 817EA80 ldrb r1, [r1] lsls r0, r1, 31 cmp r0, 0 - beq @0817EEBC + beq _0817EEBC movs r0, 0x1 adds r2, r4, 0 eors r2, r0 @@ -710804,10 +710804,10 @@ sub_817EA80: ; 817EA80 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 @@ -710827,9 +710827,9 @@ sub_817EA80: ; 817EA80 lsls r3, 24 lsrs r3, 24 movs r0, 0x14 - b @0817EE8E + b _0817EE8E .pool -@0817EE50: +_0817EE50: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -710840,37 +710840,37 @@ sub_817EA80: ; 817EA80 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 @@ -710889,7 +710889,7 @@ sub_817EA80: ; 817EA80 movs r0, 0x14 movs r1, 0 bl sub_817E684 -@0817EEBC: +_0817EEBC: pop {r3} mov r8, r3 pop {r4-r7} @@ -710911,18 +710911,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 @@ -710933,9 +710933,9 @@ sub_817EECC: ; 817EECC 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 @@ -710944,28 +710944,28 @@ sub_817EECC: ; 817EECC 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, =gBattleMoves ldr r2, =0x020244b0 adds r0, r4, r2 @@ -710983,35 +710983,35 @@ sub_817EECC: ; 817EECC 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, =gUnknown_0860A4AC 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 @@ -711033,7 +711033,7 @@ sub_817EECC: ; 817EECC add r7, sp, 0x10 ldr r4, =0x0202420c mov r9, r4 -@0817EFC2: +_0817EFC2: lsls r1, r5, 1 ldr r6, =0x0202420b ldrb r0, [r6] @@ -711055,7 +711055,7 @@ sub_817EECC: ; 817EECC bl sub_817F21C lsls r0, 24 cmp r0, 0 - beq @0817F0B4 + beq _0817F0B4 ldr r4, =0x0202428e mov r1, r9 ldrb r0, [r1] @@ -711102,7 +711102,7 @@ sub_817EECC: ; 817EECC lsls r1, 2 ands r0, r1 cmp r0, 0 - beq @0817F06A + beq _0817F06A ldr r2, =gBattleMoves mov r6, r8 ldrh r1, [r6] @@ -711112,10 +711112,10 @@ sub_817EECC: ; 817EECC 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] @@ -711124,7 +711124,7 @@ sub_817EECC: ; 817EECC ldrb r0, [r1] lsls r0, 28 cmp r0, 0 - bge @0817F08C + bge _0817F08C ldr r4, =0x020241f0 ldr r1, [r4] lsls r0, r1, 4 @@ -711132,7 +711132,7 @@ sub_817EECC: ; 817EECC movs r1, 0xA bl __divsi3 str r0, [r4] -@0817F08C: +_0817F08C: mov r1, r8 ldrh r0, [r1] ldrb r1, [r6] @@ -711145,18 +711145,18 @@ sub_817EECC: ; 817EECC 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 @@ -711165,14 +711165,14 @@ sub_817EECC: ; 817EECC 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 @@ -711183,12 +711183,12 @@ sub_817EECC: ; 817EECC 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 @@ -711197,22 +711197,22 @@ sub_817EECC: ; 817EECC 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 @@ -711260,14 +711260,14 @@ sub_817EECC: ; 817EECC str r0, [sp] adds r0, r6, 0 bl sub_80EE35C - b @0817F1DC + b _0817F1DC .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 @@ -711283,7 +711283,7 @@ sub_817EECC: ; 817EECC mov r3, sp ldrh r3, [r3, 0x24] strh r3, [r0] -@0817F1FA: +_0817F1FA: add sp, 0x28 pop {r3-r5} mov r8, r3 @@ -711309,36 +711309,36 @@ sub_817F21C: ; 817F21C adds r0, r1 ldrb r0, [r0, 0x1] cmp r0, 0 - beq @0817F286 + beq _0817F286 movs r4, 0 ldr r5, =gUnknown_0860A4AC 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 .pool -@0817F270: +_0817F270: cmp r2, 0x95 - bne @0817F294 + bne _0817F294 ldr r2, =0x02024084 ldr r0, =0x0202420b ldrb r1, [r0] @@ -711348,20 +711348,20 @@ sub_817F21C: ; 817F21C adds r0, 0x2A ldrb r0, [r0] asrs r0, 1 -@0817F286: +_0817F286: str r0, [r6] movs r0, 0 - b @0817F2A0 + b _0817F2A0 .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 @@ -711375,7 +711375,7 @@ sub_817F2A8: ; 817F2A8 movs r1, 0x2 ands r0, r1 cmp r0, 0 - beq @0817F324 + beq _0817F324 ldr r0, =0x0202449c ldr r3, [r0] ldr r0, =0x0000025b @@ -711431,7 +711431,7 @@ sub_817F2A8: ; 817F2A8 ldrb r0, [r3] ands r1, r0 strb r1, [r3] -@0817F324: +_0817F324: pop {r4,r5} pop {r0} bx r0 @@ -711450,20 +711450,20 @@ 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 .pool -@0817F36C: +_0817F36C: adds r4, 0x1 -@0817F36E: +_0817F36E: cmp r4, 0x3 - bgt @0817F388 + bgt _0817F388 ldrh r1, [r5] movs r0, 0x64 muls r0, r1 @@ -711473,8 +711473,8 @@ sub_817F33C: ; 817F33C 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} @@ -711497,37 +711497,37 @@ 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 @@ -711613,15 +711613,15 @@ sub_817F474: ; 817F474 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @0817F48C + bne _0817F48C movs r0, 0 - b @0817F492 + b _0817F492 .pool -@0817F48C: +_0817F48C: subs r0, 0x1 lsls r0, 24 lsrs r0, 24 -@0817F492: +_0817F492: pop {r1} bx r1 thumb_func_end sub_817F474 @@ -711650,7 +711650,7 @@ sub_817F498: ; 817F498 ldr r0, =DummyObjectCallback mov r12, r0 cmp r4, 0 - bne @0817F508 + bne _0817F508 ldrh r0, [r3, 0x2E] strh r0, [r2, 0x10] ldrh r0, [r3, 0x32] @@ -711665,12 +711665,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 @@ -711685,10 +711685,10 @@ sub_817F498: ; 817F498 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 @@ -711701,7 +711701,7 @@ sub_817F498: ; 817F498 strh r2, [r3, 0x30] adds r0, r5, 0 bl remove_task -@0817F528: +_0817F528: pop {r3} mov r8, r3 pop {r4-r7} @@ -711865,24 +711865,24 @@ 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 StartObjectRotScalAnim - b @0817F6B0 + b _0817F6B0 .pool -@0817F6A8: +_0817F6A8: adds r0, r4, 0 movs r1, 0 bl StartObjectRotScalAnim -@0817F6B0: +_0817F6B0: ldrb r3, [r4, 0x1] lsrs r1, r3, 6 ldrb r2, [r4, 0x3] @@ -711915,14 +711915,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 @@ -711941,12 +711941,12 @@ sub_817F70C: ; 817F70C 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 @@ -711957,7 +711957,7 @@ sub_817F724: ; 817F724 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bhi @0817F750 + bhi _0817F750 ldr r1, =0x03001240 lsls r0, r2, 1 adds r0, r2 @@ -711971,11 +711971,11 @@ sub_817F724: ; 817F724 strh r2, [r0, 0x2] strh r2, [r0, 0x8] movs r0, 0x1 - b @0817F752 + b _0817F752 .pool -@0817F750: +_0817F750: movs r0, 0 -@0817F752: +_0817F752: pop {r1} bx r1 thumb_func_end sub_817F724 @@ -712021,20 +712021,20 @@ 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 .pool -@0817F7C0: +_0817F7C0: adds r0, r4, 0 adds r0, 0x3F ldrb r2, [r0] @@ -712043,7 +712043,7 @@ sub_817F77C: ; 817F77C ands r1, r2 strb r1, [r0] adds r5, r0, 0 -@0817F7D0: +_0817F7D0: ldrb r0, [r4, 0x3] lsls r0, 26 lsrs r0, 27 @@ -712067,7 +712067,7 @@ sub_817F77C: ; 817F77C negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -@0817F800: +_0817F800: pop {r4,r5} pop {r0} bx r0 @@ -712080,14 +712080,14 @@ pokemonanimfunc_01: ; 817F808 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 @@ -712098,9 +712098,9 @@ pokemonanimfunc_01: ; 817F808 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @0817F88C + b _0817F88C .pool -@0817F840: +_0817F840: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 9 @@ -712108,9 +712108,9 @@ pokemonanimfunc_01: ; 817F808 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 @@ -712136,7 +712136,7 @@ pokemonanimfunc_01: ; 817F808 adds r0, r6, 0 movs r3, 0 bl sub_817F6D4 -@0817F88C: +_0817F88C: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -712153,20 +712153,20 @@ pokemonanimfunc_02: ; 817F898 movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble @0817F8B4 + ble _0817F8B4 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @0817F8EE + b _0817F8EE .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 @@ -712174,9 +712174,9 @@ pokemonanimfunc_02: ; 817F898 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 @@ -712189,7 +712189,7 @@ pokemonanimfunc_02: ; 817F898 adds r2, r0, 0 muls r2, r1 adds r0, r2, 0 -@0817F8EE: +_0817F8EE: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -712209,13 +712209,13 @@ sub_817F8FC: ; 817F8FC movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - ble @0817F91C + ble _0817F91C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @0817F946 + b _0817F946 .pool -@0817F91C: +_0817F91C: movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -712226,9 +712226,9 @@ sub_817F8FC: ; 817F8FC 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 @@ -712236,7 +712236,7 @@ sub_817F8FC: ; 817F8FC asrs r0, 16 movs r1, 0x6 bl sine -@0817F946: +_0817F946: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -712274,13 +712274,13 @@ sub_817F978: ; 817F978 movs r2, 0x2E ldrsh r0, [r4, r2] cmp r1, r0 - ble @0817F998 + ble _0817F998 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @0817F9C4 + b _0817F9C4 .pool -@0817F998: +_0817F998: movs r0, 0x32 ldrsh r1, [r4, r0] lsls r0, r1, 1 @@ -712291,9 +712291,9 @@ sub_817F978: ; 817F978 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 @@ -712302,7 +712302,7 @@ sub_817F978: ; 817F978 movs r1, 0x6 bl sine negs r0, r0 -@0817F9C4: +_0817F9C4: strh r0, [r4, 0x26] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -712339,28 +712339,28 @@ sub_817F9F4: ; 817F9F4 movs r0, 0xC0 lsls r0, 1 cmp r1, r0 - ble @0817FA14 + ble _0817FA14 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b @0817FA5E + b _0817FA5E .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 @@ -712370,9 +712370,9 @@ sub_817F9F4: ; 817F9F4 lsls r1, r2, 1 adds r1, r2 lsls r1, 16 - b @0817FA56 + b _0817FA56 .pool -@0817FA48: +_0817FA48: lsls r0, r2, 7 subs r0, r1, r0 lsls r0, 16 @@ -712380,13 +712380,13 @@ sub_817F9F4: ; 817F9F4 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] @@ -712420,101 +712420,101 @@ pokemonanimfunc_06: ; 817FA88 movs r0, 0xC0 lsls r0, 2 cmp r2, r0 - ble @0817FAA8 + ble _0817FAA8 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b @0817FB56 + b _0817FB56 .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 .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 @@ -712523,7 +712523,7 @@ pokemonanimfunc_06: ; 817FA88 movs r1, 0x8 bl sine negs r0, r0 -@0817FB56: +_0817FB56: strh r0, [r4, 0x26] ldrh r0, [r4, 0x32] adds r0, 0xC @@ -712540,14 +712540,14 @@ pokemonanimfunc_09: ; 817FB64 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 @@ -712558,9 +712558,9 @@ pokemonanimfunc_09: ; 817FB64 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @0817FC12 + b _0817FC12 .pool -@0817FB9C: +_0817FB9C: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -712568,9 +712568,9 @@ pokemonanimfunc_09: ; 817FB64 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 @@ -712580,7 +712580,7 @@ pokemonanimfunc_09: ; 817FB64 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne @0817FBE0 + bne _0817FBE0 lsls r4, 16 asrs r4, 16 adds r0, r4, 0 @@ -712593,8 +712593,8 @@ pokemonanimfunc_09: ; 817FB64 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 @@ -712607,7 +712607,7 @@ pokemonanimfunc_09: ; 817FB64 strh r0, [r6, 0x36] adds r0, r4, 0 movs r1, 0x8 -@0817FBFA: +_0817FBFA: bl sine adds r0, r5 strh r0, [r6, 0x38] @@ -712618,7 +712618,7 @@ pokemonanimfunc_09: ; 817FB64 adds r0, r6, 0 movs r3, 0 bl sub_817F6D4 -@0817FC12: +_0817FC12: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -712635,9 +712635,9 @@ sub_817FC20: ; 817FC20 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @0817FC32 + bne _0817FC32 strh r0, [r4, 0x34] -@0817FC32: +_0817FC32: ldr r2, =gUnknown_0860AD70 movs r5, 0x34 ldrsh r1, [r4, r5] @@ -712650,21 +712650,21 @@ sub_817FC20: ; 817FC20 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 str r0, [r4, 0x1C] - b @0817FC6A + b _0817FC6A .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 @@ -712675,12 +712675,12 @@ sub_817FC20: ; 817FC20 lsls r0, 24 asrs r0, 24 cmp r0, 0 - bne @0817FC8C + bne _0817FC8C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @0817FCBE + b _0817FCBE .pool -@0817FC8C: +_0817FC8C: adds r0, r1, r2 ldrb r0, [r0] lsls r0, 24 @@ -712705,7 +712705,7 @@ sub_817FC20: ; 817FC20 strh r0, [r4, 0x32] adds r0, r4, 0 bl sub_817F70C -@0817FCBE: +_0817FCBE: pop {r4,r5} pop {r0} bx r0 @@ -712733,18 +712733,18 @@ sub_817FCDC: ; 817FCDC movs r0, 0x90 lsls r0, 4 cmp r1, r0 - ble @0817FCF8 + ble _0817FCF8 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @0817FD12 + b _0817FD12 .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 @@ -712753,7 +712753,7 @@ sub_817FCDC: ; 817FCDC movs r2, 0x3C ldrsh r1, [r4, r2] bl sine -@0817FD12: +_0817FD12: strh r0, [r4, 0x24] ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] @@ -712791,18 +712791,18 @@ sub_817FD44: ; 817FD44 movs r0, 0x90 lsls r0, 4 cmp r1, r0 - ble @0817FD60 + ble _0817FD60 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @0817FD78 + b _0817FD78 .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 @@ -712810,7 +712810,7 @@ sub_817FD44: ; 817FD44 asrs r0, 16 movs r1, 0x3 bl sine -@0817FD78: +_0817FD78: strh r0, [r4, 0x26] ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x32] @@ -712847,28 +712847,28 @@ pokemonanimfunc_11: ; 817FDA4 movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble @0817FDC8 + ble _0817FDC8 ldr r0, =sub_8184D88 str r0, [r7, 0x1C] movs r0, 0 strh r0, [r7, 0x24] strh r0, [r7, 0x26] - b @0817FE24 + b _0817FE24 .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 @@ -712878,9 +712878,9 @@ pokemonanimfunc_11: ; 817FDA4 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 @@ -712902,7 +712902,7 @@ pokemonanimfunc_11: ; 817FDA4 muls r1, r5 adds r0, r1, 0 strh r0, [r7, 0x24] -@0817FE24: +_0817FE24: ldrh r0, [r7, 0x32] adds r0, 0x9 strh r0, [r7, 0x32] @@ -712925,26 +712925,26 @@ 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 .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 @@ -712957,7 +712957,7 @@ sub_817FE30: ; 817FE30 movs r2, 0x6 ldrsh r0, [r5, r2] cmp r1, r0 - ble @0817FEC4 + ble _0817FEC4 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -712968,30 +712968,30 @@ sub_817FE30: ; 817FE30 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 .pool -@0817FEB4: +_0817FEB4: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @0817FEF2 + b _0817FEF2 .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 @@ -713007,11 +713007,11 @@ sub_817FE30: ; 817FE30 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 @@ -713055,10 +713055,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 @@ -713068,7 +713068,7 @@ sub_817FF3C: ; 817FF3C adds r0, r1 ldrh r1, [r0] cmp r6, r1 - ble @0817FF8C + ble _0817FF8C movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -713079,9 +713079,9 @@ sub_817FF3C: ; 817FF3C bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @0817FFAA + b _0817FFAA .pool -@0817FF8C: +_0817FF8C: movs r2, 0x8 ldrsh r1, [r0, r2] movs r0, 0x80 @@ -713095,7 +713095,7 @@ sub_817FF3C: ; 817FF3C adds r0, r4, 0 adds r1, r2, 0 bl sub_817F6D4 -@0817FFAA: +_0817FFAA: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -713150,25 +713150,25 @@ 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 str r0, [r5, 0x1C] - b @0818006A + b _0818006A .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 @@ -713189,7 +713189,7 @@ sub_817FFF0: ; 817FFF0 ldrh r1, [r6, 0x8] adds r0, r1 strh r0, [r5, 0x26] -@0818006A: +_0818006A: ldr r0, =0x03001240 lsls r1, r7, 1 adds r1, r7 @@ -713244,7 +713244,7 @@ pokemonanimfunc_15: ; 81800D0 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @081800EC + bne _081800EC ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -713253,11 +713253,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 @@ -713265,9 +713265,9 @@ pokemonanimfunc_15: ; 81800D0 bl pal_fade_1 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08180128 + b _08180128 .pool -@0818010C: +_0818010C: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0x10 @@ -713280,7 +713280,7 @@ pokemonanimfunc_15: ; 81800D0 movs r1, 0x10 movs r3, 0 bl pal_fade_1 -@08180128: +_08180128: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -713297,15 +713297,15 @@ pokemonanimfunc_16: ; 8180134 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 @@ -713316,9 +713316,9 @@ pokemonanimfunc_16: ; 8180134 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @08180204 + b _08180204 .pool -@08180170: +_08180170: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 7 @@ -713331,17 +713331,17 @@ pokemonanimfunc_16: ; 8180134 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 @@ -713355,9 +713355,9 @@ pokemonanimfunc_16: ; 8180134 adds r4, r0 strh r4, [r6, 0x36] adds r4, r5, 0 - b @081801E4 + b _081801E4 .pool -@081801C4: +_081801C4: adds r0, r7, 0 movs r1, 0x10 bl sine @@ -713372,7 +713372,7 @@ pokemonanimfunc_16: ; 8180134 subs r1, r5 subs r1, r0 strh r1, [r6, 0x36] -@081801E4: +_081801E4: asrs r0, r4, 16 movs r1, 0x10 bl sine @@ -713387,7 +713387,7 @@ pokemonanimfunc_16: ; 8180134 adds r0, r6, 0 movs r3, 0 bl sub_817F618 -@08180204: +_08180204: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -713408,15 +713408,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 @@ -713429,9 +713429,9 @@ pokemonanimfunc_17: ; 8180210 str r0, [r5, 0x1C] mov r0, r8 strh r0, [r5, 0x26] - b @0818030A + b _0818030A .pool -@08180258: +_08180258: movs r1, 0x32 ldrsh r0, [r5, r1] lsls r0, 7 @@ -713444,17 +713444,17 @@ pokemonanimfunc_17: ; 8180210 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 @@ -713463,9 +713463,9 @@ pokemonanimfunc_17: ; 8180210 adds r1, r2, 0 subs r1, r0 strh r1, [r5, 0x36] - b @081802B2 + b _081802B2 .pool -@081802A0: +_081802A0: lsls r4, 16 asrs r0, r4, 16 movs r1, 0x10 @@ -713474,7 +713474,7 @@ pokemonanimfunc_17: ; 8180210 lsls r1, 1 adds r0, r1 strh r0, [r5, 0x36] -@081802B2: +_081802B2: adds r6, r4, 0 adds r0, r7, 0 movs r1, 0x8 @@ -713494,18 +713494,18 @@ pokemonanimfunc_17: ; 8180210 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 @@ -713518,7 +713518,7 @@ pokemonanimfunc_17: ; 8180210 adds r0, r5, 0 movs r3, 0 bl sub_817F618 -@0818030A: +_0818030A: ldrh r0, [r5, 0x32] adds r0, 0x1 strh r0, [r5, 0x32] @@ -713553,43 +713553,43 @@ 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 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] - b @08180394 + b _08180394 .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} @@ -713625,14 +713625,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 @@ -713645,9 +713645,9 @@ pokemonanimfunc_1A: ; 81803BC str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b @0818045E + b _0818045E .pool -@08180404: +_08180404: adds r6, r5, 0 subs r6, 0xA lsls r0, r6, 7 @@ -713656,7 +713656,7 @@ pokemonanimfunc_1A: ; 81803BC lsls r0, 16 lsrs r1, r0, 16 cmp r5, 0x9 - bhi @0818042A + bhi _0818042A movs r2, 0x80 lsls r2, 1 lsrs r3, r7, 25 @@ -713664,20 +713664,20 @@ pokemonanimfunc_1A: ; 81803BC 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 @@ -713691,7 +713691,7 @@ pokemonanimfunc_1A: ; 81803BC adds r0, r4, 0 adds r1, r2, 0 bl sub_817F6D4 -@0818045E: +_0818045E: ldrh r0, [r4, 0x32] adds r0, 0x1 strh r0, [r4, 0x32] @@ -713711,14 +713711,14 @@ pokemonanimfunc_1B: ; 8180474 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 @@ -713731,9 +713731,9 @@ pokemonanimfunc_1B: ; 8180474 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @081804E8 + b _081804E8 .pool -@081804B0: +_081804B0: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -713758,7 +713758,7 @@ pokemonanimfunc_1B: ; 8180474 adds r1, r5, 0 adds r2, r5, 0 bl sub_817F6D4 -@081804E8: +_081804E8: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -713776,14 +713776,14 @@ sub_81804F8: ; 81804F8 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 @@ -713795,9 +713795,9 @@ sub_81804F8: ; 81804F8 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @08180582 + b _08180582 .pool -@08180534: +_08180534: movs r0, 0x32 ldrsh r5, [r6, r0] lsls r0, r5, 8 @@ -713832,7 +713832,7 @@ sub_81804F8: ; 81804F8 adds r1, r4, 0 adds r2, r4, 0 bl sub_817F6D4 -@08180582: +_08180582: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -713866,14 +713866,14 @@ sub_81805B0: ; 81805B0 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 @@ -713885,9 +713885,9 @@ sub_81805B0: ; 81805B0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @08180644 + b _08180644 .pool -@081805EC: +_081805EC: movs r0, 0x32 ldrsh r5, [r6, r0] lsls r0, r5, 8 @@ -713927,7 +713927,7 @@ sub_81805B0: ; 81805B0 adds r1, r4, 0 adds r2, r4, 0 bl sub_817F6D4 -@08180644: +_08180644: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -713962,14 +713962,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 @@ -713981,9 +713981,9 @@ pokemonanimfunc_1D: ; 8180670 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @081806FC + b _081806FC .pool -@081806B0: +_081806B0: movs r0, 0x32 ldrsh r5, [r6, r0] lsls r0, r5, 8 @@ -714017,7 +714017,7 @@ pokemonanimfunc_1D: ; 8180670 adds r1, r4, 0 adds r2, r4, 0 bl sub_817F6D4 -@081806FC: +_081806FC: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -714037,11 +714037,11 @@ sub_8180714: ; 8180714 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 @@ -714051,7 +714051,7 @@ sub_8180714: ; 8180714 lsls r0, r1, 1 adds r0, r1 cmp r2, r0 - ble @08180760 + ble _08180760 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -714063,9 +714063,9 @@ sub_8180714: ; 8180714 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @081807FE + b _081807FE .pool -@08180760: +_08180760: movs r1, 0x36 ldrsh r0, [r4, r1] movs r1, 0x20 @@ -714080,33 +714080,33 @@ sub_8180714: ; 8180714 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 @@ -714142,7 +714142,7 @@ sub_8180714: ; 8180714 movs r0, 0xFF ands r1, r0 strh r1, [r4, 0x36] -@081807FE: +_081807FE: adds r0, r4, 0 bl sub_817F70C pop {r4-r6} @@ -714181,7 +714181,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 @@ -714193,9 +714193,9 @@ sub_8180828: ; 8180828 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r5, 0x1C] - b @081808D0 + b _081808D0 .pool -@08180868: +_08180868: movs r1, 0x36 ldrsh r0, [r5, r1] movs r1, 0x20 @@ -714210,15 +714210,15 @@ sub_8180828: ; 8180828 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 @@ -714247,7 +714247,7 @@ sub_8180828: ; 8180828 movs r1, 0xFF ands r0, r1 strh r0, [r5, 0x36] -@081808D0: +_081808D0: pop {r4-r6} pop {r0} bx r0 @@ -714260,14 +714260,14 @@ pokemonanimfunc_13: ; 81808D8 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} @@ -714323,13 +714323,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 @@ -714341,7 +714341,7 @@ sub_8180900: ; 8180900 movs r5, 0 ldrsb r5, [r1, r5] cmp r5, 0 - bne @081809B0 + bne _081809B0 movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -714354,9 +714354,9 @@ sub_8180900: ; 8180900 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08180A3A + b _08180A3A .pool -@081809B0: +_081809B0: lsls r0, r7, 16 asrs r5, r0, 16 lsls r0, r5, 7 @@ -714394,9 +714394,9 @@ sub_8180900: ; 8180900 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 @@ -714414,18 +714414,18 @@ sub_8180900: ; 8180900 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 @@ -714473,7 +714473,7 @@ pokemonanimfunc_20: ; 8180A8C movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08180AA8 + bne _08180AA8 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -714482,11 +714482,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 @@ -714494,9 +714494,9 @@ pokemonanimfunc_20: ; 8180A8C bl pal_fade_1 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08180AE8 + b _08180AE8 .pool -@08180ACC: +_08180ACC: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -714509,7 +714509,7 @@ pokemonanimfunc_20: ; 8180A8C ldr r3, =0x000002df movs r1, 0x10 bl pal_fade_1 -@08180AE8: +_08180AE8: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -714526,7 +714526,7 @@ pokemonanimfunc_21: ; 8180AF8 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08180B14 + bne _08180B14 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -714535,11 +714535,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 @@ -714547,9 +714547,9 @@ pokemonanimfunc_21: ; 8180AF8 bl pal_fade_1 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08180B50 + b _08180B50 .pool -@08180B34: +_08180B34: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -714562,7 +714562,7 @@ pokemonanimfunc_21: ; 8180AF8 movs r1, 0x10 movs r3, 0x1F bl pal_fade_1 -@08180B50: +_08180B50: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -714578,7 +714578,7 @@ pokemonanimfunc_22: ; 8180B5C movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08180B78 + bne _08180B78 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -714587,11 +714587,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 @@ -714600,9 +714600,9 @@ pokemonanimfunc_22: ; 8180B5C bl pal_fade_1 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08180BB6 + b _08180BB6 .pool -@08180B98: +_08180B98: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -714616,7 +714616,7 @@ pokemonanimfunc_22: ; 8180B5C lsls r3, 7 movs r1, 0x10 bl pal_fade_1 -@08180BB6: +_08180BB6: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -714632,7 +714632,7 @@ pokemonanimfunc_23: ; 8180BC4 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08180BE0 + bne _08180BE0 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -714641,11 +714641,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 @@ -714653,9 +714653,9 @@ pokemonanimfunc_23: ; 8180BC4 bl pal_fade_1 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08180C20 + b _08180C20 .pool -@08180C04: +_08180C04: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -714668,7 +714668,7 @@ pokemonanimfunc_23: ; 8180BC4 ldr r3, =0x000003ff movs r1, 0x10 bl pal_fade_1 -@08180C20: +_08180C20: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -714685,7 +714685,7 @@ pokemonanimfunc_24: ; 8180C30 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08180C4C + bne _08180C4C ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -714694,11 +714694,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 @@ -714706,9 +714706,9 @@ pokemonanimfunc_24: ; 8180C30 bl pal_fade_1 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08180C8C + b _08180C8C .pool -@08180C70: +_08180C70: movs r2, 0x32 ldrsh r0, [r4, r2] movs r1, 0xC @@ -714721,7 +714721,7 @@ pokemonanimfunc_24: ; 8180C30 ldr r3, =0x00006018 movs r1, 0x10 bl pal_fade_1 -@08180C8C: +_08180C8C: ldrh r0, [r4, 0x32] adds r0, 0x2 strh r0, [r4, 0x32] @@ -714755,14 +714755,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 str r0, [r4, 0x1C] -@08180CD6: +_08180CD6: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -714785,7 +714785,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 @@ -714794,7 +714794,7 @@ sub_8180CE8: ; 8180CE8 ldr r5, =sub_8180D44 movs r3, 0x8 negs r3, r3 -@08180D14: +_08180D14: subs r0, r1, r2 lsls r0, 16 ldrh r1, [r4, 0x3A] @@ -714806,11 +714806,11 @@ sub_8180CE8: ; 8180CE8 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} @@ -714849,9 +714849,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 @@ -714863,7 +714863,7 @@ sub_8180D44: ; 8180D44 movs r1, 0x8 negs r1, r1 cmp r0, r1 - bge @08180DAE + bge _08180DAE strh r1, [r4, 0x24] movs r0, 0x2 strh r0, [r4, 0x36] @@ -714872,7 +714872,7 @@ sub_8180D44: ; 8180D44 strh r5, [r4, 0x32] ldr r0, =sub_8180DC0 str r0, [r4, 0x1C] -@08180DAE: +_08180DAE: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -714890,16 +714890,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] @@ -714911,12 +714911,12 @@ sub_8180DC0: ; 8180DC0 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08180E1C + bne _08180E1C ldr r0, =sub_8180E28 str r0, [r4, 0x1C] - b @08180E1C + b _08180E1C .pool -@08180E08: +_08180E08: ldrh r0, [r4, 0x36] ldrh r2, [r4, 0x24] adds r0, r2 @@ -714927,7 +714927,7 @@ sub_8180DC0: ; 8180DC0 strh r0, [r4, 0x36] adds r0, r1, 0x1 strh r0, [r4, 0x34] -@08180E1C: +_08180E1C: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -714945,14 +714945,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 str r0, [r4, 0x1C] -@08180E4A: +_08180E4A: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -714991,18 +714991,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] @@ -715011,7 +715011,7 @@ sub_8180E78: ; 8180E78 strh r1, [r4, 0x36] ldr r0, =sub_8180ED0 str r0, [r4, 0x1C] -@08180EBA: +_08180EBA: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -715040,24 +715040,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 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} @@ -715075,11 +715075,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 @@ -715110,14 +715110,14 @@ sub_8180F2C: ; 8180F2C 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 str r0, [r4, 0x1C] -@08180F96: +_08180F96: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -715134,17 +715134,17 @@ pokemonanimfunc_27: ; 8180FA8 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 @@ -715164,7 +715164,7 @@ pokemonanimfunc_27: ; 8180FA8 lsls r0, 16 asrs r0, 16 cmp r0, 0x13 - ble @08180FFC + ble _08180FFC ldrb r0, [r1] adds r1, r4, 0 ands r1, r0 @@ -715172,9 +715172,9 @@ pokemonanimfunc_27: ; 8180FA8 strb r1, [r2] ldr r0, =sub_8184D88 str r0, [r3, 0x1C] -@08180FFC: +_08180FFC: movs r0, 0x2 -@08180FFE: +_08180FFE: strh r0, [r3, 0x34] pop {r4} pop {r0} @@ -715211,7 +715211,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 @@ -715220,7 +715220,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} @@ -715261,10 +715261,10 @@ sub_8181068: ; 8181068 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x20 - bgt @081810B2 + bgt _081810B2 ldr r0, =sub_81810C4 str r0, [r4, 0x1C] -@081810B2: +_081810B2: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -715286,12 +715286,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 str r0, [r4, 0x1C] -@081810E8: +_081810E8: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -715327,12 +715327,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 str r0, [r4, 0x1C] -@08181134: +_08181134: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -715355,7 +715355,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 @@ -715364,15 +715364,15 @@ sub_8181144: ; 8181144 strh r0, [r4, 0x32] ldr r0, =sub_81811A4 str r0, [r4, 0x1C] - b @08181186 + b _08181186 .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] @@ -715402,14 +715402,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 str r0, [r4, 0x1C] -@081811CE: +_081811CE: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -715456,19 +715456,19 @@ 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 .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 @@ -715488,7 +715488,7 @@ sub_8181214: ; 8181214 strh r0, [r4, 0x36] strh r5, [r4, 0x38] strh r5, [r4, 0x3A] -@08181270: +_08181270: movs r3, 0x3C ldrsh r1, [r4, r3] movs r6, 0x34 @@ -715513,7 +715513,7 @@ sub_8181214: ; 8181214 lsls r1, 16 lsrs r1, 16 cmp r1, 0x1E - bls @081812B8 + bls _081812B8 movs r1, 0x34 ldrsh r0, [r4, r1] lsls r0, 4 @@ -715522,15 +715522,15 @@ sub_8181214: ; 8181214 ldrsh r0, [r4, r2] negs r0, r0 strh r0, [r4, 0x34] - b @081812D4 + b _081812D4 .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 @@ -715539,19 +715539,19 @@ sub_8181214: ; 8181214 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] @@ -715566,7 +715566,7 @@ sub_8181214: ; 8181214 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] @@ -715579,14 +715579,14 @@ sub_8181214: ; 8181214 adds r0, r5 movs r1, 0xA strh r1, [r0] - b @08181332 + b _08181332 .pool -@08181328: +_08181328: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] -@08181332: +_08181332: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3A] @@ -715597,7 +715597,7 @@ sub_8181214: ; 8181214 bl sub_817F6D4 adds r0, r4, 0 bl sub_817F70C -@0818134A: +_0818134A: pop {r4-r6} pop {r0} bx r0 @@ -715646,40 +715646,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] @@ -715693,7 +715693,7 @@ sub_8181370: ; 8181370 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] -@08181404: +_08181404: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -715713,7 +715713,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 @@ -715725,7 +715725,7 @@ pokemonanimfunc_2C: ; 8181418 strh r2, [r4, 0x3A] strh r2, [r4, 0x38] strh r2, [r4, 0x36] -@08181442: +_08181442: ldr r1, =gUnknown_0860AA64 movs r2, 0x3A ldrsh r0, [r4, r2] @@ -715734,38 +715734,38 @@ pokemonanimfunc_2C: ; 8181418 adds r0, r2, r0 ldrb r0, [r0] cmp r0, 0xFF - bne @08181464 + bne _08181464 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @081814CE + b _081814CE .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 .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, =gUnknown_0860AA64 -@0818149A: +_0818149A: movs r2, 0x3A ldrsh r0, [r4, r2] lsls r0, 1 @@ -715775,7 +715775,7 @@ pokemonanimfunc_2C: ; 8181418 movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - bne @081814C8 + bne _081814C8 movs r1, 0 movs r0, 0x1 strh r0, [r4, 0x36] @@ -715783,13 +715783,13 @@ pokemonanimfunc_2C: ; 8181418 ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] - b @081814CE + b _081814CE .pool -@081814C8: +_081814C8: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -@081814CE: +_081814CE: pop {r4} pop {r0} bx r0 @@ -715802,10 +715802,10 @@ sub_81814D4: ; 81814D4 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 @@ -715820,7 +715820,7 @@ sub_81814D4: ; 81814D4 movs r3, 0x8 ldrsh r0, [r2, r3] cmp r1, r0 - ble @0818154C + ble _0818154C movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -715839,20 +715839,20 @@ sub_81814D4: ; 81814D4 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 .pool -@0818153C: +_0818153C: adds r0, r6, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @08181588 + b _08181588 .pool -@0818154C: +_0818154C: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -715879,7 +715879,7 @@ sub_81814D4: ; 81814D4 adds r1, r5, 0 adds r2, r5, 0 bl sub_817F6D4 -@08181588: +_08181588: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -715923,10 +715923,10 @@ sub_81815D4: ; 81815D4 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 @@ -715941,7 +715941,7 @@ sub_81815D4: ; 81815D4 movs r3, 0x8 ldrsh r0, [r2, r3] cmp r1, r0 - ble @0818164C + ble _0818164C movs r2, 0x80 lsls r2, 1 adds r0, r6, 0 @@ -715960,20 +715960,20 @@ sub_81815D4: ; 81815D4 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 .pool -@0818163C: +_0818163C: adds r0, r6, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @0818168A + b _0818168A .pool -@0818164C: +_0818164C: movs r1, 0x32 ldrsh r0, [r6, r1] lsls r0, 8 @@ -716001,7 +716001,7 @@ sub_81815D4: ; 81815D4 adds r1, r5, 0 adds r2, r5, 0 bl sub_817F6D4 -@0818168A: +_0818168A: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -716099,14 +716099,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 str r0, [r4, 0x1C] -@08181760: +_08181760: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -716122,12 +716122,12 @@ sub_8181770: ; 8181770 movs r2, 0x34 ldrsh r0, [r1, r2] cmp r0, 0x14 - bne @08181784 + bne _08181784 ldr r0, =sub_8181794 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x34] -@08181784: +_08181784: ldrh r0, [r1, 0x34] adds r0, 0x1 strh r0, [r1, 0x34] @@ -716173,7 +716173,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 @@ -716186,7 +716186,7 @@ sub_8181794: ; 8181794 bl sub_817F77C ldr r0, =pokemonanimfunc_10 str r0, [r4, 0x1C] -@08181800: +_08181800: adds r0, r4, 0 bl sub_817F70C pop {r4-r6} @@ -716209,27 +716209,27 @@ 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 .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 @@ -716261,14 +716261,14 @@ sub_8181810: ; 8181810 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 @@ -716302,7 +716302,7 @@ sub_8181810: ; 8181810 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 @@ -716313,7 +716313,7 @@ sub_8181810: ; 8181810 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 @@ -716326,8 +716326,8 @@ sub_8181810: ; 8181810 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 @@ -716338,7 +716338,7 @@ sub_8181810: ; 8181810 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r5, 0x1C] -@0818193A: +_0818193A: ldr r2, =0x03001240 movs r3, 0x2E ldrsh r1, [r5, r3] @@ -716350,7 +716350,7 @@ sub_8181810: ; 8181810 ldrh r1, [r5, 0x36] adds r0, r1 strh r0, [r5, 0x36] -@08181950: +_08181950: pop {r4-r6} pop {r0} bx r0 @@ -716393,107 +716393,107 @@ pokemonanimfunc_31: ; 8181994 movs r0, 0x80 lsls r0, 2 cmp r4, r0 - ble @081819B8 + ble _081819B8 ldr r0, =sub_8184D88 str r0, [r5, 0x1C] movs r0, 0 strh r0, [r5, 0x24] - b @08181A62 + b _08181A62 .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 @@ -716502,7 +716502,7 @@ pokemonanimfunc_31: ; 8181994 movs r1, 0x8 bl sine negs r0, r0 -@08181A62: +_08181A62: strh r0, [r5, 0x26] ldrh r0, [r5, 0x32] adds r0, 0xC @@ -716557,25 +716557,25 @@ 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 .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 str r0, [r4, 0x1C] - b @08181B3E + b _08181B3E .pool -@08181AFC: +_08181AFC: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r1, r0, 1 @@ -716587,18 +716587,18 @@ sub_8181ABC: ; 8181ABC 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 @@ -716610,10 +716610,10 @@ sub_8181ABC: ; 8181ABC 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 @@ -716627,7 +716627,7 @@ sub_8181B4C: ; 8181B4C movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x30 - ble @08181B7C + ble _08181B7C movs r2, 0x80 lsls r2, 1 adds r0, r4, 0 @@ -716639,9 +716639,9 @@ sub_8181B4C: ; 8181B4C strh r0, [r4, 0x32] ldr r0, =sub_8181C2C str r0, [r4, 0x1C] - b @08181C1A + b _08181C1A .pool -@08181B7C: +_08181B7C: movs r2, 0x36 ldrsh r0, [r4, r2] movs r1, 0x40 @@ -716657,7 +716657,7 @@ sub_8181B4C: ; 8181B4C lsls r0, 16 lsrs r0, 16 cmp r0, 0xF - bhi @08181BBA + bhi _08181BBA ldrh r0, [r4, 0x34] adds r0, 0x8 strh r0, [r4, 0x34] @@ -716672,7 +716672,7 @@ sub_8181B4C: ; 8181B4C ldrh r0, [r0, 0x8] subs r1, r0 strh r1, [r4, 0x24] -@08181BBA: +_08181BBA: movs r5, 0 lsls r1, r3, 16 asrs r2, r1, 16 @@ -716680,15 +716680,15 @@ sub_8181B4C: ; 8181B4C 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 @@ -716720,7 +716720,7 @@ sub_8181B4C: ; 8181B4C movs r1, 0xFF ands r0, r1 strh r0, [r4, 0x36] -@08181C1A: +_08181C1A: adds r0, r4, 0 bl sub_817F70C pop {r4-r6} @@ -716737,7 +716737,7 @@ sub_8181C2C: ; 8181C2C movs r0, 0x32 ldrsh r3, [r4, r0] cmp r3, 0x80 - ble @08181C90 + ble _08181C90 ldr r3, =0x03001240 movs r1, 0x2E ldrsh r0, [r4, r1] @@ -716749,7 +716749,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] @@ -716765,19 +716765,19 @@ sub_8181C2C: ; 8181C2C strh r2, [r4, 0x32] strh r2, [r4, 0x36] ldr r0, =sub_8181ABC - b @08181C84 + b _08181C84 .pool -@08181C7C: +_08181C7C: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 -@08181C84: +_08181C84: str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b @08181CD0 + b _08181CD0 .pool -@08181C90: +_08181C90: ldr r2, =0x03001240 movs r5, 0x2E ldrsh r1, [r4, r5] @@ -716790,18 +716790,18 @@ sub_8181C2C: ; 8181C2C 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 @@ -716811,7 +716811,7 @@ sub_8181C2C: ; 8181C2C movs r1, 0x8 bl sine negs r0, r0 -@08181CD0: +_08181CD0: strh r0, [r4, 0x26] ldrh r0, [r4, 0x32] adds r0, 0xC @@ -716831,19 +716831,19 @@ sub_8181CE8: ; 8181CE8 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] @@ -716864,24 +716864,24 @@ sub_8181CE8: ; 8181CE8 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 .pool -@08181D48: +_08181D48: adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] -@08181D52: +_08181D52: adds r0, r4, 0 bl sub_817F70C - b @08181DA6 + b _08181DA6 .pool -@08181D60: +_08181D60: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x10 @@ -716913,7 +716913,7 @@ sub_8181CE8: ; 8181CE8 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F70C -@08181DA6: +_08181DA6: pop {r4,r5} pop {r0} bx r0 @@ -716952,19 +716952,19 @@ pokemonanimfunc_34: ; 8181DE4 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] @@ -716980,9 +716980,9 @@ pokemonanimfunc_34: ; 8181DE4 str r0, [r4, 0x1C] adds r0, r4, 0 bl sub_817F70C - b @08181E8A + b _08181E8A .pool -@08181E34: +_08181E34: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x10 @@ -716993,9 +716993,9 @@ pokemonanimfunc_34: ; 8181DE4 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 @@ -717022,7 +717022,7 @@ pokemonanimfunc_34: ; 8181DE4 strh r0, [r4, 0x3C] adds r0, r4, 0 bl sub_817F70C -@08181E8A: +_08181E8A: pop {r4} pop {r0} bx r0 @@ -717035,9 +717035,9 @@ pokemonanimfunc_35: ; 8181E90 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] @@ -717045,7 +717045,7 @@ pokemonanimfunc_35: ; 8181E90 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 @@ -717058,8 +717058,8 @@ pokemonanimfunc_35: ; 8181E90 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 @@ -717068,11 +717068,11 @@ pokemonanimfunc_35: ; 8181E90 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 @@ -717080,7 +717080,7 @@ pokemonanimfunc_35: ; 8181E90 strb r1, [r2] ldr r0, =sub_8184D88 str r0, [r3, 0x1C] -@08181EEE: +_08181EEE: pop {r4,r5} pop {r0} bx r0 @@ -717110,19 +717110,19 @@ sub_8181F14: ; 8181F14 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 str r0, [r4, 0x1C] - b @08181F38 + b _08181F38 .pool -@08181F34: +_08181F34: adds r0, r1, 0x4 strh r0, [r4, 0x3C] -@08181F38: +_08181F38: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -717146,32 +717146,32 @@ sub_8181F50: ; 8181F50 movs r0, 0x80 lsls r0, 2 cmp r1, r0 - ble @08181F74 + ble _08181F74 ldr r0, =sub_8181FC0 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b @08181FAE + b _08181FAE .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 @@ -717184,7 +717184,7 @@ sub_8181F50: ; 8181F50 ldrh r0, [r4, 0x32] adds r0, 0xC strh r0, [r4, 0x32] -@08181FAE: +_08181FAE: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -717204,16 +717204,16 @@ 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 str r0, [r4, 0x1C] - b @08181FFE + b _08181FFE .pool -@08181FEC: +_08181FEC: movs r1, 0x3C ldrsh r0, [r4, r1] lsls r0, 17 @@ -717222,7 +717222,7 @@ sub_8181FC0: ; 8181FC0 bl sine negs r0, r0 strh r0, [r4, 0x24] -@08181FFE: +_08181FFE: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -717245,21 +717245,21 @@ pokemonanimfunc_37: ; 818201C 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] @@ -717268,9 +717268,9 @@ pokemonanimfunc_37: ; 818201C bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @081820A6 + b _081820A6 .pool -@08182060: +_08182060: adds r0, r1, 0 adds r0, 0x10 strh r0, [r4, 0x3C] @@ -717278,9 +717278,9 @@ pokemonanimfunc_37: ; 818201C 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 @@ -717294,9 +717294,9 @@ pokemonanimfunc_37: ; 818201C 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 @@ -717306,14 +717306,14 @@ pokemonanimfunc_37: ; 818201C 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 @@ -717361,21 +717361,21 @@ 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 str r0, [r4, 0x1C] - b @0818214A + b _0818214A .pool -@0818212C: +_0818212C: adds r0, r1, 0x2 strh r0, [r4, 0x3C] movs r1, 0x3C @@ -717389,7 +717389,7 @@ sub_81820FC: ; 81820FC bl sine negs r0, r0 strh r0, [r4, 0x26] -@0818214A: +_0818214A: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -717415,14 +717415,14 @@ 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 str r0, [r4, 0x1C] - b @081821AA + b _081821AA .pool -@0818218C: +_0818218C: adds r0, r1, 0x2 strh r0, [r4, 0x3C] movs r1, 0x3C @@ -717436,7 +717436,7 @@ sub_818216C: ; 818216C bl sine negs r0, r0 strh r0, [r4, 0x26] -@081821AA: +_081821AA: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -717467,12 +717467,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 str r0, [r4, 0x1C] -@081821F0: +_081821F0: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x8 @@ -717489,7 +717489,7 @@ sub_81821CC: ; 81821CC lsls r0, 16 lsrs r0, 16 cmp r0, 0x6 - bls @08182224 + bls _08182224 movs r1, 0x3A ldrsh r0, [r4, r1] negs r0, r0 @@ -717497,7 +717497,7 @@ sub_81821CC: ; 81821CC ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -@08182224: +_08182224: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -717524,16 +717524,16 @@ 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 str r0, [r4, 0x1C] - b @0818228E + b _0818228E .pool -@08182270: +_08182270: subs r0, r1, 0x2 strh r0, [r4, 0x3C] movs r1, 0x3C @@ -717547,7 +717547,7 @@ sub_8182248: ; 8182248 bl sine negs r0, r0 strh r0, [r4, 0x26] -@0818228E: +_0818228E: movs r2, 0x80 lsls r2, 1 ldrh r3, [r4, 0x3C] @@ -717573,28 +717573,28 @@ pokemonanimfunc_39: ; 81822B0 movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble @081822D0 + ble _081822D0 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] - b @0818235C + b _0818235C .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 @@ -717604,15 +717604,15 @@ pokemonanimfunc_39: ; 81822B0 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 @@ -717627,16 +717627,16 @@ pokemonanimfunc_39: ; 81822B0 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 @@ -717651,9 +717651,9 @@ pokemonanimfunc_39: ; 81822B0 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] @@ -717672,7 +717672,7 @@ pokemonanimfunc_3A: ; 8182370 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] @@ -717681,18 +717681,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 @@ -717719,16 +717719,16 @@ pokemonanimfunc_3A: ; 8182370 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 @@ -717741,16 +717741,16 @@ pokemonanimfunc_3A: ; 8182370 bl sub_817F77C ldr r0, =sub_8184D88 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 .pool -@08182424: +_08182424: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x40 @@ -717760,40 +717760,40 @@ pokemonanimfunc_3A: ; 8182370 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] @@ -717809,7 +717809,7 @@ pokemonanimfunc_3A: ; 8182370 adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -@08182494: +_08182494: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -717824,20 +717824,20 @@ pokemonanimfunc_3B: ; 81824A0 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 @@ -717850,16 +717850,16 @@ pokemonanimfunc_3B: ; 81824A0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08182540 + b _08182540 .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 @@ -717875,9 +717875,9 @@ pokemonanimfunc_3B: ; 81824A0 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 @@ -717896,7 +717896,7 @@ pokemonanimfunc_3B: ; 81824A0 adds r0, r4, 0 movs r3, 0 bl sub_817F6D4 -@08182540: +_08182540: pop {r4,r5} pop {r0} bx r0 @@ -717909,20 +717909,20 @@ pokemonanimfunc_3C: ; 8182548 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 @@ -717934,9 +717934,9 @@ pokemonanimfunc_3C: ; 8182548 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @081825D4 + b _081825D4 .pool -@08182590: +_08182590: movs r1, 0x3C ldrsh r0, [r4, r1] movs r1, 0x10 @@ -717949,9 +717949,9 @@ pokemonanimfunc_3C: ; 8182548 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 @@ -717969,7 +717969,7 @@ pokemonanimfunc_3C: ; 8182548 adds r1, r5, 0 movs r3, 0 bl sub_817F6D4 -@081825D4: +_081825D4: pop {r4,r5} pop {r0} bx r0 @@ -718001,18 +718001,18 @@ 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 str r0, [r4, 0x1C] movs r0, 0x40 - b @08182620 + b _08182620 .pool -@0818261C: +_0818261C: movs r1, 0x3C ldrsh r0, [r4, r1] -@08182620: +_08182620: movs r1, 0x80 bl sine lsls r0, 16 @@ -718042,7 +718042,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 @@ -718053,8 +718053,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 @@ -718069,18 +718069,18 @@ sub_8182648: ; 8182648 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 .pool -@081826A4: +_081826A4: movs r5, 0x1 movs r0, 0 -@081826A8: +_081826A8: lsls r0, 16 asrs r0, 15 ldrh r1, [r4, 0x3C] @@ -718096,7 +718096,7 @@ sub_8182648: ; 8182648 adds r0, r2, 0 lsls r0, 16 lsrs r2, r0, 16 -@081826C8: +_081826C8: movs r1, 0x80 lsls r1, 1 lsls r2, 16 @@ -718110,12 +718110,12 @@ sub_8182648: ; 8182648 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 str r0, [r4, 0x1C] -@081826EE: +_081826EE: pop {r4,r5} pop {r0} bx r0 @@ -718144,7 +718144,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 @@ -718157,7 +718157,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 @@ -718183,7 +718183,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 @@ -718196,16 +718196,16 @@ sub_8182764: ; 8182764 adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - b @081827F4 + b _081827F4 .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 @@ -718223,9 +718223,9 @@ sub_8182764: ; 8182764 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 @@ -718244,7 +718244,7 @@ sub_8182764: ; 8182764 adds r0, r4, 0 movs r3, 0 bl sub_817F6D4 -@081827F4: +_081827F4: pop {r4} pop {r0} bx r0 @@ -718257,7 +718257,7 @@ pokemonanimfunc_3E: ; 81827FC 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] @@ -718270,7 +718270,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} @@ -718287,7 +718287,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 @@ -718300,16 +718300,16 @@ sub_8182830: ; 8182830 adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - b @081828C0 + b _081828C0 .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 @@ -718327,9 +718327,9 @@ sub_8182830: ; 8182830 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 @@ -718348,7 +718348,7 @@ sub_8182830: ; 8182830 adds r0, r4, 0 movs r3, 0 bl sub_817F6D4 -@081828C0: +_081828C0: pop {r4} pop {r0} bx r0 @@ -718361,7 +718361,7 @@ pokemonanimfunc_3F: ; 81828C8 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] @@ -718374,7 +718374,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} @@ -718390,20 +718390,20 @@ pokemonanimfunc_40: ; 81828FC 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 @@ -718416,16 +718416,16 @@ pokemonanimfunc_40: ; 81828FC bl sub_817F6D4 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @0818299E + b _0818299E .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 @@ -718441,9 +718441,9 @@ pokemonanimfunc_40: ; 81828FC 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 @@ -718461,7 +718461,7 @@ pokemonanimfunc_40: ; 81828FC adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -@0818299E: +_0818299E: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -718477,20 +718477,20 @@ pokemonanimfunc_41: ; 81829AC 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 @@ -718503,16 +718503,16 @@ pokemonanimfunc_41: ; 81829AC bl sub_817F6D4 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08182A5E + b _08182A5E .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 @@ -718532,9 +718532,9 @@ pokemonanimfunc_41: ; 81829AC 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 @@ -718556,7 +718556,7 @@ pokemonanimfunc_41: ; 81829AC adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -@08182A5E: +_08182A5E: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -718572,20 +718572,20 @@ pokemonanimfunc_42: ; 8182A6C 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 @@ -718598,16 +718598,16 @@ pokemonanimfunc_42: ; 8182A6C bl sub_817F6D4 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08182B16 + b _08182B16 .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 @@ -718624,9 +718624,9 @@ pokemonanimfunc_42: ; 8182A6C 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 @@ -718647,7 +718647,7 @@ pokemonanimfunc_42: ; 8182A6C adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -@08182B16: +_08182B16: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -718665,108 +718665,108 @@ pokemonanimfunc_43: ; 8182B24 movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble @08182B48 + ble _08182B48 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b @08182C08 + b _08182C08 .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 .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 .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 @@ -718779,7 +718779,7 @@ pokemonanimfunc_43: ; 8182B24 ldrh r0, [r4, 0x32] adds r0, 0x18 strh r0, [r4, 0x32] -@08182C08: +_08182C08: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -718797,13 +718797,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 @@ -718813,40 +718813,40 @@ pokemonanimfunc_44: ; 8182C18 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 .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 @@ -718859,8 +718859,8 @@ pokemonanimfunc_44: ; 8182C18 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 @@ -718875,8 +718875,8 @@ pokemonanimfunc_44: ; 8182C18 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 @@ -718890,8 +718890,8 @@ pokemonanimfunc_44: ; 8182C18 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 @@ -718903,14 +718903,14 @@ pokemonanimfunc_44: ; 8182C18 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 str r0, [r4, 0x1C] -@08182D12: +_08182D12: adds r0, r4, 0 bl sub_817F70C pop {r4,r5} @@ -719022,21 +719022,21 @@ pokemonanimfunc_4B: ; 8182DD4 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} @@ -719462,21 +719462,21 @@ sub_8183140: ; 8183140 movs r0, 0x90 lsls r0, 4 cmp r2, r0 - ble @0818315C + ble _0818315C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @08183180 + b _08183180 .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 @@ -719487,7 +719487,7 @@ sub_8183140: ; 8183140 bl sine ldrh r1, [r4, 0x3C] adds r0, r1 -@08183180: +_08183180: strh r0, [r4, 0x26] ldrh r0, [r4, 0x2E] ldrh r3, [r4, 0x32] @@ -719545,109 +719545,109 @@ pokemonanimfunc_59: ; 81831D4 movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble @081831F8 + ble _081831F8 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b @081832BC + b _081832BC .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 .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 .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 .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 @@ -719659,7 +719659,7 @@ pokemonanimfunc_59: ; 81831D4 ldrh r0, [r4, 0x32] adds r0, 0x18 strh r0, [r4, 0x32] -@081832BC: +_081832BC: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -719681,7 +719681,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] @@ -719695,20 +719695,20 @@ 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 str r0, [r6, 0x1C] - b @081833DC + b _081833DC .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 @@ -719719,9 +719719,9 @@ sub_81832C8: ; 81832C8 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 @@ -719730,9 +719730,9 @@ sub_81832C8: ; 81832C8 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] @@ -719740,11 +719740,11 @@ sub_81832C8: ; 81832C8 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 @@ -719755,9 +719755,9 @@ sub_81832C8: ; 81832C8 lsls r1, 16 lsrs r1, 16 mov r9, r1 - b @08183392 + b _08183392 .pool -@0818337C: +_0818337C: lsls r4, r2, 16 asrs r0, r4, 16 movs r1, 0x10 @@ -719768,7 +719768,7 @@ sub_81832C8: ; 81832C8 lsls r0, 16 lsrs r0, 16 mov r9, r0 -@08183392: +_08183392: adds r7, r4, 0 ldrh r4, [r6, 0x34] lsls r4, 24 @@ -719802,7 +719802,7 @@ sub_81832C8: ; 81832C8 ldrh r0, [r6, 0x38] adds r0, 0x1 strh r0, [r6, 0x38] -@081833DC: +_081833DC: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -719818,7 +719818,7 @@ pokemonanimfunc_5A: ; 81833E8 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 @@ -719829,7 +719829,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} @@ -719851,7 +719851,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 @@ -719864,20 +719864,20 @@ 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 str r0, [r6, 0x1C] - b @08183538 + b _08183538 .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 @@ -719889,9 +719889,9 @@ sub_8183418: ; 8183418 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 @@ -719900,9 +719900,9 @@ sub_8183418: ; 8183418 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] @@ -719911,14 +719911,14 @@ sub_8183418: ; 8183418 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 @@ -719939,9 +719939,9 @@ sub_8183418: ; 8183418 adds r4, r0 lsls r4, 16 lsrs r1, r4, 16 - b @08183522 + b _08183522 .pool -@081834F0: +_081834F0: mov r4, r8 adds r0, r7, 0 movs r1, 0x5 @@ -719964,7 +719964,7 @@ sub_8183418: ; 8183418 subs r1, r0 lsls r1, 16 lsrs r1, 16 -@08183522: +_08183522: lsls r1, 16 asrs r1, 16 movs r2, 0x80 @@ -719975,7 +719975,7 @@ sub_8183418: ; 8183418 ldrh r0, [r6, 0x38] adds r0, 0x1 strh r0, [r6, 0x38] -@08183538: +_08183538: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -719991,7 +719991,7 @@ pokemonanimfunc_5B: ; 8183544 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 @@ -720002,7 +720002,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} @@ -720033,17 +720033,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 @@ -720051,16 +720051,16 @@ sub_8183574: ; 8183574 bl __divsi3 lsls r0, 24 lsrs r7, r0, 24 -@081835C2: +_081835C2: cmp r5, 0xFF - bne @081835D8 + bne _081835D8 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x26] - b @0818360A + b _0818360A .pool -@081835D8: +_081835D8: mov r1, r8 adds r1, 0xC0 adds r0, r1, 0 @@ -720072,22 +720072,22 @@ sub_8183574: ; 8183574 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 @@ -720156,20 +720156,20 @@ pokemonanimfunc_5F: ; 8183674 movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble @08183690 + ble _08183690 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @081836CA + b _081836CA .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 @@ -720177,9 +720177,9 @@ pokemonanimfunc_5F: ; 8183674 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 @@ -720192,7 +720192,7 @@ pokemonanimfunc_5F: ; 8183674 adds r2, r0, 0 muls r2, r1 adds r0, r2, 0 -@081836CA: +_081836CA: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -720210,20 +720210,20 @@ pokemonanimfunc_60: ; 81836D8 movs r2, 0x32 ldrsh r0, [r4, r2] cmp r0, 0x28 - ble @081836F4 + ble _081836F4 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 - b @0818372E + b _0818372E .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 @@ -720231,9 +720231,9 @@ pokemonanimfunc_60: ; 81836D8 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 @@ -720246,7 +720246,7 @@ pokemonanimfunc_60: ; 81836D8 adds r2, r0, 0 muls r2, r1 adds r0, r2, 0 -@0818372E: +_0818372E: strh r0, [r4, 0x24] ldrh r0, [r4, 0x32] adds r0, 0x1 @@ -720354,7 +720354,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 @@ -720367,19 +720367,19 @@ 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 str r0, [r7, 0x1C] - b @0818392C + b _0818392C .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 @@ -720390,9 +720390,9 @@ sub_81837DC: ; 81837DC 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 @@ -720401,15 +720401,15 @@ sub_81837DC: ; 81837DC 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 @@ -720417,7 +720417,7 @@ sub_81837DC: ; 81837DC movs r1, 0x30 ldrsh r0, [r7, r1] cmp r0, 0 - bne @081838B0 + bne _081838B0 lsls r2, 16 mov r8, r2 asrs r0, r2, 16 @@ -720441,9 +720441,9 @@ sub_81837DC: ; 81837DC lsrs r0, 16 mov r10, r0 mov r0, r8 - b @081838EA + b _081838EA .pool -@081838B0: +_081838B0: lsls r2, 16 mov r8, r2 asrs r0, r2, 16 @@ -720470,7 +720470,7 @@ sub_81837DC: ; 81837DC mov r10, r1 mov r0, r8 adds r6, r5, 0 -@081838EA: +_081838EA: asrs r0, 16 mov r1, r9 bl sine @@ -720500,7 +720500,7 @@ sub_81837DC: ; 81837DC ldrh r0, [r7, 0x38] adds r0, 0x1 strh r0, [r7, 0x38] -@0818392C: +_0818392C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -720517,7 +720517,7 @@ pokemonanimfunc_65: ; 818393C 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 @@ -720528,7 +720528,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} @@ -720546,109 +720546,109 @@ pokemonanimfunc_66: ; 818396C movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble @08183990 + ble _08183990 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b @08183A54 + b _08183A54 .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 .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 .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 .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 @@ -720660,7 +720660,7 @@ pokemonanimfunc_66: ; 818396C ldrh r0, [r4, 0x32] adds r0, 0x30 strh r0, [r4, 0x32] -@08183A54: +_08183A54: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -720678,102 +720678,102 @@ pokemonanimfunc_67: ; 8183A60 movs r0, 0x80 lsls r0, 4 cmp r1, r0 - ble @08183A84 + ble _08183A84 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x3A] - b @08183B40 + b _08183B40 .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 .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 .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 .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 @@ -720786,7 +720786,7 @@ pokemonanimfunc_67: ; 8183A60 ldrh r0, [r4, 0x32] adds r0, 0x40 strh r0, [r4, 0x32] -@08183B40: +_08183B40: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -720802,9 +720802,9 @@ sub_8183B4C: ; 8183B4C movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0 - bne @08183B5E + bne _08183B5E strh r0, [r4, 0x34] -@08183B5E: +_08183B5E: ldr r7, =gUnknown_0860ADBE movs r2, 0x34 ldrsh r1, [r4, r2] @@ -720821,13 +720821,13 @@ sub_8183B4C: ; 8183B4C 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 @@ -720842,21 +720842,21 @@ sub_8183B4C: ; 8183B4C 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 str r0, [r4, 0x1C] - b @08183C06 + b _08183C06 .pool -@08183BC8: +_08183BC8: strh r1, [r4, 0x32] - b @08183C06 -@08183BCC: + b _08183C06 +_08183BCC: adds r0, r6, r7 ldrb r0, [r0] lsls r0, 24 @@ -720885,7 +720885,7 @@ sub_8183B4C: ; 8183B4C strh r0, [r4, 0x32] adds r0, r4, 0 bl sub_817F70C -@08183C06: +_08183C06: pop {r4-r7} pop {r0} bx r0 @@ -720951,12 +720951,12 @@ sub_8183C6C: ; 8183C6C 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 @@ -720967,15 +720967,15 @@ sub_8183C6C: ; 8183C6C adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 - b @08183CE8 + b _08183CE8 .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] @@ -720984,9 +720984,9 @@ sub_8183C6C: ; 8183C6C 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 @@ -721004,7 +721004,7 @@ sub_8183C6C: ; 8183C6C adds r1, r2, 0 movs r3, 0 bl sub_817F6D4 -@08183CE8: +_08183CE8: pop {r4,r5} pop {r0} bx r0 @@ -721018,7 +721018,7 @@ pokemonanimfunc_6B: ; 8183CF0 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] @@ -721029,7 +721029,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 @@ -721047,7 +721047,7 @@ pokemonanimfunc_6C: ; 8183D28 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] @@ -721058,7 +721058,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 @@ -721075,7 +721075,7 @@ pokemonanimfunc_6D: ; 8183D60 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] @@ -721089,7 +721089,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} @@ -721104,7 +721104,7 @@ pokemonanimfunc_6E: ; 8183D94 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] @@ -721117,7 +721117,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} @@ -721132,7 +721132,7 @@ pokemonanimfunc_6F: ; 8183DC8 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] @@ -721146,7 +721146,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} @@ -721161,7 +721161,7 @@ pokemonanimfunc_70: ; 8183DFC 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] @@ -721174,7 +721174,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} @@ -721189,14 +721189,14 @@ pokemonanimfunc_71: ; 8183E30 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} @@ -721211,14 +721211,14 @@ pokemonanimfunc_72: ; 8183E58 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} @@ -721233,7 +721233,7 @@ pokemonanimfunc_73: ; 8183E80 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 @@ -721244,7 +721244,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} @@ -721259,7 +721259,7 @@ pokemonanimfunc_74: ; 8183EB0 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 @@ -721271,7 +721271,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} @@ -721286,7 +721286,7 @@ pokemonanimfunc_75: ; 8183EE0 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 @@ -721299,7 +721299,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} @@ -721314,7 +721314,7 @@ pokemonanimfunc_76: ; 8183F14 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 @@ -721326,7 +721326,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} @@ -721341,7 +721341,7 @@ pokemonanimfunc_77: ; 8183F44 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 @@ -721354,7 +721354,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} @@ -721369,7 +721369,7 @@ pokemonanimfunc_78: ; 8183F78 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 @@ -721381,7 +721381,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} @@ -721396,35 +721396,35 @@ sub_8183FA8: ; 8183FA8 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 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x24] strh r0, [r4, 0x26] - b @0818403E + b _0818403E .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 @@ -721438,10 +721438,10 @@ sub_8183FA8: ; 8183FA8 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 @@ -721453,12 +721453,12 @@ sub_8183FA8: ; 8183FA8 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 @@ -721467,7 +721467,7 @@ sub_8183FA8: ; 8183FA8 ldrh r2, [r4, 0x3C] adds r0, r2 strh r0, [r4, 0x3C] -@0818403E: +_0818403E: pop {r4} pop {r0} bx r0 @@ -721481,7 +721481,7 @@ pokemonanimfunc_79: ; 8184048 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] @@ -721491,7 +721491,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} @@ -721505,7 +721505,7 @@ pokemonanimfunc_7A: ; 8184070 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] @@ -721515,7 +721515,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} @@ -721529,7 +721529,7 @@ pokemonanimfunc_7B: ; 8184098 movs r0, 0x32 ldrsh r2, [r1, r0] cmp r2, 0 - bne @081840B8 + bne _081840B8 movs r0, 0x1 strh r0, [r1, 0x32] movs r0, 0x2 @@ -721540,7 +721540,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} @@ -721556,42 +721556,42 @@ 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 str r0, [r5, 0x1C] - b @081840F4 + b _081840F4 .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 @@ -721600,10 +721600,10 @@ sub_81840C4: ; 81840C4 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 @@ -721617,15 +721617,15 @@ sub_81840C4: ; 81840C4 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 @@ -721641,17 +721641,17 @@ sub_81840C4: ; 81840C4 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 @@ -721664,7 +721664,7 @@ pokemonanimfunc_7C: ; 8184190 movs r0, 0x32 ldrsh r3, [r2, r0] cmp r3, 0 - bne @081841B0 + bne _081841B0 movs r1, 0x1 strh r1, [r2, 0x32] movs r0, 0x2 @@ -721675,7 +721675,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} @@ -721689,7 +721689,7 @@ pokemonanimfunc_7D: ; 81841BC movs r0, 0x32 ldrsh r3, [r2, r0] cmp r3, 0 - bne @081841DC + bne _081841DC movs r1, 0x1 strh r1, [r2, 0x32] movs r0, 0x2 @@ -721700,7 +721700,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} @@ -721714,7 +721714,7 @@ pokemonanimfunc_7E: ; 81841E8 movs r0, 0x32 ldrsh r3, [r2, r0] cmp r3, 0 - bne @08184208 + bne _08184208 movs r1, 0x1 strh r1, [r2, 0x32] movs r0, 0x3 @@ -721725,7 +721725,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} @@ -721739,7 +721739,7 @@ pokemonanimfunc_7F: ; 8184214 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] @@ -721749,7 +721749,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} @@ -721763,7 +721763,7 @@ pokemonanimfunc_80: ; 818423C 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] @@ -721773,7 +721773,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} @@ -721787,7 +721787,7 @@ pokemonanimfunc_81: ; 8184264 movs r0, 0x32 ldrsh r2, [r1, r0] cmp r2, 0 - bne @08184286 + bne _08184286 movs r0, 0x1 strh r0, [r1, 0x32] movs r0, 0x2 @@ -721799,7 +721799,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} @@ -721850,7 +721850,7 @@ pokemonanimfunc_82: ; 81842DC movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne @08184300 + bne _08184300 adds r0, r4, 0 bl sub_817F670 movs r0, 0x3C @@ -721862,13 +721862,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 @@ -721886,24 +721886,24 @@ pokemonanimfunc_82: ; 81842DC lsls r0, 16 asrs r0, 16 cmp r1, r0 - bgt @08184348 + bgt _08184348 adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08184358 + b _08184358 .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 @@ -721916,7 +721916,7 @@ pokemonanimfunc_83: ; 8184360 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne @08184384 + bne _08184384 adds r0, r4, 0 bl sub_817F670 movs r0, 0x5A @@ -721928,13 +721928,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 @@ -721952,24 +721952,24 @@ pokemonanimfunc_83: ; 8184360 lsls r0, 16 asrs r0, 16 cmp r1, r0 - bgt @081843CC + bgt _081843CC adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @081843DC + b _081843DC .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 @@ -721982,7 +721982,7 @@ pokemonanimfunc_84: ; 81843E4 movs r0, 0x32 ldrsh r5, [r4, r0] cmp r5, 0 - bne @08184408 + bne _08184408 adds r0, r4, 0 bl sub_817F670 movs r0, 0x1E @@ -721994,13 +721994,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 @@ -722018,24 +722018,24 @@ pokemonanimfunc_84: ; 81843E4 lsls r0, 16 asrs r0, 16 cmp r1, r0 - bgt @08184450 + bgt _08184450 adds r0, r4, 0 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @08184460 + b _08184460 .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 @@ -722050,7 +722050,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 @@ -722063,9 +722063,9 @@ sub_8184468: ; 8184468 bl sub_817F77C ldr r0, =sub_8184D88 str r0, [r6, 0x1C] - b @08184544 + b _08184544 .pool -@0818449C: +_0818449C: movs r1, 0x32 ldrsh r0, [r6, r1] movs r2, 0x3A @@ -722078,9 +722078,9 @@ sub_8184468: ; 8184468 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 @@ -722090,7 +722090,7 @@ sub_8184468: ; 8184468 movs r1, 0x1 ands r0, r1 cmp r0, 0 - bne @081844F8 + bne _081844F8 lsls r4, 16 asrs r4, 16 adds r0, r4, 0 @@ -722108,8 +722108,8 @@ sub_8184468: ; 8184468 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 @@ -722127,16 +722127,16 @@ sub_8184468: ; 8184468 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 @@ -722146,7 +722146,7 @@ sub_8184468: ; 8184468 adds r0, r6, 0 movs r3, 0 bl sub_817F6D4 -@08184544: +_08184544: ldrh r0, [r6, 0x32] adds r0, 0x1 strh r0, [r6, 0x32] @@ -722162,7 +722162,7 @@ pokemonanimfunc_85: ; 8184550 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] @@ -722172,7 +722172,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} @@ -722187,7 +722187,7 @@ pokemonanimfunc_86: ; 818457C 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] @@ -722196,7 +722196,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} @@ -722211,7 +722211,7 @@ pokemonanimfunc_87: ; 81845A8 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] @@ -722220,7 +722220,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} @@ -722242,7 +722242,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] @@ -722250,7 +722250,7 @@ sub_81845D4: ; 81845D4 strh r0, [r4, 0x3C] ldr r0, =sub_8184610 str r0, [r4, 0x1C] -@081845FE: +_081845FE: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -722272,10 +722272,10 @@ sub_8184610: ; 8184610 strh r0, [r4, 0x3C] lsls r1, 16 cmp r1, 0 - blt @0818462E + blt _0818462E ldr r0, =sub_8184640 str r0, [r4, 0x1C] -@0818462E: +_0818462E: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -722301,11 +722301,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 str r0, [r4, 0x1C] -@08184668: +_08184668: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -722325,12 +722325,12 @@ sub_8184678: ; 8184678 movs r3, 0x38 ldrsh r0, [r4, r3] cmp r1, r0 - blt @08184698 + blt _08184698 ldr r0, =sub_81846B8 str r0, [r4, 0x1C] - b @081846AC + b _081846AC .pool -@08184698: +_08184698: ldrh r0, [r4, 0x36] ldrh r1, [r4, 0x24] adds r0, r1 @@ -722341,7 +722341,7 @@ sub_8184678: ; 8184678 strh r0, [r4, 0x36] adds r0, r2, 0x1 strh r0, [r4, 0x34] -@081846AC: +_081846AC: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -722359,14 +722359,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 str r0, [r4, 0x1C] -@081846DA: +_081846DA: adds r0, r4, 0 bl sub_817F70C pop {r4} @@ -722456,16 +722456,16 @@ 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 @@ -722489,38 +722489,38 @@ 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 str r0, [r4, 0x1C] - b @0818482E + b _0818482E .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 .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 @@ -722529,7 +722529,7 @@ sub_8184798: ; 8184798 movs r2, 0x38 ldrsh r0, [r4, r2] cmp r1, r0 - bne @08184828 + bne _08184828 movs r1, 0 movs r0, 0x1 strh r0, [r4, 0x36] @@ -722537,13 +722537,13 @@ sub_8184798: ; 8184798 ldrh r0, [r4, 0x3A] adds r0, 0x1 strh r0, [r4, 0x3A] - b @0818482E + b _0818482E .pool -@08184828: +_08184828: ldrh r0, [r4, 0x38] adds r0, 0x1 strh r0, [r4, 0x38] -@0818482E: +_0818482E: pop {r4,r5} pop {r0} bx r0 @@ -722560,7 +722560,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 @@ -722573,7 +722573,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} @@ -722592,7 +722592,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 @@ -722605,7 +722605,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} @@ -722624,7 +722624,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 @@ -722638,7 +722638,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} @@ -722653,7 +722653,7 @@ sub_81848E0: ; 81848E0 movs r1, 0x32 ldrsh r0, [r4, r1] cmp r0, 0x7F - ble @08184904 + ble _08184904 ldrh r0, [r4, 0x3C] movs r1, 0x10 movs r2, 0 @@ -722661,9 +722661,9 @@ sub_81848E0: ; 81848E0 bl pal_fade_1 ldr r0, =sub_8184D88 str r0, [r4, 0x1C] - b @0818492A + b _0818492A .pool -@08184904: +_08184904: movs r5, 0x32 ldrsh r0, [r4, r5] movs r1, 0xC @@ -722681,7 +722681,7 @@ sub_81848E0: ; 81848E0 ldrh r3, [r1] movs r1, 0x10 bl pal_fade_1 -@0818492A: +_0818492A: pop {r4,r5} pop {r0} bx r0 @@ -722697,7 +722697,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 @@ -722705,7 +722705,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 @@ -722715,12 +722715,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 @@ -722744,9 +722744,9 @@ sub_8184934: ; 8184934 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 @@ -722763,10 +722763,10 @@ sub_8184934: ; 8184934 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 @@ -722779,7 +722779,7 @@ pokemonanimfunc_8E: ; 81849D4 movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @081849FE + bne _081849FE ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -722795,15 +722795,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 @@ -722817,10 +722817,10 @@ pokemonanimfunc_8E: ; 81849D4 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] @@ -722836,7 +722836,7 @@ pokemonanimfunc_8F: ; 8184A3C movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184A66 + bne _08184A66 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -722852,15 +722852,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 @@ -722874,10 +722874,10 @@ pokemonanimfunc_8F: ; 8184A3C 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] @@ -722893,7 +722893,7 @@ pokemonanimfunc_90: ; 8184AA4 movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184ACE + bne _08184ACE ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -722909,15 +722909,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 @@ -722931,10 +722931,10 @@ pokemonanimfunc_90: ; 8184AA4 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] @@ -722950,7 +722950,7 @@ pokemonanimfunc_91: ; 8184B0C movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184B38 + bne _08184B38 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -722967,15 +722967,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 @@ -722989,10 +722989,10 @@ pokemonanimfunc_91: ; 8184B0C 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] @@ -723008,7 +723008,7 @@ pokemonanimfunc_92: ; 8184B78 movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184BA2 + bne _08184BA2 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -723024,15 +723024,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 @@ -723046,10 +723046,10 @@ pokemonanimfunc_92: ; 8184B78 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] @@ -723065,7 +723065,7 @@ pokemonanimfunc_93: ; 8184BE0 movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184C0A + bne _08184C0A ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -723081,15 +723081,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 @@ -723103,10 +723103,10 @@ pokemonanimfunc_93: ; 8184BE0 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] @@ -723122,7 +723122,7 @@ pokemonanimfunc_94: ; 8184C48 movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184C72 + bne _08184C72 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -723138,15 +723138,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 @@ -723160,10 +723160,10 @@ pokemonanimfunc_94: ; 8184C48 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] @@ -723179,7 +723179,7 @@ pokemonanimfunc_95: ; 8184CB0 movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184CDC + bne _08184CDC ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -723196,15 +723196,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 @@ -723218,10 +723218,10 @@ pokemonanimfunc_95: ; 8184CB0 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] @@ -723237,7 +723237,7 @@ pokemonanimfunc_96: ; 8184D1C movs r0, 0x32 ldrsh r2, [r4, r0] cmp r2, 0 - bne @08184D48 + bne _08184D48 ldrb r0, [r4, 0x5] lsrs r0, 4 lsls r0, 4 @@ -723254,15 +723254,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 @@ -723276,10 +723276,10 @@ pokemonanimfunc_96: ; 8184D1C 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] @@ -723297,10 +723297,10 @@ sub_8184D88: ; 8184D88 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @08184D9C + beq _08184D9C ldr r0, =DummyObjectCallback str r0, [r2, 0x1C] -@08184D9C: +_08184D9C: pop {r0} bx r0 .pool @@ -723330,7 +723330,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 @@ -723344,7 +723344,7 @@ sub_8184DA4: ; 8184DA4 adds r4, r2, 0x1 mov r3, r12 cmp r3, 0x1 - bne @08184E1C + bne _08184E1C ldr r5, =0x02022fec movs r3, 0xFF movs r1, 0xA6 @@ -723353,14 +723353,14 @@ sub_8184DA4: ; 8184DA4 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] @@ -723370,10 +723370,10 @@ sub_8184DA4: ; 8184DA4 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 @@ -723395,7 +723395,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] @@ -723407,22 +723407,22 @@ sub_8184E58: ; 8184E58 ldr r4, =0x0203c7af bl sub_81A513C strb r0, [r4] - b @08184EAC + b _08184EAC .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] @@ -723439,7 +723439,7 @@ sub_8184E58: ; 8184E58 mov r8, r0 mov r7, r9 adds r7, 0x4 -@08184EDC: +_08184EDC: lsls r0, r5, 2 adds r0, r5 lsls r4, r0, 2 @@ -723460,7 +723460,7 @@ sub_8184E58: ; 8184E58 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 @@ -723471,29 +723471,29 @@ sub_8184E58: ; 8184E58 mov r1, sp bl CopyString adds r5, 0x1 - b @08184F56 + b _08184F56 .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 .pool -@08184F64: +_08184F64: ldr r3, =0x0203cc80 ldr r4, =0x03005d90 ldr r2, [r4] @@ -723516,7 +723516,7 @@ sub_8184E58: ; 8184E58 strh r0, [r3, 0x10] movs r5, 0 adds r3, 0x4 -@08184F90: +_08184F90: adds r0, r5, r3 ldr r1, [r4] adds r1, r5 @@ -723524,8 +723524,8 @@ sub_8184E58: ; 8184E58 strb r1, [r0] adds r5, 0x1 cmp r5, 0x7 - ble @08184F90 -@08184FA0: + ble _08184F90 +_08184FA0: add sp, 0x20 pop {r3-r5} mov r8, r3 @@ -723551,11 +723551,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] @@ -723565,7 +723565,7 @@ sub_8184FBC: ; 8184FBC adds r0, r3, r0 adds r0, r1 strb r6, [r0] -@08184FF0: +_08184FF0: pop {r4-r6} pop {r0} bx r0 @@ -723581,7 +723581,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 @@ -723590,7 +723590,7 @@ sub_8185008: ; 8185008 lsls r0, 2 muls r5, r0 movs r6, 0xFF -@08185028: +_08185028: ldrh r0, [r2] subs r0, 0x1 strh r0, [r2] @@ -723602,11 +723602,11 @@ sub_8185008: ; 8185008 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 @@ -723625,7 +723625,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 @@ -723633,8 +723633,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 @@ -723652,15 +723652,15 @@ sub_8185054: ; 8185054 ldr r0, =sub_80384E4 bl SetMainCallback2 movs r0, 0xFF - b @081850C6 + b _081850C6 .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} @@ -723687,7 +723687,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 @@ -723701,7 +723701,7 @@ sub_81850DC: ; 81850DC str r1, [sp] ldrh r1, [r6] cmp r0, r1 - beq @0818517E + beq _0818517E adds r1, r7, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -723723,7 +723723,7 @@ sub_81850DC: ; 81850DC ldrh r1, [r6] subs r0, r1 cmp r4, r0 - bge @08185172 + bge _08185172 ldr r1, =0x0203bd34 mov r10, r1 ldr r6, =0x0203c79c @@ -723731,7 +723731,7 @@ sub_81850DC: ; 81850DC lsls r0, 2 mov r5, r12 muls r5, r0 -@08185146: +_08185146: adds r1, r7, 0 adds r0, r1, 0x1 lsls r0, 24 @@ -723753,21 +723753,21 @@ sub_81850DC: ; 81850DC 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} @@ -723794,29 +723794,29 @@ 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 .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 @@ -723824,8 +723824,8 @@ sub_81851A8: ; 81851A8 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 @@ -723839,7 +723839,7 @@ sub_81851A8: ; 81851A8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 - beq @08185256 + beq _08185256 ldr r3, =0x0203bd34 ldr r0, =0x0203c7a4 lsls r1, r6, 1 @@ -723848,7 +723848,7 @@ sub_81851A8: ; 81851A8 movs r0, 0xA6 lsls r0, 2 muls r6, r0 -@08185232: +_08185232: adds r0, r7, 0 mov r1, sp mov r2, r8 @@ -723865,13 +723865,13 @@ sub_81851A8: ; 81851A8 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 @@ -723921,11 +723921,11 @@ sub_81852B0: ; 81852B0 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 @@ -723933,13 +723933,13 @@ sub_81852B0: ; 81852B0 adds r4, r5, r4 ldr r1, [r4] cmp r0, r1 - bne @081852E8 + bne _081852E8 movs r0, 0x1 - b @081852EA + b _081852EA .pool -@081852E8: +_081852E8: movs r0, 0 -@081852EA: +_081852EA: pop {r4,r5} pop {r1} bx r1 @@ -723970,13 +723970,13 @@ sub_81852F0: ; 81852F0 adds r1, r5, 0 bl sub_8153634 cmp r0, 0x1 - bne @08185330 + bne _08185330 movs r0, 0x1 - b @08185332 + b _08185332 .pool -@08185330: +_08185330: movs r0, 0 -@08185332: +_08185332: pop {r4,r5} pop {r1} bx r1 @@ -724001,7 +724001,7 @@ sub_8185338: ; 8185338 bl AllocZeroed str r0, [sp] movs r6, 0 -@0818535E: +_0818535E: movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -724022,7 +724022,7 @@ sub_8185338: ; 8185338 bl memcpy adds r6, 0x1 cmp r6, 0x5 - ble @0818535E + ble _0818535E movs r6, 0 ldr r2, =0x03005d90 mov r9, r2 @@ -724039,7 +724039,7 @@ sub_8185338: ; 8185338 mov r10, r4 ldr r0, =0x000004e4 adds r4, r7, r0 -@081853AC: +_081853AC: lsls r1, r6, 3 ldr r0, =0x0203cc80 adds r0, 0x4 @@ -724047,14 +724047,14 @@ sub_8185338: ; 8185338 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] @@ -724076,7 +724076,7 @@ sub_8185338: ; 8185338 adds r4, 0x1 adds r6, 0x1 cmp r6, 0x3 - ble @081853AC + ble _081853AC movs r4, 0x9D lsls r4, 3 adds r1, r7, r4 @@ -724088,7 +724088,7 @@ sub_8185338: ; 8185338 movs r0, 0x2 ands r0, r2 cmp r0, 0 - beq @081854DC + beq _081854DC ldr r1, =0x000004ec adds r3, r7, r1 movs r1, 0x23 @@ -724101,35 +724101,35 @@ sub_8185338: ; 8185338 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 .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 .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 @@ -724141,12 +724141,12 @@ sub_8185338: ; 8185338 movs r0, 0x1 ands r0, r1 cmp r0, 0 - bne @081854E2 + bne _081854E2 ldr r5, =0x000004ec adds r0, r7, r5 - b @081854C4 + b _081854C4 .pool -@081854A8: +_081854A8: ldr r0, =0x0203c7b4 ldrb r1, [r0] lsls r0, r1, 2 @@ -724158,22 +724158,22 @@ sub_8185338: ; 8185338 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 .pool -@081854DC: +_081854DC: ldr r3, =0x000004ec adds r0, r7, r3 str r2, [r0] -@081854E2: +_081854E2: ldr r4, =0x02038bca ldrh r1, [r4] ldr r5, =0x000004f4 @@ -724251,9 +724251,9 @@ sub_8185338: ; 8185338 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 @@ -724263,7 +724263,7 @@ sub_8185338: ; 8185338 adds r2, r4, 0 mov r8, r2 ldr r4, =0x0000073c -@08185592: +_08185592: adds r2, r3, r6 mov r5, r10 ldr r1, [r5] @@ -724279,7 +724279,7 @@ sub_8185338: ; 8185338 strb r0, [r2] adds r6, 0x1 cmp r6, 0x7 - ble @08185592 + ble _08185592 mov r0, r9 ldr r2, [r0] ldr r1, =0x02038bca @@ -724298,7 +724298,7 @@ sub_8185338: ; 8185338 ldr r1, =0x0203cce8 ldrb r0, [r1] cmp r0, 0x1 - bne @08185664 + bne _08185664 movs r6, 0 ldr r2, =0x0000050e adds r4, r7, r2 @@ -724306,7 +724306,7 @@ sub_8185338: ; 8185338 ldr r5, =0x02038bca mov r8, r5 adds r5, r3, 0 -@081855E6: +_081855E6: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -724325,10 +724325,10 @@ sub_8185338: ; 8185338 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble @081855E6 - b @08185696 + ble _081855E6 + b _08185696 .pool -@08185664: +_08185664: movs r6, 0 ldr r1, =0x0000050e adds r4, r7, r1 @@ -724336,7 +724336,7 @@ sub_8185338: ; 8185338 ldr r2, =0x02038bca mov r8, r2 adds r5, r3, 0 -@08185672: +_08185672: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -724354,8 +724354,8 @@ sub_8185338: ; 8185338 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble @08185672 -@08185696: + ble _08185672 +_08185696: mov r1, r9 ldr r2, [r1] ldr r3, =0x02038bca @@ -724368,18 +724368,18 @@ sub_8185338: ; 8185338 ldr r5, =0x0000081c adds r2, r5 ldrb r1, [r2] - b @08185856 + b _08185856 .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 @@ -724389,7 +724389,7 @@ sub_8185338: ; 8185338 ldr r0, =0xfffffed4 mov r8, r0 ldr r4, =0x0000073c -@081856E6: +_081856E6: adds r2, r3, r6 mov r5, r10 ldr r1, [r5] @@ -724405,7 +724405,7 @@ sub_8185338: ; 8185338 strb r0, [r2] adds r6, 0x1 cmp r6, 0x7 - ble @081856E6 + ble _081856E6 mov r0, r9 ldr r2, [r0] ldr r1, =0x02038bcc @@ -724424,7 +724424,7 @@ sub_8185338: ; 8185338 ldr r1, =0x0203cce8 ldrb r0, [r1] cmp r0, 0x1 - bne @08185784 + bne _08185784 movs r6, 0 ldr r2, =0x0000050e adds r4, r7, r2 @@ -724432,7 +724432,7 @@ sub_8185338: ; 8185338 ldr r5, =0x02038bcc mov r8, r5 adds r5, r3, 0 -@0818573A: +_0818573A: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -724451,10 +724451,10 @@ sub_8185338: ; 8185338 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble @0818573A - b @081857B6 + ble _0818573A + b _081857B6 .pool -@08185784: +_08185784: movs r6, 0 ldr r1, =0x0000050e adds r4, r7, r1 @@ -724462,7 +724462,7 @@ sub_8185338: ; 8185338 ldr r2, =0x02038bcc mov r8, r2 adds r5, r3, 0 -@08185792: +_08185792: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -724480,8 +724480,8 @@ sub_8185338: ; 8185338 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x5 - ble @08185792 -@081857B6: + ble _08185792 +_081857B6: mov r1, r9 ldr r2, [r1] ldr r3, =0x02038bcc @@ -724494,16 +724494,16 @@ sub_8185338: ; 8185338 ldr r5, =0x0000081c adds r2, r5 ldrb r1, [r2] - b @08185856 + b _08185856 .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 @@ -724513,7 +724513,7 @@ sub_8185338: ; 8185338 ldr r0, =0xfffffed4 mov r8, r0 ldr r4, =0x0000073c -@08185804: +_08185804: adds r2, r3, r6 mov r5, r10 ldr r1, [r5] @@ -724529,7 +724529,7 @@ sub_8185338: ; 8185338 strb r0, [r2] adds r6, 0x1 cmp r6, 0x7 - ble @08185804 + ble _08185804 mov r0, r9 ldr r1, [r0] ldr r2, =0x02038bce @@ -724555,16 +724555,16 @@ sub_8185338: ; 8185338 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 @@ -724588,7 +724588,7 @@ sub_8185338: ; 8185338 ldr r1, =0x02038bca mov r8, r1 adds r5, r3, 0 -@08185894: +_08185894: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -724608,20 +724608,20 @@ sub_8185338: ; 8185338 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 .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 @@ -724645,7 +724645,7 @@ sub_8185338: ; 8185338 ldr r1, =0x02038bcc mov r8, r1 adds r5, r3, 0 -@08185936: +_08185936: lsls r3, r6, 1 mov r0, r10 ldr r2, [r0] @@ -724665,20 +724665,20 @@ sub_8185338: ; 8185338 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 .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 @@ -724699,7 +724699,7 @@ sub_8185338: ; 8185338 ldr r0, =0x02038bce ldrh r1, [r0] adds r1, r3 -@081859AC: +_081859AC: lsls r0, r1, 4 adds r0, r1 lsls r0, 2 @@ -724710,7 +724710,7 @@ sub_8185338: ; 8185338 ldr r2, =0x0000051b adds r0, r7, r2 strb r1, [r0] -@081859C0: +_081859C0: movs r6, 0 ldr r3, =0x00000297 mov r10, r3 @@ -724721,7 +724721,7 @@ sub_8185338: ; 8185338 mov r8, r5 ldr r0, =0x0000051c adds r5, r7, r0 -@081859D4: +_081859D4: adds r4, r6, 0x1 mov r0, r8 muls r0, r6 @@ -724730,32 +724730,32 @@ sub_8185338: ; 8185338 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] @@ -724780,7 +724780,7 @@ sub_8185A54: ; 8185A54 movs r0, 0x1F bl sub_81535DC cmp r0, 0x1 - bne @08185A7E + bne _08185A7E movs r2, 0xF8 lsls r2, 4 adds r0, r5, 0 @@ -724789,12 +724789,12 @@ 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 @@ -724873,7 +724873,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 str r1, [r0, 0x8] @@ -724881,7 +724881,7 @@ sub_8185B1C: ; 8185B1C bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@08185B4A: +_08185B4A: pop {r4} pop {r0} bx r0 @@ -724902,7 +724902,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 @@ -724923,7 +724923,7 @@ sub_8185B60: ; 8185B60 bl memcpy adds r6, 0x1 cmp r6, 0x5 - ble @08185B7C + ble _08185B7C movs r6, 0 ldr r3, =0x020229e8 mov r8, r3 @@ -724934,7 +724934,7 @@ sub_8185B60: ; 8185B60 adds r4, 0x4 mov r10, r6 mov r9, r6 -@08185BBE: +_08185BBE: movs r1, 0 mov r12, r1 lsls r5, r6, 2 @@ -724949,20 +724949,20 @@ sub_8185B60: ; 8185B60 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 @@ -724987,10 +724987,10 @@ sub_8185B60: ; 8185B60 str r0, [r4] mov r3, r12 cmp r3, 0 - beq @08185C2A + beq _08185C2A ldr r0, [sp] bl StopMusicWhileStringIsPrinted -@08185C2A: +_08185C2A: ldr r0, [sp] adds r0, 0x1C str r0, [sp] @@ -725001,7 +725001,7 @@ sub_8185B60: ; 8185B60 add r9, r2 adds r6, 0x1 cmp r6, 0x3 - ble @08185BBE + ble _08185BBE ldr r1, =0x0203bd2c movs r3, 0x9D lsls r3, 3 @@ -725083,14 +725083,14 @@ sub_8185B60: ; 8185B60 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] @@ -725113,14 +725113,14 @@ sub_8185B60: ; 8185B60 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 @@ -725146,7 +725146,7 @@ sub_8185B60: ; 8185B60 mov r8, r0 ldr r1, =0x0000051c adds r5, r7, r1 -@08185D5C: +_08185D5C: adds r2, r6, 0x1 mov r0, r8 muls r0, r6 @@ -725155,17 +725155,17 @@ sub_8185B60: ; 8185B60 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 @@ -725187,7 +725187,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 @@ -725209,7 +725209,7 @@ sub_8185E24: ; 8185E24 bl current_map_music_set__default_for_battle ldr r0, =sub_8185E8C bl SetMainCallback2 -@08185E6E: +_08185E6E: adds r0, r4, 0 bl Free pop {r4,r5} @@ -725249,7 +725249,7 @@ 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 @@ -725267,7 +725267,7 @@ sub_8185EB8: ; 8185EB8 bl memcpy adds r5, 0x1 cmp r5, 0x5 - ble @08185EBE + ble _08185EBE pop {r4-r6} pop {r0} bx r0 @@ -725279,7 +725279,7 @@ 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 @@ -725297,7 +725297,7 @@ sub_8185EFC: ; 8185EFC bl memcpy adds r5, 0x1 cmp r5, 0x5 - ble @08185F02 + ble _08185F02 pop {r4-r6} pop {r0} bx r0 @@ -725314,30 +725314,30 @@ 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 .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 @@ -725402,23 +725402,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 @@ -725432,8 +725432,8 @@ sub_8185FD0: ; 8185FD0 strh r1, [r0] adds r3, 0x1 cmp r3, 0x3 - ble @08186000 -@0818601C: + ble _08186000 +_0818601C: pop {r4-r7} pop {r0} bx r0 @@ -725456,14 +725456,14 @@ 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 .pool -@0818606C: +_0818606C: mov r1, r10 lsls r4, r1, 24 lsrs r5, r4, 24 @@ -725476,12 +725476,12 @@ sub_818603C: ; 818603C 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 @@ -725495,21 +725495,21 @@ sub_818603C: ; 818603C 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 @@ -725523,7 +725523,7 @@ sub_818603C: ; 818603C mov r4, r10 subs r0, r4, r6 asrs r4, r0, 1 -@081860DE: +_081860DE: movs r2, 0 lsls r0, r5, 1 adds r5, 0x1 @@ -725533,28 +725533,28 @@ sub_818603C: ; 818603C 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 .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 @@ -725571,9 +725571,9 @@ sub_818603C: ; 818603C 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 @@ -725603,7 +725603,7 @@ sub_818603C: ; 818603C adds r6, r0, 0 adds r6, 0x3B movs r4, 0x3 -@0818617E: +_0818617E: mov r0, sp adds r3, r0, r5 ldrb r1, [r6] @@ -725615,7 +725615,7 @@ sub_818603C: ; 818603C strb r1, [r3] adds r5, 0x1 cmp r5, 0x3 - ble @0818617E + ble _0818617E movs r5, 0 ldr r1, =0x02024084 mov r9, r1 @@ -725624,7 +725624,7 @@ sub_818603C: ; 818603C muls r7, r2 ldr r4, [sp, 0x28] ldr r6, [sp, 0x30] -@081861A6: +_081861A6: ldr r3, [sp, 0x4C] lsrs r0, r3, 24 bl sub_8185054 @@ -725673,7 +725673,7 @@ sub_818603C: ; 818603C adds r6, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @081861A6 + ble _081861A6 movs r5, 0 movs r3, 0xC negs r3, r3 @@ -725691,7 +725691,7 @@ sub_818603C: ; 818603C mov r7, r8 ldr r6, [sp, 0x34] ldr r2, [sp, 0x30] -@0818622C: +_0818622C: adds r1, r3, r7 ldrh r0, [r2] strh r0, [r1] @@ -725703,7 +725703,7 @@ sub_818603C: ; 818603C adds r2, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @0818622C + ble _0818622C movs r0, 0x58 mov r4, r10 muls r4, r0 @@ -725728,7 +725728,7 @@ sub_818603C: ; 818603C adds r4, 0x3B ldr r0, =0x020242bc adds r6, r3, r0 -@08186274: +_08186274: ldr r2, [sp, 0x3C] adds r0, r2, r5 ldrb r0, [r0] @@ -725751,7 +725751,7 @@ sub_818603C: ; 818603C strb r0, [r6, 0x18] adds r5, 0x1 cmp r5, 0x3 - ble @08186274 + ble _08186274 movs r2, 0x58 mov r0, r10 muls r0, r2 @@ -725763,9 +725763,9 @@ sub_818603C: ; 818603C 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 @@ -725773,7 +725773,7 @@ sub_818603C: ; 818603C ldr r0, =0x0202406e ldr r4, [sp, 0x44] adds r6, r4, r0 -@081862CA: +_081862CA: ldrh r1, [r6] movs r0, 0x64 muls r0, r1 @@ -725792,7 +725792,7 @@ sub_818603C: ; 818603C strb r0, [r3] adds r5, 0x1 cmp r5, 0x3 - ble @081862CA + ble _081862CA movs r5, 0 ldr r0, =0x0202406e ldr r2, [sp, 0x44] @@ -725802,7 +725802,7 @@ sub_818603C: ; 818603C mov r8, r4 ldr r4, [sp, 0x28] ldr r6, [sp, 0x30] -@08186304: +_08186304: ldrh r0, [r7] mov r1, r9 muls r1, r0 @@ -725835,7 +725835,7 @@ sub_818603C: ; 818603C adds r6, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @08186304 + ble _08186304 movs r5, 0 ldr r0, =0x0202406e ldr r1, [sp, 0x44] @@ -725847,7 +725847,7 @@ sub_818603C: ; 818603C ldr r6, [sp, 0x30] adds r6, 0x8 ldr r4, [sp, 0x30] -@08186360: +_08186360: ldrh r0, [r7] mov r1, r9 muls r1, r0 @@ -725870,7 +725870,7 @@ sub_818603C: ; 818603C adds r4, 0x2 adds r5, 0x1 cmp r5, 0x3 - ble @08186360 + ble _08186360 movs r0, 0 ldr r3, [sp, 0x40] strb r0, [r3] @@ -725879,7 +725879,7 @@ sub_818603C: ; 818603C ldr r6, =0x020244ec ldr r3, [sp, 0x3C] ldr r2, [sp, 0x40] -@081863A2: +_081863A2: adds r0, r3, r5 ldrb r1, [r0] lsls r0, r5, 1 @@ -725889,7 +725889,7 @@ sub_818603C: ; 818603C strb r0, [r2] adds r5, 0x1 cmp r5, 0x3 - ble @081863A2 + ble _081863A2 ldr r1, [sp, 0x44] adds r0, r1, r4 ldrh r1, [r0] @@ -725899,7 +725899,7 @@ sub_818603C: ; 818603C movs r1, 0x15 ldr r2, [sp, 0x40] bl pokemon_setattr -@081863CA: +_081863CA: ldr r2, =0x02024274 ldr r3, [sp, 0x44] adds r2, r3, r2 @@ -725918,16 +725918,16 @@ sub_818603C: ; 818603C 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 @@ -725963,9 +725963,9 @@ rfu_lacks_rfufunc: ; 8186450 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 @@ -725979,14 +725979,14 @@ sub_8186468: ; 8186468 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] @@ -726078,24 +726078,24 @@ 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, =gUnknown_0860AE90 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @08186554 + b _08186554 .pool -@08186550: +_08186550: bl sub_81871AC -@08186554: +_08186554: pop {r0} bx r0 thumb_func_end sub_8186508 @@ -726117,9 +726117,9 @@ sub_8186558: ; 8186558 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0818657C + bne _0818657C bl sub_81871AC -@0818657C: +_0818657C: pop {r0} bx r0 .pool @@ -726142,9 +726142,9 @@ sub_8186590: ; 8186590 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081865B4 + bne _081865B4 bl sub_81871AC -@081865B4: +_081865B4: pop {r0} bx r0 .pool @@ -726168,7 +726168,7 @@ sub_81865C8: ; 81865C8 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0818661A + bne _0818661A adds r0, r2, r5 ldrh r0, [r0, 0x6] bl sub_805DFE4 @@ -726189,7 +726189,7 @@ sub_81865C8: ; 81865C8 adds r0, r5 bl RemoveObjectAndFreeTiles bl sub_81871AC -@0818661A: +_0818661A: pop {r4-r6} pop {r0} bx r0 @@ -726214,7 +726214,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] @@ -726225,7 +726225,7 @@ sub_8186630: ; 8186630 movs r1, 0 strb r1, [r0, 0x9] bl sub_81871AC -@08186668: +_08186668: pop {r4} pop {r0} bx r0 @@ -726243,18 +726243,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 @@ -726271,7 +726271,7 @@ sub_8186678: ; 8186678 ldr r0, =DummyObjectCallback mov r8, r2 cmp r1, r0 - bne @08186764 + bne _08186764 ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] @@ -726283,10 +726283,10 @@ sub_8186678: ; 8186678 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge @08186764 - b @0818676A + bge _08186764 + b _0818676A .pool -@081866F8: +_081866F8: ldr r6, =0x02020630 ldr r7, =0x03005d70 ldr r2, =0x02024064 @@ -726303,7 +726303,7 @@ sub_8186678: ; 8186678 ldr r0, =DummyObjectCallback mov r8, r2 cmp r4, r0 - bne @08186764 + bne _08186764 movs r0, 0x2 adds r2, r3, 0 eors r2, r0 @@ -726315,7 +726315,7 @@ sub_8186678: ; 8186678 adds r0, r5 ldr r0, [r0] cmp r0, r4 - bne @08186764 + bne _08186764 ldr r4, =0x020241e4 adds r0, r3, r4 ldrb r1, [r0] @@ -726327,7 +726327,7 @@ sub_8186678: ; 8186678 ldrb r0, [r0] lsls r0, 27 cmp r0, 0 - bge @08186764 + bge _08186764 adds r0, r2, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -726338,21 +726338,21 @@ sub_8186678: ; 8186678 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] @@ -726366,7 +726366,7 @@ sub_8186678: ; 8186678 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq @0818683A + beq _0818683A movs r7, 0x2 adds r1, r7, 0 eors r1, r2 @@ -726378,7 +726378,7 @@ sub_8186678: ; 8186678 adds r0, r3, 0 ands r0, r1 cmp r0, 0 - beq @0818683A + beq _0818683A ldrb r1, [r4] movs r3, 0x7F adds r0, r3, 0 @@ -726429,7 +726429,7 @@ sub_8186678: ; 8186678 bl FreeObjectTilesByTag adds r0, r4, 0 bl FreeObjectPaletteByTag -@08186816: +_08186816: ldr r0, =0x020244d0 ldr r0, [r0] mov r2, r8 @@ -726448,7 +726448,7 @@ sub_8186678: ; 8186678 adds r0, r1 ldr r1, =sub_8186630 str r1, [r0] -@0818683A: +_0818683A: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -726481,7 +726481,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] @@ -726491,7 +726491,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 @@ -726506,7 +726506,7 @@ sub_818686C: ; 818686C adds r0, r5, 0 ands r0, r1 cmp r0, 0 - bne @081868DE + bne _081868DE ldr r0, =0x0202406e adds r0, r3, r0 ldrh r1, [r0] @@ -726516,7 +726516,7 @@ sub_818686C: ; 818686C adds r1, r0 adds r0, r2, 0 bl sub_8172EF0 -@081868DE: +_081868DE: ldr r0, [r4] ldrb r2, [r7] ldr r3, [r0, 0x4] @@ -726529,7 +726529,7 @@ sub_818686C: ; 818686C 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 @@ -726540,22 +726540,22 @@ sub_818686C: ; 818686C 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 @@ -726580,7 +726580,7 @@ sub_818686C: ; 818686C adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@08186964: +_08186964: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -726602,7 +726602,7 @@ sub_818686C: ; 818686C adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -@08186994: +_08186994: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -726616,7 +726616,7 @@ sub_818686C: ; 818686C movs r2, 0x80 orrs r1, r2 strb r1, [r0, 0x1] -@081869AE: +_081869AE: ldr r5, =0x020244d0 ldr r0, [r5] ldr r4, =0x02024064 @@ -726630,7 +726630,7 @@ sub_818686C: ; 818686C movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne @08186A6A + bne _08186A6A movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -726641,11 +726641,11 @@ sub_818686C: ; 818686C 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] @@ -726657,30 +726657,30 @@ sub_818686C: ; 818686C 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 .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 @@ -726696,11 +726696,11 @@ sub_818686C: ; 818686C 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 @@ -726715,7 +726715,7 @@ sub_818686C: ; 818686C ldr r3, [r0] ldr r0, =DummyObjectCallback cmp r3, r0 - bne @08186B26 + bne _08186B26 ldr r0, =0x020241e4 adds r0, r4, r0 ldrb r1, [r0] @@ -726725,10 +726725,10 @@ sub_818686C: ; 818686C adds r0, r2 ldr r0, [r0] cmp r0, r3 - bne @08186B26 - b @08186B22 + bne _08186B26 + b _08186B22 .pool -@08186AC8: +_08186AC8: ldr r2, =0x02020630 ldr r7, =0x03005d7c ldr r0, =0x02024064 @@ -726743,7 +726743,7 @@ sub_818686C: ; 818686C ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - bne @08186B26 + bne _08186B26 ldr r6, =0x020241e4 adds r0, r3, r6 ldrb r1, [r0] @@ -726753,7 +726753,7 @@ sub_818686C: ; 818686C adds r0, r2 ldr r5, [r0] cmp r5, r4 - bne @08186B26 + bne _08186B26 movs r0, 0x2 eors r3, r0 adds r0, r3, r7 @@ -726764,7 +726764,7 @@ sub_818686C: ; 818686C adds r0, r2 ldr r4, [r0] cmp r4, r5 - bne @08186B26 + bne _08186B26 adds r0, r3, r6 ldrb r1, [r0] lsls r0, r1, 4 @@ -726773,27 +726773,27 @@ sub_818686C: ; 818686C 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] @@ -726824,7 +726824,7 @@ sub_818686C: ; 818686C lsrs r1, 16 adds r0, r4, 0 bl sub_805EE54 -@08186B8A: +_08186B8A: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -726889,7 +726889,7 @@ sub_818686C: ; 818686C adds r0, r1 ldr r1, =sub_8186678 str r1, [r0] -@08186C10: +_08186C10: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -726917,12 +726917,12 @@ sub_8186C48: ; 8186C48 ldr r1, [r0] ldr r0, =DummyObjectCallback 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] @@ -726934,7 +726934,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] @@ -726944,14 +726944,14 @@ sub_8186C48: ; 8186C48 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 - b @08186CFA + b _08186CFA .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] @@ -726973,7 +726973,7 @@ sub_8186C48: ; 8186C48 adds r0, r4, 0 bl FreeObjectPaletteByTag bl sub_81871AC -@08186CFA: +_08186CFA: pop {r4-r7} pop {r0} bx r0 @@ -727003,17 +727003,17 @@ 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 .pool -@08186D4C: +_08186D4C: bl sub_81871AC -@08186D50: +_08186D50: pop {r4-r6} pop {r0} bx r0 @@ -727036,13 +727036,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 .pool @@ -727064,7 +727064,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] @@ -727090,7 +727090,7 @@ sub_8186D9C: ; 8186D9C ldrb r0, [r0] bl sub_8072984 bl sub_81871AC -@08186DF6: +_08186DF6: pop {r4-r6} pop {r0} bx r0 @@ -727104,9 +727104,9 @@ sub_8186E10: ; 8186E10 bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 - bne @08186E22 + bne _08186E22 bl sub_81871AC -@08186E22: +_08186E22: pop {r0} bx r0 thumb_func_end sub_8186E10 @@ -727127,7 +727127,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] @@ -727140,14 +727140,14 @@ bx_blink_t2: ; 8186E28 ldr r0, =0x020244b9 strb r3, [r0] bl sub_81871AC - b @08186E9E + b _08186E9E .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] @@ -727161,11 +727161,11 @@ bx_blink_t2: ; 8186E28 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 @@ -727188,7 +727188,7 @@ sub_8186EA4: ; 8186EA4 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08186EF0 + bne _08186EF0 ldr r0, =0x020244d0 ldr r0, [r0] ldr r1, [r0] @@ -727198,20 +727198,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 str r0, [r1] -@08186EF0: +_08186EF0: pop {r4} pop {r0} bx r0 @@ -727234,11 +727234,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] @@ -727252,18 +727252,18 @@ sub_8186F14: ; 8186F14 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @08186F5E + beq _08186F5E ldr r0, =nullsub_18 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 @@ -727286,7 +727286,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 @@ -727300,7 +727300,7 @@ sub_8186F94: ; 8186F94 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08187050 + bne _08187050 ldrb r1, [r3] movs r0, 0x7F ands r0, r1 @@ -727359,7 +727359,7 @@ sub_8186F94: ; 8186F94 adds r0, r1 ldr r1, =sub_8186EA4 str r1, [r0] -@08187050: +_08187050: pop {r4-r7} pop {r0} bx r0 @@ -727382,7 +727382,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] @@ -727392,7 +727392,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] @@ -727407,7 +727407,7 @@ sub_8187084: ; 8187084 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08187120 + bne _08187120 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -727418,7 +727418,7 @@ sub_8187084: ; 8187084 movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @08187120 + bne _08187120 adds r0, r3, r4 bl RemoveObjectAndFreeTiles ldrb r4, [r5] @@ -727443,7 +727443,7 @@ sub_8187084: ; 8187084 adds r0, r1 ldr r1, =sub_8186F94 str r1, [r0] -@08187120: +_08187120: pop {r4-r6} pop {r0} bx r0 @@ -727466,9 +727466,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 .pool @@ -727490,9 +727490,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 .pool @@ -727514,7 +727514,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] @@ -727528,9 +727528,9 @@ sub_81871AC: ; 81871AC adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @08187212 + b _08187212 .pool -@08187200: +_08187200: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -727540,7 +727540,7 @@ sub_81871AC: ; 81871AC ldr r0, [r2] bics r0, r1 str r0, [r2] -@08187212: +_08187212: add sp, 0x4 pop {r4} pop {r0} @@ -727561,7 +727561,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 @@ -727569,28 +727569,28 @@ sub_8187224: ; 8187224 mov r1, sp bl sub_8187298 adds r6, r0, 0 - b @0818727E + b _0818727E .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 @@ -727623,78 +727623,78 @@ 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 .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 @@ -727731,7 +727731,7 @@ sub_8187298: ; 8187298 str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@08187414: +_08187414: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -727747,7 +727747,7 @@ sub_8187298: ; 8187298 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @08187414 + ble _08187414 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -727925,33 +727925,33 @@ sub_8187298: ; 8187298 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 .pool -@081875EC: +_081875EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xB - b @08187966 + b _08187966 .pool -@081875FC: +_081875FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0xC - b @08187966 + b _08187966 .pool -@0818760C: +_0818760C: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -727963,7 +727963,7 @@ sub_8187298: ; 8187298 ldr r0, =0x02024744 adds r4, r1, r0 mov r8, r9 -@08187622: +_08187622: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -727981,7 +727981,7 @@ sub_8187298: ; 8187298 add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @08187622 + ble _08187622 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -727992,17 +727992,17 @@ sub_8187298: ; 8187298 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 .pool -@08187674: +_08187674: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728013,16 +728013,16 @@ sub_8187298: ; 8187298 adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @08187966 + b _08187966 .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 @@ -728032,7 +728032,7 @@ sub_8187298: ; 8187298 strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @0818769C + ble _0818769C movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728042,9 +728042,9 @@ sub_8187298: ; 8187298 adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @08187A2E + b _08187A2E .pool -@081876CC: +_081876CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728055,23 +728055,23 @@ sub_8187298: ; 8187298 adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @08187A26 + b _08187A26 .pool -@081876E8: +_081876E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1 - b @08187702 + b _08187702 .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] @@ -728086,105 +728086,105 @@ sub_8187298: ; 8187298 lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @08187A2E + b _08187A2E .pool -@08187728: +_08187728: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1A - b @08187A26 + b _08187A26 .pool -@08187738: +_08187738: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1B - b @08187A26 + b _08187A26 .pool -@08187748: +_08187748: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1C - b @08187A26 + b _08187A26 .pool -@08187758: +_08187758: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1D - b @08187A26 + b _08187A26 .pool -@08187768: +_08187768: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1E - b @08187A26 + b _08187A26 .pool -@08187778: +_08187778: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x1F - b @08187A26 + b _08187A26 .pool -@08187788: +_08187788: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x20 - b @08187A26 + b _08187A26 .pool -@08187798: +_08187798: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x22 - b @08187A26 + b _08187A26 .pool -@081877A8: +_081877A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x23 - b @08187A26 + b _08187A26 .pool -@081877B8: +_081877B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x24 - b @08187A26 + b _08187A26 .pool -@081877C8: +_081877C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x25 - b @08187A26 + b _08187A26 .pool -@081877D8: +_081877D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x26 - b @08187A26 + b _08187A26 .pool -@081877E8: +_081877E8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -728215,79 +728215,79 @@ sub_8187298: ; 8187298 bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @08187A2E + b _08187A2E .pool -@08187838: +_08187838: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x27 - b @08187A26 + b _08187A26 .pool -@08187848: +_08187848: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x28 - b @08187A26 + b _08187A26 .pool -@08187858: +_08187858: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x29 - b @08187A26 + b _08187A26 .pool -@08187868: +_08187868: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2A - b @08187A26 + b _08187A26 .pool -@08187878: +_08187878: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2B - b @08187A26 + b _08187A26 .pool -@08187888: +_08187888: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2C - b @08187A26 + b _08187A26 .pool -@08187898: +_08187898: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0 - b @081878C2 + b _081878C2 .pool -@081878A8: +_081878A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x9 - b @08187966 + b _08187966 .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] @@ -728304,71 +728304,71 @@ sub_8187298: ; 8187298 lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @08187A2E + b _08187A2E .pool -@081878EC: +_081878EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x38 - b @08187A26 + b _08187A26 .pool -@081878FC: +_081878FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x39 - b @08187966 + b _08187966 .pool -@0818790C: +_0818790C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3A - b @08187966 + b _08187966 .pool -@0818791C: +_0818791C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3B - b @08187966 + b _08187966 .pool -@0818792C: +_0818792C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3C - b @08187966 + b _08187966 .pool -@0818793C: +_0818793C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3D - b @08187966 + b _08187966 .pool -@0818794C: +_0818794C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x3E - b @08187966 + b _08187966 .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 @@ -728376,99 +728376,99 @@ sub_8187298: ; 8187298 lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @08187A2E + b _08187A2E .pool -@0818797C: +_0818797C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x16 - b @08187A26 + b _08187A26 .pool -@0818798C: +_0818798C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x17 - b @08187A26 + b _08187A26 .pool -@0818799C: +_0818799C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x18 - b @08187A26 + b _08187A26 .pool -@081879AC: +_081879AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x21 - b @08187A26 + b _08187A26 .pool -@081879BC: +_081879BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x2F - b @08187A26 + b _08187A26 .pool -@081879CC: +_081879CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x30 - b @08187A26 + b _08187A26 .pool -@081879DC: +_081879DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x32 - b @08187A26 + b _08187A26 .pool -@081879EC: +_081879EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x33 - b @08187A26 + b _08187A26 .pool -@081879FC: +_081879FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x34 - b @08187A26 + b _08187A26 .pool -@08187A0C: +_08187A0C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 adds r0, r1 movs r1, 0x35 - b @08187A26 + b _08187A26 .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} @@ -728500,32 +728500,32 @@ 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 .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} @@ -728554,78 +728554,78 @@ 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 .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 @@ -728675,7 +728675,7 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r6, 0x24 adds r4, r7, 0 adds r4, 0xC -@08187C42: +_08187C42: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -728692,7 +728692,7 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @08187C42 + ble _08187C42 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -728804,9 +728804,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187D74: +_08187D74: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728816,9 +728816,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0xB bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187D90: +_08187D90: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728828,9 +728828,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0xC bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187DAC: +_08187DAC: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -728843,7 +728843,7 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r7, r1, r0 adds r6, r4, 0 adds r6, 0x8 -@08187DC4: +_08187DC4: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -728860,7 +728860,7 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @08187DC4 + ble _08187DC4 movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728868,9 +728868,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187E00: +_08187E00: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728882,9 +728882,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @08187E9E + b _08187E9E .pool -@08187E20: +_08187E20: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -728929,9 +728929,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187E88: +_08187E88: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728943,13 +728943,13 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 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 .pool -@08187EB0: +_08187EB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728959,9 +728959,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x1 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187ECC: +_08187ECC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728971,9 +728971,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x19 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187EE8: +_08187EE8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728983,9 +728983,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x1A bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187F04: +_08187F04: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -728995,9 +728995,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x1B bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187F20: +_08187F20: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729007,9 +729007,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x1C bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187F3C: +_08187F3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729019,9 +729019,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x1D bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187F58: +_08187F58: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729031,9 +729031,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x1E bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187F74: +_08187F74: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729043,9 +729043,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x1F bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187F90: +_08187F90: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729055,9 +729055,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x20 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187FAC: +_08187FAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729067,9 +729067,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x22 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187FC8: +_08187FC8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729079,9 +729079,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x23 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08187FE4: +_08187FE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729091,9 +729091,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x24 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188000: +_08188000: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729103,9 +729103,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x25 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@0818801C: +_0818801C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729115,9 +729115,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x26 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188038: +_08188038: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -729168,9 +729168,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r0, r3, 0x5 adds r2, r0 adds r0, r4, 0 - b @08188146 + b _08188146 .pool -@081880AC: +_081880AC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729180,9 +729180,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x27 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081880C8: +_081880C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729192,9 +729192,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x28 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081880E4: +_081880E4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729204,9 +729204,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x29 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188100: +_08188100: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729216,9 +729216,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x2A bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@0818811C: +_0818811C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729228,9 +729228,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x2B bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188138: +_08188138: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729238,12 +729238,12 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 ldrb r2, [r6] lsls r2, 9 adds r2, r3 -@08188146: +_08188146: movs r1, 0x2C bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188154: +_08188154: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729253,9 +729253,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188170: +_08188170: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729265,9 +729265,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x9 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@0818818C: +_0818818C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729277,9 +729277,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x37 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081881A8: +_081881A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729289,9 +729289,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x38 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081881C4: +_081881C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729301,9 +729301,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x39 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081881E0: +_081881E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729313,9 +729313,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x3A bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081881FC: +_081881FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729325,9 +729325,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x3B bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188218: +_08188218: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729337,9 +729337,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x3C bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188234: +_08188234: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729349,9 +729349,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x3D bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188250: +_08188250: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729361,9 +729361,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x3E bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@0818826C: +_0818826C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729373,9 +729373,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x3F bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188288: +_08188288: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729385,9 +729385,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x16 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081882A4: +_081882A4: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729397,9 +729397,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x17 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081882C0: +_081882C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729409,9 +729409,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x18 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081882DC: +_081882DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729421,9 +729421,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x21 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081882F8: +_081882F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729433,9 +729433,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x2F bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188314: +_08188314: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729445,9 +729445,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x30 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188330: +_08188330: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729457,9 +729457,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x32 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@0818834C: +_0818834C: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729469,9 +729469,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x33 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188368: +_08188368: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729481,9 +729481,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x34 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@08188384: +_08188384: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729493,9 +729493,9 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x35 bl pokemon_setattr - b @081883B4 + b _081883B4 .pool -@081883A0: +_081883A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -729505,7 +729505,7 @@ dp01_setattr_for_opponent_pokemon: ; 8187AA8 adds r2, r3 movs r1, 0x36 bl pokemon_setattr -@081883B4: +_081883B4: add sp, 0x38 pop {r3-r5} mov r8, r3 @@ -729542,11 +729542,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 @@ -729563,8 +729563,8 @@ sub_81883C8: ; 81883C8 adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc @081883FE -@08188420: + bcc _081883FE +_08188420: bl sub_81871AC pop {r4-r7} pop {r0} @@ -729929,7 +729929,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] @@ -729944,9 +729944,9 @@ sub_8188768: ; 8188768 adds r0, r1 ldr r1, =sub_8188800 str r1, [r0] - b @081887EC + b _081887EC .pool -@081887B0: +_081887B0: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -729972,7 +729972,7 @@ sub_8188768: ; 8188768 ldrb r0, [r0] bl sub_8072984 bl sub_81871AC -@081887EC: +_081887EC: pop {r4-r6} pop {r0} bx r0 @@ -729993,12 +729993,12 @@ 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 .pool -@08188828: +_08188828: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -730006,12 +730006,12 @@ sub_8188800: ; 8188800 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] @@ -730021,15 +730021,15 @@ sub_8188800: ; 8188800 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 @@ -730042,7 +730042,7 @@ sub_8188800: ; 8188800 adds r0, r1 ldr r1, =sub_8186D9C str r1, [r0] -@0818887E: +_0818887E: pop {r4-r6} pop {r0} bx r0 @@ -730060,7 +730060,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 @@ -730068,47 +730068,47 @@ 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 .pool -@081888D8: +_081888D8: ldr r0, =0x02038bcc -@081888DA: +_081888DA: ldrh r0, [r0] bl sub_8162AA0 lsls r0, 24 lsrs r0, 24 - b @0818892C + b _0818892C .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 .pool -@08188910: +_08188910: ldr r2, =0x020229e8 ldr r0, =0x0203c7b4 ldrb r0, [r0] @@ -730119,12 +730119,12 @@ sub_818888C: ; 818888C 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] @@ -730331,7 +730331,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 @@ -730339,12 +730339,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] @@ -730355,16 +730355,16 @@ sub_8188AF8: ; 8188AF8 ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b @08188B88 + b _08188B88 .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 @@ -730387,7 +730387,7 @@ sub_8188AF8: ; 8188AF8 adds r0, r1 ldr r1, =sub_8186D58 str r1, [r0] -@08188B88: +_08188B88: pop {r4-r6} pop {r0} bx r0 @@ -730434,9 +730434,9 @@ sub_8188BD4: ; 8188BD4 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] @@ -730536,11 +730536,11 @@ sub_8188BD4: ; 8188BD4 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq @08188CDC + beq _08188CDC bl sub_81871AC - b @08188CFA + b _08188CFA .pool -@08188CDC: +_08188CDC: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -730556,7 +730556,7 @@ sub_8188BD4: ; 8188BD4 adds r0, r1 ldr r1, =sub_8188D0C str r1, [r0] -@08188CFA: +_08188CFA: pop {r4-r6} pop {r0} bx r0 @@ -730597,20 +730597,20 @@ 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 .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 @@ -730618,7 +730618,7 @@ sub_8188D0C: ; 8188D0C movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne @08188D90 + bne _08188D90 movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -730627,7 +730627,7 @@ sub_8188D0C: ; 8188D0C adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -@08188D90: +_08188D90: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -730637,13 +730637,13 @@ sub_8188D0C: ; 8188D0C 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 @@ -730657,15 +730657,15 @@ sub_8188D0C: ; 8188D0C 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] @@ -730677,10 +730677,10 @@ sub_8188D0C: ; 8188D0C 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 @@ -730695,7 +730695,7 @@ sub_8188D0C: ; 8188D0C negs r0, r0 ands r0, r2 strb r0, [r1] -@08188E1C: +_08188E1C: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -730707,16 +730707,16 @@ sub_8188D0C: ; 8188D0C adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @08188E80 + b _08188E80 .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 @@ -730737,7 +730737,7 @@ sub_8188D0C: ; 8188D0C adds r0, r2 strb r4, [r0, 0x4] bl sub_81871AC -@08188E80: +_08188E80: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -730820,7 +730820,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 @@ -730828,9 +730828,9 @@ sub_8188F20: ; 8188F20 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - b @08188F6C + b _08188F6C .pool -@08188F48: +_08188F48: ldr r5, =0x02024064 ldrb r0, [r5] bl sub_8185054 @@ -730846,7 +730846,7 @@ sub_8188F20: ; 8188F20 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb -@08188F6C: +_08188F6C: bl sub_81871AC pop {r4,r5} pop {r0} @@ -730923,7 +730923,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 @@ -730953,9 +730953,9 @@ sub_8188FD0: ; 8188FD0 str r7, [sp] mov r2, r8 bl sub_807294C - b @0818908A + b _0818908A .pool -@08189060: +_08189060: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -730975,7 +730975,7 @@ sub_8188FD0: ; 8188FD0 str r7, [sp] movs r3, 0 bl sub_807294C -@0818908A: +_0818908A: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -731009,7 +731009,7 @@ sub_81890CC: ; 81890CC bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @08189120 + bne _08189120 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -731043,7 +731043,7 @@ sub_81890CC: ; 81890CC adds r0, r1 ldr r1, =sub_818714C str r1, [r0] -@08189120: +_08189120: pop {r4} pop {r0} bx r0 @@ -731058,7 +731058,7 @@ sub_8189144: ; 8189144 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @08189194 + bne _08189194 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -731090,7 +731090,7 @@ sub_8189144: ; 8189144 adds r0, r1 ldr r1, =sub_818714C str r1, [r0] -@08189194: +_08189194: pop {r4,r5} pop {r0} bx r0 @@ -731261,11 +731261,11 @@ sub_81892AC: ; 81892AC ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge @081892E0 + bge _081892E0 bl sub_81871AC - b @0818930A + b _0818930A .pool -@081892E0: +_081892E0: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -731286,7 +731286,7 @@ sub_81892AC: ; 81892AC adds r0, r1 ldr r1, =bx_blink_t2 str r1, [r0] -@0818930A: +_0818930A: pop {r4} pop {r0} bx r0 @@ -731310,9 +731310,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 @@ -731345,7 +731345,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 @@ -731358,9 +731358,9 @@ sub_818936C: ; 818936C lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @081893BC + b _081893BC .pool -@081893A8: +_081893A8: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -731370,7 +731370,7 @@ sub_818936C: ; 818936C lsls r1, 8 orrs r0, r1 bl fanfare_play -@081893BC: +_081893BC: bl sub_81871AC pop {r4,r5} pop {r0} @@ -731511,7 +731511,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] @@ -731521,7 +731521,7 @@ sub_8189438: ; 8189438 adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@081894FA: +_081894FA: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -731563,14 +731563,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 @@ -731584,9 +731584,9 @@ c3_0803D564: ; 8189548 ldrb r0, [r7] movs r1, 0 bl sub_81885D8 - b @081895F4 + b _081895F4 .pool -@081895B4: +_081895B4: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -731617,7 +731617,7 @@ c3_0803D564: ; 8189548 ldrb r0, [r7] eors r0, r5 strb r0, [r7] -@081895F4: +_081895F4: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -731664,16 +731664,16 @@ 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 .pool -@08189678: +_08189678: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -731695,7 +731695,7 @@ sub_8189648: ; 8189648 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 @@ -731706,7 +731706,7 @@ sub_8189648: ; 8189648 lsls r1, r2, 27 lsrs r0, r1, 28 cmp r0, 0x1 - bhi @081896DC + bhi _081896DC adds r0, 0x1 movs r1, 0xF ands r0, r1 @@ -731716,14 +731716,14 @@ sub_8189648: ; 8189648 ands r1, r2 orrs r1, r0 strb r1, [r3, 0x1] - b @08189742 + b _08189742 .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 @@ -731755,7 +731755,7 @@ sub_8189648: ; 8189648 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @08189736 + beq _08189736 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -731764,14 +731764,14 @@ sub_8189648: ; 8189648 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 str r0, [r1] -@08189742: +_08189742: pop {r4-r7} pop {r0} bx r0 @@ -731796,7 +731796,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] @@ -731807,7 +731807,7 @@ sub_818975C: ; 818975C movs r1, 0 strb r1, [r0, 0x5] bl sub_81871AC -@08189794: +_08189794: pop {r4} pop {r0} bx r0 @@ -731830,7 +731830,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 @@ -731841,7 +731841,7 @@ sub_81897A4: ; 81897A4 adds r0, r2 ldr r1, =sub_8073C30 str r1, [r0] -@081897D6: +_081897D6: bl sub_81871AC pop {r0} bx r0 @@ -731864,7 +731864,7 @@ sub_8189800: ; 8189800 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq @08189846 + beq _08189846 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -731891,7 +731891,7 @@ sub_8189800: ; 8189800 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -@08189846: +_08189846: bl sub_81871AC pop {r4} pop {r0} @@ -731908,7 +731908,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 @@ -731929,18 +731929,18 @@ 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 .pool -@081898AC: +_081898AC: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_818717C str r0, [r1] -@081898B8: +_081898B8: add sp, 0x4 pop {r4-r6} pop {r0} @@ -731975,17 +731975,17 @@ 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 .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 @@ -732039,24 +732039,24 @@ 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, =gUnknown_0860AF74 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @081899B4 + b _081899B4 .pool -@081899B0: +_081899B0: bl sub_818A514 -@081899B4: +_081899B4: pop {r0} bx r0 thumb_func_end sub_8189968 @@ -732078,9 +732078,9 @@ sub_81899B8: ; 81899B8 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081899DC + bne _081899DC bl sub_818A514 -@081899DC: +_081899DC: pop {r0} bx r0 .pool @@ -732104,7 +732104,7 @@ sub_81899F0: ; 81899F0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08189A40 + bne _08189A40 movs r0, 0 bl nullsub_25 ldrb r0, [r4] @@ -732124,7 +732124,7 @@ sub_81899F0: ; 81899F0 adds r0, r6 bl RemoveObjectAndFreeTiles bl sub_818A514 -@08189A40: +_08189A40: pop {r4-r6} pop {r0} bx r0 @@ -732149,7 +732149,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] @@ -732160,7 +732160,7 @@ sub_8189A58: ; 8189A58 movs r1, 0 strb r1, [r0, 0x9] bl sub_818A514 -@08189A90: +_08189A90: pop {r4} pop {r0} bx r0 @@ -732179,24 +732179,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] @@ -732210,10 +732210,10 @@ sub_8189AA0: ; 8189AA0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08189B42 - b @08189B48 + bne _08189B42 + b _08189B48 .pool -@08189B0C: +_08189B0C: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -732228,7 +732228,7 @@ sub_8189AA0: ; 8189AA0 ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - bne @08189B42 + bne _08189B42 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -732239,13 +732239,13 @@ sub_8189AA0: ; 8189AA0 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] @@ -732261,9 +732261,9 @@ sub_8189AA0: ; 8189AA0 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 @@ -732276,9 +732276,9 @@ sub_8189AA0: ; 8189AA0 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 @@ -732342,7 +732342,7 @@ sub_8189AA0: ; 8189AA0 bl battle_type_is_double lsls r0, 24 cmp r0, 0 - beq @08189C22 + beq _08189C22 ldrb r0, [r5] mov r1, r8 eors r1, r0 @@ -732352,7 +732352,7 @@ sub_8189AA0: ; 8189AA0 muls r0, r6 adds r0, r4 bl sub_805E990 -@08189C22: +_08189C22: mov r1, r9 ldr r0, [r1] ldrb r1, [r5] @@ -732365,24 +732365,24 @@ sub_8189AA0: ; 8189AA0 strb r1, [r0, 0x9] ldr r1, =0x03005d60 ldrb r0, [r5] - b @08189D10 + b _08189D10 .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] @@ -732396,10 +732396,10 @@ sub_8189AA0: ; 8189AA0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @08189CE6 - b @08189CE4 + bne _08189CE6 + b _08189CE4 .pool -@08189CB0: +_08189CB0: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -732414,7 +732414,7 @@ sub_8189AA0: ; 8189AA0 ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - bne @08189CE6 + bne _08189CE6 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -732425,18 +732425,18 @@ sub_8189AA0: ; 8189AA0 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 @@ -732450,12 +732450,12 @@ sub_8189AA0: ; 8189AA0 strb r1, [r0, 0x9] ldr r1, =0x03005d60 ldrb r0, [r3] -@08189D10: +_08189D10: lsls r0, 2 adds r0, r1 ldr r1, =sub_8189A58 str r1, [r0] -@08189D18: +_08189D18: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -732479,7 +732479,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] @@ -732493,7 +732493,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] @@ -732503,7 +732503,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 @@ -732518,7 +732518,7 @@ sub_8189D40: ; 8189D40 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - bne @08189DBE + bne _08189DBE ldr r0, =0x0202406e adds r0, r2, r0 ldrh r1, [r0] @@ -732528,7 +732528,7 @@ sub_8189D40: ; 8189D40 adds r1, r0 adds r0, r3, 0 bl sub_8172EF0 -@08189DBE: +_08189DBE: ldr r3, =0x020244d0 ldr r0, [r3] ldr r2, =0x02024064 @@ -732545,7 +732545,7 @@ sub_8189D40: ; 8189D40 mov r9, r2 mov r8, r3 cmp r0, 0 - bne @08189EA2 + bne _08189EA2 movs r7, 0x2 adds r1, r7, 0 eors r1, r5 @@ -732557,22 +732557,22 @@ sub_8189D40: ; 8189D40 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] @@ -732600,7 +732600,7 @@ sub_8189D40: ; 8189D40 adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@08189E54: +_08189E54: ldr r5, =0x03005d70 ldr r4, =0x02024064 ldrb r1, [r4] @@ -732622,7 +732622,7 @@ sub_8189D40: ; 8189D40 adds r0, r5 ldrb r0, [r0] bl sub_80729D0 -@08189E84: +_08189E84: ldr r4, =0x020244d0 ldr r0, [r4] ldr r3, =0x02024064 @@ -732638,7 +732638,7 @@ sub_8189D40: ; 8189D40 strb r1, [r0, 0x1] mov r9, r3 mov r8, r4 -@08189EA2: +_08189EA2: mov r1, r8 ldr r0, [r1] mov r1, r9 @@ -732652,7 +732652,7 @@ sub_8189D40: ; 8189D40 movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - bne @08189F62 + bne _08189F62 movs r1, 0x2 eors r1, r2 lsls r0, r1, 1 @@ -732663,11 +732663,11 @@ sub_8189D40: ; 8189D40 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 @@ -732681,29 +732681,29 @@ sub_8189D40: ; 8189D40 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 .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 @@ -732719,10 +732719,10 @@ sub_8189D40: ; 8189D40 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 @@ -732738,7 +732738,7 @@ sub_8189D40: ; 8189D40 ldr r2, [r0] ldr r0, =DummyObjectCallback cmp r2, r0 - bne @0818A02A + bne _0818A02A ldr r0, =0x020241e4 adds r0, r3, r0 ldrb r1, [r0] @@ -732748,17 +732748,17 @@ sub_8189D40: ; 8189D40 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 @@ -732769,7 +732769,7 @@ sub_8189D40: ; 8189D40 lsls r0, 2 adds r0, r7 bl RemoveObjectAndFreeTiles -@08189FC8: +_08189FC8: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -732818,7 +732818,7 @@ sub_8189D40: ; 8189D40 adds r0, r1 ldr r1, =sub_8189AA0 str r1, [r0] -@0818A02A: +_0818A02A: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -732847,13 +732847,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 .pool @@ -732882,15 +732882,15 @@ 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 .pool -@0818A0EC: +_0818A0EC: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -732902,7 +732902,7 @@ sub_818A0A4: ; 818A0A4 adds r0, r2 bl sub_805E990 bl sub_818A514 -@0818A106: +_0818A106: pop {r4-r6} pop {r0} bx r0 @@ -732928,7 +732928,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 @@ -732967,7 +732967,7 @@ sub_818A114: ; 818A114 ldrb r0, [r0] bl sub_8072984 bl sub_818A514 -@0818A190: +_0818A190: pop {r4-r6} pop {r0} bx r0 @@ -732990,7 +732990,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] @@ -733014,7 +733014,7 @@ sub_818A1B0: ; 818A1B0 ldrb r0, [r0] bl sub_8072984 bl sub_818A514 -@0818A204: +_0818A204: pop {r4-r6} pop {r0} bx r0 @@ -733028,9 +733028,9 @@ sub_818A220: ; 818A220 bl IsTextPrinterActive lsls r0, 16 cmp r0, 0 - bne @0818A232 + bne _0818A232 bl sub_818A514 -@0818A232: +_0818A232: pop {r0} bx r0 thumb_func_end sub_818A220 @@ -733051,7 +733051,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] @@ -733064,14 +733064,14 @@ sub_818A238: ; 818A238 ldr r0, =0x020244b9 strb r3, [r0] bl sub_818A514 - b @0818A2AE + b _0818A2AE .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] @@ -733085,11 +733085,11 @@ sub_818A238: ; 818A238 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 @@ -733112,7 +733112,7 @@ sub_818A2B4: ; 818A2B4 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0818A306 + bne _0818A306 adds r0, r3, 0 bl sub_805E408 ldr r0, =0x020244d0 @@ -733125,19 +733125,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 str r0, [r1] -@0818A306: +_0818A306: pop {r4} pop {r0} bx r0 @@ -733160,7 +733160,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 @@ -733173,9 +733173,9 @@ sub_818A328: ; 818A328 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0818A364 + bne _0818A364 bl sub_818A514 -@0818A364: +_0818A364: pop {r0} bx r0 .pool @@ -733199,7 +733199,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 @@ -733269,7 +733269,7 @@ sub_818A37C: ; 818A37C adds r0, r1 ldr r1, =sub_818A2B4 str r1, [r0] -@0818A438: +_0818A438: pop {r3} mov r8, r3 pop {r4-r7} @@ -733294,7 +733294,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] @@ -733304,7 +733304,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] @@ -733319,7 +733319,7 @@ sub_818A470: ; 818A470 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @0818A4E8 + bne _0818A4E8 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -733330,7 +733330,7 @@ sub_818A470: ; 818A470 movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @0818A4E8 + bne _0818A4E8 adds r0, r3, r5 bl RemoveObjectAndFreeTiles ldr r1, =0x03005d60 @@ -733339,7 +733339,7 @@ sub_818A470: ; 818A470 adds r0, r1 ldr r1, =sub_818A37C str r1, [r0] -@0818A4E8: +_0818A4E8: pop {r4-r6} pop {r0} bx r0 @@ -733362,7 +733362,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] @@ -733376,9 +733376,9 @@ sub_818A514: ; 818A514 adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @0818A57A + b _0818A57A .pool -@0818A568: +_0818A568: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -733388,7 +733388,7 @@ sub_818A514: ; 818A514 ldr r0, [r2] bics r0, r1 str r0, [r2] -@0818A57A: +_0818A57A: add sp, 0x4 pop {r4} pop {r0} @@ -733412,9 +733412,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 .pool @@ -733436,9 +733436,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 .pool @@ -733457,7 +733457,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 @@ -733465,28 +733465,28 @@ sub_818A5EC: ; 818A5EC mov r1, sp bl sub_818A660 adds r6, r0, 0 - b @0818A646 + b _0818A646 .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 @@ -733519,78 +733519,78 @@ 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 .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 @@ -733627,7 +733627,7 @@ sub_818A660: ; 818A660 str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@0818A7DC: +_0818A7DC: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -733643,7 +733643,7 @@ sub_818A660: ; 818A660 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @0818A7DC + ble _0818A7DC movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -733821,33 +733821,33 @@ sub_818A660: ; 818A660 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 .pool -@0818A9B4: +_0818A9B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b @0818AD2E + b _0818AD2E .pool -@0818A9C4: +_0818A9C4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b @0818AD2E + b _0818AD2E .pool -@0818A9D4: +_0818A9D4: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -733859,7 +733859,7 @@ sub_818A660: ; 818A660 ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -@0818A9EA: +_0818A9EA: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -733877,7 +733877,7 @@ sub_818A660: ; 818A660 add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @0818A9EA + ble _0818A9EA movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -733888,17 +733888,17 @@ sub_818A660: ; 818A660 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 .pool -@0818AA3C: +_0818AA3C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -733909,16 +733909,16 @@ sub_818A660: ; 818A660 adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @0818AD2E + b _0818AD2E .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 @@ -733928,7 +733928,7 @@ sub_818A660: ; 818A660 strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @0818AA64 + ble _0818AA64 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -733938,9 +733938,9 @@ sub_818A660: ; 818A660 adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @0818ADF6 + b _0818ADF6 .pool -@0818AA94: +_0818AA94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -733951,23 +733951,23 @@ sub_818A660: ; 818A660 adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @0818ADEE + b _0818ADEE .pool -@0818AAB0: +_0818AAB0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b @0818AACA + b _0818AACA .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] @@ -733982,105 +733982,105 @@ sub_818A660: ; 818A660 lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @0818ADF6 + b _0818ADF6 .pool -@0818AAF0: +_0818AAF0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b @0818ADEE + b _0818ADEE .pool -@0818AB00: +_0818AB00: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b @0818ADEE + b _0818ADEE .pool -@0818AB10: +_0818AB10: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b @0818ADEE + b _0818ADEE .pool -@0818AB20: +_0818AB20: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b @0818ADEE + b _0818ADEE .pool -@0818AB30: +_0818AB30: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b @0818ADEE + b _0818ADEE .pool -@0818AB40: +_0818AB40: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b @0818ADEE + b _0818ADEE .pool -@0818AB50: +_0818AB50: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b @0818ADEE + b _0818ADEE .pool -@0818AB60: +_0818AB60: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b @0818ADEE + b _0818ADEE .pool -@0818AB70: +_0818AB70: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b @0818ADEE + b _0818ADEE .pool -@0818AB80: +_0818AB80: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b @0818ADEE + b _0818ADEE .pool -@0818AB90: +_0818AB90: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b @0818ADEE + b _0818ADEE .pool -@0818ABA0: +_0818ABA0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b @0818ADEE + b _0818ADEE .pool -@0818ABB0: +_0818ABB0: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -734111,79 +734111,79 @@ sub_818A660: ; 818A660 bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @0818ADF6 + b _0818ADF6 .pool -@0818AC00: +_0818AC00: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b @0818ADEE + b _0818ADEE .pool -@0818AC10: +_0818AC10: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b @0818ADEE + b _0818ADEE .pool -@0818AC20: +_0818AC20: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b @0818ADEE + b _0818ADEE .pool -@0818AC30: +_0818AC30: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b @0818ADEE + b _0818ADEE .pool -@0818AC40: +_0818AC40: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b @0818ADEE + b _0818ADEE .pool -@0818AC50: +_0818AC50: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b @0818ADEE + b _0818ADEE .pool -@0818AC60: +_0818AC60: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b @0818AC8A + b _0818AC8A .pool -@0818AC70: +_0818AC70: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b @0818AD2E + b _0818AD2E .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] @@ -734200,71 +734200,71 @@ sub_818A660: ; 818A660 lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @0818ADF6 + b _0818ADF6 .pool -@0818ACB4: +_0818ACB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b @0818ADEE + b _0818ADEE .pool -@0818ACC4: +_0818ACC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b @0818AD2E + b _0818AD2E .pool -@0818ACD4: +_0818ACD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b @0818AD2E + b _0818AD2E .pool -@0818ACE4: +_0818ACE4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b @0818AD2E + b _0818AD2E .pool -@0818ACF4: +_0818ACF4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b @0818AD2E + b _0818AD2E .pool -@0818AD04: +_0818AD04: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b @0818AD2E + b _0818AD2E .pool -@0818AD14: +_0818AD14: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b @0818AD2E + b _0818AD2E .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 @@ -734272,99 +734272,99 @@ sub_818A660: ; 818A660 lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @0818ADF6 + b _0818ADF6 .pool -@0818AD44: +_0818AD44: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b @0818ADEE + b _0818ADEE .pool -@0818AD54: +_0818AD54: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b @0818ADEE + b _0818ADEE .pool -@0818AD64: +_0818AD64: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b @0818ADEE + b _0818ADEE .pool -@0818AD74: +_0818AD74: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b @0818ADEE + b _0818ADEE .pool -@0818AD84: +_0818AD84: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b @0818ADEE + b _0818ADEE .pool -@0818AD94: +_0818AD94: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b @0818ADEE + b _0818ADEE .pool -@0818ADA4: +_0818ADA4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b @0818ADEE + b _0818ADEE .pool -@0818ADB4: +_0818ADB4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b @0818ADEE + b _0818ADEE .pool -@0818ADC4: +_0818ADC4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b @0818ADEE + b _0818ADEE .pool -@0818ADD4: +_0818ADD4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b @0818ADEE + b _0818ADEE .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} @@ -734396,32 +734396,32 @@ 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 .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} @@ -734449,78 +734449,78 @@ 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 .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 @@ -734570,7 +734570,7 @@ sub_818AE70: ; 818AE70 adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -@0818B00A: +_0818B00A: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -734587,7 +734587,7 @@ sub_818AE70: ; 818AE70 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @0818B00A + ble _0818B00A movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -734699,9 +734699,9 @@ sub_818AE70: ; 818AE70 movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B13C: +_0818B13C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734712,9 +734712,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0xB bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B15C: +_0818B15C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734725,9 +734725,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0xC bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B17C: +_0818B17C: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -734741,7 +734741,7 @@ sub_818AE70: ; 818AE70 adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -@0818B196: +_0818B196: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -734758,7 +734758,7 @@ sub_818AE70: ; 818AE70 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @0818B196 + ble _0818B196 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734766,9 +734766,9 @@ sub_818AE70: ; 818AE70 movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B1D4: +_0818B1D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734781,9 +734781,9 @@ sub_818AE70: ; 818AE70 adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @0818B278 + b _0818B278 .pool -@0818B1FC: +_0818B1FC: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -734824,9 +734824,9 @@ sub_818AE70: ; 818AE70 adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B260: +_0818B260: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734839,13 +734839,13 @@ sub_818AE70: ; 818AE70 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 .pool -@0818B290: +_0818B290: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734856,9 +734856,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B2B0: +_0818B2B0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734869,9 +734869,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B2D0: +_0818B2D0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734882,9 +734882,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B2F0: +_0818B2F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734895,9 +734895,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B310: +_0818B310: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734908,9 +734908,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B330: +_0818B330: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734921,9 +734921,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B350: +_0818B350: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734934,9 +734934,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B370: +_0818B370: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734947,9 +734947,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B390: +_0818B390: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734960,9 +734960,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B3B0: +_0818B3B0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734973,9 +734973,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B3D0: +_0818B3D0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734986,9 +734986,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B3F0: +_0818B3F0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -734999,9 +734999,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B410: +_0818B410: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735012,9 +735012,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B430: +_0818B430: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735025,9 +735025,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B450: +_0818B450: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -735073,9 +735073,9 @@ sub_818AE70: ; 818AE70 adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b @0818B570 + b _0818B570 .pool -@0818B4C0: +_0818B4C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735086,9 +735086,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B4E0: +_0818B4E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735099,9 +735099,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B500: +_0818B500: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735112,9 +735112,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B520: +_0818B520: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735125,9 +735125,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B540: +_0818B540: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735138,9 +735138,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B560: +_0818B560: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735149,12 +735149,12 @@ sub_818AE70: ; 818AE70 ldrb r2, [r1] lsls r2, 9 adds r2, r7 -@0818B570: +_0818B570: movs r1, 0x2C bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B580: +_0818B580: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735165,9 +735165,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B5A0: +_0818B5A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735178,9 +735178,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B5C0: +_0818B5C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735191,9 +735191,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B5E0: +_0818B5E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735204,9 +735204,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B600: +_0818B600: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735217,9 +735217,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B620: +_0818B620: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735230,9 +735230,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B640: +_0818B640: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735243,9 +735243,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B660: +_0818B660: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735256,9 +735256,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B680: +_0818B680: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735269,9 +735269,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B6A0: +_0818B6A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735282,9 +735282,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B6C0: +_0818B6C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735295,9 +735295,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B6E0: +_0818B6E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735308,9 +735308,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B700: +_0818B700: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735321,9 +735321,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B720: +_0818B720: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735334,9 +735334,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B740: +_0818B740: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735347,9 +735347,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B760: +_0818B760: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735360,9 +735360,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B780: +_0818B780: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735373,9 +735373,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B7A0: +_0818B7A0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735386,9 +735386,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B7C0: +_0818B7C0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735399,9 +735399,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B7E0: +_0818B7E0: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735412,9 +735412,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B800: +_0818B800: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735425,9 +735425,9 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b @0818B836 + b _0818B836 .pool -@0818B820: +_0818B820: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -735438,7 +735438,7 @@ sub_818AE70: ; 818AE70 adds r2, r7 movs r1, 0x36 bl pokemon_setattr -@0818B836: +_0818B836: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -735486,11 +735486,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 @@ -735507,8 +735507,8 @@ sub_818B86C: ; 818B86C adds r0, r4 ldrb r0, [r0] cmp r3, r0 - bcc @0818B8A2 -@0818B8C4: + bcc _0818B8A2 +_0818B8C4: bl sub_818A514 pop {r4-r7} pop {r0} @@ -735853,7 +735853,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] @@ -735868,9 +735868,9 @@ sub_818BBE8: ; 818BBE8 adds r0, r1 ldr r1, =sub_818BC78 str r1, [r0] - b @0818BC66 + b _0818BC66 .pool -@0818BC30: +_0818BC30: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -735894,7 +735894,7 @@ sub_818BBE8: ; 818BBE8 ldrb r0, [r0] bl sub_8072984 bl sub_818A514 -@0818BC66: +_0818BC66: pop {r4-r6} pop {r0} bx r0 @@ -735915,12 +735915,12 @@ 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 .pool -@0818BCA0: +_0818BCA0: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -735928,12 +735928,12 @@ sub_818BC78: ; 818BC78 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] @@ -735943,15 +735943,15 @@ sub_818BC78: ; 818BC78 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 @@ -735964,7 +735964,7 @@ sub_818BC78: ; 818BC78 adds r0, r1 ldr r1, =sub_818A1B0 str r1, [r0] -@0818BCF6: +_0818BCF6: pop {r4-r6} pop {r0} bx r0 @@ -735983,17 +735983,17 @@ 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 .pool -@0818BD30: +_0818BD30: ldr r2, =0x020229e8 ldr r0, =0x0203c7b4 ldrb r1, [r0] @@ -736001,20 +736001,20 @@ sub_818BD04: ; 818BD04 subs r0, r1 lsls r0, 2 adds r0, r2 - b @0818BD4A + b _0818BD4A .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 @@ -736023,27 +736023,27 @@ sub_818BD04: ; 818BD04 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, =gUnknown_083054E0 - b @0818BD9E + b _0818BD9E .pool -@0818BD98: +_0818BD98: movs r0, 0x50 mov r9, r0 -@0818BD9C: +_0818BD9C: ldr r1, =gUnknown_08305D2C -@0818BD9E: +_0818BD9E: lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] @@ -736059,9 +736059,9 @@ sub_818BD04: ; 818BD04 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] @@ -736178,9 +736178,9 @@ sub_818BD04: ; 818BD04 movs r2, 0x1 orrs r1, r2 strb r1, [r0] - b @0818BF72 + b _0818BF72 .pool -@0818BEDC: +_0818BEDC: ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -736251,7 +736251,7 @@ sub_818BD04: ; 818BD04 adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] -@0818BF72: +_0818BF72: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -736363,7 +736363,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 @@ -736371,12 +736371,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] @@ -736387,16 +736387,16 @@ sub_818C064: ; 818C064 ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b @0818C12E + b _0818C12E .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] @@ -736447,7 +736447,7 @@ sub_818C064: ; 818C064 adds r0, r1 ldr r1, =sub_818A114 str r1, [r0] -@0818C12E: +_0818C12E: pop {r4-r6} pop {r0} bx r0 @@ -736494,9 +736494,9 @@ sub_818C180: ; 818C180 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] @@ -736596,11 +736596,11 @@ sub_818C180: ; 818C180 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq @0818C288 + beq _0818C288 bl sub_818A514 - b @0818C2A6 + b _0818C2A6 .pool -@0818C288: +_0818C288: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -736616,7 +736616,7 @@ sub_818C180: ; 818C180 adds r0, r1 ldr r1, =bx_move_anim_2 str r1, [r0] -@0818C2A6: +_0818C2A6: pop {r4-r6} pop {r0} bx r0 @@ -736657,20 +736657,20 @@ 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 .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 @@ -736678,7 +736678,7 @@ bx_move_anim_2: ; 818C2B8 movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne @0818C33C + bne _0818C33C movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -736687,7 +736687,7 @@ bx_move_anim_2: ; 818C2B8 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -@0818C33C: +_0818C33C: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -736697,13 +736697,13 @@ bx_move_anim_2: ; 818C2B8 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 @@ -736717,15 +736717,15 @@ bx_move_anim_2: ; 818C2B8 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] @@ -736737,10 +736737,10 @@ bx_move_anim_2: ; 818C2B8 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 @@ -736755,7 +736755,7 @@ bx_move_anim_2: ; 818C2B8 negs r0, r0 ands r0, r2 strb r0, [r1] -@0818C3C8: +_0818C3C8: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -736767,16 +736767,16 @@ bx_move_anim_2: ; 818C2B8 adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @0818C42C + b _0818C42C .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 @@ -736797,7 +736797,7 @@ bx_move_anim_2: ; 818C2B8 adds r0, r2 strb r4, [r0, 0x4] bl sub_818A514 -@0818C42C: +_0818C42C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -736854,7 +736854,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 @@ -736865,7 +736865,7 @@ sub_818C49C: ; 818C49C movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb bl sub_818A514 -@0818C4C6: +_0818C4C6: pop {r0} bx r0 .pool @@ -736880,7 +736880,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] @@ -736888,9 +736888,9 @@ sub_818C4D8: ; 818C4D8 adds r0, r1 ldr r1, =sub_818C49C str r1, [r0] - b @0818C522 + b _0818C522 .pool -@0818C508: +_0818C508: ldr r0, =0x02024064 ldrb r0, [r0] bl sub_8185054 @@ -736901,7 +736901,7 @@ sub_818C4D8: ; 818C4D8 movs r2, 0 bl dp01_build_cmdbuf_x21_a_bb bl sub_818A514 -@0818C522: +_0818C522: pop {r0} bx r0 .pool @@ -736924,7 +736924,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 @@ -736932,9 +736932,9 @@ sub_818C538: ; 818C538 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb - b @0818C584 + b _0818C584 .pool -@0818C560: +_0818C560: ldr r5, =0x02024064 ldrb r0, [r5] bl sub_8185054 @@ -736950,7 +736950,7 @@ sub_818C538: ; 818C538 movs r0, 0x1 movs r1, 0xA bl dp01_build_cmdbuf_x21_a_bb -@0818C584: +_0818C584: bl sub_818A514 pop {r4,r5} pop {r0} @@ -737027,7 +737027,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 @@ -737057,9 +737057,9 @@ sub_818C5E8: ; 818C5E8 str r7, [sp] mov r2, r8 bl sub_807294C - b @0818C6B2 + b _0818C6B2 .pool -@0818C678: +_0818C678: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -737086,7 +737086,7 @@ sub_818C5E8: ; 818C5E8 movs r1, 0 movs r2, 0 bl heathbar_draw_hp -@0818C6B2: +_0818C6B2: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -737120,7 +737120,7 @@ sub_818C6F4: ; 818C6F4 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @0818C748 + bne _0818C748 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -737154,7 +737154,7 @@ sub_818C6F4: ; 818C6F4 adds r0, r1 ldr r1, =sub_818A58C str r1, [r0] -@0818C748: +_0818C748: pop {r4} pop {r0} bx r0 @@ -737169,7 +737169,7 @@ sub_818C76C: ; 818C76C bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @0818C7BC + bne _0818C7BC ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -737201,7 +737201,7 @@ sub_818C76C: ; 818C76C adds r0, r1 ldr r1, =sub_818A58C str r1, [r0] -@0818C7BC: +_0818C7BC: pop {r4,r5} pop {r0} bx r0 @@ -737372,11 +737372,11 @@ sub_818C8D4: ; 818C8D4 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge @0818C908 + bge _0818C908 bl sub_818A514 - b @0818C932 + b _0818C932 .pool -@0818C908: +_0818C908: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -737397,7 +737397,7 @@ sub_818C8D4: ; 818C8D4 adds r0, r1 ldr r1, =sub_818A238 str r1, [r0] -@0818C932: +_0818C932: pop {r4} pop {r0} bx r0 @@ -737421,9 +737421,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 @@ -737456,7 +737456,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 @@ -737469,9 +737469,9 @@ sub_818C994: ; 818C994 lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @0818C9E4 + b _0818C9E4 .pool -@0818C9D0: +_0818C9D0: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -737481,7 +737481,7 @@ sub_818C994: ; 818C994 lsls r1, 8 orrs r0, r1 bl fanfare_play -@0818C9E4: +_0818C9E4: bl sub_818A514 pop {r4,r5} pop {r0} @@ -737625,7 +737625,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 @@ -737634,13 +737634,13 @@ sub_818CA64: ; 818CA64 lsls r1, 2 adds r1, r4 ldrb r0, [r1, 0x13] - b @0818CB5A + b _0818CB5A .pool -@0818CB54: +_0818CB54: ldr r0, =0x03005d90 ldr r0, [r0] ldrb r0, [r0, 0x8] -@0818CB5A: +_0818CB5A: ldr r1, =gTrainerBackPicPaletteTable lsls r0, 3 adds r0, r1 @@ -737690,7 +737690,7 @@ sub_818CA64: ; 818CA64 movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @0818CBD4 + beq _0818CBD4 ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -737700,7 +737700,7 @@ sub_818CA64: ; 818CA64 adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@0818CBD4: +_0818CBD4: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -737737,12 +737737,12 @@ 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 .pool -@0818CC50: +_0818CC50: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -737751,14 +737751,14 @@ sub_818CC24: ; 818CC24 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 @@ -737772,9 +737772,9 @@ sub_818CC24: ; 818CC24 ldrb r0, [r7] movs r1, 0 bl sub_818BA6C - b @0818CCF4 + b _0818CCF4 .pool -@0818CCA0: +_0818CCA0: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -737814,7 +737814,7 @@ sub_818CC24: ; 818CC24 ldrb r0, [r7] eors r0, r6 strb r0, [r7] -@0818CCF4: +_0818CCF4: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -737826,7 +737826,7 @@ sub_818CC24: ; 818CC24 strb r3, [r2] mov r0, r8 bl remove_task -@0818CD0C: +_0818CD0C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -737847,16 +737847,16 @@ 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 .pool -@0818CD60: +_0818CD60: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -737899,7 +737899,7 @@ sub_818CD30: ; 818CD30 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @0818CDC8 + beq _0818CDC8 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -737908,14 +737908,14 @@ sub_818CD30: ; 818CD30 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 str r0, [r1] -@0818CDD4: +_0818CDD4: pop {r4-r6} pop {r0} bx r0 @@ -737940,7 +737940,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] @@ -737951,7 +737951,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 @@ -737974,7 +737974,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 @@ -737985,7 +737985,7 @@ sub_818CE3C: ; 818CE3C adds r0, r2 ldr r1, =sub_8073C30 str r1, [r0] -@0818CE6E: +_0818CE6E: bl sub_818A514 pop {r0} bx r0 @@ -738008,7 +738008,7 @@ sub_818CE98: ; 818CE98 bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq @0818CEDE + beq _0818CEDE ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -738035,7 +738035,7 @@ sub_818CE98: ; 818CE98 strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -@0818CEDE: +_0818CEDE: bl sub_818A514 pop {r4} pop {r0} @@ -738052,7 +738052,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 @@ -738073,18 +738073,18 @@ 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 .pool -@0818CF44: +_0818CF44: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =sub_818A5BC str r0, [r1] -@0818CF50: +_0818CF50: add sp, 0x4 pop {r4-r6} pop {r0} @@ -738153,7 +738153,7 @@ dp13_810BB8C: ; 818CFCC ldr r4, =gUnknown_0860B058 ldr r3, =0x0203cd04 movs r2, 0x7 -@0818CFD4: +_0818CFD4: adds r1, r3, 0 adds r0, r4, 0 ldm r0!, {r5-r7} @@ -738161,7 +738161,7 @@ dp13_810BB8C: ; 818CFCC adds r3, 0xC subs r2, 0x1 cmp r2, 0 - bge @0818CFD4 + bge _0818CFD4 movs r0, 0 pop {r4-r7} pop {r1} @@ -738188,65 +738188,65 @@ 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, =gMonFrontPicTable - b @0818D03C + b _0818D03C .pool -@0818D028: +_0818D028: lsls r0, r4, 3 ldr r1, =gMonFrontPicTable - b @0818D054 + b _0818D054 .pool -@0818D034: +_0818D034: cmp r0, 0 - bne @0818D050 + bne _0818D050 lsls r0, r4, 3 ldr r1, =gMonBackPicTable -@0818D03C: +_0818D03C: adds r0, r1 str r2, [sp] adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 bl DecompressMonPic - b @0818D08E + b _0818D08E .pool -@0818D050: +_0818D050: lsls r0, r4, 3 ldr r1, =gMonBackPicTable -@0818D054: +_0818D054: adds r0, r1 str r2, [sp] adds r1, r5, 0 adds r2, r4, 0 adds r3, r6, 0 bl DecompressMonPicWithoutDuplicatingDeoxysTiles - b @0818D08E + b _0818D08E .pool -@0818D068: +_0818D068: cmp r2, 0 - beq @0818D080 + beq _0818D080 lsls r0, r4, 3 ldr r1, =gTrainerFrontPicTable adds r0, r1 adds r1, r5, 0 adds r2, r4, 0 bl DecompressPicFromTable - b @0818D08E + b _0818D08E .pool -@0818D080: +_0818D080: lsls r0, r7, 3 ldr r1, =gTrainerBackPicTable adds r0, r1 adds r1, r5, 0 adds r2, r7, 0 bl DecompressPicFromTable -@0818D08E: +_0818D08E: movs r0, 0 add sp, 0x4 pop {r4-r7} @@ -738298,10 +738298,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 @@ -738312,9 +738312,9 @@ sub_818D0C4: ; 818D0C4 mov r2, r8 bl species_and_otid_get_pal lsls r1, r5, 20 - b @0818D144 + b _0818D144 .pool -@0818D110: +_0818D110: ldr r0, =0x0203ccec strh r3, [r0, 0x2] adds r0, r4, 0 @@ -738322,12 +738322,12 @@ sub_818D0C4: ; 818D0C4 mov r2, r8 bl sub_806E7CC bl LoadCompressedObjectPalette - b @0818D16E + b _0818D16E .pool -@0818D128: +_0818D128: ldr r0, =0x0000ffff cmp r3, r0 - bne @0818D160 + bne _0818D160 ldr r2, =0x0203ccec ldrh r1, [r2, 0x2] adds r0, r3, 0 @@ -738339,23 +738339,23 @@ sub_818D0C4: ; 818D0C4 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 .pool -@0818D160: +_0818D160: ldr r0, =0x0203ccec strh r1, [r0, 0x2] lsls r0, r6, 3 ldr r1, =gTrainerFrontPicPaletteTable adds r0, r1 bl LoadCompressedObjectPalette -@0818D16E: +_0818D16E: pop {r3} mov r8, r3 pop {r4-r7} @@ -738375,14 +738375,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, =gTrainerFrontPicPaletteTable lsls r0, 3 adds r0, r1 @@ -738390,7 +738390,7 @@ sub_818D180: ; 818D180 lsls r1, r4, 4 movs r2, 0x20 bl decompress_palette -@0818D1B4: +_0818D1B4: pop {r4,r5} pop {r0} bx r0 @@ -738402,18 +738402,18 @@ uns_builder_assign_animtable1: ; 818D1C0 push {lr} lsls r0, 24 cmp r0, 0 - bne @0818D1D8 + bne _0818D1D8 ldr r1, =0x0203ccec ldr r0, =gUnknown_082FF70C str r0, [r1, 0x8] - b @0818D1E0 + b _0818D1E0 .pool -@0818D1D8: +_0818D1D8: ldr r0, =0x0203ccec ldr r1, =gUnknown_0830536C ldr r1, [r1] str r1, [r0, 0x8] -@0818D1E0: +_0818D1E0: pop {r0} bx r0 .pool @@ -738464,41 +738464,41 @@ 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 Alloc adds r7, r0, 0 cmp r7, 0 - beq @0818D280 + beq _0818D280 movs r0, 0x20 bl Alloc 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 .pool -@0818D28C: +_0818D28C: mov r1, r9 str r1, [sp] str r5, [sp, 0x4] @@ -738509,7 +738509,7 @@ oamt_spawn_poke_or_trainer_picture: ; 818D1EC 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 @@ -738527,14 +738527,14 @@ oamt_spawn_poke_or_trainer_picture: ; 818D1EC 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 @@ -738568,7 +738568,7 @@ oamt_spawn_poke_or_trainer_picture: ; 818D1EC adds r6, r2, 0 ldr r0, =0x0000ffff cmp r10, r0 - bne @0818D336 + bne _0818D336 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -738581,7 +738581,7 @@ oamt_spawn_poke_or_trainer_picture: ; 818D1EC ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -@0818D336: +_0818D336: ldr r1, =0x0203cd04 ldr r2, [sp, 0x2C] adds r0, r2, r4 @@ -738598,7 +738598,7 @@ oamt_spawn_poke_or_trainer_picture: ; 818D1EC movs r0, 0x1 strb r0, [r2, 0xB] adds r0, r6, 0 -@0818D356: +_0818D356: add sp, 0x30 pop {r3-r5} mov r8, r3 @@ -738696,54 +738696,54 @@ 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 Alloc 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 .pool -@0818D468: +_0818D468: mov r9, r6 -@0818D46A: +_0818D46A: movs r0, 0x20 bl Alloc 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 .pool -@0818D484: +_0818D484: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -738754,7 +738754,7 @@ sub_818D3E4: ; 818D3E4 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 @@ -738773,14 +738773,14 @@ sub_818D3E4: ; 818D3E4 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, =gUnknown_08309AAC @@ -738791,27 +738791,27 @@ sub_818D3E4: ; 818D3E4 str r2, [r4, 0xC] mov r0, r9 cmp r0, 0x1 - bne @0818D4F8 + bne _0818D4F8 ldr r0, =gUnknown_082FF694 - b @0818D500 + b _0818D500 .pool -@0818D4F8: +_0818D4F8: mov r1, r9 cmp r1, 0 - bne @0818D510 + bne _0818D510 ldr r0, =gUnknown_082FF618 -@0818D500: +_0818D500: str r0, [r4, 0x10] ldr r0, =gUnknown_0860B06C str r0, [r4, 0x4] - b @0818D518 + b _0818D518 .pool -@0818D510: +_0818D510: ldr r0, =gUnknown_0860B064 str r0, [r4, 0x4] ldr r0, =gDummyObjectRotScalAnimTable str r0, [r4, 0x10] -@0818D518: +_0818D518: ldr r2, =nullsub_122 str r2, [r4, 0x14] ldr r0, [sp, 0x1C] @@ -738836,7 +738836,7 @@ sub_818D3E4: ; 818D3E4 ldr r0, =0x0000ffff ldr r1, [sp, 0x1C] cmp r1, r0 - bne @0818D566 + bne _0818D566 ldr r0, =0x02020630 lsls r1, r2, 4 adds r1, r2 @@ -738849,7 +738849,7 @@ sub_818D3E4: ; 818D3E4 ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -@0818D566: +_0818D566: ldr r1, =0x0203cd04 ldr r2, [sp, 0x28] adds r0, r2, r5 @@ -738867,7 +738867,7 @@ sub_818D3E4: ; 818D3E4 movs r0, 0x1 strb r0, [r2, 0xB] adds r0, r6, 0 -@0818D588: +_0818D588: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -738891,28 +738891,28 @@ 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 .pool -@0818D5F0: +_0818D5F0: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -738926,7 +738926,7 @@ sub_818D5B0: ; 818D5B0 ldr r0, =0x0000ffff lsls r6, r4, 4 cmp r1, r0 - beq @0818D624 + beq _0818D624 ldr r1, =0x02020630 adds r0, r6, r4 lsls r0, 2 @@ -738937,7 +738937,7 @@ sub_818D5B0: ; 818D5B0 lsls r0, 16 lsrs r0, 16 bl FreeObjectPaletteByTag -@0818D624: +_0818D624: adds r0, r6, r4 lsls r0, 2 ldr r1, =0x02020630 @@ -738952,7 +738952,7 @@ sub_818D5B0: ; 818D5B0 ldm r0!, {r2-r4} stm r1!, {r2-r4} movs r0, 0 -@0818D646: +_0818D646: pop {r3} mov r8, r3 pop {r4-r7} @@ -738997,7 +738997,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 @@ -739005,10 +739005,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 @@ -739057,7 +739057,7 @@ sub_818D6CC: ; 818D6CC bl Alloc adds r4, r0, 0 cmp r4, 0 - beq @0818D762 + beq _0818D762 str r6, [sp] mov r0, r9 ldr r1, [sp, 0x1C] @@ -739066,7 +739066,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] @@ -739090,10 +739090,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 @@ -739396,19 +739396,19 @@ sub_818D97C: ; 818D97C lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - bne @0818D9A2 + bne _0818D9A2 cmp r0, 0 - beq @0818D99C + beq _0818D99C ldr r0, =gTrainerPicIndices adds r0, 0x3F ldrb r0, [r0] - b @0818D9A2 + b _0818D9A2 .pool -@0818D99C: +_0818D99C: ldr r0, =gTrainerPicIndices adds r0, 0x3C ldrb r0, [r0] -@0818D9A2: +_0818D9A2: pop {r1} bx r1 .pool @@ -739441,7 +739441,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 @@ -739455,12 +739455,12 @@ sub_818D9C0: ; 818D9C0 bl VarSet ldr r1, =0x020375f0 movs r0, 0x1 - b @0818DA24 + b _0818DA24 .pool -@0818DA20: +_0818DA20: ldr r1, =0x020375f0 movs r0, 0 -@0818DA24: +_0818DA24: strh r0, [r1] pop {r4,r5} pop {r0} @@ -739483,26 +739483,26 @@ 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 .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 @@ -739514,25 +739514,25 @@ sub_818DA78: ; 818DA78 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 @@ -739549,25 +739549,25 @@ 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 @@ -739591,16 +739591,16 @@ 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 @@ -739708,18 +739708,18 @@ sub_818DBE8: ; 818DBE8 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x2 - bne @0818DC0C + bne _0818DC0C movs r0, 0x2 - b @0818DC16 + b _0818DC16 .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 @@ -739767,11 +739767,11 @@ sub_818DC60: ; 818DC60 str r0, [r5] ldrb r0, [r0, 0x4] cmp r0, 0xFF - bne @0818DC84 + bne _0818DC84 movs r0, 0 - b @0818DC9C + b _0818DC9C .pool -@0818DC84: +_0818DC84: ldr r4, =0x02021ec4 ldr r0, =0x00003b5c adds r1, r0 @@ -739782,7 +739782,7 @@ sub_818DC60: ; 818DC60 adds r0, r4, 0 bl StopMusicWhileStringIsPrinted movs r0, 0x1 -@0818DC9C: +_0818DC9C: pop {r4,r5} pop {r1} bx r1 @@ -739927,9 +739927,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 @@ -739939,7 +739939,7 @@ sub_818DD84: ; 818DD84 adds r0, r1 ldrh r0, [r0] cmp r0, r5 - bne @0818DE28 + bne _0818DE28 movs r7, 0x1 ldrb r0, [r2, 0x3] adds r0, 0x1 @@ -739949,20 +739949,20 @@ sub_818DD84: ; 818DD84 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 .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 @@ -739996,9 +739996,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 @@ -740079,7 +740079,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 @@ -740092,7 +740092,7 @@ sub_818DF00: ; 818DF00 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x8 - bls @0818DF1A + bls _0818DF1A ldr r2, [r7] ldr r0, =gUnknown_0860B1E4 lsls r1, r4, 1 @@ -740133,7 +740133,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 @@ -740145,7 +740145,7 @@ sub_818DF68: ; 818DF68 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x8 - bls @0818DF8A + bls _0818DF8A ldr r0, [r4] ldr r1, =0x0000ffff strh r1, [r0, 0x14] @@ -740155,7 +740155,7 @@ sub_818DF68: ; 818DF68 movs r3, 0 adds r5, r4, 0 movs r2, 0 -@0818DFB4: +_0818DFB4: ldr r0, [r5] lsls r1, r3, 1 adds r0, 0x20 @@ -740165,7 +740165,7 @@ sub_818DF68: ; 818DF68 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls @0818DFB4 + bls _0818DFB4 ldr r0, [r4] movs r2, 0 movs r1, 0 @@ -740220,18 +740220,18 @@ sub_818E038: ; 818E038 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x2 - bne @0818E05C + bne _0818E05C movs r0, 0x2 - b @0818E066 + b _0818E066 .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 @@ -740250,7 +740250,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] @@ -740260,18 +740260,18 @@ sub_818E06C: ; 818E06C adds r1, r4 mov r10, r1 ldr r6, =gUnknown_0860B1E4 -@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, =gUnknown_0860B1E4 mov r12, r0 @@ -740281,7 +740281,7 @@ sub_818E06C: ; 818E06C ldr r0, =gUnknown_0860B1A4 adds r6, r1, r0 mov r2, r8 -@0818E0C2: +_0818E0C2: lsls r0, r3, 1 ldr r1, [r6] adds r0, r1 @@ -740290,7 +740290,7 @@ sub_818E06C: ; 818E06C adds r2, 0x2 adds r3, 0x1 cmp r3, 0x8 - ble @0818E0C2 + ble _0818E0C2 mov r1, r12 adds r0, r4, r1 ldrh r0, [r0] @@ -740303,28 +740303,28 @@ sub_818E06C: ; 818E06C 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 .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 @@ -740346,14 +740346,14 @@ sub_818E13C: ; 818E13C str r0, [r5] ldrb r0, [r0, 0x18] cmp r0, 0xFF - bne @0818E174 + bne _0818E174 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085EEB7E bl CopyString_Limit7 movs r7, 0 - b @0818E1DC + b _0818E1DC .pool -@0818E174: +_0818E174: ldr r4, =0x02021cc4 ldr r0, =0x00003b70 adds r1, r0 @@ -740375,22 +740375,22 @@ sub_818E13C: ; 818E13C 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 @@ -740401,10 +740401,10 @@ sub_818E13C: ; 818E13C 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} @@ -740432,13 +740432,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 @@ -740449,10 +740449,10 @@ sub_818E1F4: ; 818E1F4 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} @@ -740465,16 +740465,16 @@ 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 @@ -740509,18 +740509,18 @@ sub_818E298: ; 818E298 bl sub_818E13C lsls r0, 24 cmp r0, 0 - beq @0818E2C0 + beq _0818E2C0 movs r0, 0 - b @0818E2CC + b _0818E2CC .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 @@ -740573,9 +740573,9 @@ sub_818E308: ; 818E308 bl CompareString movs r1, 0 cmp r0, 0 - bne @0818E33C + bne _0818E33C movs r1, 0x1 -@0818E33C: +_0818E33C: adds r0, r1, 0 pop {r4-r6} pop {r1} @@ -740660,19 +740660,19 @@ 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 .pool -@0818E41C: +_0818E41C: ldr r0, [r4] adds r0, 0x2C movs r1, 0x10 -@0818E422: +_0818E422: strb r1, [r0] bl sub_818DF00 pop {r4} @@ -740694,7 +740694,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 @@ -740706,7 +740706,7 @@ sub_818E430: ; 818E430 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x8 - bls @0818E448 + bls _0818E448 ldr r1, [r5] ldr r0, =0x0000ffff strh r0, [r1, 0x14] @@ -740757,7 +740757,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 @@ -740771,7 +740771,7 @@ sub_818E4A4: ; 818E4A4 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x3 - bls @0818E4C2 + bls _0818E4C2 ldr r0, [r4] adds r0, 0x18 ldr r1, [r6] @@ -740842,18 +740842,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 @@ -740866,14 +740866,14 @@ sub_818E570: ; 818E570 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 @@ -740881,7 +740881,7 @@ sub_818E570: ; 818E570 ldr r7, =0x0203cd68 ldrb r4, [r2] cmp r0, r4 - bne @0818E5E4 + bne _0818E5E4 ldrb r1, [r2] adds r3, r1, 0x1 adds r0, r3, 0 @@ -740889,12 +740889,12 @@ sub_818E570: ; 818E570 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 @@ -740970,13 +740970,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 .pool @@ -740995,7 +740995,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 @@ -741012,7 +741012,7 @@ sub_818E6B0: ; 818E6B0 ldr r0, =gUnknown_82E9531 ldrb r0, [r0] strb r0, [r1, 0xE] -@0818E6EA: +_0818E6EA: pop {r4} pop {r0} bx r0 @@ -741034,42 +741034,42 @@ 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 .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 @@ -741077,14 +741077,14 @@ sub_818E704: ; 818E704 ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - b @0818E78C + b _0818E78C .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} @@ -741203,18 +741203,18 @@ sub_818E880: ; 818E880 str r0, [r1] ldrb r0, [r0, 0x2] cmp r0, 0x4 - bls @0818E8A4 + bls _0818E8A4 movs r0, 0x1 - b @0818E8AE + b _0818E8AE .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 @@ -741230,13 +741230,13 @@ sub_818E8B4: ; 818E8B4 str r0, [r1] ldrb r0, [r0, 0x1] cmp r0, 0x1 - beq @0818E8D8 + beq _0818E8D8 movs r0, 0 - b @0818E8DA + b _0818E8DA .pool -@0818E8D8: +_0818E8D8: movs r0, 0x1 -@0818E8DA: +_0818E8DA: pop {r1} bx r1 thumb_func_end sub_818E8B4 @@ -741253,13 +741253,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} @@ -741400,7 +741400,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 @@ -741408,7 +741408,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 @@ -741444,28 +741444,28 @@ 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 .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] @@ -741477,9 +741477,9 @@ sub_818EA84: ; 818EA84 adds r0, r1 ldrh r0, [r0] strh r0, [r3] - b @0818ED10 + b _0818ED10 .pool -@0818EB14: +_0818EB14: ldr r4, =0x020375f0 ldr r0, =0x03005d90 ldr r2, [r0] @@ -741497,9 +741497,9 @@ sub_818EA84: ; 818EA84 orrs r0, r1 lsrs r0, 31 strh r0, [r4] - b @0818ED10 + b _0818ED10 .pool -@0818EB48: +_0818EB48: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741507,9 +741507,9 @@ sub_818EA84: ; 818EA84 adds r0, r2 ldrb r0, [r0] lsls r0, 31 - b @0818ECBE + b _0818ECBE .pool -@0818EB64: +_0818EB64: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741517,17 +741517,17 @@ sub_818EA84: ; 818EA84 adds r0, r3 ldrb r0, [r0] lsls r0, 30 - b @0818ECBE + b _0818ECBE .pool -@0818EB80: +_0818EB80: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, =0x00000d08 adds r0, r2 - b @0818ECBA + b _0818ECBA .pool -@0818EB98: +_0818EB98: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741535,17 +741535,17 @@ sub_818EA84: ; 818EA84 adds r0, r3 ldrb r0, [r0] lsls r0, 28 - b @0818ECBE + b _0818ECBE .pool -@0818EBB4: +_0818EBB4: ldr r0, =0x000040ce bl VarGet 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] @@ -741553,9 +741553,9 @@ sub_818EA84: ; 818EA84 adds r0, r2 ldrb r0, [r0] lsls r0, 26 - b @0818ECBE + b _0818ECBE .pool -@0818EBE8: +_0818EBE8: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741563,11 +741563,11 @@ sub_818EA84: ; 818EA84 adds r0, r3 ldrb r0, [r0] lsls r0, 27 - b @0818ECBE + b _0818ECBE .pool -@0818EC04: +_0818EC04: cmp r5, 0 - beq @0818EC24 + beq _0818EC24 ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741575,9 +741575,9 @@ sub_818EA84: ; 818EA84 adds r0, r2 ldrb r0, [r0] lsls r0, 30 - b @0818ECBE + b _0818ECBE .pool -@0818EC24: +_0818EC24: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741585,17 +741585,17 @@ sub_818EA84: ; 818EA84 adds r0, r3 ldrb r0, [r0] lsls r0, 31 - b @0818ECBE + b _0818ECBE .pool -@0818EC40: +_0818EC40: ldr r0, =0x000040ce bl VarGet 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] @@ -741604,9 +741604,9 @@ sub_818EA84: ; 818EA84 ldrb r0, [r0] lsrs r0, 7 strh r0, [r1] - b @0818ED10 + b _0818ED10 .pool -@0818EC74: +_0818EC74: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741614,11 +741614,11 @@ sub_818EA84: ; 818EA84 adds r0, r3 ldrb r0, [r0] lsls r0, 25 - b @0818ECBE + b _0818ECBE .pool -@0818EC90: +_0818EC90: cmp r5, 0 - beq @0818ECB0 + beq _0818ECB0 ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -741626,23 +741626,23 @@ sub_818EA84: ; 818EA84 adds r0, r2 ldrb r0, [r0] lsls r0, 28 - b @0818ECBE + b _0818ECBE .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 .pool -@0818ECD0: +_0818ECD0: bl sub_81B8558 ldr r2, =0x0203cef8 ldr r0, =0x03005d90 @@ -741655,9 +741655,9 @@ sub_818EA84: ; 818EA84 ldrh r0, [r0] lsrs r0, 8 strb r0, [r2, 0x1] - b @0818ED10 + b _0818ED10 .pool -@0818ECF4: +_0818ECF4: ldr r2, =0x020375f0 ldr r0, =0x03005d90 ldr r1, [r0] @@ -741672,7 +741672,7 @@ sub_818EA84: ; 818EA84 ldrb r1, [r1] adds r0, r1 strh r0, [r2] -@0818ED10: +_0818ED10: pop {r4-r6} pop {r0} bx r0 @@ -741696,27 +741696,27 @@ 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 .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 @@ -741728,13 +741728,13 @@ sub_818ED28: ; 818ED28 ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b @0818F01E + b _0818F01E .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 @@ -741748,9 +741748,9 @@ sub_818ED28: ; 818ED28 ldr r1, [r1] orrs r0, r1 str r0, [r2] - b @0818F01E + b _0818F01E .pool -@0818EDE8: +_0818EDE8: ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, =0x00000cdc @@ -741764,9 +741764,9 @@ sub_818ED28: ; 818ED28 ldr r1, [r1] ands r0, r1 str r0, [r2] - b @0818F01E + b _0818F01E .pool -@0818EE10: +_0818EE10: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x020375e4 @@ -741778,9 +741778,9 @@ sub_818ED28: ; 818ED28 ldrb r3, [r2] movs r0, 0x2 negs r0, r0 - b @0818EF74 + b _0818EF74 .pool -@0818EE34: +_0818EE34: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -741793,18 +741793,18 @@ sub_818ED28: ; 818ED28 ldrb r2, [r3] movs r0, 0x3 negs r0, r0 - b @0818EFF4 + b _0818EFF4 .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 .pool -@0818EE78: +_0818EE78: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -741817,17 +741817,17 @@ sub_818ED28: ; 818ED28 ldrb r2, [r3] movs r0, 0x9 negs r0, r0 - b @0818EFF4 + b _0818EFF4 .pool -@0818EEA0: +_0818EEA0: ldr r0, =0x000040ce bl VarGet 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 @@ -741839,9 +741839,9 @@ sub_818ED28: ; 818ED28 ldrb r2, [r3] movs r0, 0x21 negs r0, r0 - b @0818EFF4 + b _0818EFF4 .pool -@0818EEDC: +_0818EEDC: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -741853,11 +741853,11 @@ sub_818ED28: ; 818ED28 ldrb r2, [r3] movs r0, 0x11 negs r0, r0 - b @0818EFF4 + b _0818EFF4 .pool -@0818EF00: +_0818EF00: cmp r4, 0 - beq @0818EF2C + beq _0818EF2C ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -741870,9 +741870,9 @@ sub_818ED28: ; 818ED28 ldrb r2, [r3] movs r0, 0x3 negs r0, r0 - b @0818EFF4 + b _0818EFF4 .pool -@0818EF2C: +_0818EF2C: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x020375e4 @@ -741884,17 +741884,17 @@ sub_818ED28: ; 818ED28 ldrb r3, [r2] movs r0, 0x2 negs r0, r0 - b @0818EF74 + b _0818EF74 .pool -@0818EF50: +_0818EF50: ldr r0, =0x000040ce bl VarGet 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 @@ -741904,13 +741904,13 @@ sub_818ED28: ; 818ED28 lsls r1, 7 ldrb r3, [r2] movs r0, 0x7F -@0818EF74: +_0818EF74: ands r0, r3 orrs r0, r1 strb r0, [r2] - b @0818F01E + b _0818F01E .pool -@0818EF8C: +_0818EF8C: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -741922,11 +741922,11 @@ sub_818ED28: ; 818ED28 ldrb r2, [r3] movs r0, 0x41 negs r0, r0 - b @0818EFF4 + b _0818EFF4 .pool -@0818EFB0: +_0818EFB0: cmp r4, 0 - beq @0818EFDC + beq _0818EFDC ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -741939,29 +741939,29 @@ sub_818ED28: ; 818ED28 ldrb r2, [r3] movs r0, 0x9 negs r0, r0 - b @0818EFF4 + b _0818EFF4 .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 .pool -@0818F008: +_0818F008: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x0203cef8 @@ -741973,7 +741973,7 @@ sub_818ED28: ; 818ED28 lsls r0, 4 adds r2, r0 strh r1, [r2] -@0818F01E: +_0818F01E: pop {r4,r5} pop {r0} bx r0 @@ -742050,7 +742050,7 @@ sub_818F02C: ; 818F02C ldr r0, =0x02024488 mov r9, r0 movs r4, 0 -@0818F0BA: +_0818F0BA: mov r1, r8 ldr r0, [r1] ldr r2, =0x00000caa @@ -742073,7 +742073,7 @@ sub_818F02C: ; 818F02C mov r0, r10 lsls r7, r0, 4 adds r6, r7, 0 -@0818F0E8: +_0818F0E8: mov r1, r8 ldr r0, [r1] ldr r2, =0x00000caa @@ -742096,10 +742096,10 @@ sub_818F02C: ; 818F02C 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 @@ -742120,7 +742120,7 @@ sub_818F02C: ; 818F02C strb r0, [r1] adds r5, 0x1 cmp r5, 0x5 - ble @0818F11C + ble _0818F11C mov r5, r8 ldr r0, [r5] ldr r1, =0x00000caa @@ -742141,17 +742141,17 @@ sub_818F02C: ; 818F02C 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 @@ -742161,7 +742161,7 @@ sub_818F02C: ; 818F02C lsrs r4, r0, 16 movs r5, 0x1 cmp r5, r10 - bge @0818F1CA + bge _0818F1CA ldr r3, =0x03005d90 ldr r0, [r3] ldr r7, =0x00000d28 @@ -742171,12 +742171,12 @@ sub_818F02C: ; 818F02C 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 @@ -742185,10 +742185,10 @@ sub_818F02C: ; 818F02C 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] @@ -742202,9 +742202,9 @@ sub_818F02C: ; 818F02C ldrh r0, [r3] ldr r7, =0xfffffc00 adds r1, r7, 0 - b @0818F292 + b _0818F292 .pool -@0818F22C: +_0818F22C: bl sub_81A39C4 adds r0, 0x1 lsls r0, 24 @@ -742215,7 +742215,7 @@ sub_818F02C: ; 818F02C lsrs r4, r0, 16 movs r5, 0x1 cmp r5, r10 - bge @0818F274 + bge _0818F274 ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000d28 @@ -742225,12 +742225,12 @@ sub_818F02C: ; 818F02C 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 @@ -742239,10 +742239,10 @@ sub_818F02C: ; 818F02C 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] @@ -742256,7 +742256,7 @@ sub_818F02C: ; 818F02C ldrh r0, [r3] ldr r5, =0xfffffc00 adds r1, r5, 0 -@0818F292: +_0818F292: ands r0, r1 orrs r0, r2 strh r0, [r3] @@ -742265,14 +742265,14 @@ sub_818F02C: ; 818F02C 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 @@ -742280,7 +742280,7 @@ sub_818F02C: ; 818F02C lsrs r6, r0, 16 movs r7, 0 cmp r7, r5 - bge @0818F300 + bge _0818F300 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, [sp, 0x8] @@ -742291,32 +742291,32 @@ sub_818F02C: ; 818F02C 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] @@ -742336,7 +742336,7 @@ sub_818F02C: ; 818F02C str r0, [r2] ldr r5, [sp, 0x24] cmp r5, 0x2 - ble @0818F2A2 + ble _0818F2A2 ldr r2, [r3] ldr r7, [sp, 0x34] adds r2, r7 @@ -742375,9 +742375,9 @@ sub_818F02C: ; 818F02C 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] @@ -742385,7 +742385,7 @@ sub_818F02C: ; 818F02C mov r10, r3 ldr r6, =gUnknown_0832A328 ldr r5, =gBaseStats -@0818F38A: +_0818F38A: ldr r0, =0x03005d90 ldr r0, [r0] mov r2, r10 @@ -742477,21 +742477,21 @@ sub_818F02C: ; 818F02C 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 @@ -742511,7 +742511,7 @@ sub_818F02C: ; 818F02C adds r6, 0x2 movs r7, 0x2 str r7, [sp, 0x30] -@0818F494: +_0818F494: movs r7, 0 strh r7, [r6] ldr r1, =0x03005d90 @@ -742531,7 +742531,7 @@ sub_818F02C: ; 818F02C movs r5, 0 ldr r0, [sp, 0x30] mov r9, r0 -@0818F4BC: +_0818F4BC: ldr r1, =0x03005d90 ldr r0, [r1] mov r4, r9 @@ -742599,21 +742599,21 @@ sub_818F02C: ; 818F02C 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 @@ -742630,30 +742630,30 @@ sub_818F02C: ; 818F02C 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 @@ -742664,17 +742664,17 @@ sub_818F02C: ; 818F02C 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 .pool -@0818F600: - b @0818F61E -@0818F602: +_0818F600: + b _0818F61E +_0818F602: mov r3, r10 lsls r0, r3, 2 adds r0, r1, r0 @@ -742683,25 +742683,25 @@ sub_818F02C: ; 818F02C 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 @@ -742715,14 +742715,14 @@ sub_818F02C: ; 818F02C adds r2, r0, 0 ldr r6, =gUnknown_0860D3F1 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 @@ -742732,14 +742732,14 @@ sub_818F02C: ; 818F02C 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 @@ -742749,9 +742749,9 @@ sub_818F02C: ; 818F02C ands r0, r1 ldr r7, =0x000003fe adds r1, r7, 0 - b @0818F6BE + b _0818F6BE .pool -@0818F6AC: +_0818F6AC: movs r5, 0x1 ldr r2, [r2] ldr r0, =0x00000d28 @@ -742761,7 +742761,7 @@ sub_818F02C: ; 818F02C ands r0, r1 ldr r3, =0x000003fe adds r1, r3, 0 -@0818F6BE: +_0818F6BE: orrs r0, r1 strh r0, [r2] movs r7, 0 @@ -742769,7 +742769,7 @@ sub_818F02C: ; 818F02C lsls r0, r5, 1 adds r0, r5 lsls r4, r0, 1 -@0818F6CC: +_0818F6CC: mov r1, r10 lsls r0, r1, 24 lsrs r0, 24 @@ -742785,8 +742785,8 @@ sub_818F02C: ; 818F02C 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] @@ -742826,17 +742826,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 @@ -742848,28 +742848,28 @@ sub_818F720: ; 818F720 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 .pool -@0818F7A0: +_0818F7A0: mov r2, r10 subs r0, r2, r6 lsls r0, 2 @@ -742881,9 +742881,9 @@ sub_818F720: ; 818F720 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 @@ -742891,7 +742891,7 @@ sub_818F720: ; 818F720 bl __divsi3 adds r0, r7 adds r0, 0xA -@0818F7CA: +_0818F7CA: mov r1, r8 str r0, [r1] mov r2, r10 @@ -742905,9 +742905,9 @@ sub_818F720: ; 818F720 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 @@ -742932,9 +742932,9 @@ sub_818F720: ; 818F720 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 @@ -742959,9 +742959,9 @@ sub_818F720: ; 818F720 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 @@ -742986,9 +742986,9 @@ sub_818F720: ; 818F720 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 @@ -743013,9 +743013,9 @@ sub_818F720: ; 818F720 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 @@ -743103,7 +743103,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 @@ -743117,7 +743117,7 @@ sub_818F904: ; 818F904 adds r3, 0x2 subs r6, 0x1 cmp r6, 0 - bge @0818F974 + bge _0818F974 pop {r3-r5} mov r8, r3 mov r9, r4 @@ -743285,7 +743285,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] @@ -743327,14 +743327,14 @@ sub_818FA74: ; 818FA74 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 @@ -743403,13 +743403,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 @@ -743419,19 +743419,19 @@ sub_818FBDC: ; 818FBDC 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 @@ -743441,12 +743441,12 @@ sub_818FBDC: ; 818FBDC 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} @@ -743464,26 +743464,26 @@ 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 @@ -743508,7 +743508,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 @@ -743523,11 +743523,11 @@ sub_818FCBC: ; 818FCBC 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] @@ -743539,7 +743539,7 @@ sub_818FCBC: ; 818FCBC lsrs r0, 22 ldr r2, =0x000003fe cmp r0, r2 - bne @0818FD3C + bne _0818FD3C mov r1, r9 lsls r0, r1, 24 lsls r1, r7, 24 @@ -743549,9 +743549,9 @@ sub_818FCBC: ; 818FCBC adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - b @0818FD60 + b _0818FD60 .pool -@0818FD3C: +_0818FD3C: mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -743570,7 +743570,7 @@ sub_818FCBC: ; 818FCBC adds r0, 0x2 adds r0, r1 ldrh r4, [r0] -@0818FD60: +_0818FD60: movs r0, 0x64 muls r0, r6 ldr r1, =0x020244ec @@ -743587,14 +743587,14 @@ sub_818FCBC: ; 818FCBC 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 @@ -743628,7 +743628,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 @@ -743643,11 +743643,11 @@ sub_818FDB8: ; 818FDB8 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] @@ -743659,7 +743659,7 @@ sub_818FDB8: ; 818FDB8 lsrs r0, 22 ldr r2, =0x000003fe cmp r0, r2 - bne @0818FE38 + bne _0818FE38 mov r1, r9 lsls r0, r1, 24 lsls r1, r7, 24 @@ -743669,9 +743669,9 @@ sub_818FDB8: ; 818FDB8 adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 - b @0818FE5C + b _0818FE5C .pool -@0818FE38: +_0818FE38: mov r2, r8 lsls r0, r2, 1 add r0, r8 @@ -743690,7 +743690,7 @@ sub_818FDB8: ; 818FDB8 adds r0, 0x2 adds r0, r1 ldrh r4, [r0] -@0818FE5C: +_0818FE5C: movs r0, 0x64 muls r0, r6 ldr r1, =0x020244ec @@ -743707,14 +743707,14 @@ sub_818FDB8: ; 818FDB8 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 @@ -743744,56 +743744,56 @@ 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, =gUnknown_0832A328 -@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 .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 @@ -743801,22 +743801,22 @@ sub_818FEB4: ; 818FEB4 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 @@ -743825,7 +743825,7 @@ sub_818FEB4: ; 818FEB4 ldr r2, [sp, 0x10] ldr r3, [sp, 0x14] cmp r1, 0 - beq @0818FF7A + beq _0818FF7A ldr r1, [r6] ldr r0, [r4] str r0, [r6] @@ -743834,23 +743834,23 @@ sub_818FEB4: ; 818FEB4 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, =gUnknown_0832A328 mov r1, sp movs r3, 0x1 -@0818FF96: +_0818FF96: ldm r1!, {r0} lsls r0, 2 adds r0, r2 @@ -743860,8 +743860,8 @@ sub_818FEB4: ; 818FEB4 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} @@ -743888,10 +743888,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, =gBattleMoves lsls r1, r3, 1 adds r1, r3 @@ -743899,12 +743899,12 @@ 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 .pool -@0818FFFC: +_0818FFFC: ldr r1, =gBaseStats lsls r0, r4, 3 subs r0, r4 @@ -743919,188 +743919,188 @@ sub_818FFC0: ; 818FFC0 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 .pool -@0819002C: +_0819002C: ldr r0, =gUnknown_0831ACE8 adds r1, r6, r0 ldrb r0, [r1] ldr r7, =gUnknown_0831ACE8 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, =gUnknown_0831ACE8 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 .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 @@ -744118,27 +744118,27 @@ sub_8190168: ; 8190168 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 @@ -744160,12 +744160,12 @@ sub_81901A0: ; 81901A0 mov r12, r0 ldr r6, =gUnknown_0860D10C 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 @@ -744174,74 +744174,74 @@ sub_81901A0: ; 81901A0 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 .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, =gUnknown_0860D14C 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 .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, =gUnknown_0860D14C adds r0, r2, r0 ldrb r0, [r0] - b @08190292 + b _08190292 .pool -@0819026C: +_0819026C: mov r3, r12 ldr r1, [r3] lsls r0, r5, 2 @@ -744254,14 +744254,14 @@ sub_81901A0: ; 81901A0 ldrb r0, [r1] lsls r0, 29 cmp r0, 0 - bge @08190290 -@08190286: + bge _08190290 +_08190286: movs r0, 0xFF - b @08190292 + b _08190292 .pool -@08190290: +_08190290: adds r0, r2, 0 -@08190292: +_08190292: pop {r4-r7} pop {r1} bx r1 @@ -744364,20 +744364,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 @@ -744387,9 +744387,9 @@ sub_819033C: ; 819033C 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 @@ -744452,24 +744452,24 @@ 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 .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 @@ -744505,20 +744505,20 @@ sub_8190400: ; 8190400 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 .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 @@ -744528,9 +744528,9 @@ sub_8190400: ; 8190400 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @08190772 + b _08190772 .pool -@08190508: +_08190508: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -744567,9 +744567,9 @@ sub_8190400: ; 8190400 ldr r1, =0x0300301c movs r0, 0x4 strb r0, [r1] - b @08190602 + b _08190602 .pool -@08190570: +_08190570: ldr r1, =gUnknown_08D83D50 movs r5, 0x80 lsls r5, 6 @@ -744612,12 +744612,12 @@ sub_8190400: ; 8190400 bl decompress_palette mov r0, r9 cmp r0, 0x2 - bne @081905DE + bne _081905DE ldr r0, =gUnknown_08D854C8 movs r1, 0x50 movs r2, 0x20 bl decompress_palette -@081905DE: +_081905DE: str r7, [sp, 0x8] add r0, sp, 0x8 ldr r1, =0x02037b14 @@ -744631,13 +744631,13 @@ sub_8190400: ; 8190400 bl ShowBg movs r0, 0x3 bl ShowBg -@08190602: +_08190602: ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b @08190772 + b _08190772 .pool -@08190634: +_08190634: ldr r0, =sub_8194B70 bl SetVBlankCallback ldr r4, =0x0203cd78 @@ -744647,7 +744647,7 @@ sub_8190400: ; 8190400 movs r6, 0 lsls r5, 24 movs r2, 0xFF -@0819064A: +_0819064A: ldr r1, [r4] adds r1, r6 ldrb r0, [r1] @@ -744655,7 +744655,7 @@ sub_8190400: ; 8190400 strb r0, [r1] adds r6, 0x1 cmp r6, 0xF - ble @0819064A + ble _0819064A bl sub_80D2F04 ldr r0, =sub_8190CD4 movs r1, 0 @@ -744675,7 +744675,7 @@ sub_8190400: ; 8190400 strh r7, [r0, 0x10] mov r2, r9 cmp r2, 0x2 - bne @081906A8 + bne _081906A8 lsrs r1, r5, 24 movs r0, 0 bl sub_819314C @@ -744683,20 +744683,20 @@ sub_8190400: ; 8190400 ldr r1, [r0] movs r0, 0x1 strb r0, [r1, 0x10] - b @081906B0 + b _081906B0 .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 SetGpuReg mov r0, r9 cmp r0, 0 - beq @0819076C + beq _0819076C ldr r5, =gUnknown_0860D068 adds r0, r5, 0 movs r1, 0x78 @@ -744751,14 +744751,14 @@ sub_8190400: ; 8190400 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 @@ -744776,10 +744776,10 @@ sub_8190400: ; 8190400 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 @@ -744801,13 +744801,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] @@ -744815,23 +744815,23 @@ 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, =DummyObjectCallback str r0, [r2, 0x1C] - b @081907F0 + b _081907F0 .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 @@ -744841,7 +744841,7 @@ sub_8190790: ; 8190790 strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -@081907F0: +_081907F0: pop {r0} bx r0 .pool @@ -744857,11 +744857,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] @@ -744869,25 +744869,25 @@ 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, =DummyObjectCallback str r0, [r2, 0x1C] - b @08190858 + b _08190858 .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 @@ -744897,7 +744897,7 @@ sub_81907F8: ; 81907F8 strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -@08190858: +_08190858: pop {r0} bx r0 .pool @@ -744913,13 +744913,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] @@ -744927,23 +744927,23 @@ 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, =DummyObjectCallback str r0, [r2, 0x1C] - b @081908C0 + b _081908C0 .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 @@ -744953,7 +744953,7 @@ sub_8190860: ; 8190860 strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -@081908C0: +_081908C0: pop {r0} bx r0 .pool @@ -744969,12 +744969,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] @@ -744982,25 +744982,25 @@ 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, =DummyObjectCallback str r0, [r2, 0x1C] - b @08190930 + b _08190930 .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 @@ -745010,7 +745010,7 @@ sub_81908CC: ; 81908CC strb r1, [r0] ldrh r0, [r2, 0x34] bl sub_818D8F0 -@08190930: +_08190930: pop {r0} bx r0 .pool @@ -745023,10 +745023,10 @@ sub_8190938: ; 8190938 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 @@ -745038,23 +745038,23 @@ sub_8190950: ; 8190950 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] @@ -745062,23 +745062,23 @@ sub_8190950: ; 8190950 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 str r0, [r4, 0x1C] - b @081909C0 + b _081909C0 .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 @@ -745088,7 +745088,7 @@ sub_8190950: ; 8190950 strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -@081909C0: +_081909C0: pop {r4} pop {r0} bx r0 @@ -745102,21 +745102,21 @@ sub_81909CC: ; 81909CC 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] @@ -745124,25 +745124,25 @@ sub_81909CC: ; 81909CC 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 str r0, [r4, 0x1C] - b @08190A3C + b _08190A3C .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 @@ -745152,7 +745152,7 @@ sub_81909CC: ; 81909CC strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -@08190A3C: +_08190A3C: pop {r4} pop {r0} bx r0 @@ -745166,23 +745166,23 @@ sub_8190A48: ; 8190A48 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] @@ -745190,23 +745190,23 @@ sub_8190A48: ; 8190A48 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 str r0, [r4, 0x1C] - b @08190AB8 + b _08190AB8 .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 @@ -745216,7 +745216,7 @@ sub_8190A48: ; 8190A48 strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -@08190AB8: +_08190AB8: pop {r4} pop {r0} bx r0 @@ -745230,22 +745230,22 @@ sub_8190AC4: ; 8190AC4 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] @@ -745253,25 +745253,25 @@ sub_8190AC4: ; 8190AC4 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 str r0, [r4, 0x1C] - b @08190B34 + b _08190B34 .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 @@ -745281,7 +745281,7 @@ sub_8190AC4: ; 8190AC4 strb r1, [r0] adds r0, r4, 0 bl sub_80D2EF8 -@08190B34: +_08190B34: pop {r4} pop {r0} bx r0 @@ -745326,11 +745326,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 @@ -745340,7 +745340,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] @@ -745348,8 +745348,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 @@ -745358,51 +745358,51 @@ sub_8190B40: ; 8190B40 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 .pool -@08190BFC: +_08190BFC: ldr r0, =0x0203cd78 ldr r0, [r0] ldrb r0, [r0, 0x10] cmp r0, 0 - bne @08190C32 - b @08190C48 + bne _08190C32 + b _08190C48 .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 .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] @@ -745410,21 +745410,21 @@ sub_8190B40: ; 8190B40 negs r0, r0 ands r0, r1 strb r0, [r2] - b @08190C5C + b _08190C5C .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 @@ -745448,34 +745448,34 @@ 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 .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 .pool -@08190CC0: +_08190CC0: adds r2, r3, 0 adds r2, 0x3E ldrb r1, [r2] @@ -745483,7 +745483,7 @@ sub_8190C6C: ; 8190C6C negs r0, r0 ands r0, r1 strb r0, [r2] -@08190CCE: +_08190CCE: pop {r0} bx r0 thumb_func_end sub_8190C6C @@ -745512,27 +745512,27 @@ 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 .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 @@ -745540,9 +745540,9 @@ sub_8190CD4: ; 8190CD4 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] @@ -745558,17 +745558,17 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - bl @08192202 + bl _08192202 .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 @@ -745577,23 +745577,23 @@ sub_8190CD4: ; 8190CD4 adds r0, r2 movs r1, 0x2 strh r1, [r0, 0x8] - bl @08192202 + bl _08192202 .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 @@ -745609,9 +745609,9 @@ sub_8190CD4: ; 8190CD4 adds r0, r1 movs r1, 0x8 strh r1, [r0, 0x8] - bl @08192202 + bl _08192202 .pool -@08190DF0: +_08190DF0: ldr r1, =0x03005e00 mov r4, r8 lsls r2, r4, 2 @@ -745624,16 +745624,16 @@ sub_8190CD4: ; 8190CD4 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 @@ -745644,8 +745644,8 @@ sub_8190CD4: ; 8190CD4 bl FillWindowPixelBuffer adds r6, 0x1 cmp r6, r5 - blt @08190E18 -@08190E32: + blt _08190E18 +_08190E32: ldr r0, =0x03005e00 mov r1, r9 add r1, r8 @@ -745653,9 +745653,9 @@ sub_8190CD4: ; 8190CD4 adds r1, r0 movs r0, 0x3 strh r0, [r1, 0x8] - bl @08192202 + bl _08192202 .pool -@08190E48: +_08190E48: mov r6, r8 lsls r1, r6, 2 adds r0, r1, r6 @@ -745667,26 +745667,26 @@ sub_8190CD4: ; 8190CD4 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 .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 @@ -745695,7 +745695,7 @@ sub_8190CD4: ; 8190CD4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq @08190ED4 + beq _08190ED4 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -745706,9 +745706,9 @@ sub_8190CD4: ; 8190CD4 ldr r1, =0x02022e1a movs r0, 0xA0 strh r0, [r1] - b @08190EE6 + b _08190EE6 .pool -@08190ED4: +_08190ED4: ldr r0, =0x02022e14 strh r2, [r0] ldr r1, =0x02022e16 @@ -745718,14 +745718,14 @@ sub_8190CD4: ; 8190CD4 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 @@ -745751,9 +745751,9 @@ sub_8190CD4: ; 8190CD4 orrs r0, r2 ldrb r1, [r1] bl sub_81924E0 - b @08191084 + b _08191084 .pool -@08190F50: +_08190F50: ldr r1, =0x02022e1c movs r6, 0x80 lsls r6, 1 @@ -745782,14 +745782,14 @@ sub_8190CD4: ; 8190CD4 bl sub_81924E0 ldr r0, [r5] strb r4, [r0, 0x10] - b @08191084 + b _08191084 .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 @@ -745820,11 +745820,11 @@ sub_8190CD4: ; 8190CD4 orrs r0, r1 ldrb r1, [r2, 0x11] bl sub_81924E0 - b @08191084 + b _08191084 .pool -@08190FF8: +_08190FF8: cmp r5, 0x2 - bne @0819104C + bne _0819104C ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -745856,9 +745856,9 @@ sub_8190CD4: ; 8190CD4 orrs r0, r1 ldrb r1, [r2, 0x12] bl sub_81924E0 - b @08191084 + b _08191084 .pool -@0819104C: +_0819104C: ldr r1, =0x02022e1c movs r3, 0x80 lsls r3, 1 @@ -745886,7 +745886,7 @@ sub_8190CD4: ; 8190CD4 lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -@08191084: +_08191084: movs r6, 0 ldr r5, =0x0203cd78 mov r10, r5 @@ -745900,15 +745900,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -745943,15 +745943,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191150 + b _08191150 .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 @@ -745980,10 +745980,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -745996,15 +745996,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -746037,15 +746037,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191214 + b _08191214 .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 @@ -746072,10 +746072,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -746083,9 +746083,9 @@ sub_8190CD4: ; 8190CD4 adds r0, r3 movs r2, 0 movs r1, 0x4 - bl @08191FE8 + bl _08191FE8 .pool -@08191234: +_08191234: mov r0, r9 add r0, r8 lsls r0, 3 @@ -746094,7 +746094,7 @@ sub_8190CD4: ; 8190CD4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq @08191278 + beq _08191278 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -746106,9 +746106,9 @@ sub_8190CD4: ; 8190CD4 ldr r2, =0x0000ff60 adds r0, r2, 0 strh r0, [r1] - b @0819128C + b _0819128C .pool -@08191278: +_08191278: ldr r0, =0x02022e14 strh r2, [r0] ldr r1, =0x02022e16 @@ -746119,14 +746119,14 @@ sub_8190CD4: ; 8190CD4 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 @@ -746150,9 +746150,9 @@ sub_8190CD4: ; 8190CD4 orrs r0, r2 ldrb r1, [r1] bl sub_81924E0 - b @0819141C + b _0819141C .pool -@081912F4: +_081912F4: ldr r0, =0x02022e1c movs r4, 0 strh r4, [r0] @@ -746178,14 +746178,14 @@ sub_8190CD4: ; 8190CD4 bl sub_81924E0 ldr r0, [r5] strb r4, [r0, 0x10] - b @0819141C + b _0819141C .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 @@ -746214,11 +746214,11 @@ sub_8190CD4: ; 8190CD4 orrs r0, r1 ldrb r1, [r2, 0x11] bl sub_81924E0 - b @0819141C + b _0819141C .pool -@08191394: +_08191394: cmp r5, 0x2 - bne @081913E4 + bne _081913E4 ldr r4, =0x03005e00 lsls r0, r7, 2 adds r0, r7 @@ -746248,9 +746248,9 @@ sub_8190CD4: ; 8190CD4 orrs r0, r1 ldrb r1, [r2, 0x12] bl sub_81924E0 - b @0819141C + b _0819141C .pool -@081913E4: +_081913E4: ldr r1, =0x02022e1c movs r4, 0x80 lsls r4, 1 @@ -746278,7 +746278,7 @@ sub_8190CD4: ; 8190CD4 lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -@0819141C: +_0819141C: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -746292,15 +746292,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -746335,15 +746335,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @081914E8 + b _081914E8 .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 @@ -746372,10 +746372,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -746388,15 +746388,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -746429,15 +746429,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @081915AC + b _081915AC .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 @@ -746464,10 +746464,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -746475,9 +746475,9 @@ sub_8190CD4: ; 8190CD4 adds r0, r3 movs r2, 0 movs r1, 0x5 - bl @08191FE8 + bl _08191FE8 .pool -@081915CC: +_081915CC: mov r0, r9 add r0, r8 lsls r0, 3 @@ -746486,7 +746486,7 @@ sub_8190CD4: ; 8190CD4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq @0819160C + beq _0819160C ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -746499,9 +746499,9 @@ sub_8190CD4: ; 8190CD4 strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b @08191622 + b _08191622 .pool -@0819160C: +_0819160C: ldr r1, =0x02022e14 movs r3, 0x80 lsls r3, 1 @@ -746513,12 +746513,12 @@ sub_8190CD4: ; 8190CD4 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 @@ -746545,9 +746545,9 @@ sub_8190CD4: ; 8190CD4 orrs r0, r2 ldrb r1, [r1] bl sub_81924E0 - b @081916C6 + b _081916C6 .pool -@08191688: +_08191688: ldr r1, =0x02022e1c movs r6, 0x80 lsls r6, 1 @@ -746578,7 +746578,7 @@ sub_8190CD4: ; 8190CD4 orrs r0, r2 ldrb r1, [r1] bl sub_819314C -@081916C6: +_081916C6: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -746592,15 +746592,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -746635,15 +746635,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191798 + b _08191798 .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 @@ -746672,10 +746672,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -746688,15 +746688,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -746729,15 +746729,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @0819185C + b _0819185C .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 @@ -746764,10 +746764,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -746775,9 +746775,9 @@ sub_8190CD4: ; 8190CD4 adds r0, r3 movs r2, 0 movs r1, 0x6 - b @08191FE8 + b _08191FE8 .pool -@0819187C: +_0819187C: mov r0, r9 add r0, r8 lsls r0, 3 @@ -746786,7 +746786,7 @@ sub_8190CD4: ; 8190CD4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq @081918BC + beq _081918BC ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -746799,9 +746799,9 @@ sub_8190CD4: ; 8190CD4 strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b @081918D2 + b _081918D2 .pool -@081918BC: +_081918BC: ldr r1, =0x02022e14 movs r3, 0x80 lsls r3, 1 @@ -746813,12 +746813,12 @@ sub_8190CD4: ; 8190CD4 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 @@ -746837,9 +746837,9 @@ sub_8190CD4: ; 8190CD4 orrs r0, r1 ldrb r1, [r2, 0x11] bl sub_81924E0 - b @08191958 + b _08191958 .pool -@08191924: +_08191924: ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] @@ -746865,7 +746865,7 @@ sub_8190CD4: ; 8190CD4 lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -@08191958: +_08191958: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -746879,15 +746879,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -746922,15 +746922,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191A24 + b _08191A24 .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 @@ -746959,10 +746959,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -746975,15 +746975,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -747016,15 +747016,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191AE8 + b _08191AE8 .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 @@ -747051,10 +747051,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -747062,9 +747062,9 @@ sub_8190CD4: ; 8190CD4 adds r0, r3 movs r2, 0 movs r1, 0x6 - b @08191FE8 + b _08191FE8 .pool -@08191B08: +_08191B08: mov r0, r9 add r0, r8 lsls r0, 3 @@ -747073,7 +747073,7 @@ sub_8190CD4: ; 8190CD4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq @08191B48 + beq _08191B48 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -747086,9 +747086,9 @@ sub_8190CD4: ; 8190CD4 strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b @08191B5E + b _08191B5E .pool -@08191B48: +_08191B48: ldr r1, =0x02022e14 movs r3, 0xFF lsls r3, 8 @@ -747100,27 +747100,27 @@ sub_8190CD4: ; 8190CD4 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 .pool -@08191B94: +_08191B94: ldr r0, =0x02022e1c movs r1, 0 strh r1, [r0] ldr r0, =0x02022e1e strh r1, [r0] -@08191B9E: +_08191B9E: ldr r4, =gUnknown_0860D15C ldr r5, =0x0203cd78 ldr r3, [r5] @@ -747151,15 +747151,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -747195,15 +747195,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r7 strh r1, [r0, 0x34] - b @08191C96 + b _08191C96 .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 @@ -747233,10 +747233,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -747249,15 +747249,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -747290,15 +747290,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191D5C + b _08191D5C .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 @@ -747325,13 +747325,13 @@ sub_8190CD4: ; 8190CD4 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 .pool -@08191D68: +_08191D68: mov r0, r9 add r0, r8 lsls r0, 3 @@ -747340,7 +747340,7 @@ sub_8190CD4: ; 8190CD4 movs r5, 0xC ldrsh r2, [r0, r5] cmp r2, 0 - beq @08191DA8 + beq _08191DA8 ldr r0, =0x02022e14 movs r1, 0 strh r1, [r0] @@ -747353,9 +747353,9 @@ sub_8190CD4: ; 8190CD4 strh r0, [r2] ldr r0, =0x02022e1a strh r1, [r0] - b @08191DBE + b _08191DBE .pool -@08191DA8: +_08191DA8: ldr r1, =0x02022e14 movs r3, 0xFF lsls r3, 8 @@ -747367,12 +747367,12 @@ sub_8190CD4: ; 8190CD4 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 @@ -747391,9 +747391,9 @@ sub_8190CD4: ; 8190CD4 orrs r0, r1 ldrb r1, [r2, 0x12] bl sub_81924E0 - b @08191E44 + b _08191E44 .pool -@08191E10: +_08191E10: ldr r1, =0x02022e1c movs r0, 0 strh r0, [r1] @@ -747419,7 +747419,7 @@ sub_8190CD4: ; 8190CD4 lsls r1, r2, 24 lsrs r1, 24 bl sub_819314C -@08191E44: +_08191E44: movs r6, 0 ldr r0, =0x0203cd78 mov r10, r0 @@ -747433,15 +747433,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -747476,15 +747476,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191F10 + b _08191F10 .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 @@ -747513,10 +747513,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -747529,15 +747529,15 @@ sub_8190CD4: ; 8190CD4 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 @@ -747570,15 +747570,15 @@ sub_8190CD4: ; 8190CD4 lsls r0, 2 adds r0, r3 strh r1, [r0, 0x34] - b @08191FD4 + b _08191FD4 .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 @@ -747605,11 +747605,11 @@ sub_8190CD4: ; 8190CD4 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 @@ -747617,12 +747617,12 @@ sub_8190CD4: ; 8190CD4 adds r0, r3 movs r2, 0 movs r1, 0x7 -@08191FE8: +_08191FE8: strh r1, [r0, 0x8] strh r2, [r0, 0x12] - b @08192202 + b _08192202 .pool -@08191FF8: +_08191FF8: mov r4, r8 lsls r0, r4, 2 add r0, r8 @@ -747635,7 +747635,7 @@ sub_8190CD4: ; 8190CD4 lsls r0, 16 asrs r0, 16 cmp r0, 0x29 - beq @08192100 + beq _08192100 ldr r1, =0x02022e16 ldrh r0, [r1] subs r0, 0x4 @@ -747645,9 +747645,9 @@ sub_8190CD4: ; 8190CD4 subs r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1e - b @081920A4 + b _081920A4 .pool -@08192038: +_08192038: mov r6, r8 lsls r0, r6, 2 add r0, r8 @@ -747660,7 +747660,7 @@ sub_8190CD4: ; 8190CD4 lsls r0, 16 asrs r0, 16 cmp r0, 0x29 - beq @08192100 + beq _08192100 ldr r1, =0x02022e16 ldrh r0, [r1] adds r0, 0x4 @@ -747670,9 +747670,9 @@ sub_8190CD4: ; 8190CD4 adds r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1e - b @081920E8 + b _081920E8 .pool -@08192078: +_08192078: mov r3, r8 lsls r0, r3, 2 add r0, r8 @@ -747685,7 +747685,7 @@ sub_8190CD4: ; 8190CD4 lsls r0, 16 asrs r0, 16 cmp r0, 0x41 - beq @08192100 + beq _08192100 ldr r1, =0x02022e14 ldrh r0, [r1] subs r0, 0x4 @@ -747695,13 +747695,13 @@ sub_8190CD4: ; 8190CD4 subs r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1c -@081920A4: +_081920A4: ldrh r0, [r1] subs r0, 0x4 strh r0, [r1] - b @08192202 + b _08192202 .pool -@081920BC: +_081920BC: mov r5, r8 lsls r0, r5, 2 add r0, r8 @@ -747714,7 +747714,7 @@ sub_8190CD4: ; 8190CD4 lsls r0, 16 asrs r0, 16 cmp r0, 0x41 - beq @08192100 + beq _08192100 ldr r1, =0x02022e14 ldrh r0, [r1] adds r0, 0x4 @@ -747724,42 +747724,42 @@ sub_8190CD4: ; 8190CD4 adds r0, 0x4 strh r0, [r1] ldr r1, =0x02022e1c -@081920E8: +_081920E8: ldrh r0, [r1] adds r0, 0x4 strh r0, [r1] - b @08192202 + b _08192202 .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 .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 @@ -747767,29 +747767,29 @@ sub_8190CD4: ; 8190CD4 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 .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 @@ -747797,10 +747797,10 @@ sub_8190CD4: ; 8190CD4 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] @@ -747810,12 +747810,12 @@ sub_8190CD4: ; 8190CD4 bl FreeAllWindowBuffers mov r0, r9 cmp r0, 0 - bne @081921C4 + bne _081921C4 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 - b @081921FC + b _081921FC .pool -@081921C4: +_081921C4: ldr r0, =sub_8194220 movs r1, 0 bl AddTask @@ -747843,10 +747843,10 @@ sub_8190CD4: ; 8190CD4 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 @@ -747899,82 +747899,82 @@ 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 .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 .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 .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 @@ -747986,7 +747986,7 @@ sub_819221C: ; 819221C lsls r0, r3, 29 mov r12, r1 cmp r0, 0 - bge @0819233C + bge _0819233C ldr r0, =0x0203cd78 ldr r2, [r0] ldrb r4, [r2, 0x10] @@ -747994,11 +747994,11 @@ sub_819221C: ; 819221C 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 @@ -748007,26 +748007,26 @@ sub_819221C: ; 819221C 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 @@ -748040,100 +748040,100 @@ sub_819221C: ; 819221C subs r0, 0x1 ldrb r3, [r3, 0x10] adds r0, r3 - b @08192482 + b _08192482 .pool -@081923A0: +_081923A0: lsls r0, r6, 2 adds r0, r6 lsls r0, 3 ldr r3, =0x03005e00 adds r0, r3 - b @0819249E + b _0819249E .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, =gUnknown_0860D19C add r0, r8 ldrb r5, [r0] - b @081923DA + b _081923DA .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, =gUnknown_0860D19C add r0, r8 ldrb r0, [r0] cmp r5, r0 - bne @08192408 + bne _08192408 movs r5, 0x10 - b @0819240A + b _0819240A .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 .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 @@ -748141,11 +748141,11 @@ sub_819221C: ; 819221C adds r1, r2 ldr r2, =gUnknown_0860D1C0 ldrb r0, [r0, 0x11] - b @08192482 + b _08192482 .pool -@08192470: +_08192470: cmp r1, 0x2 - bne @08192494 + bne _08192494 lsls r1, r6, 2 adds r1, r6 lsls r1, 3 @@ -748153,25 +748153,25 @@ sub_819221C: ; 819221C adds r1, r3 ldr r2, =gUnknown_0860D1C0 ldrb r0, [r0, 0x12] -@08192482: +_08192482: adds r0, r2 ldrb r0, [r0] strh r0, [r1, 0xA] - b @081924A0 + b _081924A0 .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 @@ -748189,7 +748189,7 @@ sub_819221C: ; 819221C movs r2, 0x1 eors r1, r2 strh r1, [r0, 0xC] -@081924CC: +_081924CC: adds r0, r7, 0 pop {r3-r5} mov r8, r3 @@ -748241,71 +748241,71 @@ 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 .pool -@08192598: +_08192598: ldr r0, =0x000003fe ldr r3, [sp, 0x24] cmp r3, r0 - bne @081925AC + bne _081925AC bl sub_8195910 - b @081925B2 + b _081925B2 .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] @@ -748325,7 +748325,7 @@ sub_81924E0: ; 81924E0 ldr r4, [sp, 0x1C] ands r0, r4 cmp r0, 0 - beq @081925FC + beq _081925FC ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -748340,7 +748340,7 @@ sub_81924E0: ; 81924E0 movs r2, 0x4 orrs r1, r2 strb r1, [r0] -@081925FC: +_081925FC: movs r7, 0 ldr r0, [sp, 0x20] lsls r0, 1 @@ -748361,11 +748361,11 @@ sub_81924E0: ; 81924E0 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 @@ -748377,13 +748377,13 @@ sub_81924E0: ; 81924E0 ldrb r2, [r1] ldr r3, [sp, 0x2C] orrs r2, r3 - b @081926B0 + b _081926B0 .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 @@ -748395,9 +748395,9 @@ sub_81924E0: ; 81924E0 ldrb r2, [r1] ldr r3, [sp, 0x2C] orrs r2, r3 - b @081926B0 + b _081926B0 .pool -@08192690: +_08192690: ldr r0, =0x03005d90 ldr r0, [r0] ldr r3, =0x00000d64 @@ -748414,7 +748414,7 @@ sub_81924E0: ; 81924E0 ldrb r2, [r1] ldr r1, [sp, 0x2C] orrs r2, r1 -@081926B0: +_081926B0: ldr r1, =gUnknown_0860D343 adds r1, r7, r1 ldrb r3, [r1] @@ -748446,7 +748446,7 @@ sub_81924E0: ; 81924E0 ldr r3, [sp, 0x1C] ands r0, r3 cmp r0, 0 - beq @0819270A + beq _0819270A ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -748459,12 +748459,12 @@ sub_81924E0: ; 81924E0 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 @@ -748500,27 +748500,27 @@ sub_81924E0: ; 81924E0 ldr r0, =0x000003ff ldr r4, [sp, 0x24] cmp r4, r0 - bne @08192784 + bne _08192784 ldr r0, =gTrainerClassNameIndices adds r0, 0x3C ldrb r5, [r0] - b @081927A2 + b _081927A2 .pool -@08192784: +_08192784: ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 - bne @08192798 + bne _08192798 bl sub_8195924 - b @0819279E + b _0819279E .pool -@08192798: +_08192798: ldr r0, [sp, 0x24] bl sub_8162BD8 -@0819279E: +_0819279E: lsls r0, 24 lsrs r5, r0, 24 -@081927A2: +_081927A2: ldr r2, =gTrainerClassNames movs r0, 0xD adds r1, r5, 0 @@ -748529,11 +748529,11 @@ sub_81924E0: ; 81924E0 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] @@ -748541,8 +748541,8 @@ sub_81924E0: ; 81924E0 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 @@ -748554,27 +748554,27 @@ sub_81924E0: ; 81924E0 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 AppendString - b @08192836 + b _08192836 .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 AppendString - b @08192836 + b _08192836 .pool -@08192824: +_08192824: ldr r4, =0x02021dc4 ldr r1, [sp, 0x24] adds r0, r4, 0 @@ -748582,7 +748582,7 @@ sub_81924E0: ; 81924E0 adds r0, r5, 0 adds r1, r4, 0 bl AppendString -@08192836: +_08192836: add r0, sp, 0xC ldrb r0, [r0, 0x5] ldr r4, =0x02021cc4 @@ -748621,7 +748621,7 @@ sub_81924E0: ; 81924E0 mov r9, r0 movs r3, 0xB mov r10, r3 -@0819288A: +_0819288A: ldr r0, =gUnknown_0860D346 adds r0, r7, r0 ldrb r0, [r0] @@ -748629,29 +748629,29 @@ sub_81924E0: ; 81924E0 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 .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 .pool -@081928E4: +_081928E4: ldr r4, =0x03005d90 ldr r1, [r4] lsls r0, r7, 1 @@ -748663,7 +748663,7 @@ sub_81924E0: ; 81924E0 ldr r0, =0x0203bc8c ldr r0, [r0] lsls r1, 4 -@081928FA: +_081928FA: adds r1, r0 ldrh r0, [r1] mov r3, r10 @@ -748678,14 +748678,14 @@ sub_81924E0: ; 81924E0 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 .pool -@08192930: +_08192930: strb r1, [r6, 0x8] -@08192932: +_08192932: adds r5, r7, 0x1 ldr r0, [sp, 0x28] adds r4, r5, r0 @@ -748702,7 +748702,7 @@ sub_81924E0: ; 81924E0 bl AddTextPrinter adds r7, r5, 0 cmp r7, 0x2 - ble @0819288A + ble _0819288A ldr r4, [sp, 0x40] adds r0, r4, 0 bl PutWindowTilemap @@ -748712,18 +748712,18 @@ sub_81924E0: ; 81924E0 ldr r0, =0x000003fe ldr r1, [sp, 0x24] cmp r1, r0 - bne @08192980 + bne _08192980 ldr r0, =gUnknown_0860D1D0 ldr r0, [r0, 0x40] - b @0819298A + b _0819298A .pool -@08192980: +_08192980: ldr r0, =gUnknown_0860D1D0 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 @@ -748741,24 +748741,24 @@ sub_81924E0: ; 81924E0 bl AddTextPrinter movs r7, 0 ldr r3, =gUnknown_0860B358 -@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 @@ -748776,21 +748776,21 @@ sub_81924E0: ; 81924E0 adds r1, r0 strh r1, [r4] ldr r2, [sp, 0x48] - b @08192A58 + b _08192A58 .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 .pool -@08192A20: +_08192A20: ldr r0, =0x03005d90 ldr r0, [r0] mov r12, r0 @@ -748811,7 +748811,7 @@ sub_81924E0: ; 81924E0 adds r0, r1 adds r0, 0x2 add r0, r10 -@08192A48: +_08192A48: ldrh r0, [r0] lsls r0, 4 adds r0, r6, r0 @@ -748820,24 +748820,24 @@ sub_81924E0: ; 81924E0 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, =gUnknown_0860D214 mov r9, r2 ldr r3, =gUnknown_0860C988 mov r10, r3 -@08192A78: +_08192A78: movs r4, 0 movs r6, 0 movs r5, 0 @@ -748845,31 +748845,31 @@ sub_81924E0: ; 81924E0 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] @@ -748884,39 +748884,39 @@ sub_81924E0: ; 81924E0 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 .pool -@08192B24: +_08192B24: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 4 @@ -748925,12 +748925,12 @@ sub_81924E0: ; 81924E0 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] @@ -748938,19 +748938,19 @@ sub_81924E0: ; 81924E0 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 .pool -@08192B70: +_08192B70: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r7, 4 @@ -748958,7 +748958,7 @@ sub_81924E0: ; 81924E0 ldr r3, =0x00000f0a adds r0, r3 ldrb r2, [r0] -@08192B7E: +_08192B7E: ldr r1, =gNatureStatTable lsls r0, r2, 2 adds r0, r2 @@ -748968,7 +748968,7 @@ sub_81924E0: ; 81924E0 lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble @08192BB4 + ble _08192BB4 movs r0, 0x2 ldrsh r1, [r4, r0] movs r0, 0x6E @@ -748978,11 +748978,11 @@ sub_81924E0: ; 81924E0 ldrh r1, [r4, 0xE] adds r1, r0 strh r1, [r4, 0xE] - b @08192BDC + b _08192BDC .pool -@08192BB4: +_08192BB4: cmp r0, 0 - bge @08192BD4 + bge _08192BD4 movs r2, 0x2 ldrsh r1, [r4, r2] movs r0, 0x5A @@ -748995,40 +748995,40 @@ sub_81924E0: ; 81924E0 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 @@ -749038,9 +749038,9 @@ sub_81924E0: ; 81924E0 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] @@ -749049,7 +749049,7 @@ sub_81924E0: ; 81924E0 lsls r0, 1 mov r9, r0 movs r7, 0x2 -@08192C34: +_08192C34: ldr r3, =0x03005d90 ldr r0, [r3] ldr r4, =0x00000d64 @@ -749066,19 +749066,19 @@ sub_81924E0: ; 81924E0 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 @@ -749098,18 +749098,18 @@ sub_81924E0: ; 81924E0 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] @@ -749117,7 +749117,7 @@ sub_81924E0: ; 81924E0 strh r0, [r3, 0xC] movs r5, 0 mov r4, r8 -@08192CB4: +_08192CB4: ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000d64 @@ -749138,7 +749138,7 @@ sub_81924E0: ; 81924E0 lsls r0, 24 asrs r0, 24 cmp r0, 0 - ble @08192D04 + ble _08192D04 movs r2, 0x2 ldrsh r1, [r4, r2] movs r0, 0x6E @@ -749148,11 +749148,11 @@ sub_81924E0: ; 81924E0 ldrh r1, [r4, 0xE] adds r1, r0 strh r1, [r4, 0xE] - b @08192D2C + b _08192D2C .pool -@08192D04: +_08192D04: cmp r0, 0 - bge @08192D24 + bge _08192D24 movs r3, 0x2 ldrsh r1, [r4, r3] movs r0, 0x5A @@ -749165,39 +749165,39 @@ sub_81924E0: ; 81924E0 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 @@ -749207,27 +749207,27 @@ sub_81924E0: ; 81924E0 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 @@ -749236,52 +749236,52 @@ sub_81924E0: ; 81924E0 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] @@ -749290,7 +749290,7 @@ sub_81924E0: ; 81924E0 movs r2, 0x18 ldrsh r0, [r0, r2] cmp r0, 0 - bne @08192E22 + bne _08192E22 movs r1, 0x12 ldrsh r0, [r3, r1] lsls r0, 1 @@ -749298,18 +749298,18 @@ sub_81924E0: ; 81924E0 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] @@ -749318,12 +749318,12 @@ sub_81924E0: ; 81924E0 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] @@ -749332,22 +749332,22 @@ sub_81924E0: ; 81924E0 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, =gUnknown_0860D349 mov r4, r8 movs r1, 0xC @@ -749359,20 +749359,20 @@ sub_81924E0: ; 81924E0 subs r1, r2 ldrb r0, [r0] adds r7, r1, r0 - b @08192ED2 + b _08192ED2 .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, =gUnknown_0860D349 mov r3, r8 movs r4, 0x10 @@ -749386,20 +749386,20 @@ sub_81924E0: ; 81924E0 adds r1, r0 adds r7, r1, 0 adds r7, 0x15 - b @08192ED2 + b _08192ED2 .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, =gUnknown_0860D294 adds r0, r3 @@ -749450,13 +749450,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, =gUnknown_0860D3B4 adds r0, r6, r0 ldrb r4, [r0] @@ -749468,7 +749468,7 @@ sub_8192F08: ; 8192F08 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @08192FBE + blt _08192FBE ldr r0, [sp] add r0, r8 strb r4, [r0] @@ -749480,29 +749480,29 @@ sub_8192F08: ; 8192F08 lsls r1, r0, 22 lsrs r0, r1, 22 cmp r0, r10 - bne @08192F9C + bne _08192F9C ldr r0, =0x02021cc4 adds r1, r2, 0 bl CopyString - b @08192FB8 + b _08192FB8 .pool -@08192F9C: +_08192F9C: lsrs r0, r1, 22 cmp r0, r9 - bne @08192FB0 + bne _08192FB0 ldr r0, =0x02021cc4 bl sub_8195938 - b @08192FB8 + b _08192FB8 .pool -@08192FB0: +_08192FB0: lsrs r1, 22 ldr r0, =0x02021cc4 bl sub_8195898 -@08192FB8: +_08192FB8: movs r2, 0x1 add r8, r2 ldr r3, =gUnknown_0860D3C4 -@08192FBE: +_08192FBE: adds r6, 0x1 lsls r1, r7, 1 adds r1, r7 @@ -749513,15 +749513,15 @@ sub_8192F08: ; 8192F08 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 .pool -@08192FE8: +_08192FE8: mov r12, r3 lsls r3, r7, 1 adds r0, r3, r7 @@ -749535,14 +749535,14 @@ sub_8192F08: ; 8192F08 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, =gUnknown_0860D3B4 adds r0, r6, r0 ldrb r4, [r0] @@ -749555,7 +749555,7 @@ sub_8192F08: ; 8192F08 ldrb r2, [r0] lsls r0, r2, 29 cmp r0, 0 - bge @08193100 + bge _08193100 lsls r2, 27 adds r1, r3, r7 mov r0, r12 @@ -749564,7 +749564,7 @@ sub_8192F08: ; 8192F08 lsrs r2, 30 ldrb r1, [r1] cmp r2, r1 - bcc @08193100 + bcc _08193100 ldr r0, [sp] add r0, r8 strb r4, [r0] @@ -749582,7 +749582,7 @@ sub_8192F08: ; 8192F08 lsls r0, 27 lsrs r0, 30 cmp r0, r1 - bne @081930BC + bne _081930BC lsls r4, 1 movs r1, 0xEC lsls r1, 4 @@ -749611,43 +749611,43 @@ sub_8192F08: ; 8192F08 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 .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 CopyString - b @08193100 + b _08193100 .pool -@081930E0: +_081930E0: ldr r0, =0xff800000 cmp r1, r0 - bne @081930F8 + bne _081930F8 ldr r0, =0x02021cc4 bl sub_8195938 - b @08193100 + b _08193100 .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, =gUnknown_0860D3C4 mov r12, r1 @@ -749662,19 +749662,19 @@ sub_8192F08: ; 8192F08 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 .pool -@08193138: +_08193138: ldr r0, [sp, 0x4] adds r0, 0x2 -@0819313C: +_0819313C: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -749710,47 +749710,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 @@ -749813,7 +749813,7 @@ sub_819314C: ; 819314C adds r1, r6 adds r1, r0 ldrb r6, [r1] -@08193240: +_08193240: ldr r1, [sp, 0x48] adds r2, r3, r1 mov r7, r12 @@ -749839,29 +749839,29 @@ sub_819314C: ; 819314C 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 .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] @@ -749872,27 +749872,27 @@ sub_819314C: ; 819314C ldr r3, [sp, 0x78] mov r1, r10 str r1, [sp] - b @081932F8 + b _081932F8 .pool -@081932D4: +_081932D4: ldr r0, =0x000003fe cmp r1, r0 - bne @081932E4 + bne _081932E4 bl sub_8195910 - b @081932EC + b _081932EC .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 @@ -749906,7 +749906,7 @@ sub_819314C: ; 819314C ldr r3, [sp, 0x34] ands r0, r3 cmp r0, 0 - beq @08193334 + beq _08193334 ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -749922,10 +749922,10 @@ sub_819314C: ; 819314C 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] @@ -749942,24 +749942,24 @@ sub_819314C: ; 819314C 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 .pool -@08193388: +_08193388: ldr r0, =0x000003fe cmp r1, r0 - bne @081933A4 + bne _081933A4 bl sub_8195910 lsls r0, 24 lsrs r0, 24 @@ -749967,20 +749967,20 @@ sub_819314C: ; 819314C ldr r3, [sp, 0x78] ldr r1, [sp, 0x74] str r1, [sp] - b @081933B8 + b _081933B8 .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 @@ -749993,7 +749993,7 @@ sub_819314C: ; 819314C ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq @081933F0 + beq _081933F0 ldr r2, =0x02020630 ldr r0, =0x0203cd78 ldr r0, [r0] @@ -750008,11 +750008,11 @@ sub_819314C: ; 819314C 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] @@ -750028,7 +750028,7 @@ sub_819314C: ; 819314C movs r2, 0x30 orrs r1, r2 strb r1, [r0, 0x5] -@08193416: +_08193416: movs r5, 0 ldr r3, [sp, 0x38] lsls r3, 2 @@ -750040,11 +750040,11 @@ sub_819314C: ; 819314C 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] @@ -750056,12 +750056,12 @@ sub_819314C: ; 819314C adds r2, r1 adds r2, r0 ldrh r0, [r2] - b @081934B0 + b _081934B0 .pool -@08193464: +_08193464: ldr r0, =0x000003fe cmp r1, r0 - bne @08193490 + bne _08193490 ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] @@ -750073,9 +750073,9 @@ sub_819314C: ; 819314C adds r2, r1 adds r2, r0 ldrh r0, [r2] - b @081934B0 + b _081934B0 .pool -@08193490: +_08193490: ldr r0, =0x03005d90 ldr r2, [r0] ldr r1, [sp, 0x1C] @@ -750092,7 +750092,7 @@ sub_819314C: ; 819314C lsls r1, 4 adds r1, r0 ldrh r0, [r1] -@081934B0: +_081934B0: ldr r1, =gUnknown_0860D3A8 adds r1, r5, r1 ldrb r2, [r1] @@ -750130,7 +750130,7 @@ sub_819314C: ; 819314C ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq @08193516 + beq _08193516 ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -750143,10 +750143,10 @@ sub_819314C: ; 819314C 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] @@ -750169,15 +750169,15 @@ sub_819314C: ; 819314C 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 @@ -750185,12 +750185,12 @@ sub_819314C: ; 819314C 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] @@ -750203,12 +750203,12 @@ sub_819314C: ; 819314C adds r2, r1 adds r2, r0 ldrh r0, [r2] - b @081935FA + b _081935FA .pool -@081935AC: +_081935AC: ldr r0, =0x000003fe cmp r1, r0 - bne @081935D8 + bne _081935D8 ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, [sp, 0x48] @@ -750221,9 +750221,9 @@ sub_819314C: ; 819314C adds r2, r1 adds r2, r0 ldrh r0, [r2] - b @081935FA + b _081935FA .pool -@081935D8: +_081935D8: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, [sp, 0x48] @@ -750241,7 +750241,7 @@ sub_819314C: ; 819314C lsls r1, 4 adds r1, r0 ldrh r0, [r1] -@081935FA: +_081935FA: ldr r1, =gUnknown_0860D3AE adds r1, r5, r1 ldrb r2, [r1] @@ -750278,7 +750278,7 @@ sub_819314C: ; 819314C ldr r1, [sp, 0x34] ands r0, r1 cmp r0, 0 - beq @0819365E + beq _0819365E ldr r0, [r6] adds r0, r4 ldrb r1, [r0] @@ -750291,11 +750291,11 @@ sub_819314C: ; 819314C 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] @@ -750318,15 +750318,15 @@ sub_819314C: ; 819314C 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] @@ -750390,27 +750390,27 @@ sub_819314C: ; 819314C ldr r1, [sp, 0x24] ldr r0, =0x000003ff cmp r1, r0 - bne @0819375C + bne _0819375C ldr r0, =0x02021cc4 ldr r1, =0x03005d90 ldr r1, [r1] bl CopyString - b @0819377E + b _0819377E .pool -@0819375C: +_0819375C: ldr r0, =0x000003fe cmp r1, r0 - bne @08193774 + bne _08193774 ldr r0, =0x02021cc4 bl sub_8195938 - b @0819377E + b _0819377E .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] @@ -750445,27 +750445,27 @@ sub_819314C: ; 819314C 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 CopyString - b @08193802 + b _08193802 .pool -@081937E4: +_081937E4: ldr r0, =0x000003fe cmp r1, r0 - bne @081937F8 + bne _081937F8 adds r0, r5, 0 bl sub_8195938 - b @08193802 + b _08193802 .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 @@ -750631,26 +750631,26 @@ 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 .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 @@ -750658,9 +750658,9 @@ sub_819395C: ; 819395C 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] @@ -750682,41 +750682,41 @@ sub_819395C: ; 819395C adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim - b @08193BC2 + b _08193BC2 .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 .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 @@ -750731,9 +750731,9 @@ sub_819395C: ; 819395C adds r0, r1 movs r1, 0x7 strh r1, [r0, 0x8] - b @08193BC2 + b _08193BC2 .pool -@08193A60: +_08193A60: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -750748,9 +750748,9 @@ sub_819395C: ; 819395C adds r0, r1 movs r1, 0x3 strh r1, [r0, 0x8] - b @08193BC2 + b _08193BC2 .pool -@08193A84: +_08193A84: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -750765,9 +750765,9 @@ sub_819395C: ; 819395C adds r0, r1 movs r1, 0x5 strh r1, [r0, 0x8] - b @08193BC2 + b _08193BC2 .pool -@08193AA8: +_08193AA8: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -750775,9 +750775,9 @@ sub_819395C: ; 819395C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - beq @08193ABA - b @08193BC2 -@08193ABA: + beq _08193ABA + b _08193BC2 +_08193ABA: bl FreeAllWindowBuffers bl remove_some_task ldr r4, =0x0203cd7c @@ -750812,9 +750812,9 @@ sub_819395C: ; 819395C ldr r0, =0x0203cd78 ldr r0, [r0] strb r3, [r0, 0x10] - b @08193BC2 + b _08193BC2 .pool -@08193B20: +_08193B20: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -750822,7 +750822,7 @@ sub_819395C: ; 819395C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne @08193BC2 + bne _08193BC2 bl FreeAllWindowBuffers bl remove_some_task ldr r4, =0x0203cd7c @@ -750852,9 +750852,9 @@ sub_819395C: ; 819395C adds r0, r2 movs r1, 0x6 strh r1, [r0, 0x8] - b @08193BC2 + b _08193BC2 .pool -@08193B84: +_08193B84: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -750862,7 +750862,7 @@ sub_819395C: ; 819395C lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0 - bne @08193BC2 + bne _08193BC2 bl FreeAllWindowBuffers bl remove_some_task ldr r4, =0x0203cd7c @@ -750880,7 +750880,7 @@ sub_819395C: ; 819395C bl remove_task adds r0, r5, 0 bl remove_task -@08193BC2: +_08193BC2: add sp, 0x4 pop {r4-r7} pop {r0} @@ -750917,37 +750917,37 @@ 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 .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, =gUnknown_0860CBF1 lsls r1, r5, 2 adds r1, r5 @@ -750956,15 +750956,15 @@ sub_8193BDC: ; 8193BDC adds r1, r0 ldrb r0, [r1] cmp r0, 0xFF - beq @08193C78 + beq _08193C78 movs r1, 0 mov r8, r1 - b @08193CDE + b _08193CDE .pool -@08193C78: +_08193C78: ldrh r0, [r3, 0x2E] cmp r0, 0x80 - bne @08193C9C + bne _08193C9C ldr r0, =gUnknown_0860CBF1 lsls r1, r5, 2 adds r1, r5 @@ -750974,14 +750974,14 @@ sub_8193BDC: ; 8193BDC adds r1, r0 ldrb r0, [r1] cmp r0, 0xFF - beq @08193C9C + beq _08193C9C movs r0, 0x1 - b @08193CDC + b _08193CDC .pool -@08193C9C: +_08193C9C: ldrh r0, [r3, 0x2E] cmp r0, 0x20 - bne @08193CC0 + bne _08193CC0 ldr r0, =gUnknown_0860CBF1 lsls r1, r5, 2 adds r1, r5 @@ -750991,15 +750991,15 @@ sub_8193BDC: ; 8193BDC adds r1, r0 ldrb r0, [r1] cmp r0, 0xFF - beq @08193CC0 + beq _08193CC0 movs r1, 0x2 mov r8, r1 - b @08193CDE + b _08193CDE .pool -@08193CC0: +_08193CC0: ldrh r0, [r3, 0x2E] cmp r0, 0x10 - bne @08193CDE + bne _08193CDE ldr r0, =gUnknown_0860CBF1 lsls r1, r5, 2 adds r1, r5 @@ -751009,14 +751009,14 @@ sub_8193BDC: ; 8193BDC 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 @@ -751047,7 +751047,7 @@ sub_8193BDC: ; 8193BDC lsls r0, 3 adds r0, r1 strh r5, [r0, 0xA] -@08193D26: +_08193D26: mov r0, r9 pop {r3,r4} mov r8, r3 @@ -751093,7 +751093,7 @@ sub_8193D7C: ; 8193D7C ldr r7, =0x020375e2 ldrh r0, [r7] cmp r0, 0x1 - bne @08193E10 + bne _08193E10 ldr r5, =0x02038bca ldrh r0, [r5] bl sub_8195358 @@ -751140,13 +751140,13 @@ 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 .pool -@08193E10: +_08193E10: ldr r5, =0x000003ff adds r0, r5, 0 bl sub_8195358 @@ -751192,11 +751192,11 @@ sub_8193D7C: ; 8193D7C 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] @@ -751209,22 +751209,22 @@ sub_8193D7C: ; 8193D7C 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} @@ -751259,7 +751259,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] @@ -751271,7 +751271,7 @@ sub_8193ED0: ; 8193ED0 ldr r3, [sp, 0x50] adds r3, 0x1 str r3, [sp, 0x60] -@08193F18: +_08193F18: ldr r4, [sp, 0x74] add r4, r9 lsls r0, r4, 2 @@ -751289,7 +751289,7 @@ sub_8193ED0: ; 8193ED0 lsls r0, 22 ldr r1, =0xff800000 cmp r0, r1 - bne @08193F60 + bne _08193F60 ldr r3, [sp, 0x50] lsls r0, r3, 24 mov r5, r9 @@ -751300,9 +751300,9 @@ sub_8193ED0: ; 8193ED0 lsls r1, r4, 1 add r1, r10 strh r0, [r1] - b @08193F8C + b _08193F8C .pool -@08193F60: +_08193F60: lsls r2, r4, 1 add r2, r10 ldr r1, [sp, 0x48] @@ -751325,7 +751325,7 @@ sub_8193ED0: ; 8193ED0 adds r0, r1 ldrh r0, [r0] strh r0, [r2] -@08193F8C: +_08193F8C: ldr r0, =gBattleMoves ldr r1, [sp, 0x74] add r1, r9 @@ -751338,26 +751338,26 @@ sub_8193ED0: ; 8193ED0 adds r1, r0 ldrb r6, [r1, 0x1] cmp r6, 0 - bne @08193FB8 + bne _08193FB8 movs r6, 0x28 - b @08193FD0 + b _08193FD0 .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 @@ -751367,14 +751367,14 @@ sub_8193ED0: ; 8193ED0 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 @@ -751402,7 +751402,7 @@ sub_8193ED0: ; 8193ED0 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 @@ -751417,23 +751417,23 @@ sub_8193ED0: ; 8193ED0 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, =gBaseStats adds r0, r5 ldrb r2, [r0, 0x17] - b @08194074 + b _08194074 .pool -@08194068: +_08194068: lsls r0, r1, 3 subs r0, r1 lsls r0, 2 ldr r2, =gBaseStats adds r0, r2 ldrb r2, [r0, 0x16] -@08194074: +_08194074: ldr r4, [sp, 0x74] add r4, r9 lsls r0, r4, 1 @@ -751445,56 +751445,56 @@ sub_8193ED0: ; 8193ED0 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 .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 @@ -751502,18 +751502,18 @@ sub_8193ED0: ; 8193ED0 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 @@ -751522,79 +751522,79 @@ sub_8193ED0: ; 8193ED0 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] @@ -751611,18 +751611,18 @@ sub_8193ED0: ; 8193ED0 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 @@ -751632,25 +751632,25 @@ sub_8193ED0: ; 8193ED0 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 @@ -751690,24 +751690,24 @@ 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 .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 @@ -751758,9 +751758,9 @@ sub_8194220: ; 8194220 ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 - b @0819443C + b _0819443C .pool -@0819431C: +_0819431C: movs r0, 0x50 movs r1, 0 bl SetGpuReg @@ -751797,9 +751797,9 @@ sub_8194220: ; 8194220 ldr r1, =0x03005e00 mov r3, r8 lsls r0, r3, 2 - b @0819443C + b _0819443C .pool -@0819438C: +_0819438C: ldr r4, =0x0203cd7c movs r0, 0x80 lsls r0, 4 @@ -751872,16 +751872,16 @@ sub_8194220: ; 8194220 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 .pool -@0819447C: +_0819447C: ldr r0, =gUnknown_0860CF50 bl LoadCompressedObjectPic mov r0, r8 @@ -751889,10 +751889,10 @@ sub_8194220: ; 8194220 str r0, [sp, 0x1C] mov r1, r10 cmp r1, 0 - bne @081944E8 + bne _081944E8 movs r5, 0 ldr r4, =gUnknown_0860D411 -@08194492: +_08194492: ldrb r1, [r4] ldrb r2, [r4, 0x1] ldr r0, =gUnknown_0860CFA8 @@ -751901,7 +751901,7 @@ sub_8194220: ; 8194220 adds r4, 0x2 adds r5, 0x1 cmp r5, 0x1E - bls @08194492 + bls _08194492 ldr r0, =0x03005e00 ldr r1, [sp, 0x1C] add r1, r8 @@ -751910,27 +751910,27 @@ sub_8194220: ; 8194220 movs r2, 0x10 ldrsh r0, [r1, r2] cmp r0, 0 - beq @081944DC + beq _081944DC ldr r0, =gUnknown_0860D008 movs r1, 0xDA movs r2, 0xC movs r3, 0 bl AddObjectToFront - b @081944E8 + b _081944E8 .pool -@081944DC: +_081944DC: ldr r0, =gUnknown_0860CFD8 movs r1, 0xDA movs r2, 0xC movs r3, 0 bl AddObjectToFront -@081944E8: +_081944E8: ldr r1, =0x00007f40 movs r0, 0 bl SetGpuReg - b @081947A6 + b _081947A6 .pool -@081944FC: +_081944FC: add r0, sp, 0x4 movs r2, 0 movs r1, 0x2 @@ -751985,7 +751985,7 @@ sub_8194220: ; 8194220 str r2, [sp, 0x24] movs r7, 0 movs r5, 0xF -@0819456C: +_0819456C: ldr r3, =0x03005d90 ldr r0, [r3] adds r0, r7 @@ -751998,7 +751998,7 @@ sub_8194220: ; 8194220 bl sub_8195898 mov r2, r10 cmp r2, 0x1 - bne @081945C4 + bne _081945C4 ldr r3, =0x03005d90 ldr r2, [r3] adds r0, r2, r7 @@ -752007,21 +752007,21 @@ sub_8194220: ; 8194220 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 .pool -@081945C4: +_081945C4: mov r3, r10 cmp r3, 0 - bne @08194634 + bne _08194634 ldr r0, =0x03005d90 ldr r2, [r0] adds r0, r2, r7 @@ -752030,27 +752030,27 @@ sub_8194220: ; 8194220 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 .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 @@ -752059,20 +752059,20 @@ sub_8194220: ; 8194220 movs r3, 0x10 ldrsh r0, [r0, r3] cmp r0, 0 - beq @08194624 + beq _08194624 ldrh r1, [r1] - b @08194628 + b _08194628 .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 @@ -752081,16 +752081,16 @@ sub_8194220: ; 8194220 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 .pool -@08194660: +_08194660: ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, =0x00000cb2 @@ -752098,10 +752098,10 @@ sub_8194220: ; 8194220 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 @@ -752114,11 +752114,11 @@ sub_8194220: ; 8194220 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 @@ -752127,8 +752127,8 @@ sub_8194220: ; 8194220 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 @@ -752136,7 +752136,7 @@ sub_8194220: ; 8194220 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - bge @081946FA + bge _081946FA ldr r2, =0x00000d24 adds r0, r1, r2 ldrh r0, [r0] @@ -752144,7 +752144,7 @@ sub_8194220: ; 8194220 lsrs r0, 22 ldr r3, =0x000003ff cmp r0, r3 - bne @081946F0 + bne _081946F0 ldrb r1, [r4, 0xC] mov r0, r9 ands r0, r1 @@ -752155,15 +752155,15 @@ sub_8194220: ; 8194220 mov r0, r9 ands r0, r1 movs r1, 0x40 - b @08194740 + b _08194740 .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 @@ -752173,7 +752173,7 @@ sub_8194220: ; 8194220 lsrs r0, 22 ldr r2, =0x000003ff cmp r0, r2 - bne @0819472C + bne _0819472C ldrb r1, [r4, 0xC] mov r0, r9 ands r0, r1 @@ -752184,21 +752184,21 @@ sub_8194220: ; 8194220 mov r0, r9 ands r0, r1 movs r1, 0x40 - b @08194740 + b _08194740 .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, =gUnknown_0860D3F1 @@ -752206,17 +752206,17 @@ sub_8194220: ; 8194220 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 GetStringWidthDifference - b @0819476A + b _0819476A .pool -@08194768: +_08194768: movs r0, 0x3 -@0819476A: +_0819476A: strb r0, [r4, 0x8] ldr r0, =0x02022e2c str r0, [sp, 0x4] @@ -752244,9 +752244,9 @@ sub_8194220: ; 8194220 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 @@ -752255,9 +752255,9 @@ sub_8194220: ; 8194220 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @081948C2 + b _081948C2 .pool -@081947C8: +_081947C8: movs r0, 0 bl PutWindowTilemap movs r0, 0x1 @@ -752278,10 +752278,10 @@ sub_8194220: ; 8194220 ldr r0, =sub_8194CE4 bl SetVBlankCallback cmp r4, 0x2 - bne @0819485C + bne _0819485C mov r2, r10 cmp r2, 0 - bne @08194844 + bne _08194844 ldr r0, =sub_819395C movs r1, 0 bl AddTask @@ -752302,18 +752302,18 @@ sub_8194220: ; 8194220 adds r0, r2 ldrh r0, [r0, 0x10] strh r0, [r1, 0x14] - b @08194878 + b _08194878 .pool -@08194844: +_08194844: ldr r0, =sub_8194950 movs r1, 0 bl AddTask lsls r0, 24 lsrs r5, r0, 24 ldr r1, =0x03005e00 - b @0819486C + b _0819486C .pool -@0819485C: +_0819485C: ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 @@ -752322,14 +752322,14 @@ sub_8194220: ; 8194220 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 @@ -752337,14 +752337,14 @@ sub_8194220: ; 8194220 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, =gUnknown_0860CF44 ldr r0, =0x02038c28 @@ -752352,21 +752352,21 @@ sub_8194220: ; 8194220 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 @@ -752398,12 +752398,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] @@ -752417,8 +752417,8 @@ sub_81948EC: ; 81948EC adds r5, 0x4 subs r6, 0x1 cmp r6, 0 - bne @0819491A -@08194938: + bne _0819491A +_08194938: movs r0, 0x1 bl CopyBgTilemapBufferToVram add sp, 0xC @@ -752446,23 +752446,23 @@ 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 .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 @@ -752477,17 +752477,17 @@ sub_8194950: ; 8194950 adds r0, r1 movs r1, 0x1 strh r1, [r0, 0x8] - b @08194B3C + b _08194B3C .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 @@ -752527,7 +752527,7 @@ sub_8194950: ; 8194950 adds r4, r2, 0 ldr r6, =gUnknown_0860D3F1 movs r5, 0 -@08194A1C: +_08194A1C: mov r2, r8 ldr r0, [r2] adds r0, r5 @@ -752551,23 +752551,23 @@ sub_8194950: ; 8194950 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 GetStringWidthDifference - b @08194A86 + b _08194A86 .pool -@08194A84: +_08194A84: movs r0, 0x3 -@08194A86: +_08194A86: strb r0, [r4, 0x8] mov r1, r9 str r1, [sp, 0x4] @@ -752579,7 +752579,7 @@ sub_8194950: ; 8194950 movs r1, 0 movs r2, 0 bl AddTextPrinter -@08194A9E: +_08194A9E: mov r2, r8 ldr r1, [r2] adds r0, r1, r5 @@ -752588,7 +752588,7 @@ sub_8194950: ; 8194950 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @08194AC4 + blt _08194AC4 subs r2, 0x73 adds r0, r1, r2 ldrh r1, [r0] @@ -752598,15 +752598,15 @@ sub_8194950: ; 8194950 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 .pool -@08194AD4: +_08194AD4: lsls r0, r4, 2 adds r0, r4 lsls r0, 3 @@ -752616,17 +752616,17 @@ sub_8194950: ; 8194950 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 @@ -752641,20 +752641,20 @@ sub_8194950: ; 8194950 adds r0, r1 movs r1, 0x4 strh r1, [r0, 0x8] - b @08194B3C + b _08194B3C .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 bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@08194B3C: +_08194B3C: add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -752727,86 +752727,86 @@ sub_8194BEC: ; 8194BEC 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 .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 .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 .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 .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 .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 .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 @@ -752870,7 +752870,7 @@ sub_8194D68: ; 8194D68 push {r5-r7} sub sp, 0x8 movs r3, 0 -@08194D76: +_08194D76: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0x0203cef8 @@ -752896,17 +752896,17 @@ sub_8194D68: ; 8194D68 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 .pool -@08194DBC: +_08194DBC: adds r5, 0x1 -@08194DBE: +_08194DBE: cmp r5, 0x3 - bgt @08194DEA + bgt _08194DEA ldr r1, =0x03005d8c ldr r0, [r1] add r0, r9 @@ -752924,10 +752924,10 @@ sub_8194D68: ; 8194D68 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 @@ -752936,10 +752936,10 @@ sub_8194D68: ; 8194D68 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 @@ -752957,7 +752957,7 @@ sub_8194D68: ; 8194D68 bl memcpy ldr r3, [sp] cmp r3, 0x1 - ble @08194D76 + ble _08194D76 add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -752977,7 +752977,7 @@ sub_8194E44: ; 8194E44 ldr r7, =0x03005d8c movs r6, 0x64 movs r5, 0 -@08194E50: +_08194E50: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0x0203cef8 @@ -753010,7 +753010,7 @@ sub_8194E44: ; 8194E44 adds r5, 0x64 adds r4, 0x1 cmp r4, 0x1 - ble @08194E50 + ble _08194E50 add sp, 0x4 pop {r4-r7} pop {r0} @@ -753036,15 +753036,15 @@ 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 .pool -@08194EE8: +_08194EE8: ldr r1, =0x020375f0 movs r0, 0x2 -@08194EEC: +_08194EEC: strh r0, [r1] pop {r4} pop {r0} @@ -753064,13 +753064,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 @@ -753078,8 +753078,8 @@ sub_8194EF8: ; 8194EF8 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @08194F14 -@08194F2A: + blt _08194F14 +_08194F2A: ldr r0, =0x02021cc4 ldr r1, =0x03005d90 ldr r1, [r1] @@ -753118,14 +753118,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 AllocZeroed str r0, [sp, 0x18] @@ -753156,10 +753156,10 @@ sub_8194F58: ; 8194F58 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 @@ -753167,12 +753167,12 @@ sub_8194F58: ; 8194F58 bl __umodsi3 lsls r0, 16 lsrs r4, r0, 16 - b @08195030 + b _08195030 .pool -@08194FFC: +_08194FFC: mov r1, r10 cmp r1, 0xE - bgt @0819501A + bgt _0819501A bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -753182,8 +753182,8 @@ sub_8194F58: ; 8194F58 lsrs r0, 16 adds r4, r0, 0 adds r4, 0xA - b @08195030 -@0819501A: + b _08195030 +_0819501A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -753193,10 +753193,10 @@ sub_8194F58: ; 8194F58 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 @@ -753205,13 +753205,13 @@ sub_8194F58: ; 8194F58 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 @@ -753220,10 +753220,10 @@ sub_8194F58: ; 8194F58 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] @@ -753245,14 +753245,14 @@ sub_8194F58: ; 8194F58 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 @@ -753260,7 +753260,7 @@ sub_8194F58: ; 8194F58 lsrs r5, r0, 16 movs r7, 0 cmp r7, r6 - bge @081950F4 + bge _081950F4 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x0203bc8c @@ -753273,32 +753273,32 @@ sub_8194F58: ; 8194F58 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] @@ -753319,7 +753319,7 @@ sub_8194F58: ; 8194F58 str r0, [r2] ldr r6, [sp, 0x24] cmp r6, 0x2 - ble @08195092 + ble _08195092 ldr r4, =0x03005d90 ldr r2, [r4] ldr r5, [sp, 0x38] @@ -753361,15 +753361,15 @@ sub_8194F58: ; 8194F58 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 @@ -753389,7 +753389,7 @@ sub_8194F58: ; 8194F58 movs r6, 0 ldr r4, [sp, 0x34] mov r9, r4 -@081951AA: +_081951AA: ldr r1, =0x03005d90 ldr r0, [r1] mov r4, r9 @@ -753457,21 +753457,21 @@ sub_8194F58: ; 8194F58 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 @@ -753488,35 +753488,35 @@ sub_8194F58: ; 8194F58 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 .pool -@081952C4: +_081952C4: cmp r1, r0 - bne @081952F0 + bne _081952F0 ldr r0, =0x03005d90 ldr r1, [r0] mov r3, r10 @@ -753531,30 +753531,30 @@ sub_8194F58: ; 8194F58 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 @@ -753563,7 +753563,7 @@ sub_8194F58: ; 8194F58 add r10, r2 mov r3, r10 cmp r3, 0x3 - ble @08195314 + ble _08195314 ldr r0, =0x03005d90 ldr r1, [r0] ldr r4, =0x00000ca9 @@ -753575,7 +753575,7 @@ sub_8194F58: ; 8194F58 ldr r5, [sp, 0x14] orrs r0, r5 strb r0, [r1] -@0819533E: +_0819533E: add sp, 0x40 pop {r3-r5} mov r8, r3 @@ -753601,13 +753601,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 @@ -753616,8 +753616,8 @@ sub_8195358: ; 8195358 lsls r0, 22 lsrs r0, 22 cmp r0, r3 - bne @08195376 -@0819538E: + bne _08195376 +_0819538E: adds r0, r2, 0 pop {r4,r5} pop {r1} @@ -753639,13 +753639,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 @@ -753654,8 +753654,8 @@ sub_81953A0: ; 81953A0 lsls r0, 22 lsrs r0, 22 cmp r0, r3 - bne @081953BE -@081953D6: + bne _081953BE +_081953D6: adds r0, r2, 0 pop {r4,r5} pop {r1} @@ -753689,15 +753689,15 @@ 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 .pool -@0819542C: +_0819542C: mov r0, sp ldrb r0, [r0, 0x1] -@08195430: +_08195430: add sp, 0x4 pop {r4} pop {r1} @@ -753725,7 +753725,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 @@ -753737,18 +753737,18 @@ sub_8195438: ; 8195438 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] @@ -753763,10 +753763,10 @@ sub_8195438: ; 8195438 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 @@ -753798,9 +753798,9 @@ sub_8195438: ; 8195438 lsls r3, 4 adds r1, r3 adds r1, r2 - b @08195874 + b _08195874 .pool -@08195504: +_08195504: ldr r4, =0x03005d90 ldr r3, [r4] ldr r0, [sp, 0x8] @@ -753813,10 +753813,10 @@ sub_8195438: ; 8195438 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 @@ -753850,16 +753850,16 @@ sub_8195438: ; 8195438 strh r0, [r1] adds r5, 0x1 str r5, [sp, 0x24] - b @08195876 + b _08195876 .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 @@ -753874,15 +753874,15 @@ sub_8195438: ; 8195438 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 @@ -753911,10 +753911,10 @@ sub_8195438: ; 8195438 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 @@ -753953,7 +753953,7 @@ sub_8195438: ; 8195438 add r10, r1 mov r2, r10 cmp r2, 0x2 - ble @081955A4 + ble _081955A4 bl GenerateRandomNumber movs r1, 0x1F ands r1, r0 @@ -753972,7 +753972,7 @@ sub_8195438: ; 8195438 adds r0, r5, r3 lsls r0, 1 str r0, [sp, 0x20] -@08195668: +_08195668: movs r5, 0 mov r0, r10 lsls r3, r0, 1 @@ -753981,13 +753981,13 @@ sub_8195438: ; 8195438 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 @@ -754018,10 +754018,10 @@ sub_8195438: ; 8195438 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] @@ -754058,7 +754058,7 @@ sub_8195438: ; 8195438 str r3, [sp, 0x10] mov r5, r10 cmp r5, 0x2 - ble @08195668 + ble _08195668 bl GenerateRandomNumber movs r1, 0x1F ands r1, r0 @@ -754069,7 +754069,7 @@ sub_8195438: ; 8195438 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] @@ -754102,13 +754102,13 @@ sub_8195438: ; 8195438 adds r1, r5 ldr r2, [sp, 0x2C] adds r1, r2 - b @08195874 + b _08195874 .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] @@ -754142,13 +754142,13 @@ sub_8195438: ; 8195438 adds r1, r5 ldr r2, [sp, 0x28] adds r1, r2 - b @08195874 + b _08195874 .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] @@ -754180,9 +754180,9 @@ sub_8195438: ; 8195438 lsls r2, 4 adds r1, r2 ldr r3, [sp, 0x2C] - b @08195872 + b _08195872 .pool -@08195830: +_08195830: ldr r5, =0x03005d90 ldr r1, [r5] ldr r0, [sp, 0x4] @@ -754215,16 +754215,16 @@ sub_8195438: ; 8195438 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 @@ -754246,50 +754246,50 @@ 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 .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 .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 @@ -754322,14 +754322,14 @@ sub_8195938: ; 8195938 adds r3, r0, 0 movs r2, 0 ldr r4, =gTrainers + TRAINER_TUCKER * 0x28 + 0x4 ; Tucker's name -@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] @@ -754404,7 +754404,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 @@ -754412,7 +754412,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 @@ -754448,27 +754448,27 @@ 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 .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 .pool -@08195A90: +_08195A90: ldr r3, =0x020375f0 ldr r0, [r5] lsls r1, r7, 1 @@ -754479,9 +754479,9 @@ sub_8195A38: ; 8195A38 adds r0, r1 ldrh r0, [r0] strh r0, [r3] - b @08195AD0 + b _08195AD0 .pool -@08195AB0: +_08195AB0: ldr r4, =0x020375f0 ldr r2, [r5] ldr r0, =0x00000cdc @@ -754498,7 +754498,7 @@ sub_8195A38: ; 8195A38 orrs r0, r1 lsrs r0, 31 strh r0, [r4] -@08195AD0: +_08195AD0: pop {r4-r7} pop {r0} bx r0 @@ -754522,27 +754522,27 @@ 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 .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 .pool -@08195B3C: +_08195B3C: ldr r2, [r6] lsls r0, r5, 1 lsls r1, r4, 2 @@ -754553,13 +754553,13 @@ sub_8195AE4: ; 8195AE4 ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b @08195BA0 + b _08195BA0 .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 @@ -754571,9 +754571,9 @@ sub_8195AE4: ; 8195AE4 ldr r0, [r2] ldr r1, [r1] orrs r0, r1 - b @08195B9E + b _08195B9E .pool -@08195B88: +_08195B88: ldr r2, [r6] ldr r1, =0x00000cdc adds r2, r1 @@ -754585,9 +754585,9 @@ sub_8195AE4: ; 8195AE4 ldr r0, [r2] ldr r1, [r1] ands r0, r1 -@08195B9E: +_08195B9E: str r0, [r2] -@08195BA0: +_08195BA0: pop {r4-r6} pop {r0} bx r0 @@ -754614,7 +754614,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 @@ -754622,21 +754622,21 @@ sub_8195BB0: ; 8195BB0 movs r1, 0x3 bl __umodsi3 strh r0, [r4] - b @08195C16 + b _08195C16 .pool -@08195C00: +_08195C00: cmp r0, 0x62 - bhi @08195C10 + bhi _08195C10 ldr r1, =0x020375f0 movs r0, 0x3 - b @08195C14 + b _08195C14 .pool -@08195C10: +_08195C10: ldr r1, =0x020375f0 movs r0, 0x4 -@08195C14: +_08195C14: strh r0, [r1] -@08195C16: +_08195C16: pop {r4} pop {r0} bx r0 @@ -754674,7 +754674,7 @@ sub_8195C50: ; 8195C50 ldrh r1, [r3] ldr r0, =0x0000012b cmp r1, r0 - bhi @08195C6C + bhi _08195C6C ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 @@ -754682,7 +754682,7 @@ sub_8195C50: ; 8195C50 adds r0, r1 adds r0, 0xC bl ConvertBattleFrontierTrainerSpeechToString -@08195C6C: +_08195C6C: pop {r0} bx r0 .pool @@ -754711,7 +754711,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 @@ -754721,15 +754721,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 @@ -754784,7 +754784,7 @@ sub_8195D28: ; 8195D28 adds r2, r1 ldrh r0, [r2] cmp r0, 0x29 - bls @08195D88 + bls _08195D88 bl GenerateRandomNumber ldr r4, [r4] ldr r5, =gUnknown_0860DE84 @@ -754798,9 +754798,9 @@ sub_8195D28: ; 8195D28 ldrh r0, [r0] ldr r1, =0x00000dc6 adds r4, r1 - b @08195DA6 + b _08195DA6 .pool -@08195D88: +_08195D88: bl GenerateRandomNumber ldr r4, [r4] ldr r5, =gUnknown_0860DE78 @@ -754814,7 +754814,7 @@ sub_8195D28: ; 8195D28 ldrh r0, [r0] ldr r3, =0x00000dc6 adds r4, r3 -@08195DA6: +_08195DA6: strh r0, [r4] pop {r4,r5} pop {r0} @@ -754835,7 +754835,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 @@ -754849,13 +754849,13 @@ sub_8195DB8: ; 8195DB8 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b @08195E06 + b _08195E06 .pool -@08195E00: +_08195E00: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -@08195E06: +_08195E06: pop {r4,r5} pop {r0} bx r0 @@ -754910,18 +754910,18 @@ 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 .pool -@08195E84: +_08195E84: movs r0, 0 -@08195E86: +_08195E86: pop {r1} bx r1 thumb_func_end sub_8195E58 @@ -754935,15 +754935,15 @@ sub_8195E8C: ; 8195E8C movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne @08195EAE + bne _08195EAE adds r0, r4, 0 bl GetMonAbility 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 @@ -754954,13 +754954,13 @@ sub_8195E8C: ; 8195E8C lsls r1, r5, 1 adds r1, r5 cmp r0, r1 - blt @08195ED0 + blt _08195ED0 movs r0, 0 - b @08195ED2 + b _08195ED2 .pool -@08195ED0: +_08195ED0: movs r0, 0x1 -@08195ED2: +_08195ED2: pop {r4,r5} pop {r1} bx r1 @@ -754974,47 +754974,47 @@ sub_8195ED8: ; 8195ED8 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 FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08195F0E + bne _08195F0E movs r0, 0xDC bl FlagGet 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 FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @08195F38 + bne _08195F38 movs r0, 0x8B bl FlagGet lsls r0, 24 cmp r0, 0 - bne @08195F38 -@08195F30: + bne _08195F38 +_08195F30: movs r0, 0 - b @08195F3A + b _08195F3A .pool -@08195F38: +_08195F38: movs r0, 0x1 -@08195F3A: +_08195F3A: pop {r4} pop {r1} bx r1 @@ -755030,15 +755030,15 @@ sub_8195F40: ; 8195F40 lsls r0, 24 lsrs r0, 24 cmp r0, 0x9 - bhi @08195F5C + bhi _08195F5C movs r0, 0 - b @08195F62 + b _08195F62 .pool -@08195F5C: +_08195F5C: movs r0, 0 strb r0, [r1, 0x6] movs r0, 0x1 -@08195F62: +_08195F62: pop {r1} bx r1 thumb_func_end sub_8195F40 @@ -755049,7 +755049,7 @@ sub_8195F68: ; 8195F68 bl sub_8195FCC adds r4, r0, 0 cmp r4, 0 - beq @08195FB8 + beq _08195FB8 bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -755063,7 +755063,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 @@ -755073,18 +755073,18 @@ 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 .pool -@08195FC4: +_08195FC4: movs r0, 0x1 -@08195FC6: +_08195FC6: pop {r4} pop {r1} bx r1 @@ -755095,7 +755095,7 @@ 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 @@ -755104,12 +755104,12 @@ sub_8195FCC: ; 8195FCC bl FlagGet 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} @@ -755122,7 +755122,7 @@ sub_8195FF8: ; 8195FF8 adds r5, r0, 0 movs r4, 0 ldr r6, =gUnknown_085500A4 -@08196000: +_08196000: movs r1, 0xAE lsls r1, 1 adds r0, r4, r1 @@ -755131,21 +755131,21 @@ sub_8195FF8: ; 8195FF8 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @08196022 + beq _08196022 cmp r5, 0 - bne @08196020 + bne _08196020 ldrh r0, [r6] - b @0819602C + b _0819602C .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 @@ -755158,29 +755158,29 @@ sub_8196034: ; 8196034 bl FlagGet 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 .pool -@08196078: +_08196078: movs r0, 0 -@0819607A: +_0819607A: pop {r1} bx r1 thumb_func_end sub_8196034 @@ -755215,12 +755215,12 @@ task_prev_quest: ; 81960A8 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 @@ -755250,7 +755250,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] @@ -755259,10 +755259,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 @@ -755287,11 +755287,11 @@ sub_819612C: ; 819612C lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - bne @0819615C + bne _0819615C adds r0, r4, 0 - b @081961E0 + b _081961E0 .pool -@0819615C: +_0819615C: ldr r1, =gUnknown_0860EA6C movs r2, 0x80 lsls r2, 1 @@ -755302,13 +755302,13 @@ sub_819612C: ; 819612C lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - bne @08196188 + bne _08196188 ldrb r0, [r5, 0x4] bl RemoveWindow adds r0, r4, 0 - b @081961E0 + b _081961E0 .pool -@08196188: +_08196188: ldr r1, =gUnknown_0860EB8C ldr r3, =0x00000279 movs r0, 0 @@ -755316,7 +755316,7 @@ sub_819612C: ; 819612C 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 FillWindowPixelBuffer @@ -755333,16 +755333,16 @@ sub_819612C: ; 819612C movs r2, 0 bl ChangeBgY movs r0, 0x1 - b @081961E6 + b _081961E6 .pool -@081961D8: +_081961D8: ldrb r0, [r5, 0x4] bl RemoveWindow adds r0, r6, 0 -@081961E0: +_081961E0: bl remove_task movs r0, 0 -@081961E6: +_081961E6: add sp, 0x4 pop {r4-r6} pop {r1} @@ -755363,7 +755363,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 PutWindowTilemap movs r1, 0x4 @@ -755396,11 +755396,11 @@ sub_81961F0: ; 81961F0 movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0x1 - b @0819626A + b _0819626A .pool -@08196268: +_08196268: movs r0, 0 -@0819626A: +_0819626A: add sp, 0x10 pop {r4} pop {r1} @@ -755420,17 +755420,17 @@ sub_8196274: ; 8196274 bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - beq @08196298 + beq _08196298 movs r0, 0 - b @081962A4 + b _081962A4 .pool -@08196298: +_08196298: movs r1, 0x4 ldrsh r0, [r4, r1] ldr r1, =gUnknown_0860EF70 bl sub_81965D8 movs r0, 0x1 -@081962A4: +_081962A4: pop {r4} pop {r1} bx r1 @@ -755446,16 +755446,16 @@ sub_81962B0: ; 81962B0 movs r2, 0x1 bl ChangeBgY 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 ChangeBgY movs r0, 0x1 -@081962D2: +_081962D2: pop {r1} bx r1 thumb_func_end sub_81962B0 @@ -755474,28 +755474,28 @@ 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 FillWindowPixelBuffer 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 .pool -@08196328: +_08196328: movs r0, 0 -@0819632A: +_0819632A: pop {r4} pop {r1} bx r1 @@ -755515,17 +755515,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 FillWindowPixelBuffer @@ -755536,11 +755536,11 @@ sub_8196330: ; 8196330 lsls r0, 1 bl audio_play movs r0, 0x1 - b @0819638A + b _0819638A .pool -@08196388: +_08196388: movs r0, 0 -@0819638A: +_0819638A: pop {r4} pop {r1} bx r1 @@ -755564,11 +755564,11 @@ sub_8196390: ; 8196390 bl ChangeBgY ldr r1, =0xffffe000 cmp r0, r1 - ble @081963C0 + ble _081963C0 movs r0, 0 - b @081963E8 + b _081963E8 .pool -@081963C0: +_081963C0: movs r0, 0x1E str r0, [sp] movs r0, 0x6 @@ -755585,7 +755585,7 @@ sub_8196390: ; 8196390 movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0x1 -@081963E8: +_081963E8: add sp, 0x8 pop {r4} pop {r1} @@ -755598,11 +755598,11 @@ sub_81963F0: ; 81963F0 bl IsDma3ManagerBusyWithBgCopy 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 @@ -755610,7 +755610,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 @@ -755628,13 +755628,13 @@ sub_81963F0: ; 81963F0 bl sub_80D338C bl sub_809757C bl script_env_2_disable -@08196446: +_08196446: movs r0, 0x1 - b @08196456 + b _08196456 .pool -@08196454: +_08196454: movs r0, 0 -@08196456: +_08196456: pop {r1} bx r1 thumb_func_end sub_81963F0 @@ -755883,22 +755883,22 @@ 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 .pool -@0819666C: +_0819666C: ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 strb r0, [r2] -@08196678: +_08196678: bl RunTextPrinters lsls r0, r4, 24 lsrs r0, 24 @@ -755928,7 +755928,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] @@ -755937,9 +755937,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 @@ -755964,7 +755964,7 @@ sub_8196694: ; 8196694 bl WriteSequenceToBgTilemapBuffer movs r0, 0 bl CopyBgTilemapBufferToVram -@081966FC: +_081966FC: add sp, 0x10 pop {r0} bx r0 @@ -756008,18 +756008,18 @@ sub_8196748: ; 8196748 movs r5, 0 movs r6, 0 ldr r4, =gUnknown_085500A4 -@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} @@ -756034,26 +756034,26 @@ sub_8196774: ; 8196774 movs r4, 0 movs r6, 0 ldr r5, =gUnknown_085500A4 -@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 .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 @@ -756071,7 +756071,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 @@ -756079,17 +756079,17 @@ 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 .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 @@ -756097,8 +756097,8 @@ sub_81967AC: ; 81967AC movs r7, 0x1 adds r0, r5, 0 bl sub_80B1E94 - b @08196832 -@0819680A: + b _08196832 +_0819680A: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -756106,18 +756106,18 @@ sub_81967AC: ; 81967AC 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 @@ -756134,15 +756134,15 @@ sub_8196844: ; 8196844 adds r3, r0, 0 movs r2, 0 ldr r1, =gUnknown_0860DEB8 -@0819684C: +_0819684C: ldrh r0, [r1] cmp r0, r3 - beq @0819685C + beq _0819685C adds r1, 0x14 adds r2, 0x1 - b @0819684C + b _0819684C .pool -@0819685C: +_0819685C: adds r0, r2, 0 pop {r1} bx r1 @@ -756214,10 +756214,10 @@ sub_81968BC: ; 81968BC adds r0, r2 ldrh r4, [r0] cmp r4, 0 - bne @081968EC + bne _081968EC movs r0, 0 bl DummyObjectCallback -@081968EC: +_081968EC: movs r1, 0xFF lsrs r0, r4, 8 subs r0, 0x1 @@ -756246,11 +756246,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 @@ -756258,14 +756258,14 @@ sub_8196910: ; 8196910 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 @@ -756273,14 +756273,14 @@ sub_8196910: ; 8196910 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 @@ -756290,10 +756290,10 @@ sub_8196910: ; 8196910 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, =gUnknown_0860DEB8 @@ -756309,9 +756309,9 @@ sub_8196910: ; 8196910 lsls r1, r2, 3 ldr r0, [r0] adds r0, r1 - b @081969D0 + b _081969D0 .pool -@081969AC: +_081969AC: ldr r1, =gUnknown_0860DEB8 lsls r0, r6, 2 adds r0, r6 @@ -756330,7 +756330,7 @@ sub_8196910: ; 8196910 lsls r2, 3 ldr r0, [r1] adds r0, r2 -@081969D0: +_081969D0: add sp, 0x4 pop {r4-r7} pop {r1} @@ -756360,21 +756360,21 @@ sub_81969FC: ; 81969FC adds r6, r1, 0 movs r4, 0 ldr r5, =gUnknown_0860EFA0 -@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 @@ -756408,23 +756408,23 @@ sub_8196A44: ; 8196A44 movs r2, 0 ldr r3, =gUnknown_0860EFC4 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 CopyString - b @08196A90 + b _08196A90 .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 @@ -756432,7 +756432,7 @@ sub_8196A44: ; 8196A44 adds r1, r0 adds r0, r5, 0 bl CopyString -@08196A90: +_08196A90: pop {r4-r6} pop {r0} bx r0 @@ -756466,80 +756466,80 @@ 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 @@ -756555,33 +756555,33 @@ 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 @@ -756599,27 +756599,27 @@ sub_8196B98: ; 8196B98 ldrb r1, [r0] adds r7, r0, 0 cmp r1, 0xFF - beq @08196C5C + beq _08196C5C ldr r1, =gUnknown_085500A4 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 @@ -756627,13 +756627,13 @@ sub_8196B98: ; 8196B98 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 @@ -756643,13 +756643,13 @@ sub_8196B98: ; 8196B98 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 @@ -756661,9 +756661,9 @@ sub_8196B98: ; 8196B98 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 @@ -756678,13 +756678,13 @@ sub_8196B98: ; 8196B98 adds r1, r0 mov r0, r8 bl CopyString - b @08196C62 + b _08196C62 .pool -@08196C5C: +_08196C5C: movs r0, 0xFF mov r5, r8 strb r0, [r5] -@08196C62: +_08196C62: add sp, 0x4 pop {r3} mov r8, r3 @@ -756726,23 +756726,23 @@ 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 .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 @@ -756782,16 +756782,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 @@ -756809,20 +756809,20 @@ sub_8196D4C: ; 8196D4C push {r4,r5,lr} movs r4, 0 ldr r5, =gUnknown_0860F010 - b @08196D5C + b _08196D5C .pool -@08196D58: +_08196D58: adds r5, 0x2 adds r4, 0x1 -@08196D5C: +_08196D5C: cmp r4, 0x7 - bhi @08196D6C + bhi _08196D6C ldrh r0, [r5] bl FlagGet lsls r0, 24 cmp r0, 0 - bne @08196D58 -@08196D6C: + bne _08196D58 +_08196D6C: adds r0, r4, 0 pop {r4,r5} pop {r1} @@ -756838,7 +756838,7 @@ sub_8196D74: ; 8196D74 adds r7, r0, 0 bl sub_8196D4C cmp r0, 0x4 - ble @08196DF4 + ble _08196DF4 bl GameFreakRTC_GetNumDays adds r4, r0, 0 ldr r0, =0x03005d90 @@ -756872,16 +756872,16 @@ 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 .pool -@08196DF4: +_08196DF4: movs r0, 0 -@08196DF6: +_08196DF6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -756898,192 +756898,192 @@ sub_8196E04: ; 8196E04 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 .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 .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 .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 .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 .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 .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 .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} @@ -757097,102 +757097,102 @@ sub_8196F90: ; 8196F90 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 @@ -757202,11 +757202,11 @@ sub_8196F90: ; 8196F90 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 @@ -757215,19 +757215,19 @@ sub_8196F90: ; 8196F90 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 .pool -@08197078: +_08197078: movs r0, 0x13 -@0819707A: +_0819707A: pop {r4} pop {r1} bx r1 @@ -757246,12 +757246,12 @@ sub_8197080: ; 8197080 bl Alloc 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 @@ -757303,7 +757303,7 @@ sub_8197080: ; 8197080 adds r5, r0, 0 bl sub_809D42C cmp r0, 0 - beq @08197156 + beq _08197156 strb r6, [r5] adds r5, 0x1 movs r0, 0 @@ -757327,10 +757327,10 @@ sub_8197080: ; 8197080 ldr r1, =gUnknown_082A633D adds r0, r5, 0 bl ExpandStringRefs -@08197156: +_08197156: adds r0, r7, 0 bl Free -@0819715C: +_0819715C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -757651,11 +757651,11 @@ sub_81973C4: ; 81973C4 adds r0, r5, 0 bl PutWindowTilemap cmp r4, 0x1 - bne @081973F2 + bne _081973F2 adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@081973F2: +_081973F2: pop {r4,r5} pop {r0} bx r0 @@ -757679,11 +757679,11 @@ sub_81973FC: ; 81973FC adds r0, r5, 0 bl PutWindowTilemap cmp r4, 0x1 - bne @0819742A + bne _0819742A adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@0819742A: +_0819742A: pop {r4,r5} pop {r0} bx r0 @@ -757707,11 +757707,11 @@ sub_8197434: ; 8197434 adds r0, r5, 0 bl ClearWindowTilemap cmp r4, 0x1 - bne @08197462 + bne _08197462 adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@08197462: +_08197462: pop {r4,r5} pop {r0} bx r0 @@ -757735,11 +757735,11 @@ sub_819746C: ; 819746C adds r0, r5, 0 bl ClearWindowTilemap cmp r4, 0x1 - bne @0819749A + bne _0819749A adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@0819749A: +_0819749A: pop {r4,r5} pop {r0} bx r0 @@ -757816,13 +757816,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] @@ -757849,8 +757849,8 @@ sub_81974A4: ; 81974A4 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 @@ -758258,9 +758258,9 @@ sub_81978D0: ; 81978D0 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xF - bls @081978DC + bls _081978DC movs r1, 0 -@081978DC: +_081978DC: ldr r0, =gUnknown_0860F074 lsls r1, 1 adds r1, r0 @@ -758342,17 +758342,17 @@ sub_8197964: ; 8197964 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 .pool -@08197988: +_08197988: movs r0, 0x1 -@0819798A: +_0819798A: pop {r1} bx r1 thumb_func_end sub_8197964 @@ -758366,14 +758366,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, =gUnknown_0860F094 adds r0, r1 @@ -758392,7 +758392,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 @@ -758409,7 +758409,7 @@ sub_81979C4: ; 81979C4 movs r3, 0x7 bl sub_8198AA4 strb r0, [r4] -@081979F6: +_081979F6: ldrb r0, [r4] add sp, 0xC pop {r4} @@ -758432,11 +758432,11 @@ remove_start_menu_window_maybe: ; 8197A14 ldr r4, =0x0203cd8c ldrb r0, [r4] cmp r0, 0xFF - beq @08197A26 + beq _08197A26 bl RemoveWindow movs r0, 0xFF strb r0, [r4] -@08197A26: +_08197A26: pop {r4} pop {r0} bx r0 @@ -758464,7 +758464,7 @@ AddMapNamePopUpWindow: ; 8197A40 ldr r4, =0x0203cd8d ldrb r0, [r4] cmp r0, 0xFF - bne @08197A66 + bne _08197A66 movs r0, 0x3 str r0, [sp] movs r0, 0xE @@ -758477,7 +758477,7 @@ AddMapNamePopUpWindow: ; 8197A40 movs r3, 0xA bl sub_8198AA4 strb r0, [r4] -@08197A66: +_08197A66: ldrb r0, [r4] add sp, 0xC pop {r4} @@ -758500,11 +758500,11 @@ RemoveMapNamePopUpWindow: ; 8197A80 ldr r4, =0x0203cd8d ldrb r0, [r4] cmp r0, 0xFF - beq @08197A92 + beq _08197A92 bl RemoveWindow movs r0, 0xFF strb r0, [r4] -@08197A92: +_08197A92: pop {r4} pop {r0} bx r0 @@ -758567,10 +758567,10 @@ sub_8197AE8: ; 8197AE8 movs r3, 0 bl FillBgTilemapBufferRect cmp r4, 0x1 - bne @08197B12 + bne _08197B12 movs r0, 0 bl CopyBgTilemapBufferToVram -@08197B12: +_08197B12: add sp, 0xC pop {r4} pop {r0} @@ -758598,11 +758598,11 @@ sub_8197B1C: ; 8197B1C adds r0, r5, 0 bl PutWindowTilemap cmp r4, 0x1 - bne @08197B52 + bne _08197B52 adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@08197B52: +_08197B52: pop {r4,r5} pop {r0} bx r0 @@ -758633,11 +758633,11 @@ sub_8197B64: ; 8197B64 adds r0, r6, 0 bl PutWindowTilemap cmp r4, 0x1 - bne @08197BA2 + bne _08197BA2 adds r0, r6, 0 movs r1, 0x3 bl CopyWindowToVram -@08197BA2: +_08197BA2: pop {r4-r6} pop {r0} bx r0 @@ -758928,11 +758928,11 @@ sub_8197DF8: ; 8197DF8 adds r0, r5, 0 bl ClearWindowTilemap cmp r4, 0x1 - bne @08197E26 + bne _08197E26 adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@08197E26: +_08197E26: pop {r4,r5} pop {r0} bx r0 @@ -759003,11 +759003,11 @@ SetWindowBorderStyle: ; 8197E80 adds r0, r5, 0 bl PutWindowTilemap cmp r4, 0x1 - bne @08197EB6 + bne _08197EB6 adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@08197EB6: +_08197EB6: pop {r4,r5} pop {r0} bx r0 @@ -759038,11 +759038,11 @@ sub_8197EC8: ; 8197EC8 adds r0, r6, 0 bl PutWindowTilemap cmp r4, 0x1 - bne @08197F06 + bne _08197F06 adds r0, r6, 0 movs r1, 0x3 bl CopyWindowToVram -@08197F06: +_08197F06: pop {r4-r6} pop {r0} bx r0 @@ -759230,11 +759230,11 @@ sub_8198070: ; 8198070 adds r0, r5, 0 bl ClearWindowTilemap cmp r4, 0x1 - bne @0819809E + bne _0819809E adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@0819809E: +_0819809E: pop {r4,r5} pop {r0} bx r0 @@ -759302,15 +759302,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] @@ -759327,14 +759327,14 @@ sub_81980F0: ; 81980F0 bl AddWindow strb r0, [r4] cmp r5, 0xF - bls @08198158 + bls _08198158 movs r5, 0xF0 - b @0819815C + b _0819815C .pool -@08198158: +_08198158: lsls r0, r5, 28 lsrs r5, r0, 24 -@0819815C: +_0819815C: ldr r0, =gUnknown_0860F0B0 adds r1, r5, 0 movs r2, 0x20 @@ -759365,7 +759365,7 @@ sub_8198180: ; 8198180 ldr r5, =0x0203cda0 ldrb r0, [r5] cmp r0, 0xFF - beq @081981EE + beq _081981EE bl PutWindowTilemap ldrb r0, [r5] movs r1, 0xFF @@ -759397,11 +759397,11 @@ sub_8198180: ; 8198180 bl box_print mov r0, r8 cmp r0, 0 - beq @081981EE + beq _081981EE ldrb r0, [r5] movs r1, 0x3 bl CopyWindowToVram -@081981EE: +_081981EE: add sp, 0xC pop {r3} mov r8, r3 @@ -759435,19 +759435,19 @@ 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 .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 @@ -759459,7 +759459,7 @@ sub_8198204: ; 8198204 movs r1, 0xFF bl FillWindowPixelBuffer cmp r6, 0 - beq @0819829E + beq _0819829E movs r0, 0 adds r1, r6, 0 movs r2, 0 @@ -759485,7 +759485,7 @@ sub_8198204: ; 8198204 str r6, [sp, 0x8] movs r3, 0x1 bl box_print -@0819829E: +_0819829E: ldrb r0, [r7] movs r1, 0 str r1, [sp] @@ -759501,11 +759501,11 @@ sub_8198204: ; 8198204 bl AddTextPrinterParametrized2 mov r2, r9 cmp r2, 0 - beq @081982C8 + beq _081982C8 ldrb r0, [r7] movs r1, 0x3 bl CopyWindowToVram -@081982C8: +_081982C8: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -759522,10 +759522,10 @@ sub_81982D8: ; 81982D8 ldr r1, =0x0203cda0 ldrb r0, [r1] cmp r0, 0xFF - beq @081982E8 + beq _081982E8 movs r1, 0x3 bl CopyWindowToVram -@081982E8: +_081982E8: pop {r0} bx r0 .pool @@ -759537,13 +759537,13 @@ sub_81982F0: ; 81982F0 ldr r4, =0x0203cda0 ldrb r0, [r4] cmp r0, 0xFF - beq @08198308 + beq _08198308 movs r1, 0xFF bl FillWindowPixelBuffer ldrb r0, [r4] movs r1, 0x3 bl CopyWindowToVram -@08198308: +_08198308: pop {r4} pop {r0} bx r0 @@ -759556,7 +759556,7 @@ sub_8198314: ; 8198314 ldr r4, =0x0203cda0 ldrb r0, [r4] cmp r0, 0xFF - beq @0819833C + beq _0819833C movs r1, 0 bl FillWindowPixelBuffer ldrb r0, [r4] @@ -759568,7 +759568,7 @@ sub_8198314: ; 8198314 bl RemoveWindow movs r0, 0xFF strb r0, [r4] -@0819833C: +_0819833C: pop {r4} pop {r0} bx r0 @@ -759604,18 +759604,18 @@ 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 .pool -@08198390: +_08198390: strb r7, [r5, 0x2] -@08198392: +_08198392: movs r0, 0 bl MoveMenuCursor ldr r0, =0x0203cd90 @@ -759796,20 +759796,20 @@ 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 .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 @@ -759835,20 +759835,20 @@ 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 .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 @@ -759875,50 +759875,50 @@ ProcessMenuInput: ; 819856C 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 .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 @@ -759936,56 +759936,56 @@ 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 .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 @@ -759999,49 +759999,49 @@ ProcessMenuInput_other: ; 8198658 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 .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 @@ -760058,55 +760058,55 @@ 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 .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 @@ -760139,8 +760139,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 @@ -760163,8 +760163,8 @@ PrintTextArray: ; 8198740 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc @08198774 -@081987A4: + bcc _08198774 +_081987A4: adds r0, r6, 0 movs r1, 0x2 bl CopyWindowToVram @@ -760215,8 +760215,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 @@ -760243,8 +760243,8 @@ sub_81987BC: ; 81987BC lsls r0, 24 lsrs r4, r0, 24 cmp r4, r5 - bcc @08198804 -@0819883C: + bcc _08198804 +_0819883C: adds r0, r7, 0 movs r1, 0x2 bl CopyWindowToVram @@ -760395,9 +760395,9 @@ AddItemMenuActionTextPrinters: ; 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] @@ -760420,8 +760420,8 @@ AddItemMenuActionTextPrinters: ; 81988A4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r7 - bcc @0819896E -@0819899E: + bcc _0819896E +_0819899E: ldr r0, [sp, 0x10] movs r1, 0x2 bl CopyWindowToVram @@ -760781,9 +760781,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} @@ -760844,13 +760844,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 @@ -760858,7 +760858,7 @@ sub_8198C94: ; 8198C94 adds r0, r1, r0 lsls r0, 24 lsrs r7, r0, 24 -@08198CF8: +_08198CF8: adds r0, r5, 0 muls r0, r6 adds r0, r4 @@ -760885,14 +760885,14 @@ sub_8198C94: ; 8198C94 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 CopyWindowToVram @@ -761050,15 +761050,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 @@ -761095,14 +761095,14 @@ sub_8198DBC: ; 8198DBC 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 CopyWindowToVram @@ -761204,18 +761204,18 @@ 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 .pool -@08198FB4: +_08198FB4: strb r7, [r5, 0x2] -@08198FB6: +_08198FB6: movs r0, 0 movs r1, 0 bl sub_8199134 @@ -761417,7 +761417,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] @@ -761426,31 +761426,31 @@ 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 .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] @@ -761458,45 +761458,45 @@ sub_8199134: ; 8199134 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 @@ -761520,7 +761520,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] @@ -761528,17 +761528,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] @@ -761546,30 +761546,30 @@ sub_81991F8: ; 81991F8 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 .pool -@08199274: +_08199274: strb r7, [r5, 0x2] -@08199276: +_08199276: ldrb r0, [r5, 0x2] pop {r3} mov r8, r3 @@ -761586,83 +761586,83 @@ sub_8199284: ; 8199284 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 .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 GetLRKeysState 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 GetLRKeysState 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 @@ -761678,79 +761678,79 @@ 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 .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 GetLRKeysState 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 GetLRKeysState 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 @@ -761764,81 +761764,81 @@ sub_81993D8: ; 81993D8 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 .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 @@ -761854,77 +761854,77 @@ 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 .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 @@ -761952,18 +761952,18 @@ 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 .pool -@0819955C: +_0819955C: strb r5, [r4, 0x2] -@0819955E: +_0819955E: movs r0, 0 bl MoveMenuCursor lsls r0, 24 @@ -762003,11 +762003,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] @@ -762025,8 +762025,8 @@ PrintMenuTable: ; 819958C adds r4, 0x8 adds r5, 0x1 cmp r5, r7 - bcc @081995AA -@081995D0: + bcc _081995AA +_081995D0: mov r0, r8 movs r1, 0x2 bl CopyWindowToVram @@ -762110,9 +762110,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] @@ -762132,8 +762132,8 @@ sub_81995E4: ; 81995E4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, r7 - bcc @0819967C -@081996A6: + bcc _0819967C +_081996A6: adds r0, r6, 0 movs r1, 0x2 bl CopyWindowToVram @@ -762279,13 +762279,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 @@ -762293,7 +762293,7 @@ sub_81997AC: ; 81997AC mov r8, r0 movs r5, 0x80 lsls r5, 20 -@081997EC: +_081997EC: adds r0, r7, 0 muls r0, r6 adds r0, r4 @@ -762316,13 +762316,13 @@ sub_81997AC: ; 81997AC 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 CopyWindowToVram @@ -762410,17 +762410,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 @@ -762448,14 +762448,14 @@ sub_819983C: ; 819983C 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 CopyWindowToVram @@ -762499,19 +762499,19 @@ 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 .pool -@08199990: +_08199990: strb r7, [r6, 0x2] -@08199992: +_08199992: movs r0, 0 movs r1, 0 bl sub_8199134 @@ -762556,36 +762556,36 @@ do_scheduled_bg_tilemap_copies_to_vram: ; 81999D0 ldr r4, =0x0203cda4 ldrb r0, [r4] cmp r0, 0x1 - bne @081999E4 + bne _081999E4 movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4] -@081999E4: +_081999E4: ldrb r0, [r4, 0x1] cmp r0, 0x1 - bne @081999F4 + bne _081999F4 movs r0, 0x1 bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4, 0x1] -@081999F4: +_081999F4: ldrb r0, [r4, 0x2] cmp r0, 0x1 - bne @08199A04 + bne _08199A04 movs r0, 0x2 bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4, 0x2] -@08199A04: +_08199A04: ldrb r0, [r4, 0x3] cmp r0, 0x1 - bne @08199A14 + bne _08199A14 movs r0, 0x3 bl CopyBgTilemapBufferToVram movs r0, 0 strb r0, [r4, 0x3] -@08199A14: +_08199A14: pop {r4} pop {r0} bx r0 @@ -762601,11 +762601,11 @@ reset_temp_tile_data_buffers: ; 8199A20 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} @@ -762619,18 +762619,18 @@ free_temp_tile_data_buffers_if_possible: ; 8199A44 bl IsDma3ManagerBusyWithBgCopy 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} @@ -762638,18 +762638,18 @@ free_temp_tile_data_buffers_if_possible: ; 8199A44 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 .pool -@08199A88: +_08199A88: movs r0, 0x1 -@08199A8A: +_08199A8A: pop {r4-r6} pop {r1} bx r1 @@ -762677,17 +762677,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] @@ -762703,13 +762703,13 @@ decompress_and_copy_tile_data_to_vram: ; 8199A90 lsrs r0, 14 adds r0, r2 str r4, [r0] -@08199AEC: +_08199AEC: adds r0, r4, 0 - b @08199AFA + b _08199AFA .pool -@08199AF8: +_08199AF8: movs r0, 0 -@08199AFA: +_08199AFA: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -762742,11 +762742,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 movs r1, 0 bl AddTask @@ -762770,7 +762770,7 @@ copy_decompressed_tile_data_to_vram_autofree: ; 8199B08 movs r1, 0x1 adds r2, r6, 0 bl set_word_task_arg -@08199B6E: +_08199B6E: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -762797,14 +762797,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 @@ -762828,11 +762828,11 @@ malloc_and_decompress: ; 8199BC0 bl Alloc 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} @@ -762854,23 +762854,23 @@ 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 .pool -@08199C18: +_08199C18: adds r1, r4, 0 bl LoadBgTiles - b @08199C26 -@08199C20: + b _08199C26 +_08199C20: adds r1, r4, 0 bl LoadBgTilemap -@08199C26: +_08199C26: lsls r0, 16 lsrs r0, 16 -@08199C2A: +_08199C2A: pop {r4} pop {r1} bx r1 @@ -762906,22 +762906,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 @@ -762934,13 +762934,13 @@ sub_8199C30: ; 8199C30 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 @@ -762980,18 +762980,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 @@ -763005,13 +763005,13 @@ sub_8199CBC: ; 8199CBC 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 @@ -763031,23 +763031,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 @@ -763055,7 +763055,7 @@ sub_8199D3C: ; 8199D3C adds r7, r0, 0 adds r3, r6, 0 adds r2, r4, 0 -@08199D76: +_08199D76: ldrh r0, [r3] mov r1, r12 ands r1, r0 @@ -763066,8 +763066,8 @@ sub_8199D3C: ; 8199D3C adds r3, 0x2 subs r2, 0x1 cmp r2, 0 - bne @08199D76 -@08199D8C: + bne _08199D76 +_08199D8C: pop {r4-r7} pop {r0} bx r0 @@ -763131,9 +763131,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 GetBgAttribute @@ -763416,14 +763416,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 ExpandStringRefs lsls r3, r4, 24 @@ -763482,24 +763482,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 @@ -763519,9 +763519,9 @@ sub_819A080: ; 819A080 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 @@ -763532,15 +763532,15 @@ sub_819A080: ; 819A080 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 @@ -763582,111 +763582,111 @@ sub_819A080: ; 819A080 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 .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 .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 .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 .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 @@ -763756,22 +763756,22 @@ sub_819A2BC: ; 819A2BC 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, =gUnknown_08DC4318 - b @0819A2E6 + b _0819A2E6 .pool -@0819A2DC: +_0819A2DC: ldr r0, =gUnknown_08DC4338 - b @0819A2E6 + b _0819A2E6 .pool -@0819A2E4: +_0819A2E4: ldr r0, =gUnknown_08DC4358 -@0819A2E6: +_0819A2E6: adds r1, r2, 0 movs r2, 0x20 bl gpu_pal_apply @@ -763843,38 +763843,38 @@ 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 .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 CopyString - b @0819A43C + b _0819A43C .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 @@ -763885,8 +763885,8 @@ sub_819A344: ; 819A344 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] @@ -763904,38 +763904,38 @@ sub_819A344: ; 819A344 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalString - b @0819A43C + b _0819A43C .pool -@0819A404: +_0819A404: ldr r0, =0x02037318 ldrb r1, [r0, 0x14] adds r0, r5, 0 bl sub_81245DC - b @0819A43C + b _0819A43C .pool -@0819A414: +_0819A414: ldr r4, =0x00000867 movs r6, 0 adds r7, r5, 0x1 -@0819A41A: +_0819A41A: lsls r0, r4, 16 lsrs r0, 16 bl FlagGet 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 @@ -763955,23 +763955,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 @@ -763979,28 +763979,28 @@ sub_819A44C: ; 819A44C bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne @0819A4A6 + bne _0819A4A6 adds r0, r5, 0 movs r1, 0 bl StartObjectImageAnim movs r0, 0x20 strh r0, [r5, 0x2E] - b @0819A4C2 -@0819A4A6: + b _0819A4C2 +_0819A4A6: adds r0, r5, 0 movs r1, 0x1 bl StartObjectImageAnim - b @0819A4C2 -@0819A4B0: + b _0819A4C2 +_0819A4B0: adds r0, r5, 0 movs r1, 0x1 bl StartObjectImageAnimIfDifferent - b @0819A4C2 -@0819A4BA: + b _0819A4C2 +_0819A4BA: adds r0, r5, 0 movs r1, 0 bl StartObjectImageAnimIfDifferent -@0819A4C2: +_0819A4C2: pop {r4,r5} pop {r0} bx r0 @@ -764051,37 +764051,37 @@ 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 .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 @@ -764102,9 +764102,9 @@ sub_819A514: ; 819A514 ldr r0, =gUnknown_08610434 bl InitWindows bl DeactivateAllTextPrinters - b @0819A8E6 + b _0819A8E6 .pool -@0819A5C0: +_0819A5C0: ldr r5, =0x0203ce2c movs r4, 0x88 lsls r4, 3 @@ -764183,9 +764183,9 @@ sub_819A514: ; 819A514 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @0819A8EE + b _0819A8EE .pool -@0819A69C: +_0819A69C: bl sub_80A1A74 bl ResetAllObjectData bl clear_tasks @@ -764241,7 +764241,7 @@ sub_819A514: ; 819A514 ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0x1 - bne @0819A738 + bne _0819A738 ldr r0, =0x02037714 movs r2, 0xA9 lsls r2, 2 @@ -764251,7 +764251,7 @@ sub_819A514: ; 819A514 lsls r3, 1 adds r0, r3 strh r1, [r0] -@0819A738: +_0819A738: ldr r0, =gUnknown_0861039C movs r1, 0x20 movs r2, 0x4 @@ -764260,9 +764260,9 @@ sub_819A514: ; 819A514 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819A8EE + b _0819A8EE .pool -@0819A77C: +_0819A77C: ldr r0, =0x0203ce38 ldr r1, [r0] movs r0, 0x3 @@ -764292,9 +764292,9 @@ sub_819A514: ; 819A514 bl CopyToBgTilemapBufferRect movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @0819A8E6 + b _0819A8E6 .pool -@0819A7CC: +_0819A7CC: ldr r0, =gUnknown_086103F4 bl LoadTaggedObjectPalettes ldr r0, =gUnknown_086103BC @@ -764322,7 +764322,7 @@ sub_819A514: ; 819A514 ldr r0, [r0] ldrb r0, [r0, 0x6] cmp r0, 0x1 - bne @0819A854 + bne _0819A854 movs r0, 0x58 movs r1, 0x98 movs r2, 0x20 @@ -764336,47 +764336,47 @@ sub_819A514: ; 819A514 ldr r1, =0x0000040b movs r0, 0x52 bl SetGpuReg - b @0819A85A + b _0819A85A .pool -@0819A854: +_0819A854: movs r0, 0x3 bl HideBg -@0819A85A: +_0819A85A: ldr r1, =0x030022c0 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @0819A8EE + b _0819A8EE .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 .pool -@0819A8A4: +_0819A8A4: bl sub_819BA64 movs r0, 0x2 - b @0819A8E2 -@0819A8AC: + b _0819A8E2 +_0819A8AC: bl sub_819BCF8 movs r0, 0x5 bl PutWindowTilemap @@ -764384,9 +764384,9 @@ sub_819A514: ; 819A514 movs r3, 0x87 lsls r3, 3 adds r1, r3 - b @0819A8EE + b _0819A8EE .pool -@0819A8C4: +_0819A8C4: bl sub_819B9E8 movs r0, 0x1 bl PutWindowTilemap @@ -764394,25 +764394,25 @@ sub_819A514: ; 819A514 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819A8EE + b _0819A8EE .pool -@0819A8DC: +_0819A8DC: bl sub_819B9B4 movs r0, 0 -@0819A8E2: +_0819A8E2: bl PutWindowTilemap -@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 .pool -@0819A8FC: +_0819A8FC: ldr r0, =sub_819C69C movs r1, 0 bl AddTask @@ -764424,7 +764424,7 @@ sub_819A514: ; 819A514 ldr r3, [r2] ldrb r5, [r3, 0x6] cmp r5, 0 - bne @0819A954 + bne _0819A954 ldr r4, =0x03005e00 ldr r1, =0x000002a1 adds r0, r3, r1 @@ -764444,9 +764444,9 @@ sub_819A514: ; 819A514 lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - b @0819A988 + b _0819A988 .pool -@0819A954: +_0819A954: ldr r4, =0x03005e00 ldr r2, =0x000002a1 adds r0, r3, r2 @@ -764472,10 +764472,10 @@ sub_819A514: ; 819A514 adds r0, r4 movs r1, 0xD strh r1, [r0, 0x8] -@0819A988: +_0819A988: ldr r0, =sub_819A4C8 bl SetMainCallback2 -@0819A98E: +_0819A98E: add sp, 0xC pop {r4,r5} pop {r0} @@ -764489,7 +764489,7 @@ sub_819A9AC: ; 819A9AC ldr r5, =0x0300127c ldr r4, [r5] cmp r4, 0 - bne @0819AA12 + bne _0819AA12 movs r0, 0xAB lsls r0, 2 bl AllocZeroed @@ -764503,7 +764503,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 @@ -764513,7 +764513,7 @@ sub_819A9AC: ; 819A9AC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls @0819A9D2 + bls _0819A9D2 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000ca9 @@ -764522,15 +764522,15 @@ sub_819A9AC: ; 819A9AC movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq @0819AA0C + beq _0819AA0C movs r0, 0 bl sub_819B484 - b @0819AA12 + b _0819AA12 .pool -@0819AA0C: +_0819AA0C: movs r0, 0 bl sub_819B63C -@0819AA12: +_0819AA12: pop {r4,r5} pop {r0} bx r0 @@ -764544,7 +764544,7 @@ sub_819AA18: ; 819AA18 movs r4, 0 mov r8, r4 ldr r7, =0x02020630 -@0819AA24: +_0819AA24: lsls r1, r4, 3 adds r1, r4 lsls r1, 2 @@ -764578,7 +764578,7 @@ sub_819AA18: ; 819AA18 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @0819AA24 + bls _0819AA24 ldr r0, [r6] ldrb r1, [r0, 0x3] ldr r4, =0x02020630 @@ -764677,7 +764677,7 @@ sub_819AA18: ; 819AA18 sub_819AB40: ; 819AB40 push {r4-r6,lr} movs r4, 0 -@0819AB44: +_0819AB44: ldr r6, =0x0300127c ldr r1, [r6] movs r0, 0x6C @@ -764694,7 +764694,7 @@ sub_819AB40: ; 819AB40 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 @@ -764727,32 +764727,32 @@ 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 .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 .pool -@0819ABDC: +_0819ABDC: movs r0, 0x5 -@0819ABDE: +_0819ABDE: strb r0, [r1, 0x3] ldr r2, [r2] ldrb r3, [r2, 0x3] @@ -764783,32 +764783,32 @@ 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 .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 .pool -@0819AC44: +_0819AC44: movs r0, 0x2 -@0819AC46: +_0819AC46: strb r0, [r1] ldr r3, =0x02020630 ldr r2, [r2] @@ -764840,32 +764840,32 @@ 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 .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 .pool -@0819ACAC: +_0819ACAC: movs r0, 0x1 -@0819ACAE: +_0819ACAE: strb r0, [r1, 0x7] ldr r3, =0x02020630 ldr r2, [r2] @@ -764904,7 +764904,7 @@ sub_819ACE0: ; 819ACE0 adds r0, r4 ldrb r0, [r0, 0x10] cmp r0, 0 - beq @0819AD60 + beq _0819AD60 movs r0, 0x64 bl IndexOfObjectPaletteTag lsls r0, 24 @@ -764912,32 +764912,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 @@ -764945,7 +764945,7 @@ sub_819ACE0: ; 819ACE0 adds r1, r0 movs r0, 0x1 strb r0, [r1, 0x10] -@0819AD44: +_0819AD44: ldr r2, =0x0300127c ldr r1, [r2] movs r0, 0x6C @@ -764956,9 +764956,9 @@ sub_819ACE0: ; 819ACE0 ldr r1, [r2] ldrb r0, [r1, 0x5] subs r0, 0x1 - b @0819AD78 + b _0819AD78 .pool -@0819AD60: +_0819AD60: movs r0, 0x65 bl IndexOfObjectPaletteTag lsls r0, 24 @@ -764970,7 +764970,7 @@ sub_819ACE0: ; 819ACE0 ldr r1, [r5] ldrb r0, [r1, 0x5] adds r0, 0x1 -@0819AD78: +_0819AD78: strb r0, [r1, 0x5] ldr r2, =0x02020630 ldr r0, =0x0300127c @@ -764989,7 +764989,7 @@ sub_819ACE0: ; 819ACE0 ands r0, r2 orrs r0, r3 strb r0, [r1, 0x5] -@0819AD9C: +_0819AD9C: pop {r4-r6} pop {r0} bx r0 @@ -765008,13 +765008,13 @@ sub_819ADAC: ; 819ADAC adds r0, r1 ldrb r0, [r0, 0x10] cmp r0, 0 - beq @0819ADCC + beq _0819ADCC movs r0, 0x65 - b @0819ADCE + b _0819ADCE .pool -@0819ADCC: +_0819ADCC: movs r0, 0x64 -@0819ADCE: +_0819ADCE: bl IndexOfObjectPaletteTag lsls r0, 24 lsrs r3, r0, 24 @@ -765055,18 +765055,18 @@ 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 .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 @@ -765084,9 +765084,9 @@ sub_819AE08: ; 819AE08 bl pal_fade_maybe movs r0, 0x7 strh r0, [r6, 0x8] - b @0819AF50 + b _0819AF50 .pool -@0819AE64: +_0819AE64: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -765094,7 +765094,7 @@ sub_819AE08: ; 819AE08 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @0819AF50 + bne _0819AF50 ldr r4, =0x0300127c ldr r0, [r4] ldr r2, =0x000002a1 @@ -765130,9 +765130,9 @@ sub_819AE08: ; 819AE08 bl FreeAllWindowBuffers movs r0, 0x8 strh r0, [r6, 0x8] - b @0819AF50 + b _0819AF50 .pool -@0819AEE8: +_0819AEE8: ldr r4, =0x0300127c ldr r1, [r4] ldr r0, =0x02037714 @@ -765156,7 +765156,7 @@ sub_819AE08: ; 819AE08 bl AllocZeroed str r0, [r4] movs r4, 0 -@0819AF1A: +_0819AF1A: ldr r5, =0x0203ce3c ldr r1, [r5] movs r0, 0x64 @@ -765174,7 +765174,7 @@ sub_819AE08: ; 819AE08 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @0819AF1A + bls _0819AF1A ldr r1, [r5] ldr r0, =sub_819A514 str r0, [sp] @@ -765182,7 +765182,7 @@ sub_819AE08: ; 819AE08 adds r2, r6, 0 movs r3, 0x5 bl sub_81BF8EC -@0819AF50: +_0819AF50: add sp, 0x4 pop {r4-r6} pop {r0} @@ -765203,7 +765203,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 @@ -765212,12 +765212,12 @@ 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 .pool -@0819AFA0: +_0819AFA0: movs r0, 0x1 negs r0, r0 str r1, [sp] @@ -765228,13 +765228,13 @@ bc_exit_to_overworld: ; 819AF68 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 @@ -765262,7 +765262,7 @@ bc_exit_to_overworld: ; 819AF68 bl SetMainCallback2 adds r0, r6, 0 bl remove_task -@0819B00E: +_0819B00E: add sp, 0x4 pop {r4-r7} pop {r0} @@ -765284,7 +765284,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 @@ -765293,26 +765293,26 @@ 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 .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 @@ -765321,27 +765321,27 @@ sub_819B02C: ; 819B02C 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 str r0, [r5] - b @0819B11A + b _0819B11A .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 @@ -765353,30 +765353,30 @@ sub_819B02C: ; 819B02C strh r6, [r5, 0x8] ldr r0, =sub_819B378 str r0, [r5] - b @0819B11A + b _0819B11A .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} @@ -765400,35 +765400,35 @@ 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 .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 @@ -765436,16 +765436,16 @@ sub_819B124: ; 819B124 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 .pool -@0819B1BC: +_0819B1BC: ldr r4, =0x0300127c ldr r0, [r4] movs r1, 0xA8 @@ -765453,9 +765453,9 @@ sub_819B124: ; 819B124 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 @@ -765465,9 +765465,9 @@ sub_819B124: ; 819B124 adds r0, r5 lsls r0, 3 adds r0, r1 - b @0819B344 + b _0819B344 .pool -@0819B1EC: +_0819B1EC: ldr r2, =0x030022c0 ldrh r1, [r2, 0x2E] movs r7, 0x1 @@ -765475,7 +765475,7 @@ sub_819B124: ; 819B124 adds r0, r6, 0 ands r0, r1 cmp r0, 0 - beq @0819B27C + beq _0819B27C movs r0, 0x5 bl audio_play bl sub_819BC04 @@ -765483,16 +765483,16 @@ sub_819B124: ; 819B124 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 .pool -@0819B228: +_0819B228: cmp r0, 0x2 - bne @0819B248 + bne _0819B248 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -765502,11 +765502,11 @@ sub_819B124: ; 819B124 strh r1, [r0, 0x8] ldr r1, =sub_819B02C str r1, [r0] - b @0819B36E + b _0819B36E .pool -@0819B248: +_0819B248: cmp r1, 0x3 - bne @0819B260 + bne _0819B260 ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -765514,9 +765514,9 @@ sub_819B124: ; 819B124 adds r0, r1 movs r1, 0xB strh r1, [r0, 0x8] - b @0819B2BA + b _0819B2BA .pool -@0819B260: +_0819B260: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -765526,13 +765526,13 @@ sub_819B124: ; 819B124 strh r1, [r0, 0x8] ldr r1, =sub_819AE08 str r1, [r0] - b @0819B36E + b _0819B36E .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 @@ -765550,7 +765550,7 @@ sub_819B124: ; 819B124 ldr r0, [r4] ldr r1, =0x000002a2 adds r0, r1 -@0819B2AC: +_0819B2AC: strb r7, [r0] ldr r1, =0x03005e00 lsls r0, r5, 2 @@ -765558,34 +765558,34 @@ sub_819B124: ; 819B124 lsls r0, 3 adds r0, r1 strh r6, [r0, 0x8] -@0819B2BA: +_0819B2BA: ldr r1, =sub_819B378 str r1, [r0] - b @0819B36E + b _0819B36E .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 @@ -765593,12 +765593,12 @@ sub_819B124: ; 819B124 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 @@ -765614,19 +765614,19 @@ sub_819B124: ; 819B124 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 .pool -@0819B35C: +_0819B35C: bl sub_819B844 ldr r0, =0x03005e00 lsls r1, r5, 2 @@ -765634,9 +765634,9 @@ sub_819B124: ; 819B124 lsls r1, 3 adds r1, r0 movs r0, 0xC -@0819B36C: +_0819B36C: strh r0, [r1, 0x8] -@0819B36E: +_0819B36E: pop {r4-r7} pop {r0} bx r0 @@ -765655,7 +765655,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 @@ -765664,38 +765664,38 @@ 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 .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 .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] @@ -765707,40 +765707,40 @@ sub_819B378: ; 819B378 strh r0, [r4, 0x8] ldr r0, =sub_819B124 str r0, [r4] - b @0819B476 + b _0819B476 .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] @@ -765758,7 +765758,7 @@ sub_819B378: ; 819B378 movs r1, 0x1 strb r1, [r0] strh r6, [r4, 0x8] -@0819B476: +_0819B476: pop {r4-r7} pop {r0} bx r0 @@ -765813,10 +765813,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 @@ -765839,7 +765839,7 @@ sub_819B484: ; 819B484 mov r9, r2 movs r3, 0 mov r8, r3 -@0819B518: +_0819B518: ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r8 @@ -765863,16 +765863,16 @@ sub_819B484: ; 819B484 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 .pool -@0819B570: +_0819B570: ldr r0, [sp, 0x18] -@0819B572: +_0819B572: movs r1, 0 bl sub_81A6CA8 lsls r0, 24 @@ -765906,7 +765906,7 @@ sub_819B484: ; 819B484 movs r3, 0x1 add r8, r3 ldr r3, =0x0300127c -@0819B5B8: +_0819B5B8: ldr r0, [r3] adds r0, r4 adds r0, 0x8 @@ -765925,7 +765925,7 @@ sub_819B484: ; 819B484 lsrs r6, r0, 24 ldr r3, [sp, 0x20] cmp r6, 0x3 - bls @0819B5B8 + bls _0819B5B8 movs r0, 0x6C mov r4, r10 muls r4, r0 @@ -765954,9 +765954,9 @@ sub_819B484: ; 819B484 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 @@ -766000,7 +766000,7 @@ sub_819B63C: ; 819B63C mov r10, r3 movs r7, 0 mov r9, r7 -@0819B678: +_0819B678: ldr r0, =0x03005d90 ldr r1, [r0] mov r2, r9 @@ -766046,7 +766046,7 @@ sub_819B63C: ; 819B63C strb r3, [r0] movs r0, 0x1 add r9, r0 -@0819B6D4: +_0819B6D4: ldr r1, =0x0300127c ldr r0, [r1] adds r0, r4 @@ -766066,7 +766066,7 @@ sub_819B63C: ; 819B63C lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x3 - bls @0819B6D4 + bls _0819B6D4 movs r7, 0x6C adds r4, r6, 0 muls r4, r7 @@ -766096,7 +766096,7 @@ sub_819B63C: ; 819B63C lsrs r0, 24 mov r9, r0 cmp r0, 0x5 - bls @0819B678 + bls _0819B678 add sp, 0x14 pop {r3-r5} mov r8, r3 @@ -766120,11 +766120,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 @@ -766133,7 +766133,7 @@ sub_819B764: ; 819B764 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 @@ -766187,20 +766187,20 @@ sub_819B764: ; 819B764 ldr r2, =0x00000e78 adds r1, r2 strb r0, [r1] - b @0819B826 + b _0819B826 .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 @@ -766218,9 +766218,9 @@ sub_819B844: ; 819B844 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] @@ -766481,22 +766481,22 @@ sub_819BA64: ; 819BA64 ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x1 - bne @0819BA88 + bne _0819BA88 ldr r2, =gUnknown_085EEBC1 - b @0819BA9C + b _0819BA9C .pool -@0819BA88: +_0819BA88: cmp r0, 0x2 - bne @0819BA94 + bne _0819BA94 ldr r2, =gUnknown_085EEBDB - b @0819BA9C + b _0819BA9C .pool -@0819BA94: +_0819BA94: ldr r2, =gUnknown_085EEC2D cmp r0, 0x3 - bne @0819BA9C + bne _0819BA9C ldr r2, =gUnknown_085EEBF6 -@0819BA9C: +_0819BA9C: movs r0, 0x5 str r0, [sp] movs r0, 0 @@ -766569,7 +766569,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, =gUnknown_085EEC24 @@ -766579,9 +766579,9 @@ sub_819BAFC: ; 819BAFC movs r2, 0x7 movs r3, 0x11 bl box_print - b @0819BB74 + b _0819BB74 .pool -@0819BB60: +_0819BB60: str r4, [sp] str r5, [sp, 0x4] ldr r0, =gUnknown_085EEC10 @@ -766591,7 +766591,7 @@ sub_819BAFC: ; 819BAFC movs r2, 0x7 movs r3, 0x11 bl box_print -@0819BB74: +_0819BB74: ldr r0, =gUnknown_08610476 str r0, [sp] movs r0, 0 @@ -766684,17 +766684,17 @@ 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 .pool -@0819BC60: +_0819BC60: ldr r4, =0x0300127c ldr r1, [r4] movs r2, 0xA6 @@ -766712,13 +766712,13 @@ sub_819BC30: ; 819BC30 ldr r0, [r4] ldrb r0, [r0, 0x5] cmp r0, 0x3 - bhi @0819BC94 + bhi _0819BC94 movs r0, 0x1 - b @0819BC96 + b _0819BC96 .pool -@0819BC94: +_0819BC94: movs r0, 0x2 -@0819BC96: +_0819BC96: pop {r4} pop {r1} bx r1 @@ -766736,13 +766736,13 @@ sub_819BC9C: ; 819BC9C ldr r0, [r0] ldrb r0, [r0, 0x5] cmp r0, 0x3 - bhi @0819BCC4 + bhi _0819BCC4 movs r0, 0x1 - b @0819BCC6 + b _0819BCC6 .pool -@0819BCC4: +_0819BCC4: movs r0, 0x2 -@0819BCC6: +_0819BCC6: pop {r1} bx r1 thumb_func_end sub_819BC9C @@ -766782,7 +766782,7 @@ sub_819BCF8: ; 819BCF8 ldr r0, [r5] ldrb r4, [r0, 0x3] cmp r4, 0x5 - bhi @0819BD64 + bhi _0819BD64 movs r0, 0x5 bl PutWindowTilemap movs r0, 0x5 @@ -766822,7 +766822,7 @@ sub_819BCF8: ; 819BCF8 movs r0, 0x5 movs r1, 0x2 bl CopyWindowToVram -@0819BD64: +_0819BD64: add sp, 0x2C pop {r4,r5} pop {r0} @@ -767048,13 +767048,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 @@ -767063,7 +767063,7 @@ sub_819BF2C: ; 819BF2C 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 @@ -767139,20 +767139,20 @@ sub_819BF2C: ; 819BF2C adds r0, 0x29 movs r1, 0 strb r1, [r0] - b @0819C012 + b _0819C012 .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 @@ -767180,7 +767180,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] @@ -767195,7 +767195,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] @@ -767207,7 +767207,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] @@ -767249,7 +767249,7 @@ sub_819C040: ; 819C040 bl _call_via_r1 ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@0819C0DC: +_0819C0DC: pop {r4-r6} pop {r0} bx r0 @@ -767265,7 +767265,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] @@ -767280,7 +767280,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] @@ -767292,7 +767292,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 @@ -767345,7 +767345,7 @@ sub_819C100: ; 819C100 bl RemoveObjectAndFreeTiles adds r0, r5, 0 bl RemoveObjectAndFreeTiles -@0819C1BA: +_0819C1BA: pop {r4-r7} pop {r0} bx r0 @@ -767365,18 +767365,18 @@ 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 .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 @@ -767411,8 +767411,8 @@ sub_819C1D0: ; 819C1D0 movs r0, 0x4A movs r1, 0x37 bl SetGpuReg - b @0819C2C6 -@0819C24E: + b _0819C2C6 +_0819C24E: movs r0, 0x3 bl ShowBg ldr r1, =0x00001248 @@ -767421,9 +767421,9 @@ sub_819C1D0: ; 819C1D0 ldr r1, =0x0000040b movs r0, 0x52 bl SetGpuReg - b @0819C2C6 + b _0819C2C6 .pool -@0819C270: +_0819C270: ldrh r0, [r4, 0x12] subs r0, 0x4 strh r0, [r4, 0x12] @@ -767433,12 +767433,12 @@ sub_819C1D0: ; 819C1D0 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 @@ -767447,7 +767447,7 @@ sub_819C1D0: ; 819C1D0 lsls r1, 6 movs r0, 0 bl ResetGpuRegBits -@0819C29E: +_0819C29E: ldrh r1, [r4, 0x12] lsls r1, 8 ldrh r0, [r4, 0x18] @@ -767459,18 +767459,18 @@ sub_819C1D0: ; 819C1D0 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 @@ -767493,13 +767493,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 HideBg ldr r4, =0x02020630 @@ -767614,9 +767614,9 @@ sub_819C2D4: ; 819C2D4 bl ResetGpuRegBits adds r0, r7, 0 bl remove_task - b @0819C4A4 + b _0819C4A4 .pool -@0819C410: +_0819C410: movs r0, 0x10 strh r0, [r4, 0xE] movs r0, 0xE0 @@ -767651,8 +767651,8 @@ sub_819C2D4: ; 819C2D4 movs r0, 0x4A movs r1, 0x37 bl SetGpuReg - b @0819C49E -@0819C460: + b _0819C49E +_0819C460: ldrh r0, [r4, 0x12] adds r0, 0x4 strh r0, [r4, 0x12] @@ -767662,17 +767662,17 @@ sub_819C2D4: ; 819C2D4 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] @@ -767684,12 +767684,12 @@ sub_819C2D4: ; 819C2D4 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 @@ -767883,45 +767883,45 @@ 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 .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 @@ -767940,18 +767940,18 @@ 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 .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 @@ -767967,9 +767967,9 @@ sub_819C69C: ; 819C69C movs r1, 0x1 strb r1, [r0] strh r1, [r5, 0x8] - b @0819C7D8 + b _0819C7D8 .pool -@0819C6F8: +_0819C6F8: ldr r0, =0x0300127c ldr r3, [r0] ldr r2, =0x000002a2 @@ -767977,17 +767977,17 @@ sub_819C69C: ; 819C69C 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 .pool -@0819C724: +_0819C724: ldr r2, =0x000002a7 adds r1, r3, r2 ldrb r0, [r1] @@ -767997,30 +767997,30 @@ sub_819C69C: ; 819C69C 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 .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] @@ -768034,15 +768034,15 @@ sub_819C69C: ; 819C69C 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 .pool -@0819C790: +_0819C790: cmp r0, 0 - bne @0819C7D8 + bne _0819C7D8 ldr r1, =0x03005e00 lsls r0, r6, 2 adds r0, r6 @@ -768053,27 +768053,27 @@ sub_819C69C: ; 819C69C ldr r0, =0x000002a6 adds r1, r2, r0 movs r0, 0x1 - b @0819C7D6 + b _0819C7D6 .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 .pool -@0819C7D4: +_0819C7D4: adds r0, 0x1 -@0819C7D6: +_0819C7D6: strb r0, [r1] -@0819C7D8: +_0819C7D8: pop {r4-r7} pop {r0} bx r0 @@ -768228,18 +768228,18 @@ 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 .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 @@ -768249,8 +768249,8 @@ sub_819C90C: ; 819C90C bl pal_fade_maybe movs r0, 0x7 strh r0, [r6, 0x8] - b @0819C9F0 -@0819C950: + b _0819C9F0 +_0819C950: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -768258,7 +768258,7 @@ sub_819C90C: ; 819C90C lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @0819C9F0 + bne _0819C9F0 ldr r4, =0x03001284 ldr r0, [r4] adds r0, 0x21 @@ -768288,9 +768288,9 @@ sub_819C90C: ; 819C90C bl FreeAllWindowBuffers movs r0, 0x8 strh r0, [r6, 0x8] - b @0819C9F0 + b _0819C9F0 .pool -@0819C9C4: +_0819C9C4: adds r0, r2, 0 bl remove_task ldr r2, =0x03001284 @@ -768311,7 +768311,7 @@ sub_819C90C: ; 819C90C movs r0, 0 movs r3, 0x2 bl sub_81BF8EC -@0819C9F0: +_0819C9F0: add sp, 0x4 pop {r4-r6} pop {r0} @@ -768331,7 +768331,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 @@ -768340,51 +768340,51 @@ 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 .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 .pool -@0819CA68: +_0819CA68: movs r0, 0x2 strh r0, [r4, 0x8] ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b @0819CAFE + b _0819CAFE .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 @@ -768392,17 +768392,17 @@ sub_819CA08: ; 819CA08 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@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] @@ -768432,7 +768432,7 @@ sub_819CA08: ; 819CA08 bl SetMainCallback2 adds r0, r6, 0 bl remove_task -@0819CAFE: +_0819CAFE: add sp, 0x4 pop {r4-r7} pop {r0} @@ -768450,7 +768450,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 @@ -768459,77 +768459,77 @@ 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 .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 .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 @@ -768548,13 +768548,13 @@ 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 - b @0819CC16 + b _0819CC16 .pool -@0819CC04: +_0819CC04: movs r0, 0 strh r0, [r2, 0x8] ldr r1, =sub_819CE40 @@ -768564,7 +768564,7 @@ sub_819CBDC: ; 819CBDC movs r0, 0x1 strh r0, [r2, 0x12] ldr r0, =sub_819D770 -@0819CC16: +_0819CC16: str r0, [r2] pop {r0} bx r0 @@ -768584,7 +768584,7 @@ sub_819CC24: ; 819CC24 movs r0, 0x8 ldrsh r5, [r4, r0] cmp r5, 0 - bne @0819CC5A + bne _0819CC5A ldr r0, =gUnknown_085EECBB bl sub_819EBEC ldr r0, =0x03001284 @@ -768599,7 +768599,7 @@ sub_819CC24: ; 819CC24 strh r1, [r4, 0x16] ldr r0, =sub_819CB1C str r0, [r4] -@0819CC5A: +_0819CC5A: pop {r4,r5} pop {r0} bx r0 @@ -768626,13 +768626,13 @@ 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 - b @0819CCC2 + b _0819CCC2 .pool -@0819CCB0: +_0819CCB0: movs r0, 0 strh r0, [r2, 0x8] ldr r1, =sub_819CE40 @@ -768642,7 +768642,7 @@ sub_819CC74: ; 819CC74 movs r0, 0x1 strh r0, [r2, 0x12] ldr r0, =sub_819D770 -@0819CCC2: +_0819CCC2: str r0, [r2] pop {r4} pop {r0} @@ -768663,7 +768663,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 @@ -768685,7 +768685,7 @@ sub_819CCD4: ; 819CCD4 strh r1, [r5, 0x16] ldr r0, =sub_819CB1C str r0, [r5] -@0819CD1A: +_0819CD1A: pop {r4,r5} pop {r0} bx r0 @@ -768707,52 +768707,52 @@ 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 .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 .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 .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 @@ -768760,18 +768760,18 @@ sub_819CD34: ; 819CD34 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 .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] @@ -768790,26 +768790,26 @@ sub_819CD34: ; 819CD34 strh r1, [r5, 0x12] ldr r0, =sub_819D770 str r0, [r5] - b @0819CE36 + b _0819CE36 .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} @@ -768830,33 +768830,33 @@ 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 .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 .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 @@ -768868,13 +768868,13 @@ sub_819CE40: ; 819CE40 bl sub_819EAC0 adds r0, r6, 0 bl sub_819F184 - b @0819CF4C + b _0819CF4C .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 @@ -768891,48 +768891,48 @@ sub_819CE40: ; 819CE40 strh r5, [r4, 0x12] ldr r0, =sub_819D588 str r0, [r4] - b @0819CF4C + b _0819CF4C .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 @@ -768951,18 +768951,18 @@ 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 .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 @@ -768975,9 +768975,9 @@ sub_819CF54: ; 819CF54 movs r1, 0x1 strb r1, [r0] strh r1, [r4, 0x8] - b @0819D05C + b _0819D05C .pool -@0819CFA0: +_0819CFA0: ldr r1, =0x03001284 ldr r2, [r1] adds r0, r2, 0 @@ -768985,17 +768985,17 @@ sub_819CF54: ; 819CF54 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 .pool -@0819CFC4: +_0819CFC4: adds r1, r2, 0 adds r1, 0x27 ldrb r0, [r1] @@ -769006,25 +769006,25 @@ sub_819CF54: ; 819CF54 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] @@ -769037,14 +769037,14 @@ sub_819CF54: ; 819CF54 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 @@ -769055,27 +769055,27 @@ sub_819CF54: ; 819CF54 adds r1, r2, 0 adds r1, 0x26 movs r0, 0x1 - b @0819D05A + b _0819D05A .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 .pool -@0819D058: +_0819D058: adds r0, 0x1 -@0819D05A: +_0819D05A: strb r0, [r1] -@0819D05C: +_0819D05C: pop {r4-r6} pop {r0} bx r0 @@ -769094,49 +769094,49 @@ 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 .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 .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 .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] @@ -769147,7 +769147,7 @@ sub_819D064: ; 819D064 adds r1, 0x27 ldrb r0, [r1] cmp r0, 0x3 - bls @0819D108 + bls _0819D108 movs r0, 0 strb r0, [r1] ldr r1, =0x02037714 @@ -769164,7 +769164,7 @@ sub_819D064: ; 819D064 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] -@0819D108: +_0819D108: movs r0, 0x80 lsls r0, 7 ldr r1, [r2] @@ -769172,7 +769172,7 @@ sub_819D064: ; 819D064 ldrb r1, [r1] movs r2, 0 bl sub_80A2A20 -@0819D118: +_0819D118: pop {r4} pop {r0} bx r0 @@ -769199,31 +769199,31 @@ 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 .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] @@ -769244,7 +769244,7 @@ sub_819D12C: ; 819D12C 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] @@ -769255,19 +769255,19 @@ sub_819D12C: ; 819D12C 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 .pool -@0819D1D8: +_0819D1D8: cmp r5, 0x10 - bls @0819D210 + bls _0819D210 adds r0, r4, 0x1 add r0, r8 ldrb r1, [r0] @@ -769278,8 +769278,8 @@ sub_819D12C: ; 819D12C 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] @@ -769295,7 +769295,7 @@ sub_819D12C: ; 819D12C adds r2, 0xA strh r2, [r0, 0x20] mov r10, r3 -@0819D210: +_0819D210: mov r0, r9 asrs r2, r0, 24 adds r0, r2, 0x1 @@ -769308,7 +769308,7 @@ sub_819D12C: ; 819D12C movs r3, 0 ldrsh r0, [r0, r3] cmp r0, 0x1 - bne @0819D26A + bne _0819D26A ldr r1, =0x03001284 ldr r0, [r1] adds r0, 0x5 @@ -769326,20 +769326,20 @@ sub_819D12C: ; 819D12C lsls r0, 4 adds r0, 0x48 cmp r3, r0 - ble @0819D260 + ble _0819D260 strh r0, [r1, 0x20] movs r7, 0x1 - b @0819D26C + b _0819D26C .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] @@ -769356,7 +769356,7 @@ sub_819D12C: ; 819D12C ldrsh r0, [r1, r3] subs r0, 0x10 cmp r0, 0xF0 - ble @0819D2F8 + ble _0819D2F8 ldrh r0, [r1, 0x20] lsls r0, 24 lsrs r0, 24 @@ -769365,7 +769365,7 @@ sub_819D12C: ; 819D12C strh r0, [r1, 0x20] ldrb r0, [r2, 0x14] cmp r0, 0x1 - bne @0819D2C0 + bne _0819D2C0 movs r0, 0x65 bl IndexOfObjectPaletteTag ldr r1, [r5] @@ -769376,9 +769376,9 @@ sub_819D12C: ; 819D12C adds r2, r1 lsls r2, 2 adds r2, r6 - b @0819D2D8 + b _0819D2D8 .pool -@0819D2C0: +_0819D2C0: movs r0, 0x64 bl IndexOfObjectPaletteTag ldr r2, =0x03001284 @@ -769390,7 +769390,7 @@ sub_819D12C: ; 819D12C adds r2, r1 lsls r2, 2 add r2, r10 -@0819D2D8: +_0819D2D8: lsls r0, 4 ldrb r3, [r2, 0x5] movs r1, 0xF @@ -769407,20 +769407,20 @@ sub_819D12C: ; 819D12C 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 @@ -769453,22 +769453,22 @@ 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 .pool -@0819D368: +_0819D368: ldr r3, =0x02020630 ldr r2, =0x03001284 ldr r0, [r2] @@ -769479,7 +769479,7 @@ sub_819D324: ; 819D324 adds r0, r3 ldrh r0, [r0, 0x20] cmp r5, 0 - bne @0819D39C + bne _0819D39C lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -769487,12 +769487,12 @@ sub_819D324: ; 819D324 adds r0, r1 movs r1, 0x1 cmp r0, 0xEF - ble @0819D3B2 + ble _0819D3B2 movs r1, 0 movs r0, 0xF0 - b @0819D3B0 + b _0819D3B0 .pool -@0819D39C: +_0819D39C: lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -769500,22 +769500,22 @@ sub_819D324: ; 819D324 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 @@ -769534,14 +769534,14 @@ sub_819D324: ; 819D324 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 .pool -@0819D3FC: +_0819D3FC: movs r4, 0 lsls r1, r7, 2 mov r12, r1 @@ -769551,7 +769551,7 @@ sub_819D324: ; 819D324 add r0, r8 mov r9, r0 ldr r5, =0x02020630 -@0819D40E: +_0819D40E: ldr r1, =0x03001284 ldr r2, [r1] lsls r3, r4, 1 @@ -769588,7 +769588,7 @@ sub_819D324: ; 819D324 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @0819D40E + bls _0819D40E mov r1, r12 adds r0, r1, r7 lsls r0, 3 @@ -769602,9 +769602,9 @@ sub_819D324: ; 819D324 strh r1, [r0, 0xE] adds r0, r7, 0 bl remove_task - b @0819D570 + b _0819D570 .pool -@0819D480: +_0819D480: ldr r2, =0x02020630 ldr r0, =0x03001284 ldr r0, [r0] @@ -769615,7 +769615,7 @@ sub_819D324: ; 819D324 adds r0, r2 ldrh r0, [r0, 0x20] cmp r5, 0 - bne @0819D4B4 + bne _0819D4B4 lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -769623,12 +769623,12 @@ sub_819D324: ; 819D324 adds r0, r1 movs r1, 0x1 cmp r0, 0xEF - ble @0819D4CA + ble _0819D4CA movs r1, 0 movs r0, 0xF0 - b @0819D4C8 + b _0819D4C8 .pool -@0819D4B4: +_0819D4B4: lsls r0, 16 asrs r0, 16 lsls r2, r4, 24 @@ -769636,22 +769636,22 @@ sub_819D324: ; 819D324 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 @@ -769669,14 +769669,14 @@ sub_819D324: ; 819D324 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 .pool -@0819D510: +_0819D510: movs r4, 0 lsls r1, r7, 2 mov r12, r1 @@ -769685,7 +769685,7 @@ sub_819D324: ; 819D324 ldr r5, =0x02020630 ldr r0, =0x03001284 mov r9, r0 -@0819D520: +_0819D520: mov r1, r9 ldr r2, [r1] lsls r3, r4, 1 @@ -769711,7 +769711,7 @@ sub_819D324: ; 819D324 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @0819D520 + bls _0819D520 mov r1, r12 adds r0, r1, r7 lsls r0, 3 @@ -769725,7 +769725,7 @@ sub_819D324: ; 819D324 strh r1, [r0, 0x10] adds r0, r7, 0 bl remove_task -@0819D570: +_0819D570: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -769753,24 +769753,24 @@ 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 .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, =gUnknown_08610918 movs r1, 0xE0 movs r2, 0xA @@ -769778,9 +769778,9 @@ sub_819D588: ; 819D588 bl sub_819ED34 movs r0, 0x5 bl PutWindowTilemap - b @0819D622 + b _0819D622 .pool -@0819D5F0: +_0819D5F0: movs r0, 0x3 bl sub_819EA64 ldr r0, =0x03005e00 @@ -769791,9 +769791,9 @@ sub_819D588: ; 819D588 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @0819D762 + b _0819D762 .pool -@0819D60C: +_0819D60C: movs r0, 0x80 lsls r0, 7 ldr r1, =gUnknown_0860F13C @@ -769804,7 +769804,7 @@ sub_819D588: ; 819D588 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe -@0819D622: +_0819D622: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -769813,9 +769813,9 @@ sub_819D588: ; 819D588 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @0819D762 + b _0819D762 .pool -@0819D63C: +_0819D63C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -769823,9 +769823,9 @@ sub_819D588: ; 819D588 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 FillWindowPixelBuffer @@ -769836,7 +769836,7 @@ sub_819D588: ; 819D588 ldr r0, [r0] ldrb r0, [r0, 0x14] cmp r0, 0x1 - bne @0819D6B0 + bne _0819D6B0 ldr r0, =sub_819D324 movs r1, 0 bl AddTask @@ -769862,9 +769862,9 @@ sub_819D588: ; 819D588 ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b @0819D762 + b _0819D762 .pool -@0819D6B0: +_0819D6B0: ldr r0, =sub_819D324 movs r1, 0 bl AddTask @@ -769890,9 +769890,9 @@ sub_819D588: ; 819D588 ldrh r0, [r2, 0x8] adds r0, 0x2 strh r0, [r2, 0x8] - b @0819D762 + b _0819D762 .pool -@0819D6F0: +_0819D6F0: lsls r0, r5, 2 adds r0, r5 lsls r0, 3 @@ -769902,7 +769902,7 @@ sub_819D588: ; 819D588 movs r2, 0xC ldrsh r7, [r6, r2] cmp r7, 0 - bne @0819D734 + bne _0819D734 ldr r0, =sub_819D324 movs r1, 0 bl AddTask @@ -769922,13 +769922,13 @@ sub_819D588: ; 819D588 ldrh r0, [r6, 0x8] adds r0, 0x1 strh r0, [r6, 0x8] - b @0819D762 + b _0819D762 .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 @@ -769937,11 +769937,11 @@ sub_819D588: ; 819D588 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] @@ -769949,7 +769949,7 @@ sub_819D588: ; 819D588 lsls r0, 16 orrs r0, r1 str r0, [r2] -@0819D762: +_0819D762: add sp, 0x4 pop {r3} mov r8, r3 @@ -769972,9 +769972,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 @@ -769985,31 +769985,31 @@ sub_819D770: ; 819D770 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 .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 movs r1, 0 bl AddTask @@ -770035,9 +770035,9 @@ sub_819D770: ; 819D770 ldrh r0, [r2, 0x8] adds r0, 0x1 strh r0, [r2, 0x8] - b @0819D9D8 + b _0819D9D8 .pool -@0819D828: +_0819D828: ldr r0, =sub_819D324 movs r1, 0 bl AddTask @@ -770063,9 +770063,9 @@ sub_819D770: ; 819D770 ldrh r0, [r2, 0x8] adds r0, 0x2 strh r0, [r2, 0x8] - b @0819D9D8 + b _0819D9D8 .pool -@0819D868: +_0819D868: adds r0, r5, r6 lsls r0, 3 mov r1, r8 @@ -770074,7 +770074,7 @@ sub_819D770: ; 819D770 movs r2, 0xC ldrsh r7, [r5, r2] cmp r7, 0 - bne @0819D8A8 + bne _0819D8A8 ldr r0, =sub_819D324 movs r1, 0 bl AddTask @@ -770094,13 +770094,13 @@ sub_819D770: ; 819D770 ldrh r0, [r5, 0x8] adds r0, 0x1 strh r0, [r5, 0x8] - b @0819D9D8 + b _0819D9D8 .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 @@ -770108,15 +770108,15 @@ sub_819D770: ; 819D770 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, =gUnknown_0860F13C adds r0, 0x4A @@ -770131,9 +770131,9 @@ sub_819D770: ; 819D770 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] - b @0819D9D8 + b _0819D9D8 .pool -@0819D8F4: +_0819D8F4: movs r0, 0x80 lsls r0, 7 ldr r1, =gUnknown_0860F13C @@ -770144,52 +770144,52 @@ sub_819D770: ; 819D770 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @0819D990 + b _0819D990 .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 .pool -@0819D928: +_0819D928: movs r0, 0x1 bl sub_819EDBC movs r0, 0x3 bl PutWindowTilemap - b @0819D990 -@0819D936: + b _0819D990 +_0819D936: movs r0, 0x5 movs r1, 0 bl FillWindowPixelBuffer movs r0, 0x5 movs r1, 0x2 bl CopyWindowToVram - 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, =gUnknown_085EEC73 bl sub_819EBEC - b @0819D96A + b _0819D96A .pool -@0819D964: +_0819D964: ldr r0, =gUnknown_085EEC8B 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 @@ -770202,9 +770202,9 @@ sub_819D770: ; 819D770 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 @@ -770212,9 +770212,9 @@ sub_819D770: ; 819D770 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @0819D9D8 + b _0819D9D8 .pool -@0819D9B0: +_0819D9B0: bl sub_819EEF0 bl sub_819EADC ldr r0, =0x03001284 @@ -770233,7 +770233,7 @@ sub_819D770: ; 819D770 lsls r1, 16 orrs r1, r2 str r1, [r0] -@0819D9D8: +_0819D9D8: add sp, 0x4 pop {r3} mov r8, r3 @@ -770253,9 +770253,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 @@ -770266,31 +770266,31 @@ sub_819D9EC: ; 819D9EC 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 .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 .pool -@0819DA58: +_0819DA58: bl sub_819EADC ldr r2, =0x02020630 ldr r0, =0x03001284 @@ -770309,9 +770309,9 @@ sub_819D9EC: ; 819D9EC adds r1, r7, r6 lsls r1, 3 adds r1, r0 - b @0819DB96 + b _0819DB96 .pool -@0819DA8C: +_0819DA8C: ldr r0, =sub_819D12C movs r1, 0 bl AddTask @@ -770326,16 +770326,16 @@ sub_819D9EC: ; 819D9EC adds r0, r2 ldr r1, =sub_819D064 str r1, [r0] - b @0819DB90 + b _0819DB90 .pool -@0819DABC: +_0819DABC: ldr r0, =sub_819D12C 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] @@ -770348,23 +770348,23 @@ sub_819D9EC: ; 819D9EC 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 .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 @@ -770381,8 +770381,8 @@ sub_819D9EC: ; 819D9EC 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] @@ -770430,17 +770430,17 @@ sub_819D9EC: ; 819D9EC 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 .pool -@0819DBB0: +_0819DBB0: adds r0, r7, r6 lsls r0, 3 adds r0, r3 @@ -770454,7 +770454,7 @@ sub_819D9EC: ; 819D9EC strh r1, [r0, 0x12] ldr r1, =sub_819D770 str r1, [r0] -@0819DBCA: +_0819DBCA: pop {r4-r7} pop {r0} bx r0 @@ -770467,7 +770467,7 @@ sub_819DBD8: ; 819DBD8 ldr r5, =0x03001284 ldr r4, [r5] cmp r4, 0 - bne @0819DBF6 + bne _0819DBF6 movs r0, 0x34 bl AllocZeroed str r0, [r5] @@ -770477,7 +770477,7 @@ sub_819DBD8: ; 819DBD8 strb r4, [r0] ldr r0, [r5] strb r4, [r0, 0x15] -@0819DBF6: +_0819DBF6: pop {r4,r5} pop {r0} bx r0 @@ -770508,34 +770508,34 @@ 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 .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 @@ -770560,9 +770560,9 @@ sub_819DC1C: ; 819DC1C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819E00E + b _0819E00E .pool -@0819DCD4: +_0819DCD4: ldr r5, =0x0203ce40 movs r4, 0x88 lsls r4, 3 @@ -770639,9 +770639,9 @@ sub_819DC1C: ; 819DC1C movs r0, 0x4A movs r1, 0 bl SetGpuReg - b @0819E006 + b _0819E006 .pool -@0819DDA8: +_0819DDA8: bl sub_80A1A74 bl ResetAllObjectData bl clear_tasks @@ -770702,9 +770702,9 @@ sub_819DC1C: ; 819DC1C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819E00E + b _0819E00E .pool -@0819DE68: +_0819DE68: ldr r0, =0x0203ce4c ldr r1, [r0] movs r0, 0x3 @@ -770719,9 +770719,9 @@ sub_819DC1C: ; 819DC1C bl CopyToBgTilemapBufferRect movs r0, 0x3 bl CopyBgTilemapBufferToVram - b @0819E006 + b _0819E006 .pool -@0819DE94: +_0819DE94: ldr r0, =gUnknown_086106B0 bl LoadTaggedObjectPalettes ldr r0, =gUnknown_08610650 @@ -770734,38 +770734,38 @@ sub_819DC1C: ; 819DC1C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819E00E + b _0819E00E .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 .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 .pool -@0819DF10: +_0819DF10: ldr r0, =gUnknown_085EEC73 bl sub_819EBEC movs r0, 0x2 @@ -770774,49 +770774,49 @@ sub_819DC1C: ; 819DC1C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819E00E + b _0819E00E .pool -@0819DF30: +_0819DF30: bl sub_819EFA8 movs r0, 0x8 bl PutWindowTilemap - 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 PutWindowTilemap ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819E00E + b _0819E00E .pool -@0819DF64: +_0819DF64: bl sub_819EB18 movs r0, 0 bl PutWindowTilemap - 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 .pool -@0819DF8C: +_0819DF8C: bl sub_819ED78 movs r0, 0x3 bl PutWindowTilemap @@ -770824,9 +770824,9 @@ sub_819DC1C: ; 819DC1C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @0819E00E + b _0819E00E .pool -@0819DFA4: +_0819DFA4: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -770848,7 +770848,7 @@ sub_819DC1C: ; 819DC1C ldr r0, [r0] ldrb r0, [r0, 0x15] cmp r0, 0x1 - bne @0819E000 + bne _0819E000 movs r0, 0x3 bl ShowBg ldr r1, =0x00001248 @@ -770857,23 +770857,23 @@ sub_819DC1C: ; 819DC1C ldr r1, =0x0000040b movs r0, 0x52 bl SetGpuReg - b @0819E006 + b _0819E006 .pool -@0819E000: +_0819E000: movs r0, 0x3 bl HideBg -@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 .pool -@0819E01C: +_0819E01C: ldr r0, =sub_819CF54 movs r1, 0 bl AddTask @@ -770884,7 +770884,7 @@ sub_819DC1C: ; 819DC1C ldr r0, [r6] ldrb r5, [r0, 0x15] cmp r5, 0 - bne @0819E06C + bne _0819E06C ldr r4, =0x03005e00 adds r0, 0x21 ldrb r1, [r0] @@ -770903,9 +770903,9 @@ sub_819DC1C: ; 819DC1C lsls r0, 3 adds r0, r4 strh r5, [r0, 0x8] - b @0819E0A4 + b _0819E0A4 .pool -@0819E06C: +_0819E06C: bl sub_819EAF8 ldr r4, =0x03005e00 ldr r2, [r6] @@ -770932,10 +770932,10 @@ sub_819DC1C: ; 819DC1C adds r0, r4 movs r1, 0x2 strh r1, [r0, 0x8] -@0819E0A4: +_0819E0A4: ldr r0, =sub_819C7E0 bl SetMainCallback2 -@0819E0AA: +_0819E0AA: add sp, 0xC pop {r4-r6} pop {r0} @@ -770964,7 +770964,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 @@ -770993,7 +770993,7 @@ sub_819E0C0: ; 819E0C0 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls @0819E0E6 + bls _0819E0E6 ldr r7, =0x03001284 ldr r1, [r7] adds r0, r1, 0x5 @@ -771087,10 +771087,10 @@ sub_819E0C0: ; 819E0C0 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, =gUnknown_0861084C ldm r0!, {r3-r5} @@ -771245,7 +771245,7 @@ sub_819E0C0: ; 819E0C0 movs r7, 0 movs r0, 0x4 mov r10, r0 -@0819E330: +_0819E330: ldr r0, [r4] lsls r3, r6, 1 adds r2, r3, r6 @@ -771423,9 +771423,9 @@ sub_819E0C0: ; 819E0C0 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 @@ -771437,9 +771437,9 @@ sub_819E0C0: ; 819E0C0 movs r3, 0x5 negs r3, r3 adds r0, r3, 0 - b @0819E4C8 + b _0819E4C8 .pool -@0819E4C8: +_0819E4C8: ands r0, r2 strb r0, [r1] mov r1, r8 @@ -771502,7 +771502,7 @@ sub_819E0C0: ; 819E0C0 sub_819E538: ; 819E538 push {r4-r7,lr} movs r5, 0 -@0819E53C: +_0819E53C: ldr r6, =0x03001284 ldr r0, [r6] adds r0, 0x5 @@ -771518,7 +771518,7 @@ sub_819E538: ; 819E538 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 @@ -771541,10 +771541,10 @@ sub_819E538: ; 819E538 adds r0, r4 bl RemoveObjectAndFreeTiles movs r5, 0 -@0819E590: +_0819E590: movs r4, 0 lsls r6, r5, 1 -@0819E594: +_0819E594: ldr r0, =0x03001284 ldr r0, [r0] adds r1, r6, r5 @@ -771562,18 +771562,18 @@ sub_819E538: ; 819E538 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 @@ -771590,11 +771590,11 @@ sub_819E538: ; 819E538 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 @@ -771607,7 +771607,7 @@ sub_819E608: ; 819E608 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bhi @0819E65C + bhi _0819E65C ldr r4, =0x02020630 ldr r5, =0x03001284 ldr r0, [r5] @@ -771638,9 +771638,9 @@ sub_819E608: ; 819E608 adds r0, r4 ldrh r0, [r0, 0x20] strh r0, [r1, 0x20] - b @0819E684 + b _0819E684 .pool -@0819E65C: +_0819E65C: ldr r2, =0x02020630 ldr r3, =0x03001284 ldr r0, [r3] @@ -771660,7 +771660,7 @@ sub_819E608: ; 819E608 adds r0, r1 ldrb r0, [r0] bl sub_819E838 -@0819E684: +_0819E684: pop {r4-r6} pop {r0} bx r0 @@ -771677,31 +771677,31 @@ 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 .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 .pool -@0819E6D4: +_0819E6D4: ldrb r0, [r2, 0x17] subs r0, 0x1 -@0819E6D8: +_0819E6D8: strb r0, [r2, 0x3] ldr r0, [r1] ldrb r0, [r0, 0x3] @@ -771721,48 +771721,48 @@ 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 .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 .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 @@ -771776,32 +771776,32 @@ 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 .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 .pool -@0819E78C: +_0819E78C: movs r0, 0x1 -@0819E78E: +_0819E78E: strb r0, [r1, 0x16] ldr r3, =0x02020630 ldr r2, [r2] @@ -771838,32 +771838,32 @@ 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 .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 .pool -@0819E800: +_0819E800: movs r0, 0x2 -@0819E802: +_0819E802: strb r0, [r1] ldr r3, =0x02020630 ldr r2, [r2] @@ -771908,9 +771908,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] @@ -771927,7 +771927,7 @@ sub_819E838: ; 819E838 ands r0, r2 strb r0, [r1] cmp r4, 0x1 - bhi @0819E8D4 + bhi _0819E8D4 ldr r0, [r3] adds r0, 0x10 adds r0, r4 @@ -771936,13 +771936,13 @@ sub_819E838: ; 819E838 adds r0, r1 lsls r0, 2 adds r0, r5 - b @0819E8CA + b _0819E8CA .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 @@ -771956,7 +771956,7 @@ sub_819E838: ; 819E838 mov r0, r9 ands r0, r2 strb r0, [r1] -@0819E8BA: +_0819E8BA: ldr r0, [r7] adds r0, 0xB adds r0, r4 @@ -771965,18 +771965,18 @@ sub_819E838: ; 819E838 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 @@ -771993,7 +771993,7 @@ sub_819E8EC: ; 819E8EC ldr r4, =0x03001284 adds r6, r5, 0 movs r3, 0x4 -@0819E8F8: +_0819E8F8: ldr r0, [r4] adds r0, 0xB adds r0, r2 @@ -772007,7 +772007,7 @@ sub_819E8EC: ; 819E8EC orrs r1, r3 strb r1, [r0] cmp r2, 0x1 - bhi @0819E92C + bhi _0819E92C ldr r0, [r4] adds r0, 0x10 adds r0, r2 @@ -772020,12 +772020,12 @@ sub_819E8EC: ; 819E8EC 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 @@ -772040,15 +772040,15 @@ sub_819E944: ; 819E944 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 .pool -@0819E95C: +_0819E95C: movs r0, 0 strb r0, [r3] -@0819E960: +_0819E960: ldr r4, =0x02020630 ldr r2, [r5] ldrb r1, [r2, 0x1] @@ -772302,27 +772302,27 @@ sub_819EB4C: ; 819EB4C ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 - bls @0819EB70 + bls _0819EB70 movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram - b @0819EBD4 + b _0819EBD4 .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 .pool -@0819EB84: +_0819EB84: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 -@0819EB8A: +_0819EB8A: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -772355,7 +772355,7 @@ sub_819EB4C: ; 819EB4C movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram -@0819EBD4: +_0819EBD4: add sp, 0xC pop {r4} pop {r0} @@ -772521,19 +772521,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, =gUnknown_085EECD1 movs r1, 0 movs r2, 0x5 bl sub_819ECF0 -@0819ED56: +_0819ED56: ldr r0, =gUnknown_085EECDD movs r1, 0x18 movs r2, 0x5 bl sub_819ECF0 -@0819ED60: +_0819ED60: movs r0, 0x5 movs r1, 0x3 bl CopyWindowToVram @@ -772552,19 +772552,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, =gUnknown_085EECD1 movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 -@0819ED9A: +_0819ED9A: ldr r0, =gUnknown_085EECDD movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 -@0819EDA4: +_0819EDA4: movs r0, 0x3 movs r1, 0x3 bl CopyWindowToVram @@ -772579,28 +772579,28 @@ sub_819EDBC: ; 819EDBC 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, =gUnknown_085EECD1 movs r1, 0x8 movs r2, 0x3 bl sub_819ECF0 - b @0819EDF6 + b _0819EDF6 .pool -@0819EDEC: +_0819EDEC: ldr r0, =gUnknown_085EECDD movs r1, 0x20 movs r2, 0x3 bl sub_819ECF0 -@0819EDF6: +_0819EDF6: movs r0, 0x3 movs r1, 0x3 bl CopyWindowToVram @@ -772621,7 +772621,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 @@ -772629,13 +772629,13 @@ sub_819EE08: ; 819EE08 adds r1, r2 ldrh r1, [r1] strh r1, [r0, 0x8] - b @0819EE42 + b _0819EE42 .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 @@ -772649,27 +772649,27 @@ sub_819EE08: ; 819EE08 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 - bls @0819EE74 + bls _0819EE74 movs r0, 0x7 movs r1, 0x3 bl CopyWindowToVram - b @0819EED8 + b _0819EED8 .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 .pool -@0819EE88: +_0819EE88: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 -@0819EE8E: +_0819EE8E: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -772702,7 +772702,7 @@ sub_819EE08: ; 819EE08 movs r0, 0x7 movs r1, 0x3 bl CopyWindowToVram -@0819EED8: +_0819EED8: add sp, 0x18 pop {r4} pop {r0} @@ -772726,27 +772726,27 @@ sub_819EEF0: ; 819EEF0 ldr r1, [r0] ldrb r0, [r1, 0x3] cmp r0, 0x2 - bls @0819EF2C + bls _0819EF2C movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram - b @0819EF90 + b _0819EF90 .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 .pool -@0819EF40: +_0819EF40: movs r0, 0x64 muls r0, r2 ldr r1, =0x02024744 -@0819EF46: +_0819EF46: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -772779,7 +772779,7 @@ sub_819EEF0: ; 819EEF0 movs r0, 0x1 movs r1, 0x3 bl CopyWindowToVram -@0819EF90: +_0819EF90: add sp, 0xC pop {r4} pop {r0} @@ -772799,29 +772799,29 @@ sub_819EFA8: ; 819EFA8 movs r1, 0 bl FillWindowPixelBuffer cmp r4, 0x2 - bls @0819EFD0 + bls _0819EFD0 movs r0, 0x8 movs r1, 0x2 bl CopyWindowToVram - b @0819F03A + b _0819F03A .pool -@0819EFD0: +_0819EFD0: movs r0, 0x8 bl PutWindowTilemap 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 .pool -@0819EFEC: +_0819EFEC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 -@0819EFF2: +_0819EFF2: adds r0, r1 movs r1, 0xB movs r2, 0 @@ -772852,7 +772852,7 @@ sub_819EFA8: ; 819EFA8 movs r0, 0x8 movs r1, 0x2 bl CopyWindowToVram -@0819F03A: +_0819F03A: add sp, 0x2C pop {r4-r6} pop {r0} @@ -772869,14 +772869,14 @@ 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 .pool -@0819F068: +_0819F068: strb r2, [r3, 0x14] ldr r0, [r4] strb r2, [r0, 0x3] @@ -772885,9 +772885,9 @@ sub_819F048: ; 819F048 strb r0, [r1, 0x17] ldr r1, [r4] ldr r0, =gUnknown_08610928 - b @0819F092 + b _0819F092 .pool -@0819F080: +_0819F080: movs r1, 0 strb r2, [r3, 0x14] ldr r0, [r4] @@ -772897,9 +772897,9 @@ sub_819F048: ; 819F048 strb r0, [r1, 0x17] ldr r1, [r4] ldr r0, =gUnknown_08610948 -@0819F092: +_0819F092: str r0, [r1, 0x18] -@0819F094: +_0819F094: pop {r4} pop {r0} bx r0 @@ -773083,7 +773083,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 @@ -773095,15 +773095,15 @@ sub_819F20C: ; 819F20C strh r2, [r0, 0x16] movs r1, 0x2 strh r1, [r0, 0x12] - b @0819F292 + b _0819F292 .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 @@ -773119,9 +773119,9 @@ sub_819F20C: ; 819F20C strh r1, [r0, 0x8] strh r4, [r0, 0x12] ldr r1, =sub_819F488 - b @0819F29E + b _0819F29E .pool -@0819F278: +_0819F278: ldr r4, =0x03005e00 lsls r5, r6, 2 adds r0, r5, r6 @@ -773135,14 +773135,14 @@ sub_819F20C: ; 819F20C 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 -@0819F29E: +_0819F29E: str r1, [r0] pop {r4-r6} pop {r0} @@ -773377,7 +773377,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 @@ -773387,21 +773387,21 @@ 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 .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, =gUnknown_085EED0A bl sub_819EBEC ldr r0, =0x03001284 @@ -773409,20 +773409,20 @@ sub_819F488: ; 819F488 adds r0, 0x20 movs r1, 0 strb r1, [r0] - b @0819F54E + b _0819F54E .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 @@ -773431,25 +773431,25 @@ sub_819F488: ; 819F488 adds r1, 0x30 movs r2, 0x1 bl sub_819F3F8 - b @0819F54E + b _0819F54E .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 FillWindowPixelBuffer movs r0, 0x5 movs r1, 0x2 bl CopyWindowToVram - b @0819F54E -@0819F548: + b _0819F54E +_0819F548: ldr r0, =gUnknown_085EEC8B bl sub_819EBEC -@0819F54E: +_0819F54E: ldr r0, =0x03005e00 adds r1, r5, r4 lsls r1, 3 @@ -773457,9 +773457,9 @@ sub_819F488: ; 819F488 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @0819F58A + b _0819F58A .pool -@0819F568: +_0819F568: bl sub_819EEF0 bl sub_819EADC ldr r0, =0x03001284 @@ -773475,7 +773475,7 @@ sub_819F488: ; 819F488 strh r1, [r0, 0x8] ldr r1, =sub_819CE40 str r1, [r0] -@0819F58A: +_0819F58A: pop {r4,r5} pop {r0} bx r0 @@ -773497,12 +773497,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 @@ -773513,18 +773513,18 @@ sub_819F59C: ; 819F59C lsls r0, 16 lsrs r0, 16 cmp r0, r5 - bne @0819F5EC + bne _0819F5EC movs r0, 0x1 - b @0819F5F8 + b _0819F5F8 .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 @@ -773539,7 +773539,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] @@ -773562,7 +773562,7 @@ sub_819F600: ; 819F600 bl _call_via_r1 ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@0819F640: +_0819F640: pop {r4} pop {r0} bx r0 @@ -773578,7 +773578,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 @@ -773586,21 +773586,21 @@ 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 .pool -@0819F688: +_0819F688: movs r0, 0 bl sub_819BE20 -@0819F68E: +_0819F68E: adds r0, r4, 0 bl RemoveObjectAndFreeTiles -@0819F694: +_0819F694: pop {r4} pop {r0} bx r0 @@ -773619,18 +773619,18 @@ 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 .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 @@ -773665,8 +773665,8 @@ sub_819F69C: ; 819F69C movs r0, 0x4A movs r1, 0x37 bl SetGpuReg - b @0819F7A6 -@0819F71A: + b _0819F7A6 +_0819F71A: movs r0, 0x3 bl ShowBg ldr r1, =0x00001248 @@ -773675,9 +773675,9 @@ sub_819F69C: ; 819F69C ldr r1, =0x0000040b movs r0, 0x52 bl SetGpuReg - b @0819F7A6 + b _0819F7A6 .pool -@0819F73C: +_0819F73C: ldrh r0, [r4, 0x12] subs r0, 0x4 strh r0, [r4, 0x12] @@ -773687,17 +773687,17 @@ sub_819F69C: ; 819F69C 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] @@ -773709,9 +773709,9 @@ sub_819F69C: ; 819F69C 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 @@ -773722,18 +773722,18 @@ sub_819F69C: ; 819F69C movs r2, 0x16 ldrsh r0, [r1, r2] cmp r0, 0x1 - bne @0819F7A0 + bne _0819F7A0 bl sub_819F8E0 - b @0819F7AC + b _0819F7AC .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 @@ -773752,9 +773752,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 HideBg ldr r3, =0x02020630 @@ -773802,9 +773802,9 @@ sub_819F7B4: ; 819F7B4 bl ResetGpuRegBits adds r0, r5, 0 bl remove_task - b @0819F8D8 + b _0819F8D8 .pool -@0819F844: +_0819F844: movs r0, 0x58 strh r0, [r4, 0xE] movs r0, 0x98 @@ -773839,8 +773839,8 @@ sub_819F7B4: ; 819F7B4 movs r0, 0x4A movs r1, 0x37 bl SetGpuReg - b @0819F8D2 -@0819F894: + b _0819F8D2 +_0819F894: ldrh r0, [r4, 0x12] adds r0, 0x4 strh r0, [r4, 0x12] @@ -773850,17 +773850,17 @@ sub_819F7B4: ; 819F7B4 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] @@ -773872,12 +773872,12 @@ sub_819F7B4: ; 819F7B4 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 @@ -773891,19 +773891,19 @@ sub_819F8E0: ; 819F8E0 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 .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 @@ -773988,8 +773988,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 @@ -773999,10 +773999,10 @@ sub_819F99C: ; 819F99C 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 @@ -774064,7 +774064,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] @@ -774074,7 +774074,7 @@ sub_819FA5C: ; 819FA5C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls @0819FA6A + bls _0819FA6A adds r1, r3, 0 adds r1, 0x38 movs r0, 0xFF @@ -774113,7 +774113,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 @@ -774122,7 +774122,7 @@ sub_819FAA0: ; 819FAA0 mov r9, r4 adds r0, r7, r3 lsls r3, r0, 2 -@0819FAD6: +_0819FAD6: ldr r1, [r5] lsls r0, r2, 1 adds r0, r3 @@ -774138,7 +774138,7 @@ sub_819FAA0: ; 819FAA0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x5 - bls @0819FAD6 + bls _0819FAD6 ldr r2, [r5] mov r0, r12 adds r3, r7, r0 @@ -774180,7 +774180,7 @@ sub_819FAA0: ; 819FAA0 ldr r6, =0x03005d90 movs r4, 0x88 lsls r4, 1 -@0819FB48: +_0819FB48: ldr r0, [r6] adds r1, r2, r3 adds r0, r4 @@ -774191,7 +774191,7 @@ sub_819FAA0: ; 819FAA0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls @0819FB48 + bls _0819FB48 ldr r0, [r5] mov r3, r12 adds r2, r7, r3 @@ -774214,7 +774214,7 @@ sub_819FAA0: ; 819FAA0 lsrs r0, 24 mov r12, r0 cmp r0, 0x3 - bls @0819FAC6 + bls _0819FAC6 bl sub_81A087C pop {r3-r5} mov r8, r3 @@ -774249,10 +774249,10 @@ sub_819FBC8: ; 819FBC8 adds r0, 0xDE ldrb r0, [r0] cmp r0, 0 - bne @0819FC10 + bne _0819FC10 adds r4, r2, 0 ldr r5, =gUnknown_08611548 -@0819FBDA: +_0819FBDA: bl GenerateRandomNumber ldr r2, [r4] lsls r0, 16 @@ -774273,12 +774273,12 @@ sub_819FBC8: ; 819FBC8 ldrb r1, [r1] lsrs r0, 27 cmp r1, r0 - beq @0819FBDA - b @0819FC38 + beq _0819FBDA + b _0819FC38 .pool -@0819FC10: +_0819FC10: adds r4, r2, 0 -@0819FC12: +_0819FC12: bl GenerateRandomNumber ldr r2, [r4] lsls r0, 16 @@ -774296,8 +774296,8 @@ sub_819FBC8: ; 819FBC8 ldrb r1, [r1] lsrs r0, 27 cmp r1, r0 - beq @0819FC12 -@0819FC38: + beq _0819FC12 +_0819FC38: pop {r4,r5} pop {r0} bx r0 @@ -774326,7 +774326,7 @@ 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] @@ -774334,9 +774334,9 @@ sub_819FC60: ; 819FC60 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 @@ -774363,11 +774363,11 @@ sub_819FC60: ; 819FC60 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 @@ -774390,7 +774390,7 @@ sub_819FC60: ; 819FC60 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls @0819FCBC + bls _0819FCBC add sp, 0xC pop {r4-r7} pop {r0} @@ -774405,9 +774405,9 @@ sub_819FCF8: ; 819FCF8 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 @@ -774422,35 +774422,35 @@ sub_819FCF8: ; 819FCF8 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 .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} @@ -774473,17 +774473,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 @@ -774508,10 +774508,10 @@ sub_819FD64: ; 819FD64 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x9 - bls @0819FD92 + bls _0819FD92 movs r5, 0 ldr r2, =gUnknown_086114D3 -@0819FDD0: +_0819FDD0: mov r4, sp adds r1, r4, r5 adds r0, r5, r2 @@ -774521,9 +774521,9 @@ sub_819FD64: ; 819FD64 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 @@ -774549,7 +774549,7 @@ sub_819FD64: ; 819FD64 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x31 - bls @0819FDE6 + bls _0819FDE6 ldr r4, =0x030062ec movs r0, 0x30 bl AllocZeroed @@ -774558,9 +774558,9 @@ sub_819FD64: ; 819FD64 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 @@ -774572,17 +774572,17 @@ sub_819FD64: ; 819FD64 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 @@ -774605,7 +774605,7 @@ sub_819FD64: ; 819FD64 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] @@ -774633,13 +774633,13 @@ sub_819FD64: ; 819FD64 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 @@ -774652,34 +774652,34 @@ sub_819FD64: ; 819FD64 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] @@ -774712,14 +774712,14 @@ sub_819FD64: ; 819FD64 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 @@ -774752,7 +774752,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 @@ -774771,12 +774771,12 @@ sub_819FF98: ; 819FF98 asrs r4, r0 movs r0, 0xF ands r4, r0 - b @0819FFE4 + b _0819FFE4 .pool -@0819FFE0: +_0819FFE0: movs r4, 0 ldr r2, =0x03005d90 -@0819FFE4: +_0819FFE4: ldr r3, =gUnknown_08610970 lsls r1, r4, 1 ldr r4, [r2] @@ -774802,23 +774802,23 @@ sub_819FF98: ; 819FF98 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 @@ -774826,30 +774826,30 @@ sub_819FF98: ; 819FF98 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 @@ -774862,7 +774862,7 @@ sub_819FF98: ; 819FF98 bl sub_806E064 adds r2, r0, 0 cmp r2, 0 - beq @081A006C + beq _081A006C ldr r2, =0x00000121 adds r0, r4, r2 bl sub_81B6CFC @@ -774870,47 +774870,47 @@ sub_819FF98: ; 819FF98 lsrs r7, r0, 16 movs r2, 0x1 cmp r5, 0x4 - bhi @081A00BC + bhi _081A00BC movs r3, 0 - b @081A00C6 + b _081A00C6 .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 @@ -774926,54 +774926,54 @@ sub_819FF98: ; 819FF98 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 .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, =gUnknown_08611370 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] @@ -775007,22 +775007,22 @@ 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 .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 @@ -775033,7 +775033,7 @@ sub_81A0194: ; 81A0194 adds r1, r0 strh r5, [r1] movs r0, 0x1 -@081A01E2: +_081A01E2: pop {r4-r7} pop {r1} bx r1 @@ -775053,9 +775053,9 @@ sub_81A01E8: ; 81A01E8 ands r0, r1 movs r4, 0x3C cmp r0, 0x1 - bne @081A0204 + bne _081A0204 movs r4, 0x32 -@081A0204: +_081A0204: ldr r1, =gLevelUpLearnsetPointers lsls r0, r2, 2 adds r0, r1 @@ -775064,17 +775064,17 @@ sub_81A01E8: ; 81A01E8 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 @@ -775082,22 +775082,22 @@ sub_81A01E8: ; 81A01E8 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 @@ -775111,8 +775111,8 @@ sub_81A01E8: ; 81A01E8 lsls r2, 24 lsrs r2, 24 cmp r2, r4 - bcc @081A0250 -@081A026C: + bcc _081A0250 +_081A026C: pop {r4-r7} pop {r0} bx r0 @@ -775142,11 +775142,11 @@ sub_81A0284: ; 81A0284 lsrs r0, 28 adds r7, r1, 0 cmp r0, 0x2 - bhi @081A02B8 + bhi _081A02B8 movs r0, 0 - b @081A037C + b _081A037C .pool -@081A02B8: +_081A02B8: movs r4, 0 movs r3, 0 adds r0, r2, 0 @@ -775159,9 +775159,9 @@ sub_81A0284: ; 81A0284 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 @@ -775169,7 +775169,7 @@ sub_81A0284: ; 81A0284 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x8 - bhi @081A02F4 + bhi _081A02F4 ldr r0, [r2] lsls r1, r3, 2 adds r0, r1 @@ -775177,8 +775177,8 @@ sub_81A0284: ; 81A0284 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne @081A02D4 -@081A02F4: + bne _081A02D4 +_081A02F4: ldr r0, [r7] adds r0, 0xB0 ldrb r1, [r0] @@ -775193,7 +775193,7 @@ sub_81A0284: ; 81A0284 bl sub_81A01E8 movs r3, 0 cmp r3, r4 - bcs @081A0376 + bcs _081A0376 ldr r1, [r7] adds r0, r1, 0 adds r0, 0xB1 @@ -775202,10 +775202,10 @@ sub_81A0284: ; 81A0284 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 @@ -775214,14 +775214,14 @@ sub_81A0284: ; 81A0284 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 @@ -775231,12 +775231,12 @@ sub_81A0284: ; 81A0284 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] @@ -775244,12 +775244,12 @@ sub_81A0284: ; 81A0284 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 @@ -775273,7 +775273,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 @@ -775285,7 +775285,7 @@ sub_81A0390: ; 81A0390 adds r0, 0xEA strh r4, [r0] movs r3, 0 -@081A03BC: +_081A03BC: ldr r0, [r6] lsls r1, r3, 1 adds r1, r2 @@ -775296,18 +775296,18 @@ sub_81A0390: ; 81A0390 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 @@ -775327,11 +775327,11 @@ sub_81A0390: ; 81A0390 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls @081A03E6 + bls _081A03E6 movs r5, 0 ldr r7, =0x03005d90 ldr r6, =gUnknown_086109A4 -@081A0416: +_081A0416: ldr r0, [r7] mov r12, r0 adds r0, 0xB4 @@ -775371,12 +775371,12 @@ sub_81A0390: ; 81A0390 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 @@ -775389,10 +775389,10 @@ sub_81A0390: ; 81A0390 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] @@ -775400,15 +775400,15 @@ sub_81A0390: ; 81A0390 adds r0, 0xBA ldrh r0, [r0] strh r0, [r1, 0xA] - b @081A04CC + b _081A04CC .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 @@ -775421,13 +775421,13 @@ sub_81A0390: ; 81A0390 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 @@ -775448,25 +775448,25 @@ 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 .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 @@ -775474,9 +775474,9 @@ sub_81A04E4: ; 81A04E4 str r0, [sp, 0xC] ldr r0, =gUnknown_085EAEB8 str r0, [sp, 0x10] - b @081A0652 + b _081A0652 .pool -@081A0540: +_081A0540: movs r7, 0x3 movs r1, 0x12 mov r10, r1 @@ -775493,7 +775493,7 @@ sub_81A04E4: ; 81A04E4 adds r5, 0xB0 ldr r0, =gUnknown_086109A4 mov r8, r0 -@081A0560: +_081A0560: adds r0, r3, 0 adds r0, 0xB4 adds r0, r4 @@ -775528,10 +775528,10 @@ sub_81A04E4: ; 81A04E4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @081A0560 - b @081A0652 + bls _081A0560 + b _081A0652 .pool -@081A05B4: +_081A05B4: movs r0, 0x12 mov r10, r0 movs r6, 0x8 @@ -775542,9 +775542,9 @@ sub_81A04E4: ; 81A04E4 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] @@ -775557,9 +775557,9 @@ sub_81A04E4: ; 81A04E4 muls r0, r2 adds r0, r1 str r0, [sp, 0xC] - b @081A0652 + b _081A0652 .pool -@081A05F4: +_081A05F4: movs r1, 0x11 mov r10, r1 movs r6, 0x8 @@ -775575,9 +775575,9 @@ sub_81A04E4: ; 81A04E4 muls r0, r2 adds r0, r1 str r0, [sp, 0x10] - b @081A0652 + b _081A0652 .pool -@081A061C: +_081A061C: movs r0, 0x12 mov r10, r0 movs r6, 0x8 @@ -775585,9 +775585,9 @@ sub_81A04E4: ; 81A04E4 str r0, [sp, 0xC] ldr r0, =gUnknown_085ED198 str r0, [sp, 0x10] - b @081A0652 + b _081A0652 .pool -@081A0634: +_081A0634: movs r1, 0x14 mov r10, r1 movs r6, 0x8 @@ -775595,20 +775595,20 @@ sub_81A04E4: ; 81A04E4 str r0, [sp, 0xC] ldr r0, =gUnknown_085EAE66 str r0, [sp, 0x10] - b @081A0652 + b _081A0652 .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 @@ -775617,15 +775617,15 @@ sub_81A04E4: ; 81A04E4 movs r2, 0 bl GetStringWidth 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 @@ -775650,8 +775650,8 @@ sub_81A04E4: ; 81A04E4 bl SetStandardWindowBorderStyle movs r4, 0 cmp r4, r7 - bcs @081A06E6 -@081A06B8: + bcs _081A06E6 +_081A06B8: lsls r0, r4, 2 add r0, sp adds r0, 0xC @@ -775673,8 +775673,8 @@ sub_81A04E4: ; 81A04E4 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 @@ -775683,7 +775683,7 @@ sub_81A04E4: ; 81A04E4 adds r1, r7, 0 adds r2, r5, 0 bl sub_81A0804 -@081A06FA: +_081A06FA: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -775707,13 +775707,13 @@ sub_81A070C: ; 81A070C movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - bne @081A0730 + bne _081A0730 bl ProcessMenuInputNoWrapAround - b @081A0734 + b _081A0734 .pool -@081A0730: +_081A0730: bl ProcessMenuInput -@081A0734: +_081A0734: lsls r0, 24 lsrs r0, 24 lsls r0, 24 @@ -775721,31 +775721,31 @@ sub_81A070C: ; 81A070C 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 .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 @@ -775841,13 +775841,13 @@ 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 .pool -@081A0840: +_081A0840: movs r0, 0 -@081A0842: +_081A0842: strh r0, [r1, 0x12] ldr r1, =0x03005e00 lsls r0, r2, 2 @@ -775910,7 +775910,7 @@ sub_81A087C: ; 81A087C strb r0, [r1] movs r4, 0 movs r1, 0 -@081A08BE: +_081A08BE: ldr r0, [r3] adds r0, 0xB4 adds r0, r4 @@ -775919,7 +775919,7 @@ sub_81A087C: ; 81A087C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @081A08BE + bls _081A08BE movs r4, 0 ldr r5, =0x03005d90 movs r0, 0x4 @@ -775929,7 +775929,7 @@ sub_81A087C: ; 81A087C negs r7, r7 movs r6, 0x31 negs r6, r6 -@081A08E2: +_081A08E2: ldr r1, [r5] lsls r3, r4, 2 adds r1, r3 @@ -775968,7 +775968,7 @@ sub_81A087C: ; 81A087C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x8 - bls @081A08E2 + bls _081A08E2 pop {r4-r7} pop {r0} bx r0 @@ -775982,16 +775982,16 @@ sub_81A093C: ; 81A093C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @081A0954 + bne _081A0954 ldr r0, =0x020375f0 strh r1, [r0] - b @081A095A + b _081A095A .pool -@081A0954: +_081A0954: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -@081A095A: +_081A095A: pop {r0} bx r0 .pool @@ -776070,19 +776070,19 @@ 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 .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 @@ -776090,15 +776090,15 @@ sub_81A09D0: ; 81A09D0 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne @081A0A18 + bne _081A0A18 movs r0, 0x1 - b @081A0A1A + b _081A0A1A .pool -@081A0A18: +_081A0A18: movs r0, 0 -@081A0A1A: +_081A0A1A: strh r0, [r2] -@081A0A1C: +_081A0A1C: pop {r0} bx r0 thumb_func_end sub_81A09D0 @@ -776122,20 +776122,20 @@ sub_81A0A34: ; 81A0A34 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 bl sub_81A172C - b @081A0A68 + b _081A0A68 .pool -@081A0A64: +_081A0A64: bl script_env_2_enable_and_set_ctx_running -@081A0A68: +_081A0A68: pop {r4} pop {r0} bx r0 @@ -776147,18 +776147,18 @@ sub_81A0A70: ; 81A0A70 ldr r1, =0x020375e4 ldrh r0, [r1] cmp r0, 0x6 - bne @081A0A94 + bne _081A0A94 ldr r1, =gUnknown_08610FF0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b @081A0C66 + b _081A0C66 .pool -@081A0A94: +_081A0A94: cmp r0, 0x7 - bne @081A0AB0 + bne _081A0AB0 ldr r1, =gUnknown_08610FF0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776166,22 +776166,22 @@ sub_81A0A70: ; 81A0A70 ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b @081A0C66 + b _081A0C66 .pool -@081A0AB0: +_081A0AB0: cmp r0, 0x8 - bne @081A0ACC + bne _081A0ACC ldr r1, =gUnknown_086111B0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b @081A0C66 + b _081A0C66 .pool -@081A0ACC: +_081A0ACC: cmp r0, 0x9 - bne @081A0AE8 + bne _081A0AE8 ldr r1, =gUnknown_086111B0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776189,22 +776189,22 @@ sub_81A0A70: ; 81A0A70 ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b @081A0C66 + b _081A0C66 .pool -@081A0AE8: +_081A0AE8: cmp r0, 0x4 - bne @081A0B04 + bne _081A0B04 ldr r1, =gUnknown_08611230 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b @081A0C66 + b _081A0C66 .pool -@081A0B04: +_081A0B04: cmp r0, 0x5 - bne @081A0B20 + bne _081A0B20 ldr r1, =gUnknown_08611230 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776212,11 +776212,11 @@ sub_81A0A70: ; 81A0A70 ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b @081A0C66 + b _081A0C66 .pool -@081A0B20: +_081A0B20: cmp r0, 0xA - bne @081A0B40 + bne _081A0B40 ldr r2, =gUnknown_08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776225,22 +776225,22 @@ sub_81A0A70: ; 81A0A70 lsls r0, r1, 2 adds r0, r1 lsls r0, 2 - b @081A0BD6 + b _081A0BD6 .pool -@081A0B40: +_081A0B40: cmp r0, 0xB - bne @081A0B5C + bne _081A0B5C ldr r1, =gUnknown_086112B0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 3 - b @081A0C66 + b _081A0C66 .pool -@081A0B5C: +_081A0B5C: cmp r0, 0xC - bne @081A0B7C + bne _081A0B7C ldr r2, =gUnknown_08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776250,11 +776250,11 @@ sub_81A0A70: ; 81A0A70 adds r0, r1 lsls r0, 2 adds r2, 0xC - b @081A0BD6 + b _081A0BD6 .pool -@081A0B7C: +_081A0B7C: cmp r0, 0xD - bne @081A0B9C + bne _081A0B9C ldr r2, =gUnknown_08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776264,12 +776264,12 @@ sub_81A0A70: ; 81A0A70 adds r0, r1 lsls r0, 2 adds r2, 0x4 - b @081A0BD6 + b _081A0BD6 .pool -@081A0B9C: +_081A0B9C: ldrh r0, [r1] cmp r0, 0x10 - bne @081A0BC0 + bne _081A0BC0 ldr r2, =gUnknown_08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776279,11 +776279,11 @@ sub_81A0A70: ; 81A0A70 adds r0, r1 lsls r0, 2 adds r2, 0x10 - b @081A0BD6 + b _081A0BD6 .pool -@081A0BC0: +_081A0BC0: cmp r0, 0xE - bne @081A0BE4 + bne _081A0BE4 ldr r2, =gUnknown_08611070 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776293,14 +776293,14 @@ sub_81A0A70: ; 81A0A70 adds r0, r1 lsls r0, 2 adds r2, 0x8 -@081A0BD6: +_081A0BD6: adds r0, r2 ldr r1, [r0] - b @081A0C7A + b _081A0C7A .pool -@081A0BE4: +_081A0BE4: cmp r0, 0xF - bne @081A0C00 + bne _081A0C00 ldr r1, =gUnknown_086112B0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776308,22 +776308,22 @@ sub_81A0A70: ; 81A0A70 ldrb r0, [r0] lsls r0, 3 adds r1, 0x4 - b @081A0C66 + b _081A0C66 .pool -@081A0C00: +_081A0C00: cmp r0, 0 - bne @081A0C1C + bne _081A0C1C ldr r1, =gUnknown_08610EF0 ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 ldrb r0, [r0] lsls r0, 4 - b @081A0C66 + b _081A0C66 .pool -@081A0C1C: +_081A0C1C: cmp r0, 0x1 - bne @081A0C38 + bne _081A0C38 ldr r1, =gUnknown_08610EF0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776331,11 +776331,11 @@ sub_81A0A70: ; 81A0A70 ldrb r0, [r0] lsls r0, 4 adds r1, 0x4 - b @081A0C66 + b _081A0C66 .pool -@081A0C38: +_081A0C38: cmp r0, 0x2 - bne @081A0C54 + bne _081A0C54 ldr r1, =gUnknown_08610EF0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776343,11 +776343,11 @@ sub_81A0A70: ; 81A0A70 ldrb r0, [r0] lsls r0, 4 adds r1, 0x8 - b @081A0C66 + b _081A0C66 .pool -@081A0C54: +_081A0C54: cmp r0, 0x3 - bne @081A0C74 + bne _081A0C74 ldr r1, =gUnknown_08610EF0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -776355,15 +776355,15 @@ sub_81A0A70: ; 81A0A70 ldrb r0, [r0] lsls r0, 4 adds r1, 0xC -@081A0C66: +_081A0C66: adds r0, r1 ldr r1, [r0] - b @081A0C7A + b _081A0C7A .pool -@081A0C74: +_081A0C74: bl script_env_2_enable_and_set_ctx_running - b @081A0C8E -@081A0C7A: + b _081A0C8E +_081A0C7A: ldr r0, =0x02021fc4 bl ExpandStringRefs movs r0, 0x1 @@ -776371,7 +776371,7 @@ sub_81A0A70: ; 81A0A70 ldr r0, =sub_81A0A34 movs r1, 0x1 bl AddTask -@081A0C8E: +_081A0C8E: pop {r0} bx r0 .pool @@ -776403,15 +776403,15 @@ 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 .pool -@081A0CE4: +_081A0CE4: lsrs r0, r1, 28 cmp r0, 0xB - bhi @081A0D30 + bhi _081A0D30 lsrs r0, r1, 28 subs r0, 0x3 lsls r0, 2 @@ -776421,35 +776421,35 @@ sub_81A0CC0: ; 81A0CC0 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 .pool -@081A0D18: +_081A0D18: ldr r1, =0x020375f0 movs r0, 0x3 - b @081A0D34 + b _081A0D34 .pool -@081A0D24: +_081A0D24: ldr r1, =0x020375f0 movs r0, 0x1 - b @081A0D34 + b _081A0D34 .pool -@081A0D30: +_081A0D30: ldr r1, =0x020375f0 movs r0, 0x5 -@081A0D34: +_081A0D34: strh r0, [r1] pop {r0} bx r0 @@ -776462,7 +776462,7 @@ sub_81A0D40: ; 81A0D40 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq @081A0D6E + beq _081A0D6E ldr r4, =0x020375e4 ldr r0, =0x03005d90 ldr r2, [r0] @@ -776481,7 +776481,7 @@ sub_81A0D40: ; 81A0D40 ands r0, r3 orrs r0, r1 strb r0, [r2] -@081A0D6E: +_081A0D6E: pop {r4} pop {r0} bx r0 @@ -776499,14 +776499,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 @@ -776516,9 +776516,9 @@ sub_81A0D80: ; 81A0D80 movs r1, 0x40 orrs r0, r1 strb r0, [r2] - b @081A0DCE + b _081A0DCE .pool -@081A0DC0: +_081A0DC0: lsls r0, r2, 2 adds r0, r3, r0 adds r0, 0xB8 @@ -776526,7 +776526,7 @@ sub_81A0D80: ; 81A0D80 movs r1, 0x3F ands r1, r2 strb r1, [r0] -@081A0DCE: +_081A0DCE: pop {r0} bx r0 thumb_func_end sub_81A0D80 @@ -776547,9 +776547,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 @@ -776557,7 +776557,7 @@ sub_81A0DD4: ; 81A0DD4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x8 - bhi @081A0E14 + bhi _081A0E14 ldr r0, [r3] lsls r1, r2, 2 adds r0, r1 @@ -776565,8 +776565,8 @@ sub_81A0DD4: ; 81A0DD4 ldrb r0, [r0] lsls r0, 30 cmp r0, 0 - bne @081A0DF4 -@081A0E14: + bne _081A0DF4 +_081A0E14: mov r4, r9 movs r0, 0x8 bl AllocZeroed @@ -776575,7 +776575,7 @@ sub_81A0DD4: ; 81A0DD4 ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0x2 - bne @081A0E88 + bne _081A0E88 ldr r0, =0x03005d90 ldr r5, [r0] adds r6, r5, 0 @@ -776584,9 +776584,9 @@ sub_81A0DD4: ; 81A0DD4 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 @@ -776615,11 +776615,11 @@ sub_81A0DD4: ; 81A0DD4 muls r1, r4 adds r0, r1 adds r0, r3 - b @081A0FCA + b _081A0FCA .pool -@081A0E88: +_081A0E88: cmp r0, 0x3 - bne @081A0F54 + bne _081A0F54 ldr r0, =0x03005d90 mov r8, r0 ldr r5, [r0] @@ -776630,15 +776630,15 @@ sub_81A0DD4: ; 81A0DD4 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 @@ -776648,9 +776648,9 @@ sub_81A0DD4: ; 81A0DD4 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 @@ -776717,11 +776717,11 @@ sub_81A0DD4: ; 81A0DD4 adds r1, 0xBA ldrh r0, [r1] strh r0, [r2, 0x6] - b @081A0FCE + b _081A0FCE .pool -@081A0F54: +_081A0F54: cmp r0, 0x4 - bne @081A0FCE + bne _081A0FCE ldr r0, =0x03005d90 ldr r3, [r0] adds r0, r3, 0 @@ -776730,11 +776730,11 @@ sub_81A0DD4: ; 81A0DD4 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 @@ -776744,7 +776744,7 @@ sub_81A0DD4: ; 81A0DD4 lsls r0, 30 lsrs r0, 30 cmp r0, 0x1 - bne @081A0FCE + bne _081A0FCE adds r0, r1, 0 subs r0, 0x3 lsls r0, 2 @@ -776779,10 +776779,10 @@ sub_81A0DD4: ; 81A0DD4 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 @@ -776813,53 +776813,53 @@ sub_81A0FFC: ; 81A0FFC 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 .pool -@081A1018: +_081A1018: cmp r0, 0x2 - beq @081A1030 - b @081A11E6 -@081A101E: + beq _081A1030 + b _081A11E6 +_081A101E: ldr r5, =0x02021cc4 - b @081A1032 + b _081A1032 .pool -@081A1028: +_081A1028: ldr r5, =0x02021dc4 - b @081A1032 + b _081A1032 .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 .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] @@ -776867,9 +776867,9 @@ sub_81A0FFC: ; 81A0FFC muls r1, r0 ldr r0, =gSpeciesNames adds r1, r0 - b @081A1174 + b _081A1174 .pool -@081A1094: +_081A1094: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x2] @@ -776877,9 +776877,9 @@ sub_81A0FFC: ; 81A0FFC muls r1, r0 ldr r0, =gSpeciesNames adds r1, r0 - b @081A1174 + b _081A1174 .pool -@081A10AC: +_081A10AC: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0] @@ -776887,9 +776887,9 @@ sub_81A0FFC: ; 81A0FFC muls r1, r0 ldr r0, =gSpeciesNames adds r1, r0 - b @081A1174 + b _081A1174 .pool -@081A10C4: +_081A10C4: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x4] @@ -776897,9 +776897,9 @@ sub_81A0FFC: ; 81A0FFC muls r1, r0 ldr r0, =gMoveNames adds r1, r0 - b @081A1174 + b _081A1174 .pool -@081A10DC: +_081A10DC: ldr r0, =0x030062f0 ldr r0, [r0] ldrh r1, [r0, 0x6] @@ -776907,9 +776907,9 @@ sub_81A0FFC: ; 81A0FFC muls r1, r0 ldr r0, =gMoveNames adds r1, r0 - b @081A1174 + b _081A1174 .pool -@081A10F4: +_081A10F4: ldr r0, =0x03005d90 ldr r1, [r0] adds r0, r1, 0 @@ -776924,9 +776924,9 @@ sub_81A0FFC: ; 81A0FFC ldrh r0, [r1] bl itemid_get_item adds r1, r0, 0 - b @081A1174 + b _081A1174 .pool -@081A1118: +_081A1118: ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB0 @@ -776940,9 +776940,9 @@ sub_81A0FFC: ; 81A0FFC adds r0, r5, 0 mov r1, sp bl CopyString - b @081A11E6 + b _081A11E6 .pool -@081A1140: +_081A1140: ldr r0, =0x03005d90 ldr r0, [r0] adds r0, 0xB1 @@ -776950,15 +776950,15 @@ sub_81A0FFC: ; 81A0FFC movs r0, 0x3 ands r0, r1 cmp r0, 0x1 - bne @081A115C + bne _081A115C ldr r1, =gUnknown_085EAEB1 - b @081A1174 + b _081A1174 .pool -@081A115C: +_081A115C: ldr r1, =gUnknown_085EAEB8 - b @081A1174 + b _081A1174 .pool -@081A1164: +_081A1164: ldr r0, =0x03005d90 ldr r0, [r0] movs r1, 0x82 @@ -776966,12 +776966,12 @@ sub_81A0FFC: ; 81A0FFC adds r0, r1 bl ConvertBattleFrontierTrainerSpeechToString ldr r1, =0x02021fc4 -@081A1174: +_081A1174: adds r0, r5, 0 bl CopyString - b @081A11E6 + b _081A11E6 .pool -@081A1184: +_081A1184: ldr r0, =0x03005d90 ldr r3, [r0] adds r1, r3, 0 @@ -776981,7 +776981,7 @@ sub_81A0FFC: ; 81A0FFC 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 @@ -776998,11 +776998,11 @@ sub_81A0FFC: ; 81A0FFC asrs r2, r0 movs r0, 0xF ands r2, r0 - b @081A11C2 + b _081A11C2 .pool -@081A11C0: +_081A11C0: movs r2, 0 -@081A11C2: +_081A11C2: ldr r3, =gUnknown_08610970 lsls r1, r2, 1 ldr r0, [r6] @@ -777020,7 +777020,7 @@ sub_81A0FFC: ; 81A0FFC adds r1, r0 adds r0, r5, 0 bl CopyString -@081A11E6: +_081A11E6: add sp, 0x10 pop {r4-r6} pop {r0} @@ -777068,9 +777068,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 @@ -777082,9 +777082,9 @@ sub_81A1224: ; 81A1224 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 @@ -777092,7 +777092,7 @@ sub_81A1224: ; 81A1224 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x8 - bhi @081A127C + bhi _081A127C ldr r0, [r3] lsls r1, r2, 2 adds r0, r1 @@ -777100,11 +777100,11 @@ sub_81A1224: ; 81A1224 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] @@ -777112,10 +777112,10 @@ sub_81A1224: ; 81A1224 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 @@ -777125,17 +777125,17 @@ sub_81A1224: ; 81A1224 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] @@ -777165,14 +777165,14 @@ sub_81A1224: ; 81A1224 mov r1, r9 mov r0, r8 strh r1, [r0] - b @081A1362 + b _081A1362 .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] @@ -777180,8 +777180,8 @@ sub_81A1224: ; 81A1224 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 @@ -777214,7 +777214,7 @@ sub_81A1224: ; 81A1224 movs r0, 0x1 mov r1, r8 strh r0, [r1] -@081A1362: +_081A1362: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -777238,9 +777238,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 @@ -777252,18 +777252,18 @@ sub_81A1370: ; 81A1370 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 .pool -@081A13B8: +_081A13B8: adds r5, r2, 0 cmp r5, 0x2 - ble @081A138E + ble _081A138E ldr r0, =0x0000ffff mov r10, r0 movs r2, 0x1 @@ -777275,7 +777275,7 @@ sub_81A1370: ; 81A1370 lsls r0, 1 mov r8, r0 movs r6, 0x44 -@081A13D4: +_081A13D4: ldr r0, [r7] add r0, r8 adds r0, 0x34 @@ -777285,25 +777285,25 @@ sub_81A1370: ; 81A1370 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 @@ -777313,7 +777313,7 @@ sub_81A1370: ; 81A1370 adds r0, 0xDC adds r1, 0xDC bl memcpy -@081A1422: +_081A1422: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -777356,24 +777356,24 @@ sub_81A1438: ; 81A1438 strb r0, [r2] movs r2, 0 ldr r0, [r4] - b @081A148C + b _081A148C .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 @@ -777383,10 +777383,10 @@ sub_81A1438: ; 81A1438 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] @@ -777396,7 +777396,7 @@ sub_81A1438: ; 81A1438 movs r4, 0x88 lsls r4, 1 adds r5, r3, 0 -@081A14C2: +_081A14C2: ldr r0, [r3] adds r1, r0, r4 adds r1, r2 @@ -777408,7 +777408,7 @@ sub_81A1438: ; 81A1438 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls @081A14C2 + bls _081A14C2 ldr r1, [r5] movs r2, 0x8A lsls r2, 1 @@ -777448,52 +777448,52 @@ sub_81A150C: ; 81A150C ldr r3, =gUnknown_085DCEDC 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, =gUnknown_085DCF0E adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl VarSet - b @081A1594 + b _081A1594 .pool -@081A1568: +_081A1568: movs r1, 0 ldr r3, =gUnknown_085DCEFA 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, =gUnknown_085DCF2C adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl VarSet -@081A1594: +_081A1594: pop {r0} bx r0 .pool @@ -777516,52 +777516,52 @@ sub_81A15A4: ; 81A15A4 ldr r3, =gUnknown_085DCEDC 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, =gUnknown_085DCF0E adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl VarSet - b @081A1628 + b _081A1628 .pool -@081A15FC: +_081A15FC: movs r1, 0 ldr r3, =gUnknown_085DCEFA 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, =gUnknown_085DCF2C adds r0, r1, r0 ldrb r1, [r0] ldr r0, =0x00004010 bl VarSet -@081A1628: +_081A1628: pop {r0} bx r0 .pool @@ -777594,45 +777594,45 @@ 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 .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 @@ -777647,15 +777647,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 .pool @@ -777671,12 +777671,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 @@ -777692,7 +777692,7 @@ sub_81A16DC: ; 81A16DC bl _call_via_r1 adds r0, r4, 0 bl remove_task -@081A1718: +_081A1718: pop {r4} pop {r0} bx r0 @@ -777769,29 +777769,29 @@ 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 .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 @@ -777801,9 +777801,9 @@ sub_81A17A0: ; 81A17A0 adds r1, r2 ldrb r1, [r1] bl VarSet - b @081A1822 + b _081A1822 .pool -@081A1810: +_081A1810: movs r0, 0x80 lsls r0, 7 ldr r1, =0x03005d90 @@ -777812,7 +777812,7 @@ sub_81A17A0: ; 81A17A0 adds r1, r2 ldrb r1, [r1] bl VarSet -@081A1822: +_081A1822: pop {r0} bx r0 .pool @@ -777830,32 +777830,32 @@ 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 .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] @@ -777863,9 +777863,9 @@ sub_81A1830: ; 81A1830 adds r0, r2 ldrb r0, [r0] strh r0, [r1] - b @081A1956 + b _081A1956 .pool -@081A18A8: +_081A18A8: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -777875,9 +777875,9 @@ sub_81A1830: ; 81A1830 lsls r0, 30 lsrs r0, 30 strh r0, [r1] - b @081A1956 + b _081A1956 .pool -@081A18C8: +_081A18C8: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -777885,9 +777885,9 @@ sub_81A1830: ; 81A1830 adds r0, r2 ldrh r0, [r0] strh r0, [r1] - b @081A1956 + b _081A1956 .pool -@081A18E4: +_081A18E4: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -777895,18 +777895,18 @@ sub_81A1830: ; 81A1830 adds r0, r2 ldrb r0, [r0] lsls r0, 29 - b @081A1926 + b _081A1926 .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 .pool -@081A1918: +_081A1918: ldr r1, =0x020375f0 ldr r0, =0x03005d90 ldr r0, [r0] @@ -777914,12 +777914,12 @@ sub_81A1830: ; 81A1830 adds r0, r2 ldrb r0, [r0] lsls r0, 28 -@081A1926: +_081A1926: lsrs r0, 31 strh r0, [r1] - b @081A1956 + b _081A1956 .pool -@081A1938: +_081A1938: ldr r4, =0x020375f0 ldr r0, =0x03005d90 ldr r2, [r0] @@ -777935,7 +777935,7 @@ sub_81A1830: ; 81A1830 ldrh r0, [r0] ands r0, r1 strh r0, [r4] -@081A1956: +_081A1956: pop {r4-r6} pop {r0} bx r0 @@ -777954,32 +777954,32 @@ 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 .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 @@ -777987,9 +777987,9 @@ sub_81A1968: ; 81A1968 ldr r2, =0x00000ca8 adds r0, r2 strb r1, [r0] - b @081A1AC4 + b _081A1AC4 .pool -@081A19E0: +_081A19E0: ldr r0, =0x03005d90 ldr r2, [r0] ldr r0, =0x020375e4 @@ -778004,9 +778004,9 @@ sub_81A1968: ; 81A1968 ands r0, r3 orrs r0, r1 strb r0, [r2] - b @081A1AC4 + b _081A1AC4 .pool -@081A1A0C: +_081A1A0C: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x020375e4 @@ -778014,9 +778014,9 @@ sub_81A1968: ; 81A1968 ldr r2, =0x00000cb2 adds r0, r2 strh r1, [r0] - b @081A1AC4 + b _081A1AC4 .pool -@081A1A28: +_081A1A28: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -778029,14 +778029,14 @@ sub_81A1968: ; 81A1968 ldrb r2, [r3] movs r0, 0x5 negs r0, r0 - b @081A1A94 + b _081A1A94 .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 @@ -778046,10 +778046,10 @@ sub_81A1968: ; 81A1968 strh r0, [r1] adds r2, 0x1 cmp r2, 0x3 - ble @081A1A58 - b @081A1AC4 + ble _081A1A58 + b _081A1AC4 .pool -@081A1A7C: +_081A1A7C: ldr r0, =0x03005d90 ldr r3, [r0] ldr r0, =0x020375e4 @@ -778062,13 +778062,13 @@ sub_81A1968: ; 81A1968 ldrb r2, [r3] movs r0, 0x9 negs r0, r0 -@081A1A94: +_081A1A94: ands r0, r2 orrs r0, r1 strb r0, [r3] - b @081A1AC4 + b _081A1AC4 .pool -@081A1AA8: +_081A1AA8: ldr r0, =0x03005d90 ldr r2, [r0] movs r0, 0xD0 @@ -778083,7 +778083,7 @@ sub_81A1968: ; 81A1968 ldrh r1, [r1] orrs r0, r1 strh r0, [r2] -@081A1AC4: +_081A1AC4: pop {r4,r5} pop {r0} bx r0 @@ -778098,11 +778098,11 @@ sub_81A1AD4: ; 81A1AD4 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 @@ -778113,8 +778113,8 @@ sub_81A1AD4: ; 81A1AD4 adds r3, 0x1 ldrh r0, [r4] cmp r3, r0 - blt @081A1AEA -@081A1B00: + blt _081A1AEA +_081A1B00: bl sub_80F94E8 pop {r4-r7} pop {r0} @@ -778144,7 +778144,7 @@ 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 @@ -778156,7 +778156,7 @@ sub_81A1B38: ; 81A1B38 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi @081A1B76 + bhi _081A1B76 ldr r0, =0x03005d8c ldr r0, [r0] ldrh r1, [r1] @@ -778172,12 +778172,12 @@ sub_81A1B38: ; 81A1B38 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 @@ -778191,58 +778191,58 @@ sub_81A1B98: ; 81A1B98 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 .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 @@ -778257,13 +778257,13 @@ sub_81A1C24: ; 81A1C24 ldr r1, [r1] ands r1, r0 cmp r1, 0 - bne @081A1C44 + bne _081A1C44 movs r0, 0 - b @081A1C46 + b _081A1C46 .pool -@081A1C44: +_081A1C44: movs r0, 0x1 -@081A1C46: +_081A1C46: pop {r1} bx r1 thumb_func_end sub_81A1C24 @@ -778311,12 +778311,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] @@ -778378,9 +778378,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 @@ -778462,9 +778462,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 .pool @@ -778496,72 +778496,72 @@ 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, =gUnknown_085EE311 str r7, [sp] adds r1, r4, 0 mov r2, r8 mov r3, r9 bl sub_81A1CD8 - b @081A1E96 + b _081A1E96 .pool -@081A1E88: +_081A1E88: ldr r0, =gUnknown_085EE320 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 @@ -778592,33 +778592,33 @@ sub_81A1EA8: ; 81A1EA8 movs r1, 0x11 bl FillWindowPixelBuffer cmp r7, 0 - bne @081A1EF0 + bne _081A1EF0 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE158 bl ExpandStringRefs - b @081A1F28 + b _081A1F28 .pool -@081A1EF0: +_081A1EF0: cmp r7, 0x1 - bne @081A1F08 + bne _081A1F08 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE178 bl ExpandStringRefs - b @081A1F28 + b _081A1F28 .pool -@081A1F08: +_081A1F08: cmp r7, 0x2 - bne @081A1F20 + bne _081A1F20 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE198 bl ExpandStringRefs - b @081A1F28 + b _081A1F28 .pool -@081A1F20: +_081A1F20: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE1B7 bl ExpandStringRefs -@081A1F28: +_081A1F28: ldr r0, =0x02021fc4 movs r1, 0x2 bl sub_81A1C4C @@ -778706,9 +778706,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 .pool @@ -778805,32 +778805,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, =gUnknown_085EE311 ldr r1, =gUnknown_085EE338 str r7, [sp] @@ -778838,9 +778838,9 @@ sub_81A2094: ; 81A2094 mov r2, r8 mov r3, r9 bl sub_81A2008 - b @081A211C + b _081A211C .pool -@081A210C: +_081A210C: ldr r0, =gUnknown_085EE320 ldr r1, =gUnknown_085EE338 str r7, [sp] @@ -778848,7 +778848,7 @@ sub_81A2094: ; 81A2094 mov r2, r8 mov r3, r9 bl sub_81A2008 -@081A211C: +_081A211C: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -778880,17 +778880,17 @@ sub_81A2134: ; 81A2134 movs r1, 0x11 bl FillWindowPixelBuffer cmp r7, 0 - bne @081A217C + bne _081A217C ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE1DB bl ExpandStringRefs - b @081A2184 + b _081A2184 .pool -@081A217C: +_081A217C: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE1FE bl ExpandStringRefs -@081A2184: +_081A2184: ldr r0, =0x02021fc4 movs r1, 0 bl sub_81A1C4C @@ -779044,9 +779044,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 @@ -779127,9 +779127,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 .pool @@ -779161,48 +779161,48 @@ 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, =gUnknown_085EE311 str r7, [sp] adds r1, r4, 0 mov r2, r8 mov r3, r9 bl sub_81A22B8 - b @081A244E + b _081A244E .pool -@081A2440: +_081A2440: ldr r0, =gUnknown_085EE320 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 @@ -779233,17 +779233,17 @@ sub_81A2460: ; 81A2460 movs r1, 0x11 bl FillWindowPixelBuffer cmp r7, 0 - bne @081A24A8 + bne _081A24A8 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE221 bl ExpandStringRefs - b @081A24B0 + b _081A24B0 .pool -@081A24A8: +_081A24A8: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE241 bl ExpandStringRefs -@081A24B0: +_081A24B0: ldr r0, =0x02021fc4 movs r1, 0x2 bl sub_81A1C4C @@ -779328,9 +779328,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 .pool @@ -779422,19 +779422,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, =gUnknown_085EE311 ldr r1, =gUnknown_085EE35B str r5, [sp] @@ -779442,9 +779442,9 @@ sub_81A2618: ; 81A2618 adds r2, r7, 0 mov r3, r8 bl sub_81A2008 - b @081A2684 + b _081A2684 .pool -@081A2674: +_081A2674: ldr r0, =gUnknown_085EE320 ldr r1, =gUnknown_085EE35B str r5, [sp] @@ -779452,7 +779452,7 @@ sub_81A2618: ; 81A2618 adds r2, r7, 0 mov r3, r8 bl sub_81A2008 -@081A2684: +_081A2684: add sp, 0x8 pop {r3} mov r8, r3 @@ -779625,9 +779625,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 @@ -779704,9 +779704,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 .pool @@ -779733,33 +779733,33 @@ 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, =gUnknown_085EE311 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 mov r3, r8 bl sub_81A27E8 - b @081A2956 + b _081A2956 .pool -@081A2948: +_081A2948: ldr r0, =gUnknown_085EE320 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 @@ -779887,9 +779887,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 @@ -780006,9 +780006,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 .pool @@ -780030,9 +780030,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 .pool @@ -780075,34 +780075,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, =gUnknown_085EE311 mov r1, r8 str r1, [sp] @@ -780114,9 +780114,9 @@ sub_81A2BD0: ; 81A2BD0 adds r2, r4, 0 ldr r3, [sp, 0xC] bl sub_81A2A28 - b @081A2C80 + b _081A2C80 .pool -@081A2C68: +_081A2C68: ldr r0, =gUnknown_085EE320 mov r1, r8 str r1, [sp] @@ -780128,7 +780128,7 @@ sub_81A2BD0: ; 81A2BD0 adds r2, r4, 0 ldr r3, [sp, 0xC] bl sub_81A2A28 -@081A2C80: +_081A2C80: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -780159,17 +780159,17 @@ sub_81A2C94: ; 81A2C94 movs r1, 0x11 bl FillWindowPixelBuffer cmp r7, 0 - bne @081A2CD8 + bne _081A2CD8 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE298 bl ExpandStringRefs - b @081A2CE0 + b _081A2CE0 .pool -@081A2CD8: +_081A2CD8: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EE2B8 bl ExpandStringRefs -@081A2CE0: +_081A2CE0: ldr r0, =0x02021fc4 movs r1, 0 bl sub_81A1C4C @@ -780293,9 +780293,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 @@ -780372,9 +780372,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 .pool @@ -780401,35 +780401,35 @@ 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, =gUnknown_085EE311 str r6, [sp] adds r1, r5, 0 adds r2, r7, 0 mov r3, r8 bl sub_81A2DB4 - b @081A2F26 + b _081A2F26 .pool -@081A2F18: +_081A2F18: ldr r0, =gUnknown_085EE320 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 @@ -780666,7 +780666,7 @@ sub_81A2FF8: ; 81A2FF8 movs r3, 0x6 bl Print movs r1, 0 -@081A314A: +_081A314A: movs r5, 0 adds r0, r1, 0x1 mov r8, r0 @@ -780676,7 +780676,7 @@ sub_81A2FF8: ; 81A2FF8 adds r0, r2 lsrs r7, r0, 24 lsls r4, r1, 3 -@081A315C: +_081A315C: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000624 @@ -780706,10 +780706,10 @@ sub_81A2FF8: ; 81A2FF8 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 PutWindowTilemap ldrb r0, [r6] @@ -780750,25 +780750,25 @@ 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 .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] @@ -780789,13 +780789,13 @@ sub_81A31FC: ; 81A31FC 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] @@ -780833,7 +780833,7 @@ sub_81A31FC: ; 81A31FC ldr r1, [r3] adds r1, r2 bl write_word_to_mem -@081A32F2: +_081A32F2: mov r7, r9 ldr r0, [r7] movs r1, 0xCE @@ -780843,32 +780843,32 @@ sub_81A31FC: ; 81A31FC 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 .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 @@ -780878,8 +780878,8 @@ sub_81A31FC: ; 81A31FC ldrh r0, [r0] movs r1, 0x1 bl sub_80EE8C8 - b @081A35CE -@081A335A: + b _081A35CE +_081A335A: mov r3, r9 ldr r0, [r3] mov r1, r10 @@ -780891,8 +780891,8 @@ sub_81A31FC: ; 81A31FC ldrh r0, [r0] movs r1, 0x2 bl sub_80EE8C8 - b @081A35CE -@081A3374: + b _081A35CE +_081A3374: mov r1, r9 ldr r0, [r1] mov r1, r10 @@ -780904,8 +780904,8 @@ sub_81A31FC: ; 81A31FC ldrh r0, [r0] movs r1, 0x3 bl sub_80EE8C8 - b @081A35CE -@081A338E: + b _081A35CE +_081A338E: mov r3, r9 ldr r0, [r3] mov r1, r10 @@ -780917,8 +780917,8 @@ sub_81A31FC: ; 81A31FC ldrh r0, [r0] movs r1, 0x4 bl sub_80EE8C8 - b @081A35CE -@081A33A8: + b _081A35CE +_081A33A8: ldr r6, =0x03005d90 ldr r0, [r6] lsls r7, 1 @@ -780934,41 +780934,41 @@ sub_81A31FC: ; 81A31FC 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 .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 @@ -780985,41 +780985,41 @@ sub_81A31FC: ; 81A31FC 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 .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 @@ -781032,30 +781032,30 @@ sub_81A31FC: ; 81A31FC 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 .pool -@081A34CC: +_081A34CC: ldr r6, =0x03005d90 ldr r2, [r6] lsls r7, 1 @@ -781073,7 +781073,7 @@ sub_81A31FC: ; 81A31FC ldrh r1, [r3] ldrh r7, [r0] cmp r1, r7 - bls @081A35CE + bls _081A35CE strh r1, [r0] ldr r0, =0x00000dfa adds r1, r2, r0 @@ -781085,31 +781085,31 @@ sub_81A31FC: ; 81A31FC 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 .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 @@ -781122,24 +781122,24 @@ sub_81A31FC: ; 81A31FC 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 .pool -@081A3594: +_081A3594: ldr r6, =0x03005d90 ldr r1, [r6] lsls r4, r7, 1 @@ -781152,22 +781152,22 @@ sub_81A31FC: ; 81A31FC 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 @@ -781223,65 +781223,65 @@ sub_81A3610: ; 81A3610 ldrb r1, [r1] adds r5, r0, r1 cmp r4, 0 - beq @081A365C + beq _081A365C movs r0, 0 - b @081A36C2 + b _081A36C2 .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, =gUnknown_08611550 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 .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 @@ -781299,35 +781299,35 @@ 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 .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 @@ -781336,50 +781336,50 @@ sub_81A36D0: ; 81A36D0 adds r0, r1 adds r0, 0xC bl ConvertBattleFrontierTrainerSpeechToString - b @081A38F8 + b _081A38F8 .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 .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 .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 .pool -@081A3794: +_081A3794: ldr r0, =0x0000012b cmp r3, r0 - bhi @081A37B8 + bhi _081A37B8 ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 @@ -781388,35 +781388,35 @@ sub_81A36D0: ; 81A36D0 adds r0, r1 adds r0, 0x18 bl ConvertBattleFrontierTrainerSpeechToString - b @081A38F8 + b _081A38F8 .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 .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 @@ -781424,30 +781424,30 @@ sub_81A36D0: ; 81A36D0 ldr r1, [r1] adds r0, r1 ldr r1, =0xffff96c4 - b @081A38C4 + b _081A38C4 .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 .pool -@081A3830: +_081A3830: ldr r0, =0x000003fe cmp r3, r0 - bne @081A3844 + bne _081A3844 movs r0, 0x1 bl sub_81A51A8 - b @081A38F8 + b _081A38F8 .pool -@081A3844: +_081A3844: ldr r0, =0x0000012b cmp r3, r0 - bhi @081A3868 + bhi _081A3868 ldr r2, =0x0203bc88 movs r0, 0x34 adds r1, r3, 0 @@ -781456,53 +781456,53 @@ sub_81A36D0: ; 81A36D0 adds r0, r1 adds r0, 0x24 bl ConvertBattleFrontierTrainerSpeechToString - b @081A38F8 + b _081A38F8 .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 ConvertBattleFrontierTrainerSpeechToString - b @081A38F8 + b _081A38F8 .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 .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, =gUnknown_086109BA -@081A38C4: +_081A38C4: adds r0, r1 bl ConvertBattleFrontierTrainerSpeechToString - b @081A38F8 + b _081A38F8 .pool -@081A38D4: +_081A38D4: ldr r0, =0x03005d90 ldr r1, [r0] ldr r0, =0xfffffe70 @@ -781520,7 +781520,7 @@ sub_81A36D0: ; 81A36D0 ldr r1, =gUnknown_086109BA adds r0, r1 bl ConvertBattleFrontierTrainerSpeechToString -@081A38F8: +_081A38F8: pop {r0} bx r0 .pool @@ -781543,13 +781543,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 @@ -781561,7 +781561,7 @@ sub_81A3908: ; 81A3908 adds r0, r1 strh r6, [r0] cmp r4, 0x1 - bgt @081A3960 + bgt _081A3960 adds r7, 0x2C adds r0, r2, r7 adds r0, r1 @@ -781574,9 +781574,9 @@ sub_81A3908: ; 81A3908 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 @@ -781591,23 +781591,23 @@ sub_81A3908: ; 81A3908 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 @@ -781637,23 +781637,23 @@ 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 .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 @@ -781661,63 +781661,63 @@ sub_81A39C4: ; 81A39C4 adds r1, r2 movs r2, 0xCE lsls r2, 4 - b @081A3AB4 + b _081A3AB4 .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 .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 .pool -@081A3A6C: +_081A3A6C: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000dda - b @081A3AB4 + b _081A3AB4 .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 .pool -@081A3A98: +_081A3A98: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000e04 - b @081A3AB4 + b _081A3AB4 .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 .pool -@081A3AC4: +_081A3AC4: movs r0, 0 -@081A3AC6: +_081A3AC6: pop {r4,r5} pop {r1} bx r1 @@ -781731,7 +781731,7 @@ sub_81A3ACC: ; 81A3ACC ldr r4, =0x00000cb4 ldr r0, =0x0000ffff adds r3, r0, 0 -@081A3AD8: +_081A3AD8: ldr r0, [r5] lsls r1, r2, 1 adds r0, r4 @@ -781741,7 +781741,7 @@ sub_81A3ACC: ; 81A3ACC strh r1, [r0] adds r2, 0x1 cmp r2, 0x13 - ble @081A3AD8 + ble _081A3AD8 pop {r4,r5} pop {r0} bx r0 @@ -781755,15 +781755,15 @@ sub_81A3B00: ; 81A3B00 ldrh r1, [r0] ldr r0, =0x000003fe cmp r1, r0 - bne @081A3B20 + bne _081A3B20 ldr r1, =0x020375f0 movs r0, 0x1 - b @081A3B24 + b _081A3B24 .pool -@081A3B20: +_081A3B20: ldr r1, =0x020375f0 movs r0, 0 -@081A3B24: +_081A3B24: strh r0, [r1] pop {r0} bx r0 @@ -781817,23 +781817,23 @@ 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 .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 @@ -781841,9 +781841,9 @@ sub_81A3B64: ; 81A3B64 adds r1, r2 movs r2, 0xCE lsls r2, 4 - b @081A3C68 + b _081A3C68 .pool -@081A3BE4: +_081A3BE4: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -781853,34 +781853,34 @@ sub_81A3B64: ; 81A3B64 adds r0, r2 adds r0, r1 ldrh r5, [r0] - b @081A3C78 + b _081A3C78 .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 .pool -@081A3C18: +_081A3C18: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000dda - b @081A3C68 + b _081A3C68 .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 .pool -@081A3C44: +_081A3C44: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -781889,31 +781889,31 @@ sub_81A3B64: ; 81A3B64 adds r0, r1 ldrh r0, [r0] movs r1, 0xE - b @081A3C70 + b _081A3C70 .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, =gUnknown_086118B4 lsls r1, r7, 2 adds r1, r6, r1 @@ -781929,9 +781929,9 @@ sub_81A3B64: ; 81A3B64 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 @@ -781949,9 +781949,9 @@ sub_81A3B64: ; 81A3B64 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 @@ -781962,16 +781962,16 @@ sub_81A3B64: ; 81A3B64 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] @@ -782014,21 +782014,21 @@ sub_81A3D58: ; 81A3D58 bl sub_81A3B30 lsls r0, 24 cmp r0, 0 - bne @081A3D88 + bne _081A3D88 lsls r0, r4, 17 ldr r1, =0x8C4 << 16 adds r0, r1 lsrs r0, 16 bl FlagSet - b @081A3D94 + b _081A3D94 .pool -@081A3D88: +_081A3D88: lsls r0, r4, 17 ldr r1, =0x8C5 << 16 adds r0, r1 lsrs r0, 16 bl FlagSet -@081A3D94: +_081A3D94: pop {r4} pop {r0} bx r0 @@ -782044,16 +782044,16 @@ 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 .pool -@081A3DC4: +_081A3DC4: ldr r0, =0x020375f0 strh r2, [r0] -@081A3DC8: +_081A3DC8: pop {r0} bx r0 .pool @@ -782075,90 +782075,90 @@ 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 .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, =gUnknown_085CCB79 bl AppendString - b @081A3EC8 + b _081A3EC8 .pool -@081A3E50: +_081A3E50: cmp r5, r4 - ble @081A3EC8 + ble _081A3EC8 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB7F bl AppendString - b @081A3EC8 + b _081A3EC8 .pool -@081A3E68: +_081A3E68: cmp r4, r5 - bne @081A3E80 + bne _081A3E80 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB79 bl AppendString - b @081A3E88 + b _081A3E88 .pool -@081A3E80: +_081A3E80: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB7F bl AppendString -@081A3E88: +_081A3E88: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB86 bl AppendString - b @081A3EC8 + b _081A3EC8 .pool -@081A3EA0: +_081A3EA0: cmp r4, r5 - bne @081A3EB8 + bne _081A3EB8 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB79 bl AppendString - b @081A3EC0 + b _081A3EC0 .pool -@081A3EB8: +_081A3EB8: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB7F bl AppendString -@081A3EC0: +_081A3EC0: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB84 bl AppendString -@081A3EC8: +_081A3EC8: ldr r0, =0x02021cc4 movs r1, 0xB muls r1, r6 ldr r2, =gSpeciesNames adds r1, r2 bl AppendString -@081A3ED6: +_081A3ED6: adds r0, r4, 0 pop {r4-r6} pop {r1} @@ -782193,83 +782193,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, =gUnknown_08611C9A 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] @@ -782280,7 +782280,7 @@ sub_81A3EF0: ; 81A3EF0 ldrb r0, [r7] adds r0, 0x1 strb r0, [r7] -@081A3FBE: +_081A3FBE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -782309,46 +782309,46 @@ 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 .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 VarGet 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 .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 @@ -782356,7 +782356,7 @@ sub_81A3FD4: ; 81A3FD4 mov r0, r9 adds r0, 0x1 str r0, [sp, 0x30] -@081A404E: +_081A404E: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -782388,9 +782388,9 @@ sub_81A3FD4: ; 81A3FD4 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] @@ -782404,9 +782404,9 @@ sub_81A3FD4: ; 81A3FD4 movs r1, 0 adds r2, r4, 0 bl sub_81A3EF0 - b @081A40E4 + b _081A40E4 .pool -@081A40C8: +_081A40C8: ldr r0, =0x020375f0 ldrb r3, [r0] str r6, [sp] @@ -782420,32 +782420,32 @@ sub_81A3FD4: ; 81A3FD4 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, =gUnknown_08611C9A 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 @@ -782454,15 +782454,15 @@ sub_81A3FD4: ; 81A3FD4 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] @@ -782476,11 +782476,11 @@ sub_81A3FD4: ; 81A3FD4 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 @@ -782489,12 +782489,12 @@ sub_81A3FD4: ; 81A3FD4 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, =gUnknown_085CCB82 adds r0, r4, 0 @@ -782502,29 +782502,29 @@ sub_81A3FD4: ; 81A3FD4 ldr r1, =gUnknown_085CCB88 adds r0, r4, 0 bl AppendString - b @081A4202 + b _081A4202 .pool -@081A41A4: +_081A41A4: movs r0, 0x1 ands r0, r4 cmp r0, 0 - beq @081A41C0 + beq _081A41C0 ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB84 bl AppendString - b @081A41C8 + b _081A41C8 .pool -@081A41C0: +_081A41C0: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB82 bl AppendString -@081A41C8: +_081A41C8: ldr r0, =0x02021cc4 ldr r1, =gUnknown_085CCB8C bl AppendString - b @081A4202 + b _081A4202 .pool -@081A41E0: +_081A41E0: ldr r1, =0x020375e0 movs r0, 0 strh r0, [r1] @@ -782542,7 +782542,7 @@ sub_81A3FD4: ; 81A3FD4 ands r0, r3 orrs r0, r1 strb r0, [r2] -@081A4202: +_081A4202: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -782581,25 +782581,25 @@ 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 .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 @@ -782612,11 +782612,11 @@ sub_81A4230: ; 81A4230 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 @@ -782627,9 +782627,9 @@ sub_81A4230: ; 81A4230 ldrh r0, [r0] ldr r2, =0x00000d02 adds r1, r2 - b @081A4392 + b _081A4392 .pool -@081A42DC: +_081A42DC: ldr r6, =0x03005d90 ldr r0, [r6] lsls r2, r4, 1 @@ -782641,21 +782641,21 @@ sub_81A4230: ; 81A4230 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 .pool -@081A431C: +_081A431C: ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 @@ -782664,17 +782664,17 @@ sub_81A4230: ; 81A4230 ldr r1, =0x00000dc8 adds r2, r1 adds r1, r2, r0 - b @081A4388 + b _081A4388 .pool -@081A4338: +_081A4338: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000dda adds r0, r2 - b @081A4386 + b _081A4386 .pool -@081A434C: +_081A434C: ldr r0, =0x03005d90 ldr r2, [r0] lsls r0, r4, 1 @@ -782683,33 +782683,33 @@ sub_81A4230: ; 81A4230 ldr r3, =0x00000de2 adds r2, r3 adds r1, r2, r0 - b @081A4388 + b _081A4388 .pool -@081A4368: +_081A4368: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 ldr r2, =0x00000e04 adds r0, r2 - b @081A4386 + b _081A4386 .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 @@ -782723,7 +782723,7 @@ sub_81A43A8: ; 81A43A8 movs r4, 0 ldr r6, =0x03005d8c movs r5, 0x64 -@081A43B2: +_081A43B2: ldr r0, =0x03005d90 ldr r0, [r0] lsls r1, r4, 1 @@ -782732,7 +782732,7 @@ sub_81A43A8: ; 81A43A8 adds r1, r0, r1 ldrh r0, [r1] cmp r0, 0 - beq @081A43EE + beq _081A43EE adds r1, r0, 0 muls r1, r5 movs r0, 0xEA @@ -782752,12 +782752,12 @@ sub_81A43A8: ; 81A43A8 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} @@ -782791,24 +782791,24 @@ sub_81A443C: ; 81A443C ldr r0, =0x020375e2 ldrh r0, [r0] cmp r0, 0 - beq @081A4450 + beq _081A4450 cmp r0, 0x1 - beq @081A4464 - b @081A446E + beq _081A4464 + b _081A446E .pool -@081A4450: +_081A4450: ldr r0, =0x02021cc4 ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 - b @081A446E + b _081A446E .pool -@081A4464: +_081A4464: ldr r0, =0x02021dc4 ldr r1, =0x02038bca ldrh r1, [r1] bl sub_8162E20 -@081A446E: +_081A446E: pop {r0} bx r0 .pool @@ -782824,7 +782824,7 @@ sub_81A447C: ; 81A447C sub sp, 0x8 movs r0, 0 str r0, [sp] -@081A448C: +_081A448C: ldr r1, =0x03005d90 ldr r0, [r1] ldr r2, [sp] @@ -782840,7 +782840,7 @@ sub_81A447C: ; 81A447C adds r2, 0x1 str r2, [sp, 0x4] cmp r0, 0x5 - bhi @081A454E + bhi _081A454E movs r6, 0 ldr r0, [sp] movs r2, 0x64 @@ -782848,14 +782848,14 @@ sub_81A447C: ; 81A447C 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 @@ -782881,25 +782881,25 @@ sub_81A447C: ; 81A447C 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 @@ -782922,13 +782922,13 @@ sub_81A447C: ; 81A447C 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 @@ -782994,7 +782994,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 @@ -783016,9 +783016,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 @@ -783049,7 +783049,7 @@ sub_81A4594: ; 81A4594 movs r1, 0x1 adds r2, r5, 0 bl Print -@081A465C: +_081A465C: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -783102,7 +783102,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 @@ -783136,18 +783136,18 @@ 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 .pool -@081A4734: +_081A4734: add r0, sp, 0xC adds r1, r4, 0 bl CopyString -@081A473C: +_081A473C: ldr r2, =0x0203ab74 mov r9, r2 ldrb r0, [r2] @@ -783175,9 +783175,9 @@ sub_81A4684: ; 81A4684 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 @@ -783208,7 +783208,7 @@ sub_81A4684: ; 81A4684 movs r1, 0x1 adds r2, r5, 0 bl Print -@081A47BC: +_081A47BC: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -783252,7 +783252,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 @@ -783265,7 +783265,7 @@ sub_81A47E0: ; 81A47E0 adds r3, 0x10 subs r2, 0x1 cmp r2, 0 - bge @081A4820 + bge _081A4820 ldr r6, [sp, 0x40] lsls r0, r6, 4 mov r7, r10 @@ -783278,30 +783278,30 @@ sub_81A47E0: ; 81A47E0 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 @@ -783316,7 +783316,7 @@ sub_81A47E0: ; 81A47E0 strh r0, [r2, 0x4] adds r2, r6, 0 cmp r2, 0x2 - ble @081A4852 + ble _081A4852 mov r0, r8 bl Free add sp, 0x44 @@ -783359,7 +783359,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 @@ -783373,7 +783373,7 @@ sub_81A48B4: ; 81A48B4 adds r2, 0x1C subs r4, 0x1 cmp r4, 0 - bge @081A48EE + bge _081A48EE mov r6, r10 lsls r0, r6, 3 subs r0, r6 @@ -783390,30 +783390,30 @@ sub_81A48B4: ; 81A48B4 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 @@ -783433,7 +783433,7 @@ sub_81A48B4: ; 81A48B4 strh r0, [r2, 0x8] adds r4, r7, 0 cmp r4, 0x2 - ble @081A492A + ble _081A492A mov r0, r8 bl Free add sp, 0x74 @@ -783506,7 +783506,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 @@ -783524,7 +783524,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 @@ -783533,17 +783533,17 @@ sub_81A4998: ; 81A4998 adds r4, 0x1C adds r5, 0x1 cmp r5, 0x2 - ble @081A4A3A - b @081A4A90 + ble _081A4A3A + b _081A4A90 .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 @@ -783553,8 +783553,8 @@ sub_81A4998: ; 81A4998 adds r4, 0x10 adds r5, 0x1 cmp r5, 0x2 - ble @081A4A7A -@081A4A90: + ble _081A4A7A +_081A4A90: add sp, 0x94 pop {r3-r5} mov r8, r3 @@ -783623,7 +783623,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 @@ -783636,12 +783636,12 @@ sub_81A4B14: ; 81A4B14 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 @@ -783669,21 +783669,21 @@ sub_81A4B14: ; 81A4B14 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 @@ -783695,7 +783695,7 @@ sub_81A4B14: ; 81A4B14 ldr r3, =0x0000057c adds r6, r1, r3 movs r5, 0x2 -@081A4BAE: +_081A4BAE: ldr r0, [r7] adds r0, r6 adds r0, r2 @@ -783735,10 +783735,10 @@ sub_81A4B14: ; 81A4B14 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 @@ -783766,7 +783766,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 @@ -783775,7 +783775,7 @@ sub_81A4C30: ; 81A4C30 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 @@ -783789,7 +783789,7 @@ sub_81A4C30: ; 81A4C30 movs r0, 0xFA lsls r0, 1 adds r6, r7, r0 -@081A4C84: +_081A4C84: adds r0, r5, 0 adds r1, r4, 0 movs r2, 0x64 @@ -783797,7 +783797,7 @@ sub_81A4C30: ; 81A4C30 adds r4, 0x64 adds r5, 0x64 cmp r4, r6 - ble @081A4C84 + ble _081A4C84 adds r0, r7, 0 bl Free pop {r3} @@ -783817,18 +783817,18 @@ 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 .pool -@081A4CD0: +_081A4CD0: ldr r0, =0x000040cf bl VarGet lsls r0, 16 lsrs r0, 16 -@081A4CDA: +_081A4CDA: ldr r2, =gTrainers ldr r1, =gUnknown_08611D30 lsls r0, 1 @@ -783853,18 +783853,18 @@ 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 .pool -@081A4D20: +_081A4D20: ldr r0, =0x000040cf bl VarGet lsls r0, 16 lsrs r0, 16 -@081A4D2A: +_081A4D2A: ldr r2, =gTrainers ldr r1, =gUnknown_08611D30 lsls r0, 1 @@ -783890,18 +783890,18 @@ 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 .pool -@081A4D70: +_081A4D70: ldr r0, =0x000040cf bl VarGet lsls r0, 16 lsrs r0, 16 -@081A4D7A: +_081A4D7A: movs r3, 0 lsls r0, 1 ldr r2, =gTrainers @@ -783913,14 +783913,14 @@ sub_81A4D50: ; 81A4D50 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] @@ -783981,18 +783981,18 @@ 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 .pool -@081A4E44: +_081A4E44: movs r4, 0x7 -@081A4E46: +_081A4E46: bl zero_enemy_party_data movs r1, 0 str r1, [sp, 0x18] @@ -784002,7 +784002,7 @@ sub_81A4E04: ; 81A4E04 str r0, [sp, 0x1C] movs r2, 0 str r2, [sp, 0x14] -@081A4E5C: +_081A4E5C: movs r0, 0x1 ands r0, r4 asrs r4, 1 @@ -784011,9 +784011,9 @@ sub_81A4E04: ; 81A4E04 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 @@ -784033,7 +784033,7 @@ sub_81A4E04: ; 81A4E04 add r0, r9 lsls r0, 2 mov r8, r0 -@081A4E96: +_081A4E96: bl GenerateRandomNumber adds r4, r0, 0 bl GenerateRandomNumber @@ -784046,7 +784046,7 @@ sub_81A4E04: ; 81A4E04 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 @@ -784066,7 +784066,7 @@ sub_81A4E04: ; 81A4E04 lsls r0, 24 lsrs r0, 24 cmp r1, r0 - bne @081A4E96 + bne _081A4E96 ldr r4, [sp, 0x18] movs r0, 0x64 adds r3, r4, 0 @@ -784106,7 +784106,7 @@ sub_81A4E04: ; 81A4E04 movs r7, 0 mov r6, r8 ldr r3, =0x02024744 -@081A4F32: +_081A4F32: adds r1, r7, 0 adds r1, 0x1A ldr r0, [sp, 0x14] @@ -784121,7 +784121,7 @@ sub_81A4E04: ; 81A4E04 adds r7, 0x1 ldr r3, [sp, 0x40] cmp r7, 0x5 - ble @081A4F32 + ble _081A4F32 movs r1, 0xFF add r0, sp, 0x10 strb r1, [r0] @@ -784134,7 +784134,7 @@ sub_81A4E04: ; 81A4E04 mov r8, r3 ldr r3, =0x02024744 adds r5, r4, 0 -@081A4F6A: +_081A4F6A: ldr r4, [sp, 0x38] ldr r0, [sp, 0x24] subs r1, r4, r0 @@ -784155,15 +784155,15 @@ sub_81A4E04: ; 81A4E04 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 @@ -784178,14 +784178,14 @@ sub_81A4E04: ; 81A4E04 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 @@ -784367,7 +784367,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, =gUnknown_08611550 @@ -784380,28 +784380,28 @@ sub_81A513C: ; 81A513C adds r0, r2, r3 ldrb r0, [r0] cmp r1, r0 - bne @081A5180 + bne _081A5180 movs r4, 0 - b @081A51A0 + b _081A51A0 .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} @@ -784419,30 +784419,30 @@ 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 .pool -@081A51D4: +_081A51D4: ldr r0, =0x000040cf bl VarGet 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 .pool -@081A51F4: +_081A51F4: ldr r0, =0x02021fc4 ldr r2, =gUnknown_08611DB0 lsls r1, 2 @@ -784452,9 +784452,9 @@ sub_81A51A8: ; 81A51A8 adds r1, r2 ldr r1, [r1] bl CopyString - b @081A5228 + b _081A5228 .pool -@081A5214: +_081A5214: ldr r0, =0x02021fc4 ldr r2, =gUnknown_08611DB8 lsls r1, 2 @@ -784464,7 +784464,7 @@ sub_81A51A8: ; 81A51A8 adds r1, r2 ldr r1, [r1] bl CopyString -@081A5228: +_081A5228: pop {r4,r5} pop {r0} bx r0 @@ -784494,29 +784494,29 @@ sub_81A5258: ; 81A5258 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 .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] @@ -784540,9 +784540,9 @@ sub_81A5258: ; 81A5258 ldr r1, =0x02022e26 movs r0, 0x70 strh r0, [r1] - b @081A553E + b _081A553E .pool -@081A52F4: +_081A52F4: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -784550,24 +784550,24 @@ sub_81A5258: ; 81A5258 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 .pool -@081A531C: +_081A531C: bl IsDma3ManagerBusyWithBgCopy 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] @@ -784606,22 +784606,22 @@ sub_81A5258: ; 81A5258 adds r0, r4, 0 movs r1, 0x15 bl battle_show_message_maybe - b @081A553E + b _081A553E .pool -@081A53B4: +_081A53B4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - beq @081A53C0 - b @081A5544 -@081A53C0: + beq _081A53C0 + b _081A5544 +_081A53C0: ldr r1, =0x00003f3f movs r0, 0x48 bl SetGpuReg movs r6, 0x80 lsls r6, 15 movs r4, 0x7 -@081A53CE: +_081A53CE: asrs r1, r6, 16 ldr r0, =gUnknown_08611F5C movs r2, 0x54 @@ -784642,10 +784642,10 @@ sub_81A5258: ; 81A5258 adds r6, r0 subs r4, 0x1 cmp r4, 0 - bge @081A53CE - b @081A553C + bge _081A53CE + b _081A553C .pool -@081A540C: +_081A540C: ldr r0, =0x00000109 bl audio_play movs r0, 0x50 @@ -784656,9 +784656,9 @@ sub_81A5258: ; 81A5258 movs r0, 0xA0 movs r1, 0x28 movs r2, 0 - b @081A5464 + b _081A5464 .pool -@081A542C: +_081A542C: ldr r0, =0x00000109 bl audio_play movs r0, 0x50 @@ -784669,9 +784669,9 @@ sub_81A5258: ; 81A5258 movs r0, 0xA0 movs r1, 0x38 movs r2, 0x1 - b @081A5464 + b _081A5464 .pool -@081A544C: +_081A544C: ldr r0, =0x00000109 bl audio_play movs r0, 0x50 @@ -784682,7 +784682,7 @@ sub_81A5258: ; 81A5258 movs r0, 0xA0 movs r1, 0x48 movs r2, 0x2 -@081A5464: +_081A5464: movs r3, 0x1 bl sub_81A5558 ldr r0, =gUnknown_085CCDCB @@ -784694,9 +784694,9 @@ sub_81A5258: ; 81A5258 adds r0, 0x1 strb r0, [r5] movs r6, 0x1 - b @081A5544 + b _081A5544 .pool -@081A5490: +_081A5490: movs r0, 0x85 lsls r0, 1 bl audio_play @@ -784705,26 +784705,26 @@ sub_81A5258: ; 81A5258 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 .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 .pool -@081A54D0: +_081A54D0: movs r6, 0x4 - b @081A553E -@081A54D4: + b _081A553E +_081A54D4: ldr r1, =0x00003f3e movs r0, 0x48 bl SetGpuReg @@ -784749,28 +784749,28 @@ sub_81A5258: ; 81A5258 movs r2, 0x8 movs r3, 0 bl pal_fade_maybe - b @081A553E + b _081A553E .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 SetGpuReg movs r0, 0xFA lsls r0, 2 bl FreeObjectTilesByTag -@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} @@ -784811,19 +784811,19 @@ 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 .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] @@ -784833,8 +784833,8 @@ sub_81A5558: ; 81A5558 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] @@ -784844,8 +784844,8 @@ sub_81A5558: ; 81A5558 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 @@ -784873,43 +784873,43 @@ sub_81A5558: ; 81A5558 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 .pool -@081A5628: +_081A5628: ldr r1, =0x02022f58 -@081A562A: +_081A562A: ldrb r0, [r1] adds r0, 0x2 strb r0, [r1] - b @081A565E + b _081A565E .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 .pool -@081A564C: +_081A564C: ldr r1, =0x02022f58 -@081A564E: +_081A564E: ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @081A565E + b _081A565E .pool -@081A565C: +_081A565C: movs r4, 0 -@081A565E: +_081A565E: ldr r0, =gUnknown_08611F5C ldr r1, [sp] mov r2, r10 @@ -784942,10 +784942,10 @@ sub_81A5698: ; 81A5698 ldr r0, =0x02024332 ldrb r0, [r0] cmp r0, 0x8 - bls @081A56AA + bls _081A56AA adds r0, r1, 0 bl RemoveObjectAndFreeTiles -@081A56AA: +_081A56AA: pop {r0} bx r0 .pool @@ -785015,7 +785015,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] @@ -785026,75 +785026,75 @@ 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 .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 .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 @@ -785116,57 +785116,57 @@ 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 .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 .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 @@ -785200,9 +785200,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 @@ -785241,31 +785241,31 @@ 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 .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 @@ -785298,55 +785298,55 @@ 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 .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 .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 .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 .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 @@ -785366,26 +785366,26 @@ 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 .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 .pool -@081A5A48: +_081A5A48: lsls r1, 1 ldr r3, =0x00000dda adds r0, r2, r3 @@ -785393,53 +785393,53 @@ sub_81A59FC: ; 81A59FC ldr r1, =0x020375e4 ldrh r1, [r1] strh r1, [r0] - b @081A5ABA + b _081A5ABA .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 .pool -@081A5A80: +_081A5A80: ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] movs r2, 0x81 negs r2, r2 - b @081A5AB6 + b _081A5AB6 .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 .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 .pool @@ -785488,7 +785488,7 @@ sub_81A5B08: ; 81A5B08 adds r1, r0 ldrh r0, [r1] cmp r0, 0x29 - bls @081A5B58 + bls _081A5B58 bl GenerateRandomNumber ldr r4, [r4] ldr r5, =gUnknown_08611FAC @@ -785502,9 +785502,9 @@ sub_81A5B08: ; 81A5B08 ldrh r0, [r0] ldr r1, =0x00000dd8 adds r4, r1 - b @081A5B76 + b _081A5B76 .pool -@081A5B58: +_081A5B58: bl GenerateRandomNumber ldr r4, [r4] ldr r5, =gUnknown_08611FA0 @@ -785518,7 +785518,7 @@ sub_81A5B08: ; 81A5B08 ldrh r0, [r0] ldr r2, =0x00000dd8 adds r4, r2 -@081A5B76: +_081A5B76: strh r0, [r4] pop {r4,r5} pop {r0} @@ -785539,7 +785539,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 @@ -785553,13 +785553,13 @@ sub_81A5B88: ; 81A5B88 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b @081A5BD6 + b _081A5BD6 .pool -@081A5BD0: +_081A5BD0: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -@081A5BD6: +_081A5BD6: pop {r4,r5} pop {r0} bx r0 @@ -785928,7 +785928,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 @@ -785940,7 +785940,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] @@ -785950,7 +785950,7 @@ sub_81A5E94: ; 81A5E94 lsls r4, 4 ldr r0, =0x0000ffff adds r3, r0, 0 -@081A5F1C: +_081A5F1C: ldr r1, [r5] lsls r0, r2, 1 adds r0, r2 @@ -785964,12 +785964,12 @@ sub_81A5E94: ; 81A5E94 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] @@ -785979,7 +785979,7 @@ sub_81A5E94: ; 81A5E94 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x2 - bls @081A5F40 + bls _081A5F40 ldr r0, [r6] movs r1, 0x4 ldrsb r1, [r0, r1] @@ -786015,27 +786015,27 @@ 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 .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 .pool -@081A6000: +_081A6000: ldr r4, =0x020375f0 ldr r2, [r7] ldr r0, =0x00000cdc @@ -786052,21 +786052,21 @@ sub_81A5FA8: ; 81A5FA8 orrs r0, r1 lsrs r0, 31 strh r0, [r4] - b @081A6044 + b _081A6044 .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 @@ -786090,18 +786090,18 @@ 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 .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 @@ -786112,13 +786112,13 @@ sub_81A6054: ; 81A6054 ldr r0, =0x020375e4 ldrh r0, [r0] strh r0, [r2] - b @081A6128 + b _081A6128 .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 @@ -786131,9 +786131,9 @@ sub_81A6054: ; 81A6054 ldr r1, [r1] orrs r0, r1 str r0, [r2] - b @081A6128 + b _081A6128 .pool -@081A60E4: +_081A60E4: ldr r2, [r6] ldr r1, =0x00000cdc adds r2, r1 @@ -786146,13 +786146,13 @@ sub_81A6054: ; 81A6054 ldr r1, [r1] ands r0, r1 str r0, [r2] - b @081A6128 + b _081A6128 .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 @@ -786165,7 +786165,7 @@ sub_81A6054: ; 81A6054 movs r1, 0 strh r0, [r2] strb r1, [r3] -@081A6128: +_081A6128: pop {r4-r6} pop {r0} bx r0 @@ -786273,7 +786273,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] @@ -786290,49 +786290,49 @@ sub_81A61B0: ; 81A61B0 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 @@ -786340,7 +786340,7 @@ sub_81A61B0: ; 81A61B0 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] @@ -786356,13 +786356,13 @@ sub_81A61B0: ; 81A61B0 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 @@ -786371,53 +786371,53 @@ sub_81A61B0: ; 81A61B0 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, =gBattleFrontierHeldItems mov r12, r3 add r0, sp, 0x8 @@ -786426,10 +786426,10 @@ sub_81A61B0: ; 81A61B0 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] @@ -786439,15 +786439,15 @@ sub_81A61B0: ; 81A61B0 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] @@ -786470,9 +786470,9 @@ sub_81A61B0: ; 81A61B0 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 @@ -786509,20 +786509,20 @@ sub_81A63CC: ; 81A63CC movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq @081A63FC + beq _081A63FC ldr r1, =0x0203bc8c ldr r0, =gBattleFrontierMons - b @081A6400 + b _081A6400 .pool -@081A63FC: +_081A63FC: ldr r1, =0x0203bc8c ldr r0, =gSlateportBattleTentMons -@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 @@ -786589,7 +786589,7 @@ sub_81A63CC: ; 81A63CC lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x2 - bls @081A6408 + bls _081A6408 pop {r3} mov r8, r3 pop {r4-r7} @@ -786615,15 +786615,15 @@ sub_81A64C4: ; 81A64C4 adds r0, r3, 0 ands r0, r1 cmp r0, 0x2 - bne @081A6500 + bne _081A6500 ldr r1, =0x0203bc8c ldr r0, =gSlateportBattleTentMons str r0, [r1] movs r2, 0x1E str r2, [sp, 0x14] - b @081A6518 + b _081A6518 .pool -@081A6500: +_081A6500: ldr r1, =0x0203bc8c ldr r0, =gBattleFrontierMons str r0, [r1] @@ -786633,16 +786633,16 @@ sub_81A64C4: ; 81A64C4 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 @@ -786651,7 +786651,7 @@ sub_81A64C4: ; 81A64C4 str r1, [sp, 0x1C] ldr r2, =0x0203bc8c mov r9, r2 -@081A6534: +_081A6534: ldr r4, =0x03005d90 ldr r2, [r4] mov r5, r8 @@ -786700,18 +786700,18 @@ sub_81A64C4: ; 81A64C4 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 @@ -786724,14 +786724,14 @@ sub_81A64C4: ; 81A64C4 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 @@ -786739,12 +786739,12 @@ sub_81A64C4: ; 81A64C4 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 @@ -786755,7 +786755,7 @@ sub_81A64C4: ; 81A64C4 ldr r1, [sp, 0x1C] strb r0, [r1] movs r6, 0 -@081A6602: +_081A6602: mov r2, r9 ldr r0, [r2] adds r0, r7, r0 @@ -786769,7 +786769,7 @@ sub_81A64C4: ; 81A64C4 bl sub_81A7024 adds r6, 0x1 cmp r6, 0x3 - ble @081A6602 + ble _081A6602 movs r5, 0x64 mov r4, r8 muls r4, r5 @@ -786803,22 +786803,22 @@ sub_81A64C4: ; 81A64C4 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 @@ -786869,18 +786869,18 @@ sub_81A64C4: ; 81A64C4 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 @@ -786893,14 +786893,14 @@ sub_81A64C4: ; 81A64C4 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 @@ -786908,12 +786908,12 @@ sub_81A64C4: ; 81A64C4 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 @@ -786921,7 +786921,7 @@ sub_81A64C4: ; 81A64C4 adds r0, r4, r5 bl pokemon_calc_effective_stats movs r6, 0 -@081A674E: +_081A674E: mov r1, r9 ldr r0, [r1] adds r0, r7, r0 @@ -786935,7 +786935,7 @@ sub_81A64C4: ; 81A64C4 bl sub_81A7024 adds r6, 0x1 cmp r6, 0x3 - ble @081A674E + ble _081A674E movs r2, 0x64 mov r4, r8 muls r4, r2 @@ -786965,9 +786965,9 @@ sub_81A64C4: ; 81A64C4 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 @@ -787004,7 +787004,7 @@ sub_81A67EC: ; 81A67EC mov r0, sp movs r4, 0x5 mov r8, r4 -@081A681A: +_081A681A: strh r2, [r0] strh r2, [r1] strh r2, [r3] @@ -787016,7 +787016,7 @@ sub_81A67EC: ; 81A67EC add r8, r5 mov r4, r8 cmp r4, 0 - bge @081A681A + bge _081A681A mov r5, r9 ldr r0, [r5] ldr r7, =0x00000ca9 @@ -787047,9 +787047,9 @@ sub_81A67EC: ; 81A67EC lsrs r0, 16 movs r2, 0 cmp r0, 0x1 - bne @081A6878 + bne _081A6878 movs r2, 0x1 -@081A6878: +_081A6878: ldr r1, =0x0203bc8c ldr r0, =gBattleFrontierMons str r0, [r1] @@ -787060,15 +787060,15 @@ sub_81A67EC: ; 81A67EC movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq @081A68B4 + beq _081A68B4 movs r4, 0x1 str r4, [sp, 0x28] - b @081A68B8 + b _081A68B8 .pool -@081A68B4: +_081A68B4: movs r5, 0 str r5, [sp, 0x28] -@081A68B8: +_081A68B8: adds r0, r2, 0 ldr r1, [sp, 0x28] bl sub_81A6F70 @@ -787087,19 +787087,19 @@ sub_81A67EC: ; 81A67EC 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 @@ -787110,59 +787110,59 @@ sub_81A67EC: ; 81A67EC 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, =gBattleFrontierHeldItems 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 @@ -787172,22 +787172,22 @@ sub_81A67EC: ; 81A67EC 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 .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 @@ -787221,12 +787221,12 @@ sub_81A67EC: ; 81A67EC 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 @@ -787251,7 +787251,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] @@ -787259,7 +787259,7 @@ sub_81A6A08: ; 81A6A08 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x11 - bls @081A6A1E + bls _081A6A1E movs r4, 0 ldr r0, =0x03006298 mov r8, r0 @@ -787267,7 +787267,7 @@ sub_81A6A08: ; 81A6A08 ldr r6, [r0] ldr r1, =gBaseStats mov r12, r1 -@081A6A3C: +_081A6A3C: lsls r0, r4, 1 add r0, r8 ldrh r0, [r0] @@ -787287,25 +787287,25 @@ sub_81A6A08: ; 81A6A08 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 @@ -787313,40 +787313,40 @@ sub_81A6A08: ; 81A6A08 ldrb r2, [r0] ldrb r0, [r1] cmp r2, r0 - bcs @081A6AAC + bcs _081A6AAC strb r4, [r5] - b @081A6AB2 + b _081A6AB2 .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 @@ -787365,7 +787365,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] @@ -787373,15 +787373,15 @@ sub_81A6AEC: ; 81A6AEC 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 @@ -787402,12 +787402,12 @@ sub_81A6AEC: ; 81A6AEC 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] @@ -787415,7 +787415,7 @@ sub_81A6AEC: ; 81A6AEC adds r5, r1, 0 ldr r3, =gBattleFactoryStyleRequiredMoveCounts adds r2, r5, 0 -@081A6B5C: +_081A6B5C: mov r1, sp adds r0, r1, r4 subs r1, r4, 0x1 @@ -787423,22 +787423,22 @@ sub_81A6AEC: ; 81A6AEC 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} @@ -787453,7 +787453,7 @@ sub_81A6BA4: ; 81A6BA4 lsrs r5, r0, 16 movs r2, 0 ldr r6, =gBattleFactoryStyleMoveListPointers -@081A6BAE: +_081A6BAE: movs r3, 0 lsls r0, r2, 2 adds r0, r6 @@ -787461,19 +787461,19 @@ sub_81A6BA4: ; 81A6BA4 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 .pool -@081A6BD4: +_081A6BD4: adds r0, r3, 0x1 lsls r0, 24 lsrs r3, r0, 24 @@ -787481,14 +787481,14 @@ sub_81A6BA4: ; 81A6BA4 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 @@ -787506,9 +787506,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 @@ -787526,18 +787526,18 @@ sub_81A6C1C: ; 81A6C1C movs r0, 0x3 ands r0, r1 cmp r0, 0x2 - beq @081A6C48 + beq _081A6C48 ldr r1, =0x0203bc8c ldr r0, =gBattleFrontierMons - b @081A6C4C + b _081A6C4C .pool -@081A6C48: +_081A6C48: ldr r1, =0x0203bc8c ldr r0, =gSlateportBattleTentMons -@081A6C4C: +_081A6C4C: str r0, [r1] movs r4, 0 -@081A6C50: +_081A6C50: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -787566,7 +787566,7 @@ sub_81A6C1C: ; 81A6C1C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @081A6C50 + bls _081A6C50 pop {r4} pop {r0} bx r0 @@ -787584,9 +787584,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, =gUnknown_08612184 lsls r1, 1 adds r1, r2, r1 @@ -787657,7 +787657,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 @@ -787670,17 +787670,17 @@ sub_81A6CD0: ; 81A6CD0 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] @@ -787689,28 +787689,28 @@ sub_81A6CD0: ; 81A6CD0 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] @@ -787720,35 +787720,35 @@ sub_81A6CD0: ; 81A6CD0 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, =gBattleFrontierHeldItems 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] @@ -787756,15 +787756,15 @@ sub_81A6CD0: ; 81A6CD0 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 @@ -787811,7 +787811,7 @@ sub_81A6CD0: ; 81A6CD0 movs r0, 0x1 add r0, r9 mov r8, r0 -@081A6E6E: +_081A6E6E: ldr r1, =0x0203bc8c ldr r0, [r1] adds r0, r7, r0 @@ -787825,7 +787825,7 @@ sub_81A6CD0: ; 81A6CD0 bl sub_81A7024 adds r4, 0x1 cmp r4, 0x3 - ble @081A6E6E + ble _081A6E6E movs r0, 0x64 mov r4, r9 muls r4, r0 @@ -787846,12 +787846,12 @@ sub_81A6CD0: ; 81A6CD0 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 @@ -787879,28 +787879,28 @@ 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, =gUnknown_08612194 adds r1, r3 adds r1, 0x1 - b @081A6F38 + b _081A6F38 .pool -@081A6F20: +_081A6F20: ldr r2, =gUnknown_08612194 adds r1, r3 - b @081A6F38 + b _081A6F38 .pool -@081A6F2C: +_081A6F2C: adds r1, r3, 0 cmp r1, 0x7 - beq @081A6F34 + beq _081A6F34 movs r1, 0x7 -@081A6F34: +_081A6F34: ldr r2, =gUnknown_08612194 adds r1, r4, r1 -@081A6F38: +_081A6F38: lsls r1, 2 adds r0, r2, 0x2 adds r0, r1, r0 @@ -787943,21 +787943,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 .pool @@ -787974,7 +787974,7 @@ sub_81A6FB4: ; 81A6FB4 lsls r0, 30 lsrs r4, r0, 30 cmp r4, 0x2 - beq @081A6FF8 + beq _081A6FF8 ldr r0, =0x000040ce bl VarGet lsls r0, 16 @@ -787994,22 +787994,22 @@ 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 .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 @@ -788023,9 +788023,9 @@ sub_81A7024: ; 81A7024 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 @@ -788073,79 +788073,79 @@ 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 .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 .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 VarSet -@081A7126: +_081A7126: cmp r6, 0x1 - bne @081A7132 + bne _081A7132 ldr r0, =0x00004011 adds r1, r7, 0 bl VarSet -@081A7132: +_081A7132: pop {r4-r7} pop {r0} bx r0 @@ -788166,30 +788166,30 @@ 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 .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 .pool -@081A71A0: +_081A71A0: ldr r2, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000ca9 @@ -788201,9 +788201,9 @@ sub_81A7140: ; 81A7140 adds r1, r3 adds r1, r0 ldrh r0, [r1] - b @081A7238 + b _081A7238 .pool -@081A71C4: +_081A71C4: ldr r2, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000ca9 @@ -788215,9 +788215,9 @@ sub_81A7140: ; 81A7140 adds r1, r3 adds r1, r0 ldrh r0, [r1] - b @081A7238 + b _081A7238 .pool -@081A71E8: +_081A71E8: ldr r2, =0x020375f0 ldr r1, [r3] ldr r3, =0x00000ca9 @@ -788229,11 +788229,11 @@ sub_81A7140: ; 81A7140 adds r1, r3 adds r1, r0 ldrh r0, [r1] - b @081A7238 + b _081A7238 .pool -@081A720C: +_081A720C: cmp r2, 0 - beq @081A7228 + beq _081A7228 ldr r2, =0x020375f0 ldr r0, [r3] ldr r1, =0x00000cdc @@ -788241,9 +788241,9 @@ sub_81A7140: ; 81A7140 ldr r0, [r0] movs r1, 0x80 lsls r1, 4 - b @081A7236 + b _081A7236 .pool -@081A7228: +_081A7228: ldr r2, =0x020375f0 ldr r0, [r3] ldr r3, =0x00000cdc @@ -788251,11 +788251,11 @@ sub_81A7140: ; 81A7140 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 .pool @@ -788275,39 +788275,39 @@ 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 .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 .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 @@ -788315,15 +788315,15 @@ sub_81A7248: ; 81A7248 lsls r1, 30 lsrs r1, 29 ldr r5, =0x00000e04 - b @081A732C + b _081A732C .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 @@ -788335,18 +788335,18 @@ sub_81A7248: ; 81A7248 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 .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 @@ -788354,19 +788354,19 @@ sub_81A7248: ; 81A7248 lsls r1, 30 lsrs r1, 29 ldr r5, =0x00000e0c -@081A732C: +_081A732C: adds r0, r5 adds r0, r1 strh r3, [r0] - b @081A73AA + b _081A73AA .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 @@ -788374,21 +788374,21 @@ sub_81A7248: ; 81A7248 movs r2, 0x80 lsls r2, 4 orrs r1, r2 - b @081A73A8 + b _081A73A8 .pool -@081A7368: +_081A7368: ldr r0, [r2] ldr r2, =0x00000cdc adds r0, r2 ldr r1, [r0] ldr r2, =0xfffff7ff - b @081A73A6 + b _081A73A6 .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 @@ -788396,19 +788396,19 @@ sub_81A7248: ; 81A7248 movs r2, 0x80 lsls r2, 3 orrs r1, r2 - b @081A73A8 + b _081A73A8 .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 @@ -788424,15 +788424,15 @@ 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 .pool -@081A73DC: +_081A73DC: ldr r1, =0x020375f0 movs r0, 0 -@081A73E0: +_081A73E0: strh r0, [r1] pop {r0} bx r0 @@ -788513,47 +788513,47 @@ sub_81A7468: ; 81A7468 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 .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 .pool -@081A7498: +_081A7498: ldr r1, =0x020375f0 movs r0, 0x1 - b @081A74C0 + b _081A74C0 .pool -@081A74A4: +_081A74A4: ldr r1, =0x020375f0 movs r0, 0x2 - b @081A74C0 + b _081A74C0 .pool -@081A74B0: +_081A74B0: ldr r1, =0x020375f0 movs r0, 0x3 - b @081A74C0 + b _081A74C0 .pool -@081A74BC: +_081A74BC: ldr r1, =0x020375f0 movs r0, 0x4 -@081A74C0: +_081A74C0: strh r0, [r1] -@081A74C2: +_081A74C2: pop {r0} bx r0 .pool @@ -788598,34 +788598,34 @@ sub_81A7508: ; 81A7508 adds r0, r1 ldrh r0, [r0] cmp r0, 0x4 - bhi @081A7538 + bhi _081A7538 ldr r1, =gUnknown_0861231C ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x2] - b @081A7560 + b _081A7560 .pool -@081A7538: +_081A7538: cmp r0, 0xA - bhi @081A7554 + bhi _081A7554 ldr r1, =gUnknown_0861231C ldr r0, =0x03001294 ldrb r0, [r0] lsls r0, 3 adds r0, r1 ldrb r1, [r0, 0x3] - b @081A7560 + b _081A7560 .pool -@081A7554: +_081A7554: ldr r1, =gUnknown_0861231C 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 @@ -788655,7 +788655,7 @@ sub_81A7594: ; 81A7594 adds r5, r0, 0 movs r4, 0 movs r1, 0 -@081A759E: +_081A759E: mov r2, sp adds r0, r2, r4 strb r1, [r0] @@ -788663,7 +788663,7 @@ sub_81A7594: ; 81A7594 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @081A759E + bls _081A759E adds r0, r5, 0 movs r1, 0x3A bl pokemon_getattr @@ -788683,7 +788683,7 @@ sub_81A7594: ; 81A7594 lsls r0, 24 lsrs r6, r0, 24 movs r4, 0 -@081A75DA: +_081A75DA: adds r1, r4, 0 adds r1, 0xD adds r0, r5, 0 @@ -788704,7 +788704,7 @@ sub_81A7594: ; 81A7594 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @081A75DA + bls _081A75DA mov r0, sp movs r1, 0 strb r1, [r0] @@ -788730,44 +788730,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} @@ -788781,19 +788781,19 @@ sub_81A767C: ; 81A767C 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, =gBaseStats lsls r0, r2, 3 subs r0, r2 @@ -788801,17 +788801,17 @@ sub_81A767C: ; 81A767C 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 .pool -@081A76C4: +_081A76C4: ldr r0, =gBaseStats lsls r1, r2, 3 subs r1, r2 @@ -788819,13 +788819,13 @@ sub_81A767C: ; 81A767C 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 .pool -@081A76E0: +_081A76E0: ldr r1, =gBaseStats lsls r0, r2, 3 subs r0, r2 @@ -788833,17 +788833,17 @@ sub_81A767C: ; 81A767C 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 .pool -@081A7704: +_081A7704: ldr r0, =gBaseStats lsls r1, r2, 3 subs r1, r2 @@ -788851,13 +788851,13 @@ sub_81A767C: ; 81A767C 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 @@ -788873,7 +788873,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] @@ -788881,10 +788881,10 @@ sub_81A7728: ; 81A7728 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 @@ -788912,7 +788912,7 @@ sub_81A7728: ; 81A7728 lsrs r0, 24 mov r8, r0 cmp r0, 0x9 - bls @081A774A + bls _081A774A ldr r0, =0x03005d90 ldr r0, [r0] ldr r4, =0x00000cb2 @@ -788921,18 +788921,18 @@ sub_81A7728: ; 81A7728 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 @@ -788944,43 +788944,43 @@ sub_81A7728: ; 81A7728 lsrs r0, 24 adds r1, r0, 0 cmp r0, 0x22 - bhi @081A77DC + bhi _081A77DC movs r0, 0x80 - b @081A77FC + b _081A77FC .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] @@ -788994,12 +788994,12 @@ sub_81A7728: ; 81A7728 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 @@ -789015,70 +789015,70 @@ sub_81A7728: ; 81A7728 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 .pool -@081A7898: +_081A7898: ldr r1, =0x0300128d movs r0, 0x1 - b @081A78D4 + b _081A78D4 .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 .pool -@081A78C0: +_081A78C0: ldr r0, =0x0300128d strb r1, [r0] - b @081A78D6 + b _081A78D6 .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] @@ -789092,12 +789092,12 @@ sub_81A7728: ; 81A7728 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 @@ -789114,28 +789114,28 @@ sub_81A7728: ; 81A7728 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 @@ -789157,23 +789157,23 @@ 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 .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 @@ -789185,27 +789185,27 @@ sub_81A7974: ; 81A7974 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 .pool -@081A79E4: +_081A79E4: movs r0, 0 -@081A79E6: +_081A79E6: pop {r4-r7} pop {r1} bx r1 @@ -789225,34 +789225,34 @@ 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 .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 .pool -@081A7A34: +_081A7A34: movs r2, 0 ldr r3, =gUnknown_0861266C movs r1, 0 -@081A7A3A: +_081A7A3A: mov r4, sp adds r0, r4, r2 strb r1, [r0] @@ -789260,7 +789260,7 @@ sub_81A79EC: ; 81A79EC lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x7 - bls @081A7A3A + bls _081A7A3A movs r4, 0x8 ldr r0, [r5] movs r6, 0xE1 @@ -789274,53 +789274,53 @@ sub_81A79EC: ; 81A79EC 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 @@ -789330,52 +789330,52 @@ sub_81A79EC: ; 81A79EC 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 AllocZeroed 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 @@ -789386,11 +789386,11 @@ sub_81A79EC: ; 81A79EC 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} @@ -789468,11 +789468,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 @@ -789484,12 +789484,12 @@ 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 .pool -@081A7C1C: +_081A7C1C: lsls r0, r6, 2 ldr r2, [sp, 0x4] adds r0, r2 @@ -789501,19 +789501,19 @@ sub_81A7B90: ; 81A7B90 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, =gBaseStats mov r8, r1 @@ -789553,13 +789553,13 @@ sub_81A7B90: ; 81A7B90 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 @@ -789568,7 +789568,7 @@ sub_81A7B90: ; 81A7B90 movs r4, 0 adds r0, r6, r5 lsls r6, r0, 2 -@081A7CBA: +_081A7CBA: ldr r2, [sp, 0x4] adds r0, r7, r2 ldr r0, [r0] @@ -789583,11 +789583,11 @@ sub_81A7B90: ; 81A7B90 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 @@ -789617,25 +789617,25 @@ sub_81A7D00: ; 81A7D00 movs r0, 0x8C lsls r0, 1 cmp r1, r0 - bhi @081A7D34 + bhi _081A7D34 movs r1, 0 - b @081A7D4C + b _081A7D4C .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 @@ -789652,7 +789652,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 @@ -789662,7 +789662,7 @@ sub_81A7D54: ; 81A7D54 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081A7D66 + bne _081A7D66 pop {r4,r5} pop {r0} bx r0 @@ -789677,13 +789677,13 @@ sub_81A7D8C: ; 81A7D8C 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] @@ -789693,26 +789693,26 @@ sub_81A7D8C: ; 81A7D8C 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} @@ -789728,13 +789728,13 @@ sub_81A7DE8: ; 81A7DE8 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] @@ -789743,38 +789743,38 @@ sub_81A7DE8: ; 81A7DE8 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 bl get_task_id_by_function lsls r0, 24 lsrs r0, 24 bl remove_task - b @081A7E56 + b _081A7E56 .pool -@081A7E50: +_081A7E50: ldrh r0, [r4, 0xA] strh r0, [r4, 0x14] strh r1, [r4, 0x8] -@081A7E56: +_081A7E56: movs r0, 0 pop {r4} pop {r1} @@ -789839,13 +789839,13 @@ sub_81A7EC4: ; 81A7EC4 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @081A7EDC + beq _081A7EDC movs r0, 0 - b @081A7EDE + b _081A7EDE .pool -@081A7EDC: +_081A7EDC: movs r0, 0x1 -@081A7EDE: +_081A7EDE: pop {r1} bx r1 thumb_func_end sub_81A7EC4 @@ -789866,7 +789866,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 @@ -789876,17 +789876,17 @@ sub_81A7EE4: ; 81A7EE4 movs r2, 0x3 movs r3, 0x2 bl sub_81A7E60 - b @081A7F30 + b _081A7F30 .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} @@ -789905,12 +789905,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 @@ -789921,9 +789921,9 @@ sub_81A7F38: ; 81A7F38 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 @@ -789951,10 +789951,10 @@ sub_81A7F38: ; 81A7F38 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 @@ -789976,19 +789976,19 @@ sub_81A7F38: ; 81A7F38 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 .pool -@081A7FFC: +_081A7FFC: adds r0, r7, 0 movs r1, 0x15 bl pokemon_getattr @@ -789996,14 +789996,14 @@ sub_81A7F38: ; 81A7F38 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 @@ -790022,14 +790022,14 @@ sub_81A7F38: ; 81A7F38 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 @@ -790043,16 +790043,16 @@ sub_81A7F38: ; 81A7F38 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 @@ -790089,17 +790089,17 @@ InBattlePike: ; 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 @@ -790118,7 +790118,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 @@ -790146,9 +790146,9 @@ sub_81A80DC: ; 81A80DC negs r0, r0 ands r0, r1 movs r1, 0x40 - b @081A8248 + b _081A8248 .pool -@081A8138: +_081A8138: bl GenerateRandomNumber ldr r7, =0x03005d90 ldr r4, [r7] @@ -790174,18 +790174,18 @@ sub_81A80DC: ; 81A80DC ands r0, r1 movs r6, 0x8 cmp r0, 0 - beq @081A8172 + beq _081A8172 movs r6, 0x6 -@081A8172: +_081A8172: adds r0, r6, 0 bl AllocZeroed 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 @@ -790194,29 +790194,29 @@ sub_81A80DC: ; 81A80DC 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 .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] @@ -790247,11 +790247,11 @@ sub_81A80DC: ; 81A80DC 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] @@ -790260,7 +790260,7 @@ sub_81A80DC: ; 81A80DC movs r1, 0x10 orrs r0, r1 strb r0, [r2] -@081A821C: +_081A821C: ldr r5, =0x03005d90 ldr r0, [r5] movs r4, 0xE1 @@ -790270,11 +790270,11 @@ sub_81A80DC: ; 81A80DC 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] @@ -790282,10 +790282,10 @@ sub_81A80DC: ; 81A80DC 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} @@ -790335,9 +790335,9 @@ sub_81A82A4: ; 81A82A4 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 @@ -790354,7 +790354,7 @@ sub_81A82A4: ; 81A82A4 lsls r0, 16 lsrs r6, r0, 16 adds r5, r4, 0 -@081A82D2: +_081A82D2: lsls r0, r6, 24 lsrs r0, 24 adds r1, r7, 0 @@ -790368,28 +790368,28 @@ sub_81A82A4: ; 81A82A4 ldrh r0, [r0] subs r2, r0, 0x1 cmp r3, r2 - bge @081A831A + bge _081A831A ldr r0, =0x00000cb4 adds r1, r0 - b @081A8314 + b _081A8314 .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 @@ -790404,7 +790404,7 @@ sub_81A82A4: ; 81A82A4 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xD - bhi @081A8356 + bhi _081A8356 subs r0, 0x1 lsls r0, 1 ldr r2, =0x00000cb4 @@ -790412,7 +790412,7 @@ sub_81A82A4: ; 81A82A4 adds r1, r0 ldrh r0, [r5] strh r0, [r1] -@081A8356: +_081A8356: pop {r4-r7} pop {r0} bx r0 @@ -790442,7 +790442,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 @@ -790456,28 +790456,28 @@ sub_81A8374: ; 81A8374 ldrh r0, [r0] subs r2, r0, 0x1 cmp r3, r2 - bge @081A83EE + bge _081A83EE ldr r0, =0x00000cb4 adds r1, r0 - b @081A83E8 + b _081A83E8 .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] @@ -790489,7 +790489,7 @@ sub_81A8374: ; 81A8374 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xE - bhi @081A8424 + bhi _081A8424 subs r0, 0x1 lsls r0, 1 ldr r2, =0x00000cb4 @@ -790497,9 +790497,9 @@ sub_81A8374: ; 81A8374 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 @@ -790511,12 +790511,12 @@ sub_81A8374: ; 81A8374 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 @@ -790524,21 +790524,21 @@ sub_81A8374: ; 81A8374 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] @@ -790550,7 +790550,7 @@ sub_81A8374: ; 81A8374 adds r2, r1, r0 ldrh r0, [r2] cmp r0, 0xD - bhi @081A849A + bhi _081A849A subs r0, 0x2 lsls r0, 1 ldr r2, =0x00000cb4 @@ -790558,7 +790558,7 @@ sub_81A8374: ; 81A8374 adds r1, r0 ldrh r0, [r5] strh r0, [r1] -@081A849A: +_081A849A: pop {r4-r7} pop {r0} bx r0 @@ -790573,7 +790573,7 @@ sub_81A84B4: ; 81A84B4 ldr r4, =0x00000cb4 ldr r0, =0x0000ffff adds r3, r0, 0 -@081A84C0: +_081A84C0: ldr r1, [r5] lsls r0, r2, 1 adds r1, r4 @@ -790585,7 +790585,7 @@ sub_81A84B4: ; 81A84B4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xD - bls @081A84C0 + bls _081A84C0 pop {r4,r5} pop {r0} bx r0 @@ -790598,12 +790598,12 @@ sub_81A84EC: ; 81A84EC 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 @@ -790611,16 +790611,16 @@ sub_81A84EC: ; 81A84EC adds r0, r1 adds r0, 0xC bl ConvertBattleFrontierTrainerSpeechToString - b @081A8542 + b _081A8542 .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 @@ -790628,7 +790628,7 @@ sub_81A84EC: ; 81A84EC adds r0, r1 adds r0, 0xC bl ConvertBattleFrontierTrainerSpeechToString -@081A8542: +_081A8542: pop {r0} bx r0 .pool @@ -790640,30 +790640,30 @@ sub_81A8554: ; 81A8554 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 .pool -@081A8588: +_081A8588: movs r0, 0 -@081A858A: +_081A858A: pop {r4-r6} pop {r1} bx r1 @@ -790694,9 +790694,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, =gUnknown_086125DC adds r0, r2, 0 adds r0, 0x14 @@ -790705,13 +790705,13 @@ 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 .pool -@081A85F0: +_081A85F0: ldr r5, =gUnknown_086125DC movs r0, 0x5 lsls r3, r0, 2 @@ -790722,19 +790722,19 @@ sub_81A8590: ; 81A8590 ldrb r2, [r0] subs r1, r2 cmp r4, r1 - bne @081A8610 + bne _081A8610 movs r6, 0x3 - b @081A8634 + b _081A8634 .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 @@ -790742,10 +790742,10 @@ sub_81A8590: ; 81A8590 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} @@ -790827,7 +790827,7 @@ sub_81A86C0: ; 81A86C0 strh r0, [r1] movs r0, 0 mov r10, r0 -@081A86D4: +_081A86D4: movs r0, 0 mov r9, r0 movs r0, 0x64 @@ -790846,14 +790846,14 @@ sub_81A86C0: ; 81A86C0 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 @@ -790861,15 +790861,15 @@ sub_81A86C0: ; 81A86C0 lsrs r0, 24 mov r8, r0 movs r6, 0 - b @081A8732 + b _081A8732 .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 @@ -790888,28 +790888,28 @@ sub_81A86C0: ; 81A86C0 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 .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 @@ -790925,7 +790925,7 @@ sub_81A8794: ; 81A8794 movs r5, 0 ldr r7, =0x03005d8c ldr r6, =0x03005d90 -@081A879C: +_081A879C: ldr r0, [r6] lsls r4, r5, 1 ldr r1, =0x00000caa @@ -790950,7 +790950,7 @@ sub_81A8794: ; 81A8794 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x2 - bls @081A879C + bls _081A879C pop {r4-r7} pop {r0} bx r0 @@ -790961,7 +790961,7 @@ sub_81A8794: ; 81A8794 sub_81A87E8: ; 81A87E8 push {r4,lr} movs r4, 0 -@081A87EC: +_081A87EC: ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, r4, 1 @@ -790982,7 +790982,7 @@ sub_81A87E8: ; 81A87E8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @081A87EC + bls _081A87EC pop {r4} pop {r0} bx r0 @@ -791023,13 +791023,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 @@ -791051,39 +791051,39 @@ sub_81A88B0: ; 81A88B0 movs r1, 0x6 bl pokemon_getattr cmp r0, 0 - bne @081A8904 + bne _081A8904 adds r0, r4, 0 bl GetMonAbility 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 .pool -@081A8904: +_081A8904: movs r0, 0x1 -@081A8906: +_081A8906: pop {r4,r5} pop {r1} bx r1 @@ -791096,17 +791096,17 @@ sub_81A890C: ; 81A890C lsrs r2, r0, 16 ldr r0, =0x0000017b cmp r2, r0 - bne @081A8920 + bne _081A8920 movs r1, 0 - b @081A892A + b _081A892A .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 @@ -791122,11 +791122,11 @@ sub_81A8934: ; 81A8934 ldr r4, =0x0203ce50 ldr r0, [r4] cmp r0, 0 - bne @081A894A + bne _081A894A movs r0, 0x44 bl AllocZeroed str r0, [r4] -@081A894A: +_081A894A: ldr r0, [r4] adds r0, 0x41 strb r5, [r0] @@ -791142,11 +791142,11 @@ sub_81A895C: ; 81A895C 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 @@ -791187,7 +791187,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 @@ -791211,67 +791211,67 @@ sub_81A89A0: ; 81A89A0 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 .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, =gUnknown_08612698 movs r1, 0x1 - b @081A8A74 + b _081A8A74 .pool -@081A8A58: +_081A8A58: ldr r7, =gUnknown_0861269C movs r2, 0x1 - b @081A8A74 + b _081A8A74 .pool -@081A8A64: +_081A8A64: ldr r7, =gUnknown_086126A0 movs r1, 0xFF - b @081A8A74 + b _081A8A74 .pool -@081A8A70: +_081A8A70: ldr r7, =gUnknown_086126A4 movs r2, 0xFF -@081A8A74: +_081A8A74: mov r3, r8 adds r0, r4, r3 lsls r0, 3 @@ -791296,7 +791296,7 @@ sub_81A89A0: ; 81A89A0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x10 - beq @081A8ACC + beq _081A8ACC mov r0, r8 adds r1, r5, 0 bl sub_81A8D60 @@ -791308,22 +791308,22 @@ sub_81A89A0: ; 81A89A0 ldrb r2, [r2, 0x4] adds r3, r7, 0 bl exec_movement - b @081A8AD4 + b _081A8AD4 .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} @@ -791345,9 +791345,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] @@ -791355,11 +791355,11 @@ sub_81A8AF8: ; 81A8AF8 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 @@ -791371,11 +791371,11 @@ sub_81A8AF8: ; 81A8AF8 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 @@ -791401,9 +791401,9 @@ sub_81A8AF8: ; 81A8AF8 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 @@ -791417,24 +791417,24 @@ sub_81A8AF8: ; 81A8AF8 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 .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 @@ -791452,9 +791452,9 @@ sub_81A8AF8: ; 81A8AF8 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 @@ -791465,22 +791465,22 @@ sub_81A8AF8: ; 81A8AF8 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 .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, =gUnknown_086126AE ldr r0, [r5] adds r0, r4 @@ -791490,9 +791490,9 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0x7 - b @081A8C72 + b _081A8C72 .pool -@081A8C30: +_081A8C30: ldr r3, =gUnknown_086126A8 ldr r0, [r5] adds r0, r4 @@ -791502,9 +791502,9 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0xA - b @081A8C72 + b _081A8C72 .pool -@081A8C48: +_081A8C48: ldr r3, =gUnknown_086126AA ldr r0, [r5] adds r0, r4 @@ -791514,9 +791514,9 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0x8 - b @081A8C72 + b _081A8C72 .pool -@081A8C60: +_081A8C60: ldr r3, =gUnknown_086126AC ldr r0, [r5] adds r0, r4 @@ -791526,7 +791526,7 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0x9 -@081A8C72: +_081A8C72: strb r1, [r0, 0x9] mov r1, r8 ldr r0, [r1] @@ -791542,23 +791542,23 @@ sub_81A8AF8: ; 81A8AF8 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl exec_movement - b @081A8D32 + b _081A8D32 .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, =gUnknown_086126AA ldr r0, [r5] adds r0, r4 @@ -791568,9 +791568,9 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0x8 - b @081A8D12 + b _081A8D12 .pool -@081A8CD0: +_081A8CD0: ldr r3, =gUnknown_086126AC ldr r0, [r5] adds r0, r4 @@ -791580,9 +791580,9 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0x9 - b @081A8D12 + b _081A8D12 .pool -@081A8CE8: +_081A8CE8: ldr r3, =gUnknown_086126AE ldr r0, [r5] adds r0, r4 @@ -791592,9 +791592,9 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0x7 - b @081A8D12 + b _081A8D12 .pool -@081A8D00: +_081A8D00: ldr r3, =gUnknown_086126A8 ldr r0, [r5] adds r0, r4 @@ -791604,7 +791604,7 @@ sub_81A8AF8: ; 81A8AF8 lsls r0, 3 adds r0, r7 movs r1, 0xA -@081A8D12: +_081A8D12: strb r1, [r0, 0x9] mov r2, r8 ldr r0, [r2] @@ -791620,7 +791620,7 @@ sub_81A8AF8: ; 81A8AF8 ldrb r1, [r2, 0x5] ldrb r2, [r2, 0x4] bl exec_movement -@081A8D32: +_081A8D32: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -791631,9 +791631,9 @@ sub_81A8AF8: ; 81A8AF8 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 @@ -791707,15 +791707,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 @@ -791725,26 +791725,26 @@ sub_81A8D94: ; 81A8D94 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 .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 @@ -791752,55 +791752,55 @@ sub_81A8D94: ; 81A8D94 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 @@ -791846,26 +791846,26 @@ 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 .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 @@ -791874,7 +791874,7 @@ sub_81A8E9C: ; 81A8E9C strh r2, [r0] adds r0, r5, 0 bl sub_81AAA7C -@081A8F14: +_081A8F14: bl sub_81C4EEC ldr r0, =0x02038bca movs r1, 0 @@ -791901,31 +791901,31 @@ 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 .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 .pool -@081A8F9C: +_081A8F9C: ldr r2, =0x020375f0 ldr r0, [r3] lsls r1, r4, 1 @@ -791933,18 +791933,18 @@ sub_81A8F38: ; 81A8F38 adds r0, r3 adds r0, r1 ldrh r0, [r0] - b @081A9038 + b _081A9038 .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 .pool -@081A8FCC: +_081A8FCC: ldr r2, =0x020375f0 ldr r0, [r3] ldr r3, =0x00000cdc @@ -791952,27 +791952,27 @@ sub_81A8F38: ; 81A8F38 ldr r0, [r0] movs r1, 0x80 lsls r1, 5 - b @081A9036 + b _081A9036 .pool -@081A8FE4: +_081A8FE4: ldr r0, =0x020375f0 ldr r1, [r3] ldr r2, =0x00000e1a adds r1, r2 - b @081A9000 + b _081A9000 .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 .pool -@081A9010: +_081A9010: ldr r2, =0x020375f0 ldr r0, [r3] ldr r1, =0x00000cdc @@ -791980,22 +791980,22 @@ sub_81A8F38: ; 81A8F38 ldr r0, [r0] movs r1, 0x80 lsls r1, 5 - b @081A9036 + b _081A9036 .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 @@ -792015,28 +792015,28 @@ 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 .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 .pool -@081A9098: +_081A9098: lsls r1, 1 ldr r3, =0x00000e1a adds r0, r2, r3 @@ -792044,61 +792044,61 @@ sub_81A9048: ; 81A9048 ldr r1, =0x020375e4 ldrh r1, [r1] strh r1, [r0] - b @081A9126 + b _081A9126 .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 .pool -@081A90D0: +_081A90D0: ldr r3, =0x00000cdc adds r0, r2, r3 ldr r1, [r0] ldr r2, =0xffffdfff - b @081A910C + b _081A910C .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 .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 .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 .pool @@ -792149,7 +792149,7 @@ sub_81A917C: ; 81A917C adds r1, r0 ldrh r0, [r1] cmp r0, 0x29 - bls @081A91CC + bls _081A91CC bl GenerateRandomNumber ldr r4, [r4] ldr r5, =gUnknown_08613F34 @@ -792163,9 +792163,9 @@ sub_81A917C: ; 81A917C ldrh r0, [r0] ldr r1, =0x00000e18 adds r4, r1 - b @081A91EA + b _081A91EA .pool -@081A91CC: +_081A91CC: bl GenerateRandomNumber ldr r4, [r4] ldr r5, =gUnknown_08613F28 @@ -792179,7 +792179,7 @@ sub_81A917C: ; 81A917C ldrh r0, [r0] ldr r2, =0x00000e18 adds r4, r2 -@081A91EA: +_081A91EA: strh r0, [r4] pop {r4,r5} pop {r0} @@ -792200,7 +792200,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 @@ -792214,13 +792214,13 @@ sub_81A91FC: ; 81A91FC strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b @081A924A + b _081A924A .pool -@081A9244: +_081A9244: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -@081A924A: +_081A924A: pop {r4,r5} pop {r0} bx r0 @@ -792232,7 +792232,7 @@ sub_81A9254: ; 81A9254 push {r4,r5,lr} movs r4, 0 ldr r5, =0x03005d90 -@081A925A: +_081A925A: bl GenerateRandomNumber ldr r1, [r5] lsls r2, r4, 1 @@ -792242,7 +792242,7 @@ sub_81A9254: ; 81A9254 strh r0, [r1] adds r4, 0x1 cmp r4, 0x3 - ble @081A925A + ble _081A925A ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e2a @@ -792291,10 +792291,10 @@ CalculateBattlePyramidItemBallItemId: ; 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 @@ -792321,8 +792321,8 @@ CalculateBattlePyramidItemBallItemId: ; 81A9290 lsls r0, 2 mov r9, r0 cmp r5, r4 - bge @081A9332 -@081A9318: + bge _081A9332 +_081A9318: bl GenerateRandomNumber2 lsls r0, 16 lsrs r0, 16 @@ -792333,8 +792333,8 @@ CalculateBattlePyramidItemBallItemId: ; 81A9290 adds r5, 0x1 adds r0, r7, 0x1 cmp r5, r0 - blt @081A9318 -@081A9332: + blt _081A9318 +_081A9332: ldr r0, =gUnknown_08613B3A ldr r1, [sp] adds r0, r1, r0 @@ -792343,31 +792343,31 @@ CalculateBattlePyramidItemBallItemId: ; 81A9290 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, =gUnknown_0861392C - b @081A9396 + b _081A9396 .pool -@081A9394: +_081A9394: ldr r2, =gUnknown_0861379C -@081A9396: +_081A9396: lsls r0, r5, 1 adds r1, 0x1 adds r0, r1 @@ -792403,9 +792403,9 @@ sub_81A93C8: ; 81A93C8 adds r3, r0, r1 movs r2, 0 ldr r4, =0x020375f2 - b @081A93F4 + b _081A93F4 .pool -@081A93E4: +_081A93E4: adds r2, 0x1 lsls r0, r2, 1 adds r0, r2 @@ -792413,8 +792413,8 @@ sub_81A93C8: ; 81A93C8 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 @@ -792422,11 +792422,11 @@ sub_81A93C8: ; 81A93C8 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 @@ -792479,15 +792479,15 @@ 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 .pool -@081A9488: +_081A9488: adds r6, 0x1 cmp r6, 0x31 - bhi @081A94AE + bhi _081A94AE ldr r4, =gUnknown_08613C1C lsls r3, r6, 1 adds r2, r3, r4 @@ -792499,12 +792499,12 @@ sub_81A9424: ; 81A9424 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, =gUnknown_08613ED8 ldr r2, =0x02037350 ldr r0, =0x03005df0 @@ -792522,73 +792522,73 @@ sub_81A9424: ; 81A9424 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 .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 .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, =gUnknown_08613650 @@ -792602,55 +792602,55 @@ sub_81A9424: ; 81A9424 ldrb r2, [r0] ldr r1, =gUnknown_0832A328 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 .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, =gUnknown_08613EC0 add r1, r9 ldr r0, [sp] @@ -792688,10 +792688,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 @@ -792701,9 +792701,9 @@ sub_81A9618: ; 81A9618 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 @@ -792730,12 +792730,12 @@ sub_81A9684: ; 81A9684 ldr r0, =0x020375e4 ldrh r0, [r0] cmp r0, 0 - beq @081A9698 + beq _081A9698 cmp r0, 0x1 - beq @081A96B4 - b @081A9754 + beq _081A96B4 + b _081A9754 .pool -@081A9698: +_081A9698: ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x020375e2 @@ -792743,50 +792743,50 @@ sub_81A9684: ; 81A9684 ldr r2, =0x00000e68 adds r0, r2 strb r1, [r0] - b @081A9754 + b _081A9754 .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 .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 .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 @@ -792800,20 +792800,20 @@ sub_81A9684: ; 81A9684 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 .pool -@081A9750: +_081A9750: movs r0, 0x2 strh r0, [r4] -@081A9754: +_081A9754: pop {r4} pop {r0} bx r0 @@ -792834,12 +792834,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 @@ -792848,22 +792848,22 @@ sub_81A975C: ; 81A975C 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 @@ -792895,7 +792895,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 @@ -792909,7 +792909,7 @@ sub_81A97DC: ; 81A97DC bl CpuSet adds r0, r4, 0 bl remove_task -@081A980C: +_081A980C: pop {r4} pop {r0} bx r0 @@ -792934,7 +792934,7 @@ sub_81A9834: ; 81A9834 sub sp, 0x18 movs r0, 0 str r0, [sp] -@081A9844: +_081A9844: ldr r0, =0x03005d90 ldr r0, [r0] ldr r2, [sp] @@ -792955,7 +792955,7 @@ sub_81A9834: ; 81A9834 adds r6, r1, r0 movs r1, 0 str r1, [sp, 0x10] -@081A986C: +_081A986C: ldr r2, =0x03005d8c ldr r0, [r2] adds r0, r6 @@ -792972,7 +792972,7 @@ sub_81A9834: ; 81A9834 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] @@ -792986,17 +792986,17 @@ sub_81A9834: ; 81A9834 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 .pool -@081A98C4: +_081A98C4: adds r5, 0x1 -@081A98C6: +_081A98C6: cmp r5, 0x3 - bgt @081A98EE + bgt _081A98EE ldr r1, =0x03005d8c ldr r0, [r1] add r0, r9 @@ -793012,20 +793012,20 @@ sub_81A9834: ; 81A9834 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] @@ -793044,9 +793044,9 @@ sub_81A9834: ; 81A9834 mov r1, sp ldrb r1, [r1, 0xC] strb r1, [r0] - b @081A994C + b _081A994C .pool -@081A993C: +_081A993C: ldr r2, [sp, 0x10] adds r2, 0x64 str r2, [sp, 0x10] @@ -793054,21 +793054,21 @@ sub_81A9834: ; 81A9834 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 @@ -793080,7 +793080,7 @@ sub_81A9834: ; 81A9834 adds r5, 0x1 str r5, [sp] cmp r5, 0x2 - ble @081A9962 + ble _081A9962 add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -793120,16 +793120,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] @@ -793145,86 +793145,86 @@ sub_81A9998: ; 81A9998 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 .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 @@ -793289,7 +793289,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 @@ -793297,7 +793297,7 @@ sub_81A9B04: ; 81A9B04 ldr r0, =0x02038bcc ldrh r0, [r0] bl sub_81A9B44 -@081A9B2E: +_081A9B2E: pop {r0} bx r0 .pool @@ -793323,7 +793323,7 @@ sub_81A9B44: ; 81A9B44 ldr r0, =0x00000cb4 mov r8, r0 ldr r4, =gUnknown_0832A328 -@081A9B68: +_081A9B68: mov r1, r9 ldr r2, [r1] lsls r0, r3, 1 @@ -793332,18 +793332,18 @@ sub_81A9B44: ; 81A9B44 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 @@ -793412,17 +793412,17 @@ 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, =gBattlePyramidOpenLevelWildMonPointers - b @081A9C56 + b _081A9C56 .pool -@081A9C54: +_081A9C54: ldr r1, =gBattlePyramidLevel50WildMonPointers -@081A9C56: +_081A9C56: lsls r0, 2 adds r0, r1 ldr r6, [r0] @@ -793453,7 +793453,7 @@ sub_81A9C04: ; 81A9C04 mov r2, sp bl pokemon_setattr cmp r5, 0 - beq @081A9CD4 + beq _081A9CD4 bl sub_8165C40 lsls r0, 24 lsrs r5, r0, 24 @@ -793473,9 +793473,9 @@ sub_81A9C04: ; 81A9C04 lsrs r0, 16 subs r0, 0x5 adds r5, r0 - b @081A9CF6 + b _081A9CF6 .pool -@081A9CD4: +_081A9CD4: bl GenerateRandomNumber ldr r2, [sp, 0x10] lsls r1, r2, 1 @@ -793491,7 +793491,7 @@ sub_81A9C04: ; 81A9C04 lsrs r0, 16 subs r0, 0x5 adds r5, r4, r0 -@081A9CF6: +_081A9CF6: ldr r4, =0x02024744 ldr r2, =gBaseStats ldr r1, [sp, 0x10] @@ -793523,13 +793523,13 @@ sub_81A9C04: ; 81A9C04 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 .pool -@081A9D4C: +_081A9D4C: ldr r2, =gBaseStats ldr r1, [sp, 0x10] lsls r0, r1, 1 @@ -793543,7 +793543,7 @@ sub_81A9C04: ; 81A9C04 adds r0, r2 ldrb r0, [r0, 0x17] cmp r0, 0 - beq @081A9D90 + beq _081A9D90 ldr r4, =0x02024744 adds r0, r4, 0 movs r1, 0 @@ -793553,24 +793553,24 @@ sub_81A9C04: ; 81A9C04 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 .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 @@ -793589,7 +793589,7 @@ sub_81A9C04: ; 81A9C04 str r0, [sp, 0xC] adds r2, r0, 0 cmp r2, 0x3 - ble @081A9DA4 + ble _081A9DA4 ldr r0, =0x03005d90 ldr r0, [r0] ldr r1, =0x00000e1a @@ -793597,7 +793597,7 @@ sub_81A9C04: ; 81A9C04 adds r0, r4 ldrh r0, [r0] cmp r0, 0x8B - bls @081A9E0C + bls _081A9E0C bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -793609,7 +793609,7 @@ sub_81A9C04: ; 81A9C04 str r0, [sp, 0x10] movs r0, 0 str r0, [sp, 0xC] -@081A9DF6: +_081A9DF6: adds r1, r0, 0 adds r1, 0x27 ldr r0, =0x02024744 @@ -793619,8 +793619,8 @@ sub_81A9C04: ; 81A9C04 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 @@ -793651,20 +793651,20 @@ InBattlePyramid: ; 81A9E40 ldrh r1, [r0, 0x12] ldr r0, =0x00000169 cmp r1, r0 - bne @081A9E58 + bne _081A9E58 movs r0, 0x1 - b @081A9E66 + b _081A9E66 .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 InBattlePyramid @@ -793677,13 +793677,13 @@ sub_81A9E6C: ; 81A9E6C 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 @@ -793696,7 +793696,7 @@ sub_81A9E90: ; 81A9E90 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @081A9EB8 + beq _081A9EB8 bl sub_81A9834 ldr r0, =0x03005d90 ldr r0, [r0] @@ -793708,7 +793708,7 @@ sub_81A9E90: ; 81A9E90 movs r1, 0 bl VarSet bl copy_player_party_from_sav1 -@081A9EB8: +_081A9EB8: pop {r0} bx r0 .pool @@ -793720,9 +793720,9 @@ sub_81A9EC8: ; 81A9EC8 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - beq @081A9ED8 + beq _081A9ED8 bl Reset -@081A9ED8: +_081A9ED8: pop {r0} bx r0 thumb_func_end sub_81A9EC8 @@ -793794,20 +793794,20 @@ sub_81A9F3C: ; 81A9F3C adds r0, r3 ldrb r2, [r0] ldr r1, =gUnknown_08613B44 -@081A9F58: +_081A9F58: ldrb r0, [r1] cmp r0, r2 - bne @081A9F70 + bne _081A9F70 ldrb r0, [r1, 0x1] - b @081A9F7A + b _081A9F7A .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 @@ -793849,12 +793849,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 @@ -793863,36 +793863,36 @@ sub_81A9F90: ; 81A9F90 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 .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 @@ -793901,30 +793901,30 @@ sub_81A9F90: ; 81A9F90 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 @@ -793956,7 +793956,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] @@ -793984,9 +793984,9 @@ sub_81AA078: ; 81AA078 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 @@ -794007,44 +794007,44 @@ sub_81AA078: ; 81AA078 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 @@ -794056,7 +794056,7 @@ sub_81AA078: ; 81AA078 muls r0, r2 add r0, r8 strh r0, [r3, 0x2] -@081AA164: +_081AA164: ldrh r0, [r5] movs r1, 0xFC lsls r1, 8 @@ -794066,18 +794066,18 @@ sub_81AA078: ; 81AA078 orrs r1, r0 strh r1, [r4] ldr r3, [r6] - b @081AA196 + b _081AA196 .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 @@ -794087,13 +794087,13 @@ sub_81AA078: ; 81AA078 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 @@ -794122,7 +794122,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 @@ -794132,7 +794132,7 @@ sub_81AA1D8: ; 81AA1D8 strh r1, [r0] adds r5, 0x1 cmp r5, 0x7 - ble @081AA1F2 + ble _081AA1F2 bl sub_81AA9E4 lsls r0, 24 lsrs r7, r0, 24 @@ -794150,71 +794150,71 @@ sub_81AA1D8: ; 81AA1D8 mov r0, r8 bl CpuSet movs r5, 0 -@081AA22E: +_081AA22E: cmp r5, 0 - bne @081AA254 + bne _081AA254 ldr r1, =gUnknown_08613650 lsls r0, r7, 4 adds r0, r1 ldrb r0, [r0, 0x3] - b @081AA25C + b _081AA25C .pool -@081AA254: +_081AA254: ldr r1, =gUnknown_08613650 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 .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] @@ -794222,13 +794222,13 @@ sub_81AA1D8: ; 81AA1D8 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 @@ -794251,21 +794251,21 @@ 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 .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 @@ -794290,7 +794290,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 @@ -794310,7 +794310,7 @@ sub_81AA33C: ; 81AA33C lsls r0, 4 subs r0, r2, r0 strb r0, [r6] -@081AA386: +_081AA386: pop {r4-r7} pop {r0} bx r0 @@ -794345,7 +794345,7 @@ sub_81AA398: ; 81AA398 ands r4, r0 ldr r0, [sp] cmp r0, 0 - bne @081AA3F0 + bne _081AA3F0 ldr r1, =gUnknown_08613650 lsls r0, r6, 4 adds r0, r1 @@ -794353,9 +794353,9 @@ sub_81AA398: ; 81AA398 mov r10, r0 movs r1, 0 str r1, [sp, 0x4] - b @081AA3FE + b _081AA3FE .pool -@081AA3F0: +_081AA3F0: ldr r1, =gUnknown_08613650 lsls r0, r6, 4 adds r0, r1 @@ -794363,18 +794363,18 @@ sub_81AA398: ; 81AA398 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 .pool -@081AA414: +_081AA414: lsls r2, r4, 24 lsrs r2, 24 ldr r3, [sp, 0x4] @@ -794386,8 +794386,8 @@ sub_81AA398: ; 81AA398 bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq @081AA4B6 -@081AA42E: + beq _081AA4B6 +_081AA42E: ldr r0, =gUnknown_0832A328 mov r12, r0 ldr r6, =0x03005d90 @@ -794396,38 +794396,38 @@ sub_81AA398: ; 81AA398 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 .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 @@ -794435,34 +794435,34 @@ sub_81AA398: ; 81AA398 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 .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 @@ -794502,23 +794502,23 @@ sub_81AA4D8: ; 81AA4D8 bl sub_81AA96C ldr r1, [sp] cmp r1, 0 - bne @081AA524 + bne _081AA524 ldr r1, =gUnknown_08613650 lsls r0, r4, 4 adds r0, r1 ldrb r0, [r0, 0x1] str r0, [sp, 0x10] movs r0, 0 - b @081AA530 + b _081AA530 .pool -@081AA524: +_081AA524: ldr r1, =gUnknown_08613650 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] @@ -794526,14 +794526,14 @@ sub_81AA4D8: ; 81AA4D8 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] @@ -794542,19 +794542,19 @@ sub_81AA4D8: ; 81AA4D8 bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq @081AA568 + beq _081AA568 movs r7, 0x1 - b @081AA56E + b _081AA56E .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, =gUnknown_08613F46 mov r8, r2 ldr r3, [sp, 0x4] @@ -794572,12 +794572,12 @@ sub_81AA4D8: ; 81AA4D8 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 .pool -@081AA5A8: +_081AA5A8: adds r0, r6, r5 adds r0, r2 ldrb r2, [r0] @@ -794589,8 +794589,8 @@ sub_81AA4D8: ; 81AA4D8 bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq @081AA5E0 -@081AA5C2: + beq _081AA5E0 +_081AA5C2: adds r6, 0x1 ldr r0, =gUnknown_08613F46 adds r1, r6, r5 @@ -794598,39 +794598,39 @@ sub_81AA4D8: ; 81AA4D8 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 .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] @@ -794644,8 +794644,8 @@ sub_81AA4D8: ; 81AA4D8 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] @@ -794653,9 +794653,9 @@ sub_81AA4D8: ; 81AA4D8 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} @@ -794693,35 +794693,35 @@ sub_81AA648: ; 81AA648 bl sub_81AA96C ldr r1, [sp] cmp r1, 0 - bne @081AA694 + bne _081AA694 ldr r1, =gUnknown_08613650 lsls r0, r5, 4 adds r0, r1 ldrb r0, [r0, 0x1] mov r10, r0 movs r0, 0 - b @081AA6A0 + b _081AA6A0 .pool -@081AA694: +_081AA694: ldr r1, =gUnknown_08613650 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, =gUnknown_08613F46 mov r9, r2 lsls r5, r6, 2 lsls r6, r0, 24 -@081AA6B6: +_081AA6B6: adds r0, r4, r5 add r0, r9 ldrb r2, [r0] @@ -794731,11 +794731,11 @@ sub_81AA648: ; 81AA648 bl sub_81AA760 lsls r0, 24 cmp r0, 0 - beq @081AA714 + beq _081AA714 adds r7, 0x1 - b @081AA6EE + b _081AA6EE .pool -@081AA6D8: +_081AA6D8: adds r0, r4, r5 adds r0, r1 ldrb r2, [r0] @@ -794745,44 +794745,44 @@ sub_81AA648: ; 81AA648 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, =gUnknown_08613F46 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 .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 @@ -794790,17 +794790,17 @@ sub_81AA648: ; 81AA648 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} @@ -794837,12 +794837,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 @@ -794854,26 +794854,26 @@ sub_81AA760: ; 81AA760 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 .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 @@ -794885,16 +794885,16 @@ sub_81AA760: ; 81AA760 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 @@ -794945,12 +794945,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 @@ -794963,30 +794963,30 @@ sub_81AA810: ; 81AA810 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 @@ -794998,24 +794998,24 @@ sub_81AA810: ; 81AA810 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 @@ -795047,7 +795047,7 @@ sub_81AA810: ; 81AA810 strb r0, [r5] ldrb r0, [r5, 0x1] cmp r0, 0x3B - beq @081AA940 + beq _081AA940 adds r0, r6, 0 bl sub_81A9F90 lsls r0, 16 @@ -795062,19 +795062,19 @@ sub_81AA810: ; 81AA810 adds r0, r1 add r0, r8 strh r4, [r0] -@081AA940: +_081AA940: movs r0, 0 - b @081AA95C + b _081AA95C .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 @@ -795106,7 +795106,7 @@ sub_81AA96C: ; 81AA96C ldr r2, =gUnknown_08613655 mov r12, r2 movs r7, 0x7 -@081AA994: +_081AA994: adds r2, r6, r3 adds r0, r4, 0 ands r0, r7 @@ -795117,7 +795117,7 @@ sub_81AA96C: ; 81AA96C strb r0, [r2] asrs r4, 3 cmp r3, 0x7 - bne @081AA9C0 + bne _081AA9C0 ldr r0, =0x03005d90 ldr r1, [r0] ldr r2, =0x00000e26 @@ -795129,10 +795129,10 @@ sub_81AA96C: ; 81AA96C 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 @@ -795158,25 +795158,25 @@ sub_81AA9E4: ; 81AA9E4 adds r0, r1 ldrb r2, [r0] cmp r2, 0x21 - bhi @081AAA38 + bhi _081AAA38 ldr r1, =gUnknown_08613750 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 .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 @@ -795194,23 +795194,23 @@ sub_81AAA40: ; 81AAA40 movs r3, 0xC7 lsls r3, 4 adds r0, r3 - b @081AAA6E + b _081AAA6E .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 @@ -795235,7 +795235,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 @@ -795249,7 +795249,7 @@ sub_81AAA7C: ; 81AAA7C adds r2, 0x2 adds r3, 0x1 cmp r3, 0x9 - ble @081AAA9E + ble _081AAA9E movs r0, 0x15 movs r1, 0x1 bl sub_80D7204 @@ -795284,9 +795284,9 @@ CalculateBattlePyramidPickupItemId: ; 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 @@ -795299,29 +795299,29 @@ CalculateBattlePyramidPickupItemId: ; 81AAAE0 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, =gUnknown_0861379C - b @081AAB5A + b _081AAB5A .pool -@081AAB58: +_081AAB58: ldr r2, =gUnknown_0861392C -@081AAB5A: +_081AAB5A: lsls r1, 1 adds r0, r5, r4 lsls r0, 2 @@ -795375,18 +795375,18 @@ sub_81AABB0: ; 81AABB0 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @081AABCC + bne _081AABCC ldr r2, =sub_8059D50 movs r0, 0x1 movs r1, 0x5 bl sub_81AAC90 - b @081AABD4 + b _081AABD4 .pool -@081AABCC: +_081AABCC: ldr r1, =sub_8059D50 movs r0, 0x1 bl sub_81C4F98 -@081AABD4: +_081AABD4: pop {r0} bx r0 .pool @@ -795499,31 +795499,31 @@ sub_81AAC90: ; 81AAC90 bl AllocZeroed str r0, [r6] cmp r0, 0 - bne @081AACBC + bne _081AACBC adds r0, r4, 0 bl SetMainCallback2 - b @081AAD3A + b _081AAD3A .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 @@ -795534,7 +795534,7 @@ sub_81AAC90: ; 81AAC90 movs r1, 0x1 orrs r0, r1 strb r0, [r2] -@081AACF0: +_081AACF0: ldr r0, [r6] movs r1, 0 str r1, [r0] @@ -795569,7 +795569,7 @@ sub_81AAC90: ; 81AAC90 bl memset ldr r0, =c2_bag_2 bl SetMainCallback2 -@081AAD3A: +_081AAD3A: pop {r4-r7} pop {r0} bx r0 @@ -795601,23 +795601,23 @@ vblank_cb_bag_menu: ; 81AAD78 thumb_func_start c2_bag_2 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 @@ -795633,54 +795633,54 @@ 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 .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 .pool -@081AAE50: +_081AAE50: bl ResetObjectPaletteAllocator - b @081AB012 -@081AAE56: + b _081AB012 +_081AAE56: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] @@ -795691,30 +795691,30 @@ setup_bag_menu: ; 81AADB8 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @081AB01A + b _081AB01A .pool -@081AAE78: +_081AAE78: bl ResetAllObjectData - 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 .pool -@081AAEA4: +_081AAEA4: bl bag_menu_init_bgs ldr r0, =0x0203ce54 ldr r0, [r0] @@ -795726,44 +795726,44 @@ setup_bag_menu: ; 81AADB8 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @081AB01A + b _081AB01A .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 .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 .pool -@081AAF0C: +_081AAF0C: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] bl load_bag_item_list_buffers - b @081AB012 + b _081AB012 .pool -@081AAF1C: +_081AAF1C: ldr r1, =gUnknown_085E91FC ldr r4, =0x0203ce58 ldrb r0, [r4, 0x5] @@ -795781,9 +795781,9 @@ setup_bag_menu: ; 81AADB8 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @081AB01A + b _081AB01A .pool -@081AAF54: +_081AAF54: ldr r4, =0x0203ce58 ldrb r0, [r4, 0x4] bl sub_81AB1F0 @@ -795812,9 +795812,9 @@ setup_bag_menu: ; 81AADB8 strh r0, [r1, 0x8] strh r2, [r1, 0xE] strh r2, [r1, 0x18] - b @081AB012 + b _081AB012 .pool -@081AAFA0: +_081AAFA0: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] bl AddBagVisualObject @@ -795822,24 +795822,24 @@ setup_bag_menu: ; 81AADB8 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @081AB01A + b _081AB01A .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 .pool -@081AAFD8: +_081AAFD8: bl sub_81AE2B4 - b @081AB012 -@081AAFDE: + b _081AB012 +_081AAFDE: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -795849,9 +795849,9 @@ setup_bag_menu: ; 81AADB8 movs r2, 0x87 lsls r2, 3 adds r1, r2 - b @081AB01A + b _081AB01A .pool -@081AAFF8: +_081AAFF8: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -795864,28 +795864,28 @@ setup_bag_menu: ; 81AADB8 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 .pool -@081AB02C: +_081AB02C: ldr r0, =vblank_cb_bag_menu bl SetVBlankCallback ldr r0, =c2_bag_3 bl SetMainCallback2 movs r0, 0x1 - b @081AB046 + b _081AB046 .pool -@081AB044: +_081AB044: movs r0, 0 -@081AB046: +_081AB046: add sp, 0x4 pop {r4,r5} pop {r1} @@ -795946,23 +795946,23 @@ 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 .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, =gUnknown_08D9A620 movs r0, 0 @@ -795971,81 +795971,81 @@ load_bag_menu_graphics: ; 81AB0BC movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @081AB1AE + b _081AB1AE .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, =gUnknown_08D9A88C ldr r4, =0x0203ce54 ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram ldr r1, [r4] - b @081AB1B2 + b _081AB1B2 .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, =gUnknown_08D9A5D4 movs r1, 0 movs r2, 0x40 bl decompress_palette - b @081AB1AE + b _081AB1AE .pool -@081AB164: +_081AB164: ldr r0, =gUnknown_08D9A588 movs r1, 0 movs r2, 0x40 bl decompress_palette - b @081AB1AE + b _081AB1AE .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, =gUnknown_0857FB34 bl LoadCompressedObjectPic - b @081AB1AE + b _081AB1AE .pool -@081AB19C: +_081AB19C: ldr r0, =gUnknown_0857FB3C bl LoadCompressedObjectPic - b @081AB1AE + b _081AB1AE .pool -@081AB1A8: +_081AB1A8: ldr r0, =gUnknown_0857FB44 bl LoadCompressedObjectPalette -@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 .pool -@081AB1CC: +_081AB1CC: bl sub_8122328 ldr r0, [r4] ldr r1, =0x00000834 @@ -796053,11 +796053,11 @@ load_bag_menu_graphics: ; 81AB0BC movs r1, 0 strh r1, [r0] movs r0, 0x1 - b @081AB1E6 + b _081AB1E6 .pool -@081AB1E4: +_081AB1E4: movs r0, 0 -@081AB1E6: +_081AB1E6: add sp, 0x4 pop {r4} pop {r1} @@ -796070,13 +796070,13 @@ sub_81AB1F0: ; 81AB1F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0xA - bne @081AB204 + bne _081AB204 ldr r0, =sub_81ADD98 - b @081AB206 + b _081AB206 .pool -@081AB204: +_081AB204: ldr r0, =Task_BagMenu -@081AB206: +_081AB206: movs r1, 0 bl AddTask lsls r0, 24 @@ -796125,7 +796125,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 @@ -796133,9 +796133,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 @@ -796166,8 +796166,8 @@ load_bag_item_list_buffers: ; 81AB240 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 @@ -796186,18 +796186,18 @@ load_bag_item_list_buffers: ; 81AB240 movs r0, 0x2 negs r0, r0 str r0, [r1, 0x4] - b @081AB34A + b _081AB34A .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 @@ -796227,8 +796227,8 @@ load_bag_item_list_buffers: ; 81AB240 adds r0, r7 ldrb r0, [r0] cmp r6, r0 - bcc @081AB30C -@081AB34A: + bcc _081AB30C +_081AB34A: ldr r2, =0x03006310 adds r1, r2, 0 ldr r0, =gUnknown_08613F9C @@ -796269,15 +796269,15 @@ 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 .pool -@081AB3C0: +_081AB3C0: ldr r4, =0x02021dc4 adds r0, r5, 0 bl sub_81B6CFC @@ -796292,7 +796292,7 @@ get_name: ; 81AB39C movs r0, 0xA9 lsls r0, 1 cmp r5, r0 - bls @081AB408 + bls _081AB408 ldr r0, =0x02021cc4 ldr r2, =0xfffffeae adds r1, r5, r2 @@ -796300,18 +796300,18 @@ get_name: ; 81AB39C movs r3, 0x1 bl ConvertIntToDecimalString ldr r1, =gUnknown_085E921A - b @081AB438 + b _081AB438 .pool -@081AB408: +_081AB408: ldr r0, =0x02021cc4 ldr r2, =0xfffffee0 adds r1, r5, r2 movs r2, 0x2 movs r3, 0x2 bl ConvertIntToDecimalString - b @081AB436 + b _081AB436 .pool -@081AB420: +_081AB420: ldr r0, =0x02021cc4 adds r1, r5, 0 subs r1, 0x84 @@ -796321,12 +796321,12 @@ get_name: ; 81AB39C ldr r1, =0x02021dc4 adds r0, r5, 0 bl itemid_get_name -@081AB436: +_081AB436: ldr r1, =gUnknown_085E9210 -@081AB438: +_081AB438: adds r0, r6, 0 bl ExpandStringRefs -@081AB43E: +_081AB43E: pop {r4-r6} pop {r0} bx r0 @@ -796340,18 +796340,18 @@ bag_menu_change_item_callback: ; 81AB450 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - beq @081AB466 + beq _081AB466 movs r0, 0x5 bl audio_play bl ShakeBagVisual -@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] @@ -796363,7 +796363,7 @@ bag_menu_change_item_callback: ; 81AB450 movs r0, 0x2 negs r0, r0 cmp r6, r0 - beq @081AB4C8 + beq _081AB4C8 ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] adds r0, 0x1 @@ -796381,9 +796381,9 @@ bag_menu_change_item_callback: ; 81AB450 lsls r1, 26 lsrs r1, 30 bl AddBagItemIconObject - b @081AB4DA + b _081AB4DA .pool -@081AB4C8: +_081AB4C8: ldr r0, =0x0000ffff ldr r1, [r4] ldr r2, =0x0000081b @@ -796392,7 +796392,7 @@ bag_menu_change_item_callback: ; 81AB450 lsls r1, 26 lsrs r1, 30 bl AddBagItemIconObject -@081AB4DA: +_081AB4DA: ldr r5, =0x0203ce54 ldr r2, [r5] ldr r4, =0x0000081b @@ -796414,10 +796414,10 @@ bag_menu_change_item_callback: ; 81AB450 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 @@ -796441,30 +796441,30 @@ 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 .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 @@ -796490,7 +796490,7 @@ sub_81AB520: ; 81AB520 lsls r0, 16 lsrs r0, 16 cmp r0, 0x7 - bhi @081AB5BE + bhi _081AB5BE ldr r1, =gUnknown_08DC6378 subs r3, r7, 0x1 lsls r3, 16 @@ -796501,10 +796501,10 @@ sub_81AB520: ; 81AB520 mov r0, r8 movs r2, 0x8 bl BlitBitmapToWindow -@081AB5BE: +_081AB5BE: ldrb r0, [r5, 0x5] cmp r0, 0x3 - bne @081AB610 + bne _081AB610 ldr r0, =0x02021cc4 adds r1, r4, 0 movs r2, 0x1 @@ -796527,17 +796527,17 @@ sub_81AB520: ; 81AB520 movs r0, 0xFF str r0, [sp, 0xC] str r1, [sp, 0x10] - b @081AB652 + b _081AB652 .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 @@ -796559,23 +796559,23 @@ sub_81AB520: ; 81AB520 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 .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, =gUnknown_086140A4 subs r3, r7, 0x1 lsls r3, 16 @@ -796587,7 +796587,7 @@ sub_81AB520: ; 81AB520 mov r0, r8 movs r2, 0x60 bl BlitBitmapToWindow -@081AB696: +_081AB696: add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -796607,7 +796607,7 @@ bag_menu_print_description_box_text: ; 81AB6B0 movs r0, 0x2 negs r0, r0 cmp r1, r0 - beq @081AB6E0 + beq _081AB6E0 ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] adds r0, 0x1 @@ -796620,9 +796620,9 @@ bag_menu_print_description_box_text: ; 81AB6B0 lsrs r0, 16 bl itemid_get_description adds r4, r0, 0 - b @081AB6FC + b _081AB6FC .pool -@081AB6E0: +_081AB6E0: ldr r0, =0x02021cc4 ldr r2, =gUnknown_085E9180 ldr r1, =0x0203ce58 @@ -796635,7 +796635,7 @@ bag_menu_print_description_box_text: ; 81AB6B0 ldr r1, =gUnknown_085E91C0 adds r0, r4, 0 bl ExpandStringRefs -@081AB6FC: +_081AB6FC: movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -796685,7 +796685,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 @@ -796704,8 +796704,8 @@ sub_81AB75C: ; 81AB75C movs r2, 0 adds r3, r5, 0 bl FillWindowPixelRect - b @081AB7AE -@081AB798: + b _081AB7AE +_081AB798: ldr r2, =gUnknown_085E8D60 str r5, [sp] movs r0, 0 @@ -796716,7 +796716,7 @@ sub_81AB75C: ; 81AB75C movs r1, 0x1 movs r3, 0 bl sub_81AE0BC -@081AB7AE: +_081AB7AE: add sp, 0x14 pop {r4,r5} pop {r0} @@ -796734,7 +796734,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 @@ -796764,7 +796764,7 @@ sub_81AB7BC: ; 81AB7BC ldr r2, =0x0000081e adds r1, r2 strb r0, [r1] -@081AB80A: +_081AB80A: add sp, 0x10 pop {r4-r6} pop {r0} @@ -796781,14 +796781,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} @@ -796807,12 +796807,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, =gUnknown_08614094 ldr r1, =0x0203ce5e bl sub_81AF380 @@ -796820,7 +796820,7 @@ sub_81AB854: ; 81AB854 ldr r2, =0x0000081f adds r1, r2 strb r0, [r1] -@081AB882: +_081AB882: pop {r4} pop {r0} bx r0 @@ -796836,14 +796836,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 @@ -796911,7 +796911,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] @@ -796927,21 +796927,21 @@ task_close_bag_menu_2: ; 81AB930 ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - beq @081AB984 + beq _081AB984 bl SetMainCallback2 - b @081AB98A + b _081AB98A .pool -@081AB984: +_081AB984: ldr r0, [r4] bl SetMainCallback2 -@081AB98A: +_081AB98A: bl sub_81AB824 bl ResetAllObjectData bl ResetObjectPaletteAllocator bl free_bag_item_list_buffers adds r0, r5, 0 bl remove_task -@081AB9A0: +_081AB9A0: pop {r4,r5} pop {r0} bx r0 @@ -796956,17 +796956,17 @@ 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 .pool -@081AB9C8: +_081AB9C8: adds r0, r4, 0 bl sub_80D6F64 -@081AB9CE: +_081AB9CE: ldr r0, =0x0203ce54 ldr r1, [r0] ldr r6, =0x00000829 @@ -796977,13 +796977,13 @@ sub_81AB9A8: ; 81AB9A8 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 @@ -796995,14 +796995,14 @@ sub_81AB9A8: ; 81AB9A8 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 @@ -797010,34 +797010,34 @@ sub_81AB9A8: ; 81AB9A8 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 .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 @@ -797048,14 +797048,14 @@ sub_81AB9A8: ; 81AB9A8 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 @@ -797093,14 +797093,14 @@ sub_81ABA88: ; 81ABA88 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 @@ -797114,7 +797114,7 @@ sub_81ABAE0: ; 81ABAE0 ldr r6, =0x0203ce6a adds r7, r6, 0 subs r7, 0xA -@081ABAEC: +_081ABAEC: lsls r1, r5, 1 adds r0, r1, r6 adds r1, r7 @@ -797135,7 +797135,7 @@ sub_81ABAE0: ; 81ABAE0 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0x4 - bls @081ABAEC + bls _081ABAEC add sp, 0x4 pop {r4-r7} pop {r0} @@ -797297,9 +797297,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 @@ -797342,9 +797342,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 ConvertIntToDecimalString @@ -797408,24 +797408,24 @@ Task_BagMenu: ; 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 GetSwitchBagPocketDirection 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 @@ -797434,29 +797434,29 @@ Task_BagMenu: ; 81ABD28 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 .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 SwitchBagPocket - b @081ABEB2 -@081ABDCC: + b _081ABEB2 +_081ABDCC: ldrb r0, [r6] adds r1, r7, 0 mov r2, r8 @@ -797475,14 +797475,14 @@ Task_BagMenu: ; 81ABD28 ldrb r0, [r0] subs r0, 0x1 cmp r2, r0 - beq @081ABEB2 + beq _081ABEB2 movs r0, 0x5 bl audio_play mov r0, r9 bl bag_menu_swap_items - b @081ABEB2 + b _081ABEB2 .pool -@081ABE10: +_081ABE10: ldrb r0, [r6] bl sub_81AE604 adds r4, r0, 0 @@ -797493,19 +797493,19 @@ Task_BagMenu: ; 81ABD28 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 @@ -797517,9 +797517,9 @@ Task_BagMenu: ; 81ABD28 adds r0, r3, r0 ldr r1, =sub_81AB8F8 str r1, [r0] - b @081ABEB2 + b _081ABEB2 .pool -@081ABE68: +_081ABE68: movs r0, 0x5 bl audio_play bl sub_81AB824 @@ -797551,7 +797551,7 @@ Task_BagMenu: ; 81ABD28 ldr r1, [r0] mov r0, r9 bl _call_via_r1 -@081ABEB2: +_081ABEB2: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -797603,7 +797603,7 @@ GetSwitchBagPocketDirection: ; 81ABF10 movs r0, 0xF ands r0, r1 cmp r0, 0 - bne @081ABF6A + bne _081ABF6A bl GetLRKeysState lsls r0, 24 lsrs r2, r0, 24 @@ -797612,30 +797612,30 @@ GetSwitchBagPocketDirection: ; 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 .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 GetSwitchBagPocketDirection @@ -797649,27 +797649,27 @@ ChangeBagPocketId: ; 81ABF70 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} @@ -797696,7 +797696,7 @@ SwitchBagPocket: ; 81ABFA8 strh r0, [r4, 0x18] strh r5, [r4, 0x16] cmp r2, 0 - bne @081AC026 + bne _081AC026 movs r0, 0 bl ClearWindowTilemap movs r0, 0x1 @@ -797737,7 +797737,7 @@ SwitchBagPocket: ; 81ABFA8 orrs r1, r2 strb r1, [r0] bl sub_81AB824 -@081AC026: +_081AC026: ldr r4, =0x0203ce58 ldrb r1, [r4, 0x5] add r0, sp, 0x8 @@ -797749,7 +797749,7 @@ SwitchBagPocket: ; 81ABFA8 asrs r1, r0, 16 adds r5, r0, 0 cmp r1, 0x1 - bne @081AC07C + bne _081AC07C ldr r2, =gUnknown_085E91FC ldrb r0, [r4, 0x5] lsls r0, 2 @@ -797763,9 +797763,9 @@ SwitchBagPocket: ; 81ABFA8 bl sub_81ADF20 movs r0, 0 bl sub_81ADFF8 - b @081AC09A + b _081AC09A .pool -@081AC07C: +_081AC07C: ldr r2, =gUnknown_085E91FC add r0, sp, 0x8 ldrb r0, [r0] @@ -797779,7 +797779,7 @@ SwitchBagPocket: ; 81ABFA8 bl sub_81ADF20 movs r0, 0x8 bl sub_81ADFF8 -@081AC09A: +_081AC09A: ldr r0, =0x0203ce58 ldrb r0, [r0, 0x5] movs r1, 0 @@ -797836,21 +797836,21 @@ 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 GetSwitchBagPocketDirection lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081AC148 + beq _081AC148 cmp r0, 0x2 - beq @081AC164 - b @081AC184 + beq _081AC164 + b _081AC184 .pool -@081AC148: +_081AC148: ldr r0, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] @@ -797860,9 +797860,9 @@ sub_81AC10C: ; 81AC10C movs r1, 0x1 negs r1, r1 adds r0, r7, 0 - b @081AC178 + b _081AC178 .pool -@081AC164: +_081AC164: ldr r0, =0x0203ce5d movs r1, 0x16 ldrsb r1, [r6, r1] @@ -797871,20 +797871,20 @@ sub_81AC10C: ; 81AC10C bl set_task_function_to_args_14_15 adds r0, r7, 0 movs r1, 0x1 -@081AC178: +_081AC178: movs r2, 0x1 bl SwitchBagPocket - b @081AC22E + b _081AC22E .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] @@ -797893,18 +797893,18 @@ sub_81AC10C: ; 81AC10C 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 @@ -797912,16 +797912,16 @@ sub_81AC10C: ; 81AC10C 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] @@ -797954,7 +797954,7 @@ sub_81AC10C: ; 81AC10C bl sub_81AB854 adds r0, r7, 0 bl set_task_function_to_args_14_15 -@081AC22E: +_081AC22E: pop {r4-r7} pop {r0} bx r0 @@ -797995,7 +797995,7 @@ bag_menu_draw_pocket_indicator_square: ; 81AC26C lsrs r0, 24 lsls r1, 24 cmp r1, 0 - bne @081AC298 + bne _081AC298 ldr r1, =0x00001017 adds r2, r0, 0x5 lsls r2, 24 @@ -798006,9 +798006,9 @@ bag_menu_draw_pocket_indicator_square: ; 81AC26C movs r0, 0x2 movs r3, 0x3 bl FillBgTilemapBufferRect_Palette0 - b @081AC2AE + b _081AC2AE .pool -@081AC298: +_081AC298: ldr r1, =0x0000102b adds r2, r0, 0x5 lsls r2, 24 @@ -798019,7 +798019,7 @@ bag_menu_draw_pocket_indicator_square: ; 81AC26C movs r0, 0x2 movs r3, 0x3 bl FillBgTilemapBufferRect_Palette0 -@081AC2AE: +_081AC2AE: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -798034,19 +798034,19 @@ sub_81AC2C0: ; 81AC2C0 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 .pool -@081AC2E0: +_081AC2E0: movs r0, 0 -@081AC2E2: +_081AC2E2: pop {r1} bx r1 thumb_func_end sub_81AC2C0 @@ -798155,14 +798155,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] @@ -798175,9 +798175,9 @@ sub_81AC3C0: ; 81AC3C0 adds r3, 0x8 adds r2, r3 bl get_coro_args_x18_x1A - b @081AC472 + b _081AC472 .pool -@081AC418: +_081AC418: ldrb r0, [r4] bl sub_81AE604 adds r7, r0, 0 @@ -798202,13 +798202,13 @@ sub_81AC3C0: ; 81AC3C0 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 .pool -@081AC460: +_081AC460: movs r0, 0x5 bl audio_play mov r0, r8 @@ -798216,21 +798216,21 @@ sub_81AC3C0: ; 81AC3C0 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} @@ -798273,16 +798273,16 @@ 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 .pool -@081AC4F8: +_081AC4F8: ldr r1, =0x02039dd8 lsls r0, r6, 3 adds r0, r1 @@ -798305,7 +798305,7 @@ sub_81AC498: ; 81AC498 movs r1, 0x2 ldrsh r0, [r2, r1] cmp r0, r4 - bge @081AC538 + bge _081AC538 ldrb r1, [r5, 0x5] lsls r1, 1 ldr r2, =0x0203ce60 @@ -798313,7 +798313,7 @@ sub_81AC498: ; 81AC498 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] -@081AC538: +_081AC538: ldrb r0, [r5, 0x5] bl load_bag_item_list_buffers ldr r0, =0x03006310 @@ -798333,7 +798333,7 @@ sub_81AC498: ; 81AC498 add r0, r10 ldr r1, =Task_BagMenu str r1, [r0] -@081AC566: +_081AC566: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -798387,14 +798387,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 @@ -798430,34 +798430,34 @@ sub_81AC644: ; 81AC644 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 .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 @@ -798468,9 +798468,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b @081ACA10 + b _081ACA10 .pool -@081AC6C4: +_081AC6C4: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798481,9 +798481,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b @081ACA10 + b _081ACA10 .pool -@081AC6E8: +_081AC6E8: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798494,18 +798494,18 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 - b @081ACA10 + b _081ACA10 .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 @@ -798516,9 +798516,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b @081ACA10 + b _081ACA10 .pool -@081AC748: +_081AC748: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798529,18 +798529,18 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b @081ACA10 + b _081ACA10 .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 @@ -798551,9 +798551,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b @081ACA10 + b _081ACA10 .pool -@081AC7A8: +_081AC7A8: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798564,18 +798564,18 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b @081ACA10 + b _081ACA10 .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 @@ -798586,9 +798586,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b @081ACA10 + b _081ACA10 .pool -@081AC808: +_081AC808: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798599,29 +798599,29 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b @081ACA10 + b _081ACA10 .pool -@081AC82C: +_081AC82C: bl sub_81221AC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081AC840 + beq _081AC840 bl InUnionRoom 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 @@ -798632,9 +798632,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x1 - b @081ACA10 + b _081ACA10 .pool -@081AC880: +_081AC880: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798645,29 +798645,29 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x2 - b @081ACA10 + b _081ACA10 .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 .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 @@ -798691,17 +798691,17 @@ sub_81AC644: ; 81AC644 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 .pool -@081AC92C: +_081AC92C: ldr r4, =0x0203ce54 ldr r1, [r4] movs r0, 0x82 @@ -798727,33 +798727,33 @@ sub_81AC644: ; 81AC644 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 TestPlayerAvatarFlags 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 .pool -@081AC9B4: +_081AC9B4: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798764,9 +798764,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 - b @081ACA10 + b _081ACA10 .pool -@081AC9D8: +_081AC9D8: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798777,9 +798777,9 @@ sub_81AC644: ; 81AC644 ldr r0, =0x00000828 adds r1, r0 movs r0, 0x4 - b @081ACA10 + b _081ACA10 .pool -@081AC9FC: +_081AC9FC: ldr r0, =0x0203ce54 ldr r1, [r0] movs r0, 0x82 @@ -798790,13 +798790,13 @@ sub_81AC644: ; 81AC644 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 ClearWindowTilemap ldr r0, =0x0203ce7c @@ -798808,9 +798808,9 @@ sub_81AC644: ; 81AC644 bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram - b @081ACA86 + b _081ACA86 .pool -@081ACA50: +_081ACA50: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -798834,30 +798834,30 @@ sub_81AC644: ; 81AC644 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 .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 @@ -798865,8 +798865,8 @@ sub_81AC644: ; 81AC644 movs r1, 0x2 movs r2, 0x2 bl sub_81ACB54 - b @081ACAEE -@081ACADC: + b _081ACAEE +_081ACADC: movs r0, 0x3 bl sub_81AE13C lsls r0, 24 @@ -798874,7 +798874,7 @@ sub_81AC644: ; 81AC644 movs r1, 0x2 movs r2, 0x3 bl sub_81ACB54 -@081ACAEE: +_081ACAEE: add sp, 0x14 pop {r4,r5} pop {r0} @@ -798981,23 +798981,23 @@ 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, =Task_HandleInBattleItemMenuInput - b @081ACBF4 + b _081ACBF4 .pool -@081ACBE8: +_081ACBE8: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 lsls r1, 3 adds r1, r0 ldr r0, =Task_HandleOutOfBattleItemMenuInput -@081ACBF4: +_081ACBF4: str r0, [r1] pop {r4} pop {r0} @@ -799015,26 +799015,26 @@ Task_HandleInBattleItemMenuInput: ; 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, =gUnknown_08613FB4 ldr r1, [r0, 0x24] adds r0, r5, 0 bl _call_via_r1 - b @081ACC6A + b _081ACC6A .pool -@081ACC44: +_081ACC44: movs r0, 0x5 bl audio_play ldr r1, =gUnknown_08613FB4 @@ -799052,7 +799052,7 @@ Task_HandleInBattleItemMenuInput: ; 81ACC04 ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -@081ACC6A: +_081ACC6A: pop {r4-r6} pop {r0} bx r0 @@ -799068,9 +799068,9 @@ Task_HandleOutOfBattleItemMenuInput: ; 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 @@ -799079,35 +799079,35 @@ Task_HandleOutOfBattleItemMenuInput: ; 81ACC78 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 .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 @@ -799117,90 +799117,90 @@ Task_HandleOutOfBattleItemMenuInput: ; 81ACC78 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 .pool -@081ACD1C: +_081ACD1C: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne @081ACD30 + bne _081ACD30 bl GetLRKeysState 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 GetLRKeysState 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, =gUnknown_08613FB4 @@ -799220,20 +799220,20 @@ Task_HandleOutOfBattleItemMenuInput: ; 81ACC78 ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 - b @081ACDF0 + b _081ACDF0 .pool -@081ACDD8: +_081ACDD8: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @081ACDF0 + beq _081ACDF0 movs r0, 0x5 bl audio_play ldr r0, =gUnknown_08613FB4 ldr r1, [r0, 0x24] adds r0, r6, 0 bl _call_via_r1 -@081ACDF0: +_081ACDF0: pop {r4-r6} pop {r0} bx r0 @@ -799246,14 +799246,14 @@ sub_81ACDFC: ; 81ACDFC 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 @@ -799261,13 +799261,13 @@ sub_81ACDFC: ; 81ACDFC adds r0, r1 ldrb r0, [r0] cmp r0, 0xE - beq @081ACE30 + beq _081ACE30 movs r0, 0x1 - b @081ACE32 + b _081ACE32 .pool -@081ACE30: +_081ACE30: movs r0, 0 -@081ACE32: +_081ACE32: pop {r1} bx r1 thumb_func_end sub_81ACDFC @@ -799281,27 +799281,27 @@ 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 .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 @@ -799316,23 +799316,23 @@ ItemMenu_UseOutOfBattle: ; 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 .pool -@081ACEB8: +_081ACEB8: movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -799341,19 +799341,19 @@ ItemMenu_UseOutOfBattle: ; 81ACE7C 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 .pool -@081ACEE8: +_081ACEE8: adds r0, r4, 0 bl sub_80FDD10 -@081ACEEE: +_081ACEEE: pop {r4,r5} pop {r0} bx r0 @@ -799376,12 +799376,12 @@ ItemMenu_Toss: ; 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 .pool -@081ACF24: +_081ACF24: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -799412,7 +799412,7 @@ ItemMenu_Toss: ; 81ACEF4 adds r0, r6, r0 ldr r1, =sub_81AD044 str r1, [r0] -@081ACF6A: +_081ACF6A: add sp, 0x14 pop {r4-r7} pop {r0} @@ -799515,7 +799515,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 @@ -799524,35 +799524,35 @@ sub_81AD044: ; 81AD044 movs r2, 0x10 ldrsh r1, [r4, r2] bl sub_81ABC54 - b @081AD0C6 + b _081AD0C6 .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 .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 @@ -799636,7 +799636,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 @@ -799665,7 +799665,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} @@ -799700,14 +799700,14 @@ ItemMenu_Register: ; 81AD1EC ldrh r2, [r0] ldrh r0, [r1] cmp r0, r2 - bne @081AD238 + bne _081AD238 movs r0, 0 strh r0, [r1] - b @081AD23A + b _081AD23A .pool -@081AD238: +_081AD238: strh r2, [r1] -@081AD23A: +_081AD23A: ldrb r0, [r7] adds r1, r6, 0 adds r2, r5, 0 @@ -799744,40 +799744,40 @@ ItemMenu_Give: ; 81AD278 bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 - bne @081AD2AC + bne _081AD2AC ldr r2, =gUnknown_085E8DCE ldr r3, =sub_81AD350 adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @081AD2EA + b _081AD2EA .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 str r0, [r1] adds r0, r4, 0 bl sub_81AB8F8 - b @081AD2EA + b _081AD2EA .pool -@081AD2E4: +_081AD2E4: adds r0, r6, 0 bl sub_81AD30C -@081AD2EA: +_081AD2EA: pop {r4-r6} pop {r0} bx r0 @@ -799832,12 +799832,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 @@ -799898,14 +799898,14 @@ ItemMenu_UseInBattle: ; 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 @@ -799933,20 +799933,20 @@ sub_81AD41C: ; 81AD41C bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 - bne @081AD44C + bne _081AD44C ldr r2, =gUnknown_085E8DCE ldr r3, =sub_81AD350 adds r0, r5, 0 movs r1, 0x1 bl DisplayItemMessage - b @081AD4AE + b _081AD4AE .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 @@ -799959,26 +799959,26 @@ sub_81AD41C: ; 81AD41C movs r1, 0x1 adds r2, r4, 0 bl DisplayItemMessage - b @081AD4AE + b _081AD4AE .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 sub_81AB8F8 - b @081AD4AE + b _081AD4AE .pool -@081AD4A8: +_081AD4A8: adds r0, r5, 0 bl sub_81AD30C -@081AD4AE: +_081AD4AE: pop {r4,r5} pop {r0} bx r0 @@ -799995,24 +799995,24 @@ sub_81AD4B4: ; 81AD4B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081AD4E4 + bne _081AD4E4 ldr r2, =gUnknown_085E8DCE ldr r3, =sub_81AD350 adds r0, r4, 0 movs r1, 0x1 bl DisplayItemMessage - b @081AD51A + b _081AD51A .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 @@ -800020,12 +800020,12 @@ sub_81AD4B4: ; 81AD4B4 adds r1, r0 ldr r0, =sub_81AB8F8 str r0, [r1] - b @081AD51A + b _081AD51A .pool -@081AD514: +_081AD514: adds r0, r4, 0 bl sub_81AD30C -@081AD51A: +_081AD51A: pop {r4,r5} pop {r0} bx r0 @@ -800037,25 +800037,25 @@ UseRegisteredKeyItemOnField: ; 81AD520 push {r4-r7,lr} bl InUnionRoom cmp r0, 0x1 - beq @081AD54C + beq _081AD54C bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @081AD54C + bne _081AD54C bl InBattlePike lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0 - bne @081AD54C + bne _081AD54C bl in_multi_battle_room_with_var_condition 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 HideMapNamePopUpWindow movs r0, 0 movs r1, 0 @@ -800067,13 +800067,13 @@ UseRegisteredKeyItemOnField: ; 81AD520 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 @@ -800095,18 +800095,18 @@ UseRegisteredKeyItemOnField: ; 81AD520 lsls r1, 3 adds r1, r2 strh r6, [r1, 0xE] - b @081AD5D0 + b _081AD5D0 .pool -@081AD5C4: +_081AD5C4: ldr r0, [r4] adds r0, r5 strh r7, [r0] -@081AD5CA: +_081AD5CA: ldr r0, =gUnknown_082736B3 bl script_env_1_execute_new_script -@081AD5D0: +_081AD5D0: movs r0, 0x1 -@081AD5D2: +_081AD5D2: pop {r4-r7} pop {r1} bx r1 @@ -800130,7 +800130,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 @@ -800143,20 +800143,20 @@ display_sell_item_ask_str: ; 81AD5DC movs r1, 0x1 adds r2, r4, 0 bl DisplayItemMessage - b @081AD66A + b _081AD66A .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 @@ -800169,7 +800169,7 @@ display_sell_item_ask_str: ; 81AD5DC movs r1, 0x1 adds r2, r4, 0 bl DisplayItemMessage -@081AD66A: +_081AD66A: pop {r4-r7} pop {r0} bx r0 @@ -800315,7 +800315,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 @@ -800335,28 +800335,28 @@ sub_81AD794: ; 81AD794 adds r0, r4, 0 adds r1, r5, 0 bl sub_81ABCC0 - b @081AD844 + b _081AD844 .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 .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] @@ -800369,7 +800369,7 @@ sub_81AD794: ; 81AD794 bl sub_81AE1F8 adds r0, r5, 0 bl set_callback3_to_bag -@081AD844: +_081AD844: pop {r4-r6} pop {r0} bx r0 @@ -800533,13 +800533,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 @@ -800562,12 +800562,12 @@ 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 .pool -@081ADA18: +_081ADA18: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -800598,7 +800598,7 @@ display_deposit_item_ask_str: ; 81AD9EC adds r0, r5, r0 ldr r1, =sub_81ADA7C str r1, [r0] -@081ADA5E: +_081ADA5E: add sp, 0x14 pop {r4-r6} pop {r0} @@ -800624,7 +800624,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 @@ -800633,28 +800633,28 @@ sub_81ADA7C: ; 81ADA7C movs r2, 0x10 ldrsh r1, [r5, r2] bl sub_81ABC54 - b @081ADB0E + b _081ADB0E .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 .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 @@ -800667,7 +800667,7 @@ sub_81ADA7C: ; 81ADA7C bl sub_81AE184 adds r0, r6, 0 bl set_callback3_to_bag -@081ADB0E: +_081ADB0E: pop {r4-r6} pop {r0} bx r0 @@ -800699,7 +800699,7 @@ sub_81ADB14: ; 81ADB14 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - beq @081ADB6C + beq _081ADB6C ldr r2, =gUnknown_085E8E8E movs r0, 0x1 str r0, [sp] @@ -800709,9 +800709,9 @@ sub_81ADB14: ; 81ADB14 str r0, [sp, 0xC] str r0, [sp, 0x10] movs r0, 0x1 - b @081ADBE2 + b _081ADBE2 .pool -@081ADB6C: +_081ADB6C: ldrh r0, [r4] mov r3, r8 ldrh r1, [r3, 0x10] @@ -800719,7 +800719,7 @@ sub_81ADB14: ; 81ADB14 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x1 - bne @081ADBD4 + bne _081ADBD4 ldrh r0, [r4] ldr r1, =0x02021cc4 bl itemid_get_name @@ -800748,9 +800748,9 @@ sub_81ADB14: ; 81ADB14 subs r0, 0x8 adds r0, r7, r0 ldr r1, =sub_81AD150 - b @081ADBF2 + b _081ADBF2 .pool -@081ADBD4: +_081ADBD4: ldr r2, =gUnknown_085E8E6E movs r0, 0x1 str r0, [sp] @@ -800758,7 +800758,7 @@ sub_81ADB14: ; 81ADB14 str r5, [sp, 0x8] str r5, [sp, 0xC] str r5, [sp, 0x10] -@081ADBE2: +_081ADBE2: movs r1, 0x1 movs r3, 0x3 bl sub_81AE0BC @@ -800766,7 +800766,7 @@ sub_81ADB14: ; 81ADB14 subs r0, 0x8 adds r0, r7, r0 ldr r1, =sub_81ADC0C -@081ADBF2: +_081ADBF2: str r1, [r0] add sp, 0x14 pop {r3,r4} @@ -800793,7 +800793,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 @@ -800804,7 +800804,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 @@ -800817,13 +800817,13 @@ sub_81ADC54: ; 81ADC54 ldr r0, =0x0203ce58 ldrb r0, [r0, 0x4] cmp r0, 0xA - beq @081ADC68 + beq _081ADC68 movs r0, 0 - b @081ADC6A + b _081ADC6A .pool -@081ADC68: +_081ADC68: movs r0, 0x1 -@081ADC6A: +_081ADC6A: pop {r1} bx r1 thumb_func_end sub_81ADC54 @@ -800858,7 +800858,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 @@ -800873,7 +800873,7 @@ sub_81ADC70: ; 81ADC70 adds r5, 0x2 adds r6, 0x1 cmp r6, 0x4 - bls @081ADCAE + bls _081ADCAE ldr r4, =0x03005d8c ldr r0, [r4] movs r1, 0xAC @@ -800923,7 +800923,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 @@ -800938,7 +800938,7 @@ sub_81ADD00: ; 81ADD00 adds r3, 0x2 adds r5, 0x1 cmp r5, 0x4 - bls @081ADD3A + bls _081ADD3A ldr r0, [r6] bl Free pop {r4-r6} @@ -800981,32 +800981,32 @@ 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 .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 SwitchBagPocket - b @081ADE2C -@081ADDEC: + b _081ADE2C +_081ADDEC: movs r0, 0x5 bl audio_play ldrb r0, [r4] @@ -801017,9 +801017,9 @@ sub_81ADD98: ; 81ADD98 strh r0, [r1] adds r0, r5, 0 bl sub_81AC644 - b @081ADE2C + b _081ADE2C .pool -@081ADE0C: +_081ADE0C: movs r0, 0x5 bl audio_play bl sub_81ACE38 @@ -801030,12 +801030,12 @@ sub_81ADD98: ; 81ADD98 bl sub_81ADD00 adds r0, r5, 0 bl sub_81AB8F8 - 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 @@ -801196,7 +801196,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 @@ -801215,7 +801215,7 @@ sub_81ADF20: ; 81ADF20 movs r1, 0x1 mov r2, r8 bl sub_81AE0BC -@081ADFBA: +_081ADFBA: adds r0, r6, 0 movs r1, 0x7 bl GetWindowAttribute @@ -801242,9 +801242,9 @@ 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 @@ -801301,7 +801301,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 FillWindowPixelBuffer @@ -801311,7 +801311,7 @@ setup_bag_menu_textboxes: ; 81AE054 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 @@ -801404,7 +801404,7 @@ sub_81AE13C: ; 81AE13C adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne @081AE172 + bne _081AE172 lsls r0, r2, 3 ldr r1, =gUnknown_086141AC adds r0, r1 @@ -801417,7 +801417,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} @@ -801438,7 +801438,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] @@ -801449,7 +801449,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 @@ -801470,13 +801470,13 @@ AddItemMessageWindow: ; 81AE1C4 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne @081AE1E8 + bne _081AE1E8 lsls r0, r2, 3 ldr r1, =gUnknown_086141AC adds r0, r1 bl AddWindow strb r0, [r4] -@081AE1E8: +_081AE1E8: ldrb r0, [r4] pop {r4} pop {r1} @@ -801497,7 +801497,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] @@ -801508,7 +801508,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 @@ -801625,10 +801625,10 @@ sub_81AE2FC: ; 81AE2FC movs r1, 0 bl FillWindowPixelBuffer 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 @@ -801648,13 +801648,13 @@ sub_81AE2FC: ; 81AE2FC lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3 - bls @081AE31A + bls _081AE31A movs r0, 0x4 movs r1, 0x2 bl CopyWindowToVram - b @081AE440 + b _081AE440 .pool -@081AE354: +_081AE354: adds r0, r4, 0 bl sub_81B6CFC lsls r0, 16 @@ -801674,11 +801674,11 @@ sub_81AE2FC: ; 81AE2FC bl sub_819A2F8 ldrb r0, [r5, 0x1] cmp r0, 0x1 - bhi @081AE38C + bhi _081AE38C ldr r2, =gUnknown_085E8D45 - b @081AE39C + b _081AE39C .pool -@081AE38C: +_081AE38C: ldr r4, =0x02021cc4 ldrb r1, [r5, 0x1] adds r0, r4, 0 @@ -801686,7 +801686,7 @@ sub_81AE2FC: ; 81AE2FC movs r3, 0x3 bl ConvertIntToDecimalString adds r2, r4, 0 -@081AE39C: +_081AE39C: movs r0, 0xC str r0, [sp] movs r0, 0 @@ -801707,11 +801707,11 @@ sub_81AE2FC: ; 81AE2FC ldrb r0, [r2, 0x3] adds r6, r1, 0 cmp r0, 0 - bne @081AE3D8 + bne _081AE3D8 ldr r2, =gUnknown_085E8D45 - b @081AE3E8 + b _081AE3E8 .pool -@081AE3D8: +_081AE3D8: ldr r4, =0x02021cc4 ldrb r1, [r2, 0x3] adds r0, r4, 0 @@ -801719,7 +801719,7 @@ sub_81AE2FC: ; 81AE2FC movs r3, 0x3 bl ConvertIntToDecimalString adds r2, r4, 0 -@081AE3E8: +_081AE3E8: movs r0, 0x18 str r0, [sp] movs r4, 0 @@ -801760,7 +801760,7 @@ sub_81AE2FC: ; 81AE2FC movs r0, 0x4 movs r1, 0x2 bl CopyWindowToVram -@081AE440: +_081AE440: add sp, 0x14 pop {r3,r4} mov r8, r3 @@ -801800,26 +801800,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 AddWindow 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 @@ -801827,7 +801827,7 @@ sub_81AE45C: ; 81AE45C lsrs r2, 24 ldr r1, [sp, 0x4] bl sub_8098858 -@081AE4C0: +_081AE4C0: ldr r0, =0x03006310 adds r2, r0, 0 ldr r1, [sp] @@ -801847,9 +801847,9 @@ sub_81AE45C: ; 81AE45C bl CopyWindowToVram movs r0, 0x1 strb r0, [r4, 0x4] - b @081AE570 + b _081AE570 .pool -@081AE4F4: +_081AE4F4: ldrb r0, [r5, 0x6] bl sub_81AE604 str r0, [r5] @@ -801857,47 +801857,47 @@ sub_81AE45C: ; 81AE45C 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 ClearWindowTilemap - b @081AE546 + b _081AE546 .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 CopyWindowToVram - b @081AE570 + b _081AE570 .pool -@081AE558: +_081AE558: ldrb r0, [r5, 0x6] movs r1, 0 movs r2, 0 @@ -801907,11 +801907,11 @@ sub_81AE45C: ; 81AE45C 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 @@ -801962,9 +801962,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] @@ -801977,8 +801977,8 @@ sub_81AE5B0: ; 81AE5B0 adds r5, 0x8 ldrb r0, [r5, 0x4] cmp r0, 0xFF - bne @081AE5D4 -@081AE5F0: + bne _081AE5D4 +_081AE5F0: ldrb r0, [r6, 0x10] movs r1, 0x2 bl CopyWindowToVram @@ -802005,7 +802005,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 @@ -802013,57 +802013,57 @@ sub_81AE604: ; 81AE604 lsls r0, 3 adds r0, r1 ldr r0, [r0, 0x4] - b @081AE6C2 + b _081AE6C2 .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 @@ -802071,32 +802071,32 @@ sub_81AE604: ; 81AE604 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 @@ -802114,23 +802114,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} @@ -802261,33 +802261,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 @@ -802308,12 +802308,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 .pool @@ -802331,15 +802331,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 .pool @@ -802457,9 +802457,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 @@ -802505,7 +802505,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 @@ -802538,9 +802538,9 @@ sub_81AE9B4: ; 81AE9B4 movs r0, 0x7F ands r0, r1 strb r0, [r5, 0x3] - b @081AEA5E + b _081AEA5E .pool -@081AEA20: +_081AEA20: add r2, sp, 0x14 ldrb r1, [r4, 0x15] lsls r0, r1, 28 @@ -802571,7 +802571,7 @@ sub_81AE9B4: ; 81AE9B4 adds r2, r7, 0 mov r3, r12 bl AddTextPrinterParametrized2 -@081AEA5E: +_081AEA5E: add sp, 0x18 pop {r4-r7} pop {r0} @@ -802611,8 +802611,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 @@ -802622,12 +802622,12 @@ calls_printshopbuyprice: ; 81AEA68 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] @@ -802642,13 +802642,13 @@ calls_printshopbuyprice: ; 81AEA68 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] @@ -802664,8 +802664,8 @@ calls_printshopbuyprice: ; 81AEA68 movs r0, 0x1 add r8, r0 cmp r8, r10 - blt @081AEAAA -@081AEB10: + blt _081AEAAA +_081AEB10: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -802706,35 +802706,35 @@ DrawListMenuCursor: ; 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, =gUnknown_085E8D60 adds r0, r6, 0 mov r2, r8 adds r3, r7, 0 bl sub_81AE9B4 - b @081AEC0C + b _081AEC0C .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 @@ -802757,17 +802757,17 @@ DrawListMenuCursor: ; 81AEB20 adds r1, r4, 0 movs r3, 0 bl sub_81AF69C - b @081AEC0C + b _081AEC0C .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 @@ -802789,7 +802789,7 @@ DrawListMenuCursor: ; 81AEB20 adds r1, r4, 0 movs r3, 0x1 bl sub_81AF69C -@081AEC0C: +_081AEC0C: pop {r3} mov r8, r3 pop {r4-r7} @@ -802857,7 +802857,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 @@ -802904,7 +802904,7 @@ sub_81AEC78: ; 81AEC78 str r0, [sp, 0x4] adds r0, r6, 0 bl FillWindowPixelRect -@081AECF4: +_081AECF4: add sp, 0x8 pop {r3} mov r8, r3 @@ -802922,13 +802922,13 @@ ListMenuUpdateSelectedRowIndexAndScrollOffset: ; 81AED00 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 @@ -802938,15 +802938,15 @@ ListMenuUpdateSelectedRowIndexAndScrollOffset: ; 81AED00 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 @@ -802955,17 +802955,17 @@ ListMenuUpdateSelectedRowIndexAndScrollOffset: ; 81AED00 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 @@ -802974,38 +802974,38 @@ ListMenuUpdateSelectedRowIndexAndScrollOffset: ; 81AED00 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 @@ -803014,23 +803014,23 @@ ListMenuUpdateSelectedRowIndexAndScrollOffset: ; 81AED00 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 @@ -803039,16 +803039,16 @@ ListMenuUpdateSelectedRowIndexAndScrollOffset: ; 81AED00 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 @@ -803069,7 +803069,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 @@ -803082,8 +803082,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 @@ -803097,7 +803097,7 @@ sub_81AEDF0: ; 81AEDF0 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 @@ -803150,8 +803150,8 @@ sub_81AEDF0: ; 81AEDF0 movs r2, 0 adds r3, r4, 0 bl FillWindowPixelRect - b @081AEF1A -@081AEEBC: + b _081AEF1A +_081AEEBC: ldrb r0, [r6, 0x10] adds r2, r7, 0 muls r2, r4 @@ -803195,7 +803195,7 @@ sub_81AEDF0: ; 81AEDF0 movs r2, 0 movs r3, 0 bl FillWindowPixelRect -@081AEF1A: +_081AEF1A: add sp, 0x8 pop {r3} mov r8, r3 @@ -803228,11 +803228,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 @@ -803246,8 +803246,8 @@ sub_81AEF28: ; 81AEF28 movs r0, 0x3 negs r0, r0 cmp r1, r0 - bne @081AEF88 -@081AEF76: + bne _081AEF88 +_081AEF76: adds r0, r4, 0 mov r1, r9 bl ListMenuUpdateSelectedRowIndexAndScrollOffset @@ -803255,26 +803255,26 @@ sub_81AEF28: ; 81AEF28 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 @@ -803286,8 +803286,8 @@ sub_81AEF28: ; 81AEF28 ldrb r0, [r4, 0x10] movs r1, 0x2 bl CopyWindowToVram - b @081AEFEE -@081AEFC6: + b _081AEFEE +_081AEFC6: adds r0, r4, 0 mov r1, r10 bl sub_81AEC78 @@ -803303,9 +803303,9 @@ sub_81AEF28: ; 81AEF28 ldrb r0, [r4, 0x10] movs r1, 0x2 bl CopyWindowToVram -@081AEFEE: +_081AEFEE: movs r0, 0 -@081AEFF0: +_081AEFF0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -803324,7 +803324,7 @@ calls_printshopitemdescription: ; 81AF000 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 @@ -803334,7 +803334,7 @@ calls_printshopitemdescription: ; 81AF000 ldr r0, [r0, 0x4] adds r1, r4, 0 bl _call_via_r3 -@081AF022: +_081AF022: pop {r4} pop {r0} bx r0 @@ -803387,10 +803387,10 @@ 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 @@ -803408,97 +803408,97 @@ 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 .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 @@ -803516,125 +803516,125 @@ 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 .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 @@ -803647,11 +803647,11 @@ sub_81AF264: ; 81AF264 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 @@ -803660,17 +803660,17 @@ sub_81AF264: ; 81AF264 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, =gUnknown_08329F40 @@ -803682,14 +803682,14 @@ sub_81AF264: ; 81AF264 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 .pool -@081AF2C0: +_081AF2C0: movs r0, 0x34 ldrsh r3, [r4, r0] ldr r1, =gUnknown_08329F40 @@ -803701,16 +803701,16 @@ sub_81AF264: ; 81AF264 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 @@ -803813,7 +803813,7 @@ sub_81AF380: ; 81AF380 bl LoadCompressedObjectPic ldrh r2, [r6, 0xC] cmp r2, r4 - bne @081AF3DC + bne _081AF3DC ldr r0, =gUnknown_086142A8 ldrb r1, [r6, 0xE] lsls r1, 20 @@ -803823,9 +803823,9 @@ sub_81AF380: ; 81AF380 lsrs r1, 16 movs r2, 0x20 bl gpu_pal_apply - b @081AF3EE + b _081AF3EE .pool -@081AF3DC: +_081AF3DC: ldr r0, =gUnknown_086142A8 str r0, [sp, 0xC] add r0, sp, 0xC @@ -803834,7 +803834,7 @@ sub_81AF380: ; 81AF380 orrs r1, r2 str r1, [r0, 0x4] bl LoadTaggedObjectPalette -@081AF3EE: +_081AF3EE: ldr r0, =sub_81AF504 movs r1, 0 bl AddTask @@ -803877,7 +803877,7 @@ sub_81AF380: ; 81AF380 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 @@ -803903,7 +803903,7 @@ sub_81AF380: ; 81AF380 ands r2, r3 orrs r2, r1 strb r2, [r0, 0x5] -@081AF47C: +_081AF47C: mov r0, r8 add sp, 0x14 pop {r3,r4} @@ -803921,7 +803921,7 @@ sub_81AF4A0: ; 81AF4A0 adds r4, r1, 0 subs r0, 0x2 cmp r0, 0x1 - bhi @081AF4C4 + bhi _081AF4C4 ldr r0, =0x0203ce8c movs r1, 0x2 strb r1, [r0] @@ -803931,9 +803931,9 @@ sub_81AF4A0: ; 81AF4A0 strb r1, [r0, 0x3] strb r4, [r0, 0x4] strb r3, [r0, 0x5] - b @081AF4D6 + b _081AF4D6 .pool -@081AF4C4: +_081AF4C4: ldr r0, =0x0203ce8c movs r1, 0 strb r1, [r0] @@ -803943,7 +803943,7 @@ sub_81AF4A0: ; 81AF4A0 strb r1, [r0, 0x3] strb r3, [r0, 0x4] strb r4, [r0, 0x5] -@081AF4D6: +_081AF4D6: adds r2, r0, 0 movs r1, 0 movs r0, 0 @@ -803980,10 +803980,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 @@ -803994,9 +803994,9 @@ sub_81AF504: ; 81AF504 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b @081AF55E + b _081AF55E .pool -@081AF548: +_081AF548: ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 @@ -804008,11 +804008,11 @@ sub_81AF504: ; 81AF504 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 @@ -804022,9 +804022,9 @@ sub_81AF504: ; 81AF504 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b @081AF594 + b _081AF594 .pool -@081AF580: +_081AF580: ldrb r1, [r4, 0xD] lsls r0, r1, 4 adds r0, r1 @@ -804035,7 +804035,7 @@ sub_81AF504: ; 81AF504 movs r1, 0x5 negs r1, r1 ands r1, r2 -@081AF594: +_081AF594: strb r1, [r0] pop {r4,r5} pop {r0} @@ -804055,7 +804055,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 @@ -804077,9 +804077,9 @@ sub_81AF59C: ; 81AF59C ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b @081AF612 + b _081AF612 .pool -@081AF5E8: +_081AF5E8: ldr r3, =0x02020630 ldrb r1, [r4, 0xC] lsls r0, r1, 4 @@ -804101,7 +804101,7 @@ sub_81AF59C: ; 81AF59C movs r1, 0x5 negs r1, r1 ands r1, r2 -@081AF612: +_081AF612: strb r1, [r0] pop {r4} pop {r0} @@ -804123,14 +804123,14 @@ sub_81AF620: ; 81AF620 ldrh r0, [r5, 0xE] ldr r4, =0x0000ffff cmp r0, r4 - beq @081AF63E + beq _081AF63E bl FreeObjectTilesByTag -@081AF63E: +_081AF63E: ldrh r0, [r5, 0x10] cmp r0, r4 - beq @081AF648 + beq _081AF648 bl FreeObjectPaletteByTag -@081AF648: +_081AF648: ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -804156,15 +804156,15 @@ sub_81AF620: ; 81AF620 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} @@ -804182,16 +804182,16 @@ 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 @@ -804202,16 +804202,16 @@ sub_81AF6C4: ; 81AF6C4 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 @@ -804230,29 +804230,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} @@ -804303,12 +804303,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, =gUnknown_08614264 ldr r0, [r0] str r0, [sp] @@ -804318,7 +804318,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 @@ -804335,16 +804335,16 @@ sub_81AF724: ; 81AF724 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, =gUnknown_08614268 ldr r6, [r0] ldr r0, =gUnknown_0861426C @@ -804355,7 +804355,7 @@ sub_81AF724: ; 81AF724 movs r7, 0x88 mov r3, r8 adds r3, 0x80 -@081AF7DC: +_081AF7DC: str r6, [r2] strb r7, [r2] adds r0, r1, 0 @@ -804368,8 +804368,8 @@ sub_81AF724: ; 81AF724 adds r2, 0x4 adds r1, 0x8 cmp r1, r4 - blt @081AF7DC -@081AF7F6: + blt _081AF7DC +_081AF7F6: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -804407,7 +804407,7 @@ sub_81AF828: ; 81AF828 ldrh r2, [r6, 0x8] ldr r7, =0x0000ffff cmp r2, r7 - bne @081AF884 + bne _081AF884 ldr r0, =gUnknown_086142A8 ldrb r1, [r6, 0xA] lsls r1, 20 @@ -804417,9 +804417,9 @@ sub_81AF828: ; 81AF828 lsrs r1, 16 movs r2, 0x20 bl gpu_pal_apply - b @081AF896 + b _081AF896 .pool -@081AF884: +_081AF884: ldr r0, =gUnknown_086142A8 str r0, [sp, 0x20] add r0, sp, 0x20 @@ -804428,7 +804428,7 @@ sub_81AF828: ; 81AF828 orrs r1, r2 str r1, [r0, 0x4] bl LoadTaggedObjectPalette -@081AF896: +_081AF896: ldr r0, =nullsub_126 movs r1, 0 bl AddTask @@ -804518,7 +804518,7 @@ sub_81AF828: ; 81AF828 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 @@ -804531,7 +804531,7 @@ sub_81AF828: ; 81AF828 ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -@081AF96E: +_081AF96E: adds r0, r4, 0 add sp, 0x28 pop {r3} @@ -804594,14 +804594,14 @@ sub_81AF9D8: ; 81AF9D8 ldrh r0, [r4, 0xE] ldr r6, =0x0000ffff cmp r0, r6 - beq @081AF9FC + beq _081AF9FC bl FreeObjectTilesByTag -@081AF9FC: +_081AF9FC: ldrh r0, [r4, 0x10] cmp r0, r6 - beq @081AFA06 + beq _081AFA06 bl FreeObjectPaletteByTag -@081AFA06: +_081AFA06: ldrb r1, [r4, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -804629,9 +804629,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 @@ -804669,7 +804669,7 @@ sub_81AFA60: ; 81AFA60 bl LoadCompressedObjectPic ldrh r2, [r5, 0x8] cmp r2, r4 - bne @081AFAB4 + bne _081AFAB4 ldr r0, =gUnknown_086142A8 ldrb r1, [r5, 0xA] lsls r1, 20 @@ -804679,9 +804679,9 @@ sub_81AFA60: ; 81AFA60 lsrs r1, 16 movs r2, 0x20 bl gpu_pal_apply - b @081AFAC6 + b _081AFAC6 .pool -@081AFAB4: +_081AFAB4: ldr r0, =gUnknown_086142A8 str r0, [sp, 0x20] add r0, sp, 0x20 @@ -804690,7 +804690,7 @@ sub_81AFA60: ; 81AFA60 orrs r1, r2 str r1, [r0, 0x4] bl LoadTaggedObjectPalette -@081AFAC6: +_081AFAC6: ldr r0, =nullsub_127 movs r1, 0 bl AddTask @@ -804740,7 +804740,7 @@ sub_81AFA60: ; 81AFA60 ldrh r1, [r5, 0x8] ldr r0, =0x0000ffff cmp r1, r0 - bne @081AFB46 + bne _081AFB46 ldrb r0, [r4] lsls r1, r0, 4 adds r1, r0 @@ -804753,7 +804753,7 @@ sub_81AFA60: ; 81AFA60 ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -@081AFB46: +_081AFB46: adds r0, r6, 0 add sp, 0x28 pop {r4-r7} @@ -804806,14 +804806,14 @@ sub_81AFBA0: ; 81AFBA0 ldrh r0, [r4, 0x2] ldr r6, =0x0000ffff cmp r0, r6 - beq @081AFBBE + beq _081AFBBE bl FreeObjectTilesByTag -@081AFBBE: +_081AFBBE: ldrh r0, [r4, 0x4] cmp r0, r6 - beq @081AFBC8 + beq _081AFBC8 bl FreeObjectPaletteByTag -@081AFBC8: +_081AFBC8: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -804836,11 +804836,11 @@ sub_81AFBF0: ; 81AFBF0 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 .pool @@ -804853,12 +804853,12 @@ sub_81AFC0C: ; 81AFC0C 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 .pool @@ -804872,35 +804872,35 @@ sub_81AFC28: ; 81AFC28 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 .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 CopyString 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 @@ -804938,24 +804938,24 @@ 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 .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 @@ -804996,21 +804996,21 @@ 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 .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 @@ -805022,21 +805022,21 @@ 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 .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 @@ -805048,21 +805048,21 @@ 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 .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 @@ -805127,23 +805127,23 @@ AllocItemIconTemporaryBuffers: ; 81AFDE4 bl Alloc str r0, [r5] cmp r0, 0 - beq @081AFE1A + beq _081AFE1A ldr r4, =0x0203cec0 movs r0, 0x80 lsls r0, 2 bl AllocZeroed str r0, [r4] cmp r0, 0 - beq @081AFE14 + beq _081AFE14 movs r0, 0x1 - b @081AFE1C + b _081AFE1C .pool -@081AFE14: +_081AFE14: ldr r0, [r5] bl Free -@081AFE1A: +_081AFE1A: movs r0, 0 -@081AFE1C: +_081AFE1C: pop {r4,r5} pop {r1} bx r1 @@ -805171,7 +805171,7 @@ CopyItemIconPicTo4x4Buffer: ; 81AFE44 adds r6, r0, 0 adds r5, r1, 0 movs r4, 0 -@081AFE4C: +_081AFE4C: lsls r0, r4, 1 adds r0, r4 lsls r0, 5 @@ -805184,7 +805184,7 @@ CopyItemIconPicTo4x4Buffer: ; 81AFE44 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @081AFE4C + bls _081AFE4C pop {r4-r6} pop {r0} bx r0 @@ -805204,7 +805204,7 @@ AddItemIconObject: ; 81AFE70 bl AllocItemIconTemporaryBuffers lsls r0, 24 cmp r0, 0 - beq @081AFF28 + beq _081AFF28 adds r0, r5, 0 movs r1, 0 bl GetItemIconPicOrPalette @@ -805261,11 +805261,11 @@ AddItemIconObject: ; 81AFE70 adds r0, r5, 0 bl Free adds r0, r4, 0 - b @081AFF2A + b _081AFF2A .pool -@081AFF28: +_081AFF28: movs r0, 0x40 -@081AFF2A: +_081AFF2A: add sp, 0x10 pop {r4-r7} pop {r1} @@ -805289,7 +805289,7 @@ AddItemIconObjectWithCustomObjectTemplate: ; 81AFF34 bl AllocItemIconTemporaryBuffers lsls r0, 24 cmp r0, 0 - beq @081AFFEC + beq _081AFFEC adds r0, r5, 0 movs r1, 0 bl GetItemIconPicOrPalette @@ -805346,11 +805346,11 @@ AddItemIconObjectWithCustomObjectTemplate: ; 81AFF34 adds r0, r5, 0 bl Free adds r0, r4, 0 - b @081AFFEE + b _081AFFEE .pool -@081AFFEC: +_081AFFEC: movs r0, 0x40 -@081AFFEE: +_081AFFEE: add sp, 0x10 pop {r3} mov r8, r3 @@ -805369,17 +805369,17 @@ GetItemIconPicOrPalette: ; 81AFFFC lsrs r1, 24 ldr r0, =0x0000ffff cmp r3, r0 - bne @081B0018 + bne _081B0018 ldr r3, =0x00000179 - b @081B0022 + b _081B0022 .pool -@081B0018: +_081B0018: movs r0, 0xBC lsls r0, 1 cmp r3, r0 - bls @081B0022 + bls _081B0022 movs r3, 0 -@081B0022: +_081B0022: ldr r2, =gItemIconTable lsls r0, r1, 2 lsls r1, r3, 3 @@ -805423,12 +805423,12 @@ sub_81B0038: ; 81B0038 mov r1, r10 str r5, [r1] cmp r5, 0 - bne @081B0088 + bne _081B0088 ldr r0, [sp, 0x2C] bl SetMainCallback2 - b @081B0194 + b _081B0194 .pool -@081B0088: +_081B0088: ldr r3, =0x0203cec8 movs r1, 0xF mov r4, r8 @@ -805473,22 +805473,22 @@ sub_81B0038: ; 81B0038 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 .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 @@ -805499,13 +805499,13 @@ sub_81B0038: ; 81B0038 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 @@ -805515,11 +805515,11 @@ sub_81B0038: ; 81B0038 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 @@ -805530,19 +805530,19 @@ sub_81B0038: ; 81B0038 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 .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 @@ -805551,11 +805551,11 @@ sub_81B0038: ; 81B0038 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 @@ -805565,7 +805565,7 @@ sub_81B0038: ; 81B0038 bl calc_player_party_count ldr r0, =c2_811EBD0 bl SetMainCallback2 -@081B0194: +_081B0194: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -805602,23 +805602,23 @@ sub_81B01CC: ; 81B01CC thumb_func_start c2_811EBD0 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 @@ -805634,41 +805634,41 @@ 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 .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 @@ -805676,12 +805676,12 @@ sub_81B020C: ; 81B020C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081B048C + b _081B048C .pool -@081B02AC: +_081B02AC: bl remove_some_task - b @081B0484 -@081B02B2: + b _081B0484 +_081B02B2: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] @@ -805692,45 +805692,45 @@ sub_81B020C: ; 81B020C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081B048C + b _081B048C .pool -@081B02D4: +_081B02D4: bl ResetAllObjectData - b @081B0484 -@081B02DA: + b _081B0484 +_081B02DA: bl ResetObjectPaletteAllocator ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081B048C + b _081B048C .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 .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 @@ -805738,30 +805738,30 @@ sub_81B020C: ; 81B020C adds r0, r1 movs r1, 0 strh r1, [r0] - b @081B0484 + b _081B0484 .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 .pool -@081B0354: +_081B0354: ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 26 lsrs r0, 30 bl sub_81B239C - b @081B0484 + b _081B0484 .pool -@081B0368: +_081B0368: ldr r0, =0x0203cec8 ldrb r0, [r0, 0x8] lsls r0, 26 @@ -805774,37 +805774,37 @@ sub_81B020C: ; 81B020C adds r0, r1 movs r1, 0 strh r1, [r0] - b @081B0484 + b _081B0484 .pool -@081B038C: +_081B038C: bl sub_81B5D30 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081B048C + b _081B048C .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 .pool -@081B03B8: +_081B03B8: bl sub_80D2F04 - b @081B0484 -@081B03BE: + b _081B0484 +_081B03BE: bl party_menu_add_per_mon_objects 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 @@ -805812,13 +805812,13 @@ sub_81B020C: ; 81B020C adds r0, r1 movs r1, 0 strh r1, [r0] - b @081B0484 + b _081B0484 .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 @@ -805826,31 +805826,31 @@ sub_81B020C: ; 81B020C adds r0, r1 movs r1, 0 strh r1, [r0] - b @081B0484 + b _081B0484 .pool -@081B0400: +_081B0400: bl sub_81B0F28 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081B048C + b _081B048C .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 .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] @@ -805860,9 +805860,9 @@ sub_81B020C: ; 81B020C ldrh r0, [r0, 0xA] lsrs r0, 2 bl display_pokemon_menu_message - b @081B0484 + b _081B0484 .pool -@081B044C: +_081B044C: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -805877,9 +805877,9 @@ sub_81B020C: ; 81B020C movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081B048C + b _081B048C .pool -@081B0474: +_081B0474: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -805887,28 +805887,28 @@ sub_81B020C: ; 81B020C movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@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 .pool -@081B0498: +_081B0498: ldr r0, =sub_81B01CC bl SetVBlankCallback ldr r0, =sub_81B01B0 bl SetMainCallback2 movs r0, 0x1 - b @081B04B2 + b _081B04B2 .pool -@081B04B0: +_081B04B0: movs r0, 0 -@081B04B2: +_081B04B2: add sp, 0x4 pop {r4} pop {r1} @@ -805949,14 +805949,14 @@ sub_81B04F8: ; 81B04F8 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081B051C + bne _081B051C ldr r0, =0x0203cec8 ldr r0, [r0] bl SetMainCallback2 bl sub_81B06F4 adds r0, r4, 0 bl remove_task -@081B051C: +_081B051C: pop {r4} pop {r0} bx r0 @@ -805988,7 +805988,7 @@ sub_81B0550: ; 81B0550 bl Alloc str r0, [r5] cmp r0, 0 - beq @081B05C0 + beq _081B05C0 movs r1, 0 adds r2, r4, 0 bl memset @@ -806018,11 +806018,11 @@ sub_81B0550: ; 81B0550 movs r0, 0x2 bl ShowBg movs r0, 0x1 - b @081B05C2 + b _081B05C2 .pool -@081B05C0: +_081B05C0: movs r0, 0 -@081B05C2: +_081B05C2: pop {r4,r5} pop {r1} bx r1 @@ -806040,24 +806040,24 @@ 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 .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, =gUnknown_08D967EC mov r1, sp @@ -806070,20 +806070,20 @@ sub_81B05C8: ; 81B05C8 movs r0, 0x1 movs r3, 0 bl LoadBgTiles - b @081B069A + b _081B069A .pool -@081B0638: +_081B0638: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @081B06B4 + bne _081B06B4 ldr r0, =gUnknown_08D96BA0 ldr r1, =0x0203cee4 ldr r1, [r1] bl LZDecompressWram - b @081B069A + b _081B069A .pool -@081B0658: +_081B0658: ldr r0, =gUnknown_08D96AB4 movs r2, 0xB0 lsls r2, 1 @@ -806096,42 +806096,42 @@ sub_81B05C8: ; 81B05C8 movs r2, 0xB0 bl CpuSet ldr r1, [r4] - b @081B069E + b _081B069E .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 .pool -@081B06B0: +_081B06B0: movs r0, 0x1 - b @081B06B6 -@081B06B4: + b _081B06B6 +_081B06B4: movs r0, 0 -@081B06B6: +_081B06B6: add sp, 0x4 pop {r4} pop {r1} @@ -806169,27 +806169,27 @@ sub_81B06F4: ; 81B06F4 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 FreeAllWindowBuffers pop {r0} bx r0 @@ -806215,7 +806215,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 @@ -806252,22 +806252,22 @@ sub_81B0740: ; 81B0740 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 .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 @@ -806286,9 +806286,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 @@ -806297,23 +806297,23 @@ 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 .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] @@ -806327,9 +806327,9 @@ sub_81B07E0: ; 81B07E0 bl PutWindowTilemap movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - b @081B093E + b _081B093E .pool -@081B085C: +_081B085C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -806337,7 +806337,7 @@ sub_81B07E0: ; 81B07E0 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - bne @081B089C + bne _081B089C ldr r4, =0x0203cedc ldr r0, [r4] lsls r5, 4 @@ -806353,79 +806353,79 @@ sub_81B07E0: ; 81B07E0 ldrb r0, [r0, 0x8] movs r1, 0x2 bl CopyWindowToVram - b @081B092C + b _081B092C .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 .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 .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 @@ -806433,7 +806433,7 @@ sub_81B07E0: ; 81B07E0 bl PutWindowTilemap movs r0, 0 bl schedule_bg_copy_tilemap_to_vram -@081B093E: +_081B093E: pop {r4,r5} pop {r0} bx r0 @@ -806456,7 +806456,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 @@ -806477,9 +806477,9 @@ sub_81B0948: ; 81B0948 adds r0, r7, 0 movs r2, 0 bl sub_81B2A70 - b @081B0A02 + b _081B0A02 .pool -@081B09A0: +_081B09A0: ldr r5, =0x0203cedc ldr r0, [r5] lsls r4, 4 @@ -806522,7 +806522,7 @@ sub_81B0948: ; 81B0948 adds r1, r4 adds r0, r7, 0 bl sub_81B2E28 -@081B0A02: +_081B0A02: add sp, 0x8 pop {r4-r7} pop {r0} @@ -806570,7 +806570,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 @@ -806581,7 +806581,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 @@ -806609,44 +806609,44 @@ 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 .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 @@ -806665,30 +806665,30 @@ 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 .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 @@ -806706,17 +806706,17 @@ 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 .pool -@081B0B88: +_081B0B88: adds r0, r4, 0 movs r1, 0x8 bl sub_81B0A10 -@081B0B90: +_081B0B90: pop {r4} pop {r0} bx r0 @@ -806732,16 +806732,16 @@ 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 @@ -806759,17 +806759,17 @@ 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 .pool -@081B0BEC: +_081B0BEC: adds r0, r4, 0 movs r1, 0xC bl sub_81B0A10 -@081B0BF4: +_081B0BF4: pop {r4} pop {r0} bx r0 @@ -806790,7 +806790,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] @@ -806799,48 +806799,48 @@ sub_81B0BFC: ; 81B0BFC adds r0, r5, 0 movs r1, 0 bl sub_81B0C94 - b @081B0C8A + b _081B0C8A .pool -@081B0C40: +_081B0C40: cmp r0, 0x3 - bne @081B0C56 + bne _081B0C56 adds r0, r4, 0 bl CheckIfItemIsTMHMOrEvolutionStone 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 @@ -806863,31 +806863,31 @@ 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 .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 @@ -806913,12 +806913,12 @@ 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 .pool -@081B0D24: +_081B0D24: ldr r2, [r6] ldrb r0, [r6, 0x8] movs r1, 0 @@ -806962,7 +806962,7 @@ sub_81B0CEC: ; 81B0CEC ldrh r1, [r7, 0x12] adds r2, r6, 0 bl sub_81B2E64 -@081B0D8E: +_081B0D8E: add sp, 0x8 pop {r3} mov r8, r3 @@ -806990,13 +806990,13 @@ sub_81B0DA0: ; 81B0DA0 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - beq @081B0DCC + beq _081B0DCC movs r0, 0 - b @081B0DCE + b _081B0DCE .pool -@081B0DCC: +_081B0DCC: movs r0, 0x1 -@081B0DCE: +_081B0DCE: pop {r4,r5} pop {r1} bx r1 @@ -807029,9 +807029,9 @@ party_menu_add_per_mon_objects_internal: ; 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 @@ -807045,7 +807045,7 @@ party_menu_add_per_mon_objects_internal: ; 81B0DE8 add r6, r9 ldrh r0, [r6] cmp r0, 0 - beq @081B0EDC + beq _081B0EDC mov r1, r9 adds r1, 0x18 add r1, r8 @@ -807068,11 +807068,11 @@ party_menu_add_per_mon_objects_internal: ; 81B0DE8 bl party_menu_link_mon_pokeball_object ldrh r0, [r6, 0x10] cmp r0, 0 - bne @081B0E68 + bne _081B0E68 movs r3, 0x7 - b @081B0E78 + b _081B0E78 .pool -@081B0E68: +_081B0E68: mov r0, r9 adds r0, 0x14 add r0, r8 @@ -807080,7 +807080,7 @@ party_menu_add_per_mon_objects_internal: ; 81B0DE8 bl pokemon_ailments_get_primary lsls r0, 24 lsrs r3, r0, 24 -@081B0E78: +_081B0E78: ldr r1, =0x02022ff8 mov r2, r10 lsls r0, r2, 5 @@ -807091,9 +807091,9 @@ party_menu_add_per_mon_objects_internal: ; 81B0DE8 adds r2, r5 adds r1, r3, 0 bl party_menu_link_mon_status_condition_object - b @081B0EDC + b _081B0EDC .pool -@081B0E98: +_081B0E98: movs r0, 0x64 adds r1, r7, 0 muls r1, r0 @@ -807103,7 +807103,7 @@ party_menu_add_per_mon_objects_internal: ; 81B0DE8 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq @081B0EDC + beq _081B0EDC ldr r4, =0x0203cedc lsls r5, r7, 4 ldr r1, [r4] @@ -807123,7 +807123,7 @@ party_menu_add_per_mon_objects_internal: ; 81B0DE8 adds r1, r5 adds r0, r6, 0 bl party_menu_status_condition_object -@081B0EDC: +_081B0EDC: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -807153,13 +807153,13 @@ party_menu_add_per_mon_objects: ; 81B0EF4 lsls r0, 16 asrs r0, 16 cmp r0, 0x6 - beq @081B0F20 + beq _081B0F20 movs r0, 0 - b @081B0F22 + b _081B0F22 .pool -@081B0F20: +_081B0F20: movs r0, 0x1 -@081B0F22: +_081B0F22: pop {r4,r5} pop {r1} bx r1 @@ -807174,7 +807174,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 @@ -807185,15 +807185,15 @@ sub_81B0F28: ; 81B0F28 movs r2, 0x17 movs r3, 0x11 bl FillBgTilemapBufferRect - b @081B0FBC + b _081B0FBC .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 @@ -807212,13 +807212,13 @@ sub_81B0F28: ; 81B0F28 movs r0, 0xBF movs r1, 0x98 bl sub_81B5F74 - b @081B0F9C + b _081B0F9C .pool -@081B0F94: +_081B0F94: movs r0, 0xC6 movs r1, 0x94 bl sub_81B5F34 -@081B0F9C: +_081B0F9C: ldr r3, [r4] lsls r0, 24 lsrs r0, 24 @@ -807234,7 +807234,7 @@ sub_81B0F28: ; 81B0F28 ldrb r0, [r0, 0x9] movs r1, 0x1 bl sub_81B0FCC -@081B0FBC: +_081B0FBC: add sp, 0xC pop {r4} pop {r0} @@ -807254,9 +807254,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 @@ -807264,7 +807264,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] @@ -807287,12 +807287,12 @@ sub_81B0FCC: ; 81B0FCC ldrb r0, [r5, 0xB] mov r1, r8 bl sub_81B5F98 - b @081B10E8 + b _081B10E8 .pool -@081B1038: +_081B1038: mov r0, r8 cmp r0, 0 - bne @081B1052 + bne _081B1052 movs r0, 0x2 str r0, [sp] movs r0, 0x1 @@ -807301,8 +807301,8 @@ sub_81B0FCC: ; 81B0FCC 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] @@ -807311,54 +807311,54 @@ sub_81B0FCC: ; 81B0FCC 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 .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 .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] @@ -807367,18 +807367,18 @@ sub_81B0FCC: ; 81B0FCC 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 @@ -807397,9 +807397,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 @@ -807407,59 +807407,59 @@ sub_81B10F8: ; 81B10F8 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} @@ -807477,27 +807477,27 @@ 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 .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 @@ -807505,7 +807505,7 @@ sub_81B118C: ; 81B118C movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @081B11F6 + beq _081B11F6 adds r0, r2, 0 bl sub_81B8F38 ldr r1, =0x0202449c @@ -807520,10 +807520,10 @@ sub_81B118C: ; 81B118C movs r0, 0x1 ands r1, r0 cmp r1, 0 - bne @081B11F8 -@081B11F6: + bne _081B11F8 +_081B11F6: movs r0, 0 -@081B11F8: +_081B11F8: pop {r1} bx r1 .pool @@ -807569,7 +807569,7 @@ sub_81B1250: ; 81B1250 movs r1, 0x49 ands r0, r1 cmp r0, 0x49 - bne @081B1280 + bne _081B1280 ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -807577,13 +807577,13 @@ sub_81B1250: ; 81B1250 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @081B1280 + beq _081B1280 movs r0, 0x1 - b @081B1282 + b _081B1282 .pool -@081B1280: +_081B1280: movs r0, 0 -@081B1282: +_081B1282: pop {r1} bx r1 thumb_func_end sub_81B1250 @@ -807652,32 +807652,32 @@ 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 SetMainCallback2 - b @081B133E + b _081B133E .pool -@081B1338: +_081B1338: ldr r0, [r4] bl SetMainCallback2 -@081B133E: +_081B133E: bl ResetAllObjectData bl sub_81B06F4 adds r0, r5, 0 bl remove_task -@081B134C: +_081B134C: pop {r4,r5} pop {r0} bx r0 @@ -807712,50 +807712,50 @@ 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 .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 @@ -807768,16 +807768,16 @@ sub_81B13EC: ; 81B13EC 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 .pool -@081B1404: +_081B1404: adds r0, 0x9 -@081B1406: +_081B1406: pop {r1} bx r1 thumb_func_end sub_81B13EC @@ -807791,75 +807791,75 @@ 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 .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 .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 .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 str r0, [r1, 0x4] -@081B14BE: +_081B14BE: ldr r0, [r2] adds r0, 0xD bl sub_81B302C @@ -807868,14 +807868,14 @@ sub_81B140C: ; 81B140C ldr r2, [r0] adds r0, r5, 0 bl _call_via_r2 - b @081B159E + b _081B159E .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 @@ -807884,14 +807884,14 @@ sub_81B140C: ; 81B140C bl sub_81B302C adds r0, r5, 0 bl sub_81B7E4C - b @081B159E + b _081B159E .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 @@ -807900,14 +807900,14 @@ sub_81B140C: ; 81B140C bl sub_81B302C adds r0, r5, 0 bl sub_81B8474 - b @081B159E + b _081B159E .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 @@ -807916,36 +807916,36 @@ sub_81B140C: ; 81B140C bl sub_81B302C adds r0, r5, 0 bl sub_81B7FAC - b @081B159E + b _081B159E .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 @@ -807962,15 +807962,15 @@ sub_81B15A4: ; 81B15A4 movs r1, 0x2D bl pokemon_getattr cmp r0, 0x1 - beq @081B15C4 + beq _081B15C4 movs r0, 0x1 - b @081B15CC + b _081B15CC .pool -@081B15C4: +_081B15C4: movs r0, 0x20 bl audio_play movs r0, 0 -@081B15CC: +_081B15CC: pop {r1} bx r1 thumb_func_end sub_81B15A4 @@ -807984,36 +807984,36 @@ 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 .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 @@ -808021,15 +808021,15 @@ sub_81B15D0: ; 81B15D0 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] @@ -808037,7 +808037,7 @@ sub_81B15D0: ; 81B15D0 strb r0, [r5] adds r0, r4, 0 bl sub_81B12C0 -@081B1652: +_081B1652: pop {r4,r5} pop {r0} bx r0 @@ -808055,18 +808055,18 @@ sub_81B1660: ; 81B1660 movs r1, 0xF ands r1, r0 cmp r1, 0x2 - bne @081B1680 + bne _081B1680 ldr r5, =gUnknown_085EA110 - b @081B168A + b _081B168A .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 @@ -808086,11 +808086,11 @@ sub_81B1660: ; 81B1660 ldr r1, =sub_81B16D4 str r1, [r0] movs r0, 0x1 - b @081B16CE + b _081B16CE .pool -@081B16CC: +_081B16CC: movs r0, 0 -@081B16CE: +_081B16CE: pop {r4-r6} pop {r1} bx r1 @@ -808105,7 +808105,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 @@ -808114,7 +808114,7 @@ sub_81B16D4: ; 81B16D4 adds r1, r0 ldr r0, =sub_81B1708 str r0, [r1] -@081B16F8: +_081B16F8: pop {r4} pop {r0} bx r0 @@ -808130,19 +808130,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 @@ -808151,15 +808151,15 @@ sub_81B1708: ; 81B1708 bl sub_81B8558 adds r0, r4, 0 bl sub_81B12C0 - b @081B1758 + b _081B1758 .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 @@ -808173,82 +808173,82 @@ sub_81B1760: ; 81B1760 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 .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 .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 @@ -808266,25 +808266,25 @@ 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 .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 @@ -808293,7 +808293,7 @@ sub_81B17F8: ; 81B17F8 ldrb r0, [r5] movs r1, 0x1 bl sub_81B0FCC -@081B184C: +_081B184C: pop {r4,r5} pop {r0} bx r0 @@ -808308,112 +808308,112 @@ 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 .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 .pool -@081B18B0: +_081B18B0: ldr r0, =0x020244e9 ldrb r0, [r0] subs r0, 0x1 - b @081B1950 + b _081B1950 .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 .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 .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 @@ -808427,11 +808427,11 @@ sub_81B1854: ; 81B1854 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 @@ -808448,54 +808448,54 @@ 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 .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 .pool -@081B19C0: +_081B19C0: subs r0, r1, 0x1 strb r0, [r4] -@081B19C4: +_081B19C4: movs r0, 0 ldrsb r0, [r4, r0] lsls r1, r2, 24 @@ -808507,24 +808507,24 @@ sub_81B195C: ; 81B195C 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 @@ -808533,78 +808533,78 @@ sub_81B195C: ; 81B195C 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 .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 .pool -@081B1A54: +_081B1A54: ldr r0, =0x020245b4 - b @081B1A70 + b _081B1A70 .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 .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 .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 @@ -808619,14 +808619,14 @@ sub_81B195C: ; 81B195C orrs r0, r1 strb r0, [r3, 0x8] movs r0, 0 - b @081B1AF2 + b _081B1AF2 .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 @@ -808641,9 +808641,9 @@ sub_81B195C: ; 81B195C orrs r0, r1 strb r0, [r3, 0x8] movs r0, 0x1 -@081B1AF2: +_081B1AF2: strb r0, [r4] -@081B1AF4: +_081B1AF4: pop {r4-r6} pop {r0} bx r0 @@ -808657,7 +808657,7 @@ sub_81B1B00: ; 81B1B00 lsrs r5, r0, 24 lsls r1, 24 asrs r6, r1, 24 -@081B1B0A: +_081B1B0A: lsls r0, r5, 24 asrs r0, 24 adds r0, r6 @@ -808666,7 +808666,7 @@ sub_81B1B00: ; 81B1B00 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 @@ -808675,14 +808675,14 @@ sub_81B1B00: ; 81B1B00 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq @081B1B0A + beq _081B1B0A adds r0, r4, 0 - b @081B1B3C + b _081B1B3C .pool -@081B1B38: +_081B1B38: movs r0, 0x1 negs r0, r0 -@081B1B3C: +_081B1B3C: pop {r4-r6} pop {r1} bx r1 @@ -808737,7 +808737,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 @@ -808746,16 +808746,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 ClearWindowTilemap -@081B1BC2: +_081B1BC2: adds r0, r5, 0 bl remove_task -@081B1BC8: +_081B1BC8: pop {r4,r5} pop {r0} bx r0 @@ -808783,7 +808783,7 @@ sub_81B1BE8: ; 81B1BE8 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081B1C0E + beq _081B1C0E movs r0, 0 bl display_pokemon_menu_message ldr r0, =0x03005e00 @@ -808793,7 +808793,7 @@ sub_81B1BE8: ; 81B1BE8 adds r1, r0 ldr r0, =sub_81B1370 str r0, [r1] -@081B1C0E: +_081B1C0E: pop {r4} pop {r0} bx r0 @@ -808810,7 +808810,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 @@ -808820,16 +808820,16 @@ 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 - b @081B1C72 + b _081B1C72 .pool -@081B1C60: +_081B1C60: movs r0, 0 bl display_pokemon_menu_message ldr r0, =0x03005e00 @@ -808838,9 +808838,9 @@ sub_81B1C1C: ; 81B1C1C lsls r1, 3 adds r1, r0 ldr r0, =sub_81B1370 -@081B1C72: +_081B1C72: str r0, [r1] -@081B1C74: +_081B1C74: pop {r4,r5} pop {r0} bx r0 @@ -808978,15 +808978,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 @@ -808996,7 +808996,7 @@ sub_81B1DB8: ; 81B1DB8 movs r1, 0xC mov r2, sp bl pokemon_setattr -@081B1DF6: +_081B1DF6: add sp, 0x4 pop {r4-r7} pop {r0} @@ -809015,15 +809015,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] @@ -809032,10 +809032,10 @@ sub_81B1E00: ; 81B1E00 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} @@ -809105,22 +809105,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] @@ -809128,10 +809128,10 @@ sub_81B1E60: ; 81B1E60 movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalString -@081B1EF8: +_081B1EF8: mov r0, r8 bl set_task_function_to_args_14_15 -@081B1EFE: +_081B1EFE: pop {r3} mov r8, r3 pop {r4-r7} @@ -809220,42 +809220,42 @@ 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 .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 adds r0, r4, 0 bl set_task_function_and_args_14_15 -@081B200A: +_081B200A: pop {r4,r5} pop {r0} bx r0 @@ -809269,40 +809269,40 @@ pokemon_ailments_get_primary: ; 81B2014 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 @@ -809315,10 +809315,10 @@ sub_81B205C: ; 81B205C 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 @@ -809326,18 +809326,18 @@ sub_81B205C: ; 81B205C 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 @@ -809351,7 +809351,7 @@ sub_81B209C: ; 81B209C movs r0, 0xF ands r0, r1 cmp r0, 0xB - bne @081B2126 + bne _081B2126 adds r5, r2, 0 adds r5, 0xE movs r0, 0 @@ -809359,13 +809359,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 @@ -809383,13 +809383,13 @@ sub_81B209C: ; 81B209C ldr r0, =0x020244e9 ldrb r0, [r0] cmp r4, r0 - bcc @081B20C4 - b @081B2126 + bcc _081B20C4 + b _081B2126 .pool -@081B20FC: +_081B20FC: movs r4, 0 - b @081B211E -@081B2100: + b _081B211E +_081B2100: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -809404,12 +809404,12 @@ sub_81B209C: ; 81B209C 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 @@ -809423,7 +809423,7 @@ sub_81B2134: ; 81B2134 movs r1, 0x2D bl pokemon_getattr cmp r0, 0x1 - beq @081B215A + beq _081B215A adds r0, r4, 0 movs r1, 0xB bl pokemon_getattr @@ -809431,12 +809431,12 @@ 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 @@ -809449,17 +809449,17 @@ sub_81B2164: ; 81B2164 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 @@ -809477,9 +809477,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 .pool @@ -809497,16 +809497,16 @@ 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 .pool -@081B21DC: +_081B21DC: movs r0, 0x20 bl audio_play ldr r0, =gUnknown_085EA0EE @@ -809521,7 +809521,7 @@ sub_81B21AC: ; 81B21AC adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] -@081B21FE: +_081B21FE: pop {r4,r5} pop {r0} bx r0 @@ -809561,7 +809561,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 @@ -809570,7 +809570,7 @@ sub_81B2248: ; 81B2248 adds r1, r0 ldr r0, =sub_81B227C str r0, [r1] -@081B226C: +_081B226C: pop {r4} pop {r0} bx r0 @@ -809586,30 +809586,30 @@ 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 .pool -@081B22B4: +_081B22B4: movs r0, 0x5 bl audio_play -@081B22BA: +_081B22BA: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -809617,7 +809617,7 @@ sub_81B227C: ; 81B227C adds r1, r0 ldr r0, =sub_81B1C1C str r0, [r1] -@081B22C8: +_081B22C8: pop {r4} pop {r0} bx r0 @@ -809639,14 +809639,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 @@ -809654,11 +809654,11 @@ sub_81B22D8: ; 81B22D8 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 @@ -809668,14 +809668,14 @@ sub_81B22D8: ; 81B22D8 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 @@ -809683,12 +809683,12 @@ sub_81B22D8: ; 81B22D8 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} @@ -809721,13 +809721,13 @@ sub_81B2370: ; 81B2370 ldr r0, [r0] ands r0, r2 cmp r0, 0 - bne @081B2394 + bne _081B2394 movs r0, 0 - b @081B2396 + b _081B2396 .pool -@081B2394: +_081B2394: movs r0, 0x1 -@081B2396: +_081B2396: pop {r1} bx r1 thumb_func_end sub_81B2370 @@ -809739,38 +809739,38 @@ sub_81B239C: ; 81B239C 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, =gUnknown_08615810 bl InitWindows - b @081B23E2 + b _081B23E2 .pool -@081B23C4: +_081B23C4: ldr r0, =gUnknown_08615850 bl InitWindows - b @081B23E2 + b _081B23E2 .pool -@081B23D0: +_081B23D0: ldr r0, =gUnknown_08615890 bl InitWindows - b @081B23E2 + b _081B23E2 .pool -@081B23DC: +_081B23DC: ldr r0, =gUnknown_086158D0 bl InitWindows -@081B23E2: +_081B23E2: bl DeactivateAllTextPrinters movs r4, 0 -@081B23E8: +_081B23E8: adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -809778,7 +809778,7 @@ sub_81B239C: ; 81B239C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @081B23E8 + bls _081B23E8 movs r0, 0 movs r1, 0x4F movs r2, 0xD0 @@ -809808,11 +809808,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, =gUnknown_08615918 bl AddWindow adds r4, r0, 0 @@ -809851,15 +809851,15 @@ sub_81B2428: ; 81B2428 lsls r0, 24 lsrs r5, r0, 24 movs r6, 0 - b @081B24C0 + b _081B24C0 .pool -@081B24B4: +_081B24B4: ldr r0, =gUnknown_08615908 bl AddWindow lsls r0, 24 lsrs r5, r0, 24 movs r6, 0x3 -@081B24C0: +_081B24C0: adds r0, r5, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -809868,7 +809868,7 @@ sub_81B2428: ; 81B2428 movs r0, 0xF ands r0, r1 cmp r0, 0xA - beq @081B2514 + beq _081B2514 ldr r4, =gUnknown_085E8CF0 movs r0, 0 adds r1, r4, 0 @@ -809889,9 +809889,9 @@ sub_81B2428: ; 81B2428 movs r1, 0 movs r3, 0x1 bl box_print - b @081B2540 + b _081B2540 .pool -@081B2514: +_081B2514: ldr r4, =gUnknown_085E8CF7 movs r0, 0 adds r1, r4, 0 @@ -809912,7 +809912,7 @@ sub_81B2428: ; 81B2428 movs r1, 0 movs r3, 0x1 bl box_print -@081B2540: +_081B2540: adds r0, r5, 0 bl PutWindowTilemap adds r0, r5, 0 @@ -809920,7 +809920,7 @@ sub_81B2428: ; 81B2428 bl CopyWindowToVram movs r0, 0 bl schedule_bg_copy_tilemap_to_vram -@081B2554: +_081B2554: add sp, 0x14 pop {r4-r6} pop {r0} @@ -809976,7 +809976,7 @@ sub_81B2578: ; 81B2578 bl AllocZeroed mov r9, r0 cmp r0, 0 - beq @081B2646 + beq _081B2646 movs r5, 0 ldr r0, [sp, 0x14] lsls r0, 19 @@ -809990,20 +809990,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 @@ -810022,14 +810022,14 @@ sub_81B2578: ; 81B2578 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] @@ -810045,7 +810045,7 @@ sub_81B2578: ; 81B2578 bl BlitBitmapToWindow mov r0, r9 bl Free -@081B2646: +_081B2646: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -810075,14 +810075,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, =gUnknown_08615988 str r2, [sp] str r3, [sp, 0x4] @@ -810090,9 +810090,9 @@ sub_81B2658: ; 81B2658 movs r2, 0xA adds r3, r6, 0 bl sub_81B2578 - b @081B26B0 + b _081B26B0 .pool -@081B26A0: +_081B26A0: ldr r1, =gUnknown_086159CE str r2, [sp] str r3, [sp, 0x4] @@ -810100,7 +810100,7 @@ sub_81B2658: ; 81B2658 movs r2, 0xA adds r3, r6, 0 bl sub_81B2578 -@081B26B0: +_081B26B0: add sp, 0xC pop {r4-r6} pop {r0} @@ -810127,14 +810127,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, =gUnknown_08615A14 str r2, [sp] str r3, [sp, 0x4] @@ -810142,9 +810142,9 @@ sub_81B26BC: ; 81B26BC movs r2, 0x12 adds r3, r6, 0 bl sub_81B2578 - b @081B2714 + b _081B2714 .pool -@081B2704: +_081B2704: ldr r1, =gUnknown_08615A4A str r2, [sp] str r3, [sp, 0x4] @@ -810152,7 +810152,7 @@ sub_81B26BC: ; 81B26BC movs r2, 0x12 adds r3, r6, 0 bl sub_81B2578 -@081B2714: +_081B2714: add sp, 0xC pop {r4-r6} pop {r0} @@ -810197,26 +810197,26 @@ sub_81B2748: ; 81B2748 movs r0, 0x40 ands r0, r4 cmp r0, 0 - beq @081B277C + beq _081B277C ldr r5, =gUnknown_08615AF1 ldrb r0, [r5] bl sub_81B2564 ldr r4, =gUnknown_08615AC0 - b @081B297E + b _081B297E .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, =gUnknown_08615ADF - b @081B2942 + b _081B2942 .pool -@081B2794: +_081B2794: ldr r5, =gUnknown_08615ADF ldrb r0, [r5] bl sub_81B2564 @@ -810238,13 +810238,13 @@ sub_81B2748: ; 81B2748 movs r2, 0x2 bl gpu_pal_apply ldr r5, =gUnknown_08615AEE - b @081B2976 + b _081B2976 .pool -@081B27D8: +_081B27D8: movs r0, 0x10 ands r0, r4 cmp r0, 0 - beq @081B2824 + beq _081B2824 ldr r5, =gUnknown_08615ADF ldrb r0, [r5] bl sub_81B2564 @@ -810266,21 +810266,21 @@ sub_81B2748: ; 81B2748 movs r2, 0x2 bl gpu_pal_apply ldr r5, =gUnknown_08615AEE - b @081B2976 + b _081B2976 .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, =gUnknown_08615ADF - b @081B2942 + b _081B2942 .pool -@081B283C: +_081B283C: ldr r5, =gUnknown_08615ADF ldrb r0, [r5] bl sub_81B2564 @@ -810302,21 +810302,21 @@ sub_81B2748: ; 81B2748 movs r2, 0x2 bl gpu_pal_apply ldr r5, =gUnknown_08615AEE - b @081B2976 + b _081B2976 .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, =gUnknown_08615ADC - b @081B2942 + b _081B2942 .pool -@081B2898: +_081B2898: ldr r5, =gUnknown_08615AD3 ldrb r0, [r5] bl sub_81B2564 @@ -810338,21 +810338,21 @@ sub_81B2748: ; 81B2748 movs r2, 0x2 bl gpu_pal_apply ldr r5, =gUnknown_08615AE8 - b @081B2976 + b _081B2976 .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, =gUnknown_08615AD9 - b @081B2942 + b _081B2942 .pool -@081B28F4: +_081B28F4: ldr r5, =gUnknown_08615AD0 ldrb r0, [r5] bl sub_81B2564 @@ -810374,15 +810374,15 @@ sub_81B2748: ; 81B2748 movs r2, 0x2 bl gpu_pal_apply ldr r5, =gUnknown_08615AE5 - b @081B2976 + b _081B2976 .pool -@081B2938: +_081B2938: movs r0, 0x1 ands r5, r0 cmp r5, 0 - beq @081B29BC + beq _081B29BC ldr r5, =gUnknown_08615AD6 -@081B2942: +_081B2942: ldrb r0, [r5] bl sub_81B2564 ldr r4, =gUnknown_08615ABA @@ -810403,11 +810403,11 @@ sub_81B2748: ; 81B2748 movs r2, 0x2 bl gpu_pal_apply ldr r5, =gUnknown_08615AEB -@081B2976: +_081B2976: ldrb r0, [r5] bl sub_81B2564 ldr r4, =gUnknown_08615ABD -@081B297E: +_081B297E: ldrb r1, [r4] adds r1, r6 movs r2, 0x2 @@ -810424,9 +810424,9 @@ sub_81B2748: ; 81B2748 adds r1, r6 movs r2, 0x2 bl gpu_pal_apply - b @081B2A24 + b _081B2A24 .pool -@081B29BC: +_081B29BC: ldr r5, =gUnknown_08615ACD ldrb r0, [r5] bl sub_81B2564 @@ -810467,7 +810467,7 @@ sub_81B2748: ; 81B2748 adds r1, r7 movs r2, 0x2 bl gpu_pal_apply -@081B2A24: +_081B2A24: pop {r4-r7} pop {r0} bx r0 @@ -810513,9 +810513,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] @@ -810531,7 +810531,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 GetMonNickname @@ -810541,7 +810541,7 @@ sub_81B2A70: ; 81B2A70 add r1, sp, 0x8 movs r2, 0 bl sub_81B2A3C -@081B2AC0: +_081B2AC0: add sp, 0x14 pop {r4-r7} pop {r0} @@ -810562,18 +810562,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] @@ -810590,10 +810590,10 @@ sub_81B2AC8: ; 81B2AC8 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 @@ -810601,7 +810601,7 @@ sub_81B2AC8: ; 81B2AC8 lsrs r0, 24 adds r1, r7, 0 bl sub_81B2B40 -@081B2B34: +_081B2B34: add sp, 0x8 pop {r3} mov r8, r3 @@ -810651,7 +810651,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] @@ -810668,7 +810668,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 GetMonNickname @@ -810713,12 +810713,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 @@ -810727,16 +810727,16 @@ sub_81B2BF4: ; 81B2BF4 mov r0, r9 bl CompareString 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 .pool -@081B2C48: +_081B2C48: ldr r5, =gUnknown_08615AC3 ldrb r0, [r5] bl sub_81B2564 @@ -810757,9 +810757,9 @@ sub_81B2BF4: ; 81B2BF4 adds r3, 0xC movs r2, 0x2 bl sub_81B2A3C - b @081B2CBA + b _081B2CBA .pool -@081B2C88: +_081B2C88: ldr r5, =gUnknown_08615AC5 ldrb r0, [r5] bl sub_81B2564 @@ -810780,7 +810780,7 @@ sub_81B2BF4: ; 81B2BF4 adds r3, 0xC movs r2, 0x2 bl sub_81B2A3C -@081B2CBA: +_081B2CBA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -810804,9 +810804,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] @@ -810823,10 +810823,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 @@ -810834,7 +810834,7 @@ sub_81B2CD4: ; 81B2CD4 lsrs r0, 16 adds r1, r6, 0 bl sub_81B2D3C -@081B2D2E: +_081B2D2E: add sp, 0x8 pop {r3} mov r8, r3 @@ -810886,9 +810886,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] @@ -810906,10 +810906,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 @@ -810917,7 +810917,7 @@ sub_81B2D74: ; 81B2D74 lsrs r0, 16 adds r1, r6, 0 bl sub_81B2DDC -@081B2DD0: +_081B2DD0: add sp, 0x8 pop {r3} mov r8, r3 @@ -810966,7 +810966,7 @@ sub_81B2E28: ; 81B2E28 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq @081B2E5C + beq _081B2E5C adds r0, r5, 0 movs r1, 0x39 bl pokemon_getattr @@ -810982,7 +810982,7 @@ sub_81B2E28: ; 81B2E28 adds r0, r4, 0 adds r2, r6, 0 bl sub_81B2E64 -@081B2E5C: +_081B2E5C: pop {r4-r6} pop {r0} bx r0 @@ -811017,17 +811017,17 @@ 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, =gUnknown_08615AC7 - b @081B2EB2 + b _081B2EB2 .pool -@081B2EB0: +_081B2EB0: ldr r5, =gUnknown_08615AC9 -@081B2EB2: +_081B2EB2: ldrb r0, [r5] bl sub_81B2564 ldr r4, =gUnknown_08615AB8 @@ -811041,9 +811041,9 @@ sub_81B2E64: ; 81B2E64 adds r1, r7 movs r2, 0x2 bl gpu_pal_apply - b @081B2F04 + b _081B2F04 .pool -@081B2EE0: +_081B2EE0: ldr r5, =gUnknown_08615ACB ldrb r0, [r5] bl sub_81B2564 @@ -811058,7 +811058,7 @@ sub_81B2E64: ; 81B2E64 adds r1, r7 movs r2, 0x2 bl gpu_pal_apply -@081B2F04: +_081B2F04: mov r1, r8 lsls r0, r1, 16 asrs r0, 16 @@ -811093,7 +811093,7 @@ sub_81B2E64: ; 81B2E64 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 @@ -811120,7 +811120,7 @@ sub_81B2E64: ; 81B2E64 str r4, [sp, 0x4] movs r1, 0x2 bl FillWindowPixelRect -@081B2F88: +_081B2F88: ldrb r0, [r6, 0x8] movs r1, 0x2 bl CopyWindowToVram @@ -811147,7 +811147,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 @@ -811172,9 +811172,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] @@ -811191,7 +811191,7 @@ sub_81B2FA8: ; 81B2FA8 str r1, [sp, 0x8] movs r1, 0x1 bl box_print -@081B3018: +_081B3018: add sp, 0xC pop {r3} mov r8, r3 @@ -811207,7 +811207,7 @@ sub_81B302C: ; 81B302C adds r4, r0, 0 ldrb r0, [r4] cmp r0, 0xFF - beq @081B304C + beq _081B304C movs r1, 0 bl sub_8198070 ldrb r0, [r4] @@ -811216,7 +811216,7 @@ sub_81B302C: ; 81B302C strb r0, [r4] movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -@081B304C: +_081B304C: pop {r4} pop {r0} bx r0 @@ -811233,76 +811233,76 @@ display_pokemon_menu_message: ; 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 .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, =gUnknown_08615928 - b @081B30C6 + b _081B30C6 .pool -@081B30AC: +_081B30AC: ldr r0, =gUnknown_08615930 - b @081B30C6 + b _081B30C6 .pool -@081B30B4: +_081B30B4: ldr r0, =gUnknown_08615938 - b @081B30C6 + b _081B30C6 .pool -@081B30BC: +_081B30BC: ldr r0, =gUnknown_08615940 - b @081B30C6 + b _081B30C6 .pool -@081B30C4: +_081B30C4: ldr r0, =gUnknown_08615948 -@081B30C6: +_081B30C6: bl AddWindow strb r0, [r5] - b @081B30DC + b _081B30DC .pool -@081B30D4: +_081B30D4: ldr r0, =gUnknown_08615920 bl AddWindow 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 .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 @@ -811327,7 +811327,7 @@ display_pokemon_menu_message: ; 81B3054 bl Print movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -@081B313C: +_081B313C: add sp, 0xC pop {r4-r6} pop {r0} @@ -811343,14 +811343,14 @@ sub_81B314C: ; 81B314C ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x1 - bne @081B3168 -@081B315A: + bne _081B3168 +_081B315A: movs r0, 0x1 - b @081B31AA + b _081B31AA .pool -@081B3168: +_081B3168: movs r5, 0 -@081B316A: +_081B316A: movs r0, 0x64 muls r0, r5 adds r4, r7, r0 @@ -811358,31 +811358,31 @@ sub_81B314C: ; 81B314C 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 @@ -811398,17 +811398,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] @@ -811431,24 +811431,24 @@ sub_81B31B0: ; 81B31B0 movs r1, 0x2 movs r2, 0x13 bl rbox_template_set - b @081B3226 + b _081B3226 .pool -@081B320C: +_081B320C: ldr r0, =gUnknown_08615950 - b @081B321E + b _081B321E .pool -@081B3214: +_081B3214: ldr r0, =gUnknown_08615958 - b @081B321E + b _081B321E .pool -@081B321C: +_081B321C: ldr r0, =gUnknown_08615960 -@081B321E: +_081B321E: ldr r1, [r0, 0x4] ldr r0, [r0] str r0, [sp, 0x14] str r1, [sp, 0x18] -@081B3226: +_081B3226: add r0, sp, 0x14 bl AddWindow ldr r6, =0x0203cec4 @@ -811461,11 +811461,11 @@ sub_81B31B0: ; 81B31B0 movs r3, 0xD bl SetWindowBorderStyle cmp r4, 0x3 - bne @081B3250 + bne _081B3250 ldr r0, [r6] - b @081B32E2 + b _081B32E2 .pool -@081B3250: +_081B3250: movs r0, 0x1 movs r1, 0 bl GetMenuCursorDimensionByFont @@ -811482,10 +811482,10 @@ sub_81B31B0: ; 81B31B0 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 @@ -811493,9 +811493,9 @@ sub_81B31B0: ; 81B31B0 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 @@ -811525,8 +811525,8 @@ sub_81B31B0: ; 81B31B0 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] @@ -811537,7 +811537,7 @@ sub_81B31B0: ; 81B31B0 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} @@ -811646,10 +811646,10 @@ sub_81B33B4: ; 81B33B4 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, =gUnknown_08615D70 @@ -811660,11 +811660,11 @@ sub_81B33B4: ; 81B33B4 ldr r0, [r4] ldrb r0, [r0, 0x17] cmp r3, r0 - bcs @081B3400 + bcs _081B3400 ldr r1, =gUnknown_08615D38 lsls r0, r2, 2 adds r2, r0, r1 -@081B33E4: +_081B33E4: ldr r1, [r4] adds r1, 0xF adds r1, r3 @@ -811678,8 +811678,8 @@ sub_81B33B4: ; 81B33B4 ldr r0, [r4] ldrb r0, [r0, 0x17] cmp r3, r0 - bcc @081B33E4 -@081B3400: + bcc _081B33E4 +_081B3400: pop {r4} pop {r0} bx r0 @@ -811712,18 +811712,18 @@ sub_81B3414: ; 81B3414 ldr r0, =gUnknown_08615D7E 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, =gUnknown_08615D7E -@081B345A: +_081B345A: mov r1, r9 adds r0, r1, r6 adds r1, r7, 0 @@ -811733,7 +811733,7 @@ sub_81B3414: ; 81B3414 adds r1, r5 ldrh r1, [r1] cmp r0, r1 - bne @081B3490 + bne _081B3490 ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -811744,9 +811744,9 @@ sub_81B3414: ; 81B3414 lsls r2, 24 lsrs r2, 24 bl append_byte - b @081B34A0 + b _081B34A0 .pool -@081B3490: +_081B3490: adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -811754,23 +811754,23 @@ sub_81B3414: ; 81B3414 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 InBattlePike 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 @@ -811778,7 +811778,7 @@ sub_81B3414: ; 81B3414 adds r1, 0x17 movs r2, 0x1 bl append_byte -@081B34D2: +_081B34D2: movs r0, 0x64 mov r1, r10 muls r1, r0 @@ -811791,7 +811791,7 @@ sub_81B3414: ; 81B3414 bl itemid_is_mail lsls r0, 24 cmp r0, 0 - beq @081B3508 + beq _081B3508 ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -811799,9 +811799,9 @@ sub_81B3414: ; 81B3414 adds r1, 0x17 movs r2, 0x6 bl append_byte - b @081B3518 + b _081B3518 .pool -@081B3508: +_081B3508: ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -811809,7 +811809,7 @@ sub_81B3414: ; 81B3414 adds r1, 0x17 movs r2, 0x3 bl append_byte -@081B3518: +_081B3518: ldr r0, =0x0203cec4 ldr r1, [r0] adds r0, r1, 0 @@ -811838,90 +811838,90 @@ 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 .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 in_multi_battle_room_with_var_condition 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} @@ -811954,7 +811954,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 @@ -811968,16 +811968,16 @@ sub_81B3608: ; 81B3608 bl sub_81B31B0 movs r0, 0x15 bl display_pokemon_menu_message - b @081B36EA + b _081B36EA .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, =gUnknown_085E9980 adds r0, r4, 0 @@ -811996,9 +811996,9 @@ sub_81B3608: ; 81B3608 ldr r1, =sub_81B469C str r1, [r0] movs r0, 0 - b @081B36EC + b _081B36EC .pool -@081B36C0: +_081B36C0: ldrb r4, [r4, 0x9] adds r0, r5, 0 bl sub_81B353C @@ -812015,9 +812015,9 @@ sub_81B3608: ; 81B3608 bl itemid_get_name movs r0, 0x1A bl display_pokemon_menu_message -@081B36EA: +_081B36EA: movs r0, 0x1 -@081B36EC: +_081B36EC: pop {r3} mov r8, r3 pop {r4-r7} @@ -812035,7 +812035,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 @@ -812045,7 +812045,7 @@ sub_81B36FC: ; 81B36FC strh r1, [r0, 0x8] ldr r1, =sub_81B3730 str r1, [r0] -@081B3720: +_081B3720: pop {r4} pop {r0} bx r0 @@ -812062,12 +812062,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 @@ -812077,13 +812077,13 @@ sub_81B3730: ; 81B3730 ldr r0, [r0] ldrb r0, [r0, 0x17] cmp r0, 0x3 - bhi @081B3774 + bhi _081B3774 bl ProcessMenuInputNoWrapAround_other - b @081B3778 + b _081B3778 .pool -@081B3774: +_081B3774: bl ProcessMenuInput_other -@081B3778: +_081B3778: lsls r0, 24 lsrs r4, r0, 24 bl GetMenuCursorPos @@ -812095,10 +812095,10 @@ sub_81B3730: ; 81B3730 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 @@ -812116,9 +812116,9 @@ sub_81B3730: ; 81B3730 ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 - b @081B37EE + b _081B37EE .pool -@081B37CC: +_081B37CC: ldr r4, =0x0203cec4 ldr r0, [r4] adds r0, 0xE @@ -812134,7 +812134,7 @@ sub_81B3730: ; 81B3730 ldr r1, [r0] adds r0, r6, 0 bl _call_via_r1 -@081B37EE: +_081B37EE: pop {r4-r6} pop {r0} bx r0 @@ -812170,7 +812170,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] @@ -812183,9 +812183,9 @@ sub_81B3828: ; 81B3828 str r0, [sp] movs r0, 0x1 bl sub_81BF8EC - b @081B3880 + b _081B3880 .pool -@081B3868: +_081B3868: ldr r1, =0x020244ec ldrb r2, [r4, 0x9] ldr r0, =0x020244e9 @@ -812197,7 +812197,7 @@ sub_81B3828: ; 81B3828 str r0, [sp] movs r0, 0 bl sub_81BF8EC -@081B3880: +_081B3880: add sp, 0x4 pop {r4} pop {r0} @@ -812292,12 +812292,12 @@ 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 .pool -@081B3968: +_081B3968: add r2, sp, 0x8 movs r0, 0x9 ldrsb r0, [r3, r0] @@ -812332,15 +812332,15 @@ sub_81B3938: ; 81B3938 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 .pool -@081B39C4: +_081B39C4: movs r0, 0x1 -@081B39C6: +_081B39C6: strh r0, [r6, 0x14] add r2, sp, 0x8 ldr r0, =0x0203cec8 @@ -812378,15 +812378,15 @@ sub_81B3938: ; 81B3938 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 .pool -@081B3A2C: +_081B3A2C: movs r0, 0x1 -@081B3A2E: +_081B3A2E: strh r0, [r6, 0x16] ldr r4, =0x0203cef0 movs r0, 0x4 @@ -812448,7 +812448,7 @@ sub_81B3938: ; 81B3938 adds r0, r1 ldr r1, =sub_81B3D48 str r1, [r0] -@081B3ABA: +_081B3ABA: add sp, 0xC pop {r4-r7} pop {r0} @@ -812476,15 +812476,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 @@ -812492,24 +812492,24 @@ sub_81B3AD8: ; 81B3AD8 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} @@ -812556,7 +812556,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 @@ -812585,7 +812585,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] @@ -812608,7 +812608,7 @@ sub_81B3B40: ; 81B3B40 ldr r1, [sp, 0x28] movs r3, 0 bl CopyRectToBgTilemapBufferRect -@081B3BFA: +_081B3BFA: add sp, 0x34 pop {r3-r5} mov r8, r3 @@ -812676,7 +812676,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 @@ -812687,11 +812687,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 @@ -812702,7 +812702,7 @@ sub_81B3C60: ; 81B3C60 movs r2, 0x16 ldrsh r1, [r4, r2] bl sub_81B3C0C -@081B3CAC: +_081B3CAC: pop {r4} pop {r0} bx r0 @@ -812723,7 +812723,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] @@ -812742,11 +812742,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] @@ -812765,7 +812765,7 @@ sub_81B3CC0: ; 81B3CC0 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 @@ -812814,11 +812814,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 @@ -812887,7 +812887,7 @@ sub_81B3D48: ; 81B3D48 adds r0, r7, r0 ldr r1, =sub_81B3E60 str r1, [r0] -@081B3E3A: +_081B3E3A: add sp, 0xC pop {r3} mov r8, r3 @@ -812914,11 +812914,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] @@ -812945,9 +812945,9 @@ sub_81B3E60: ; 81B3E60 bl Free adds r0, r6, 0 bl sub_81B407C - b @081B3F08 + b _081B3F08 .pool -@081B3EE4: +_081B3EE4: ldrh r1, [r4, 0x14] ldrh r0, [r4, 0x10] adds r1, r0 @@ -812959,15 +812959,15 @@ sub_81B3E60: ; 81B3E60 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 @@ -813201,15 +813201,15 @@ brm_cancel_1: ; 81B40D4 movs r0, 0xF ands r0, r1 cmp r0, 0x6 - bne @081B4110 + bne _081B4110 movs r0, 0xF bl display_pokemon_menu_message - b @081B4116 + b _081B4116 .pool -@081B4110: +_081B4110: movs r0, 0 bl display_pokemon_menu_message -@081B4116: +_081B4116: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -813288,18 +813288,18 @@ sub_81B41C4: ; 81B41C4 bl InBattlePyramid lsls r0, 24 cmp r0, 0 - bne @081B41E0 + bne _081B41E0 ldr r2, =c2_8123744 movs r0, 0x2 movs r1, 0x5 bl sub_81AAC90 - b @081B41E8 + b _081B41E8 .pool -@081B41E0: +_081B41E0: ldr r1, =c2_8123744 movs r0, 0x2 bl sub_81C4F98 -@081B41E8: +_081B41E8: pop {r0} bx r0 .pool @@ -813314,7 +813314,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 @@ -813325,9 +813325,9 @@ c2_8123744: ; 81B41F0 ldr r1, =sub_81B36FC str r1, [sp, 0x4] ldr r1, [r3] - b @081B425A + b _081B425A .pool -@081B4224: +_081B4224: ldr r4, =0x0203cefc ldr r5, =0x0203cec8 movs r0, 0x9 @@ -813344,7 +813344,7 @@ c2_8123744: ; 81B41F0 strh r0, [r4] lsls r0, 16 cmp r0, 0 - beq @081B4278 + beq _081B4278 ldrb r0, [r5, 0x8] lsls r0, 28 lsrs r0, 28 @@ -813354,19 +813354,19 @@ c2_8123744: ; 81B41F0 ldr r1, =sub_81B4350 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 .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 @@ -813379,8 +813379,8 @@ c2_8123744: ; 81B41F0 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 @@ -813394,7 +813394,7 @@ c2_8123744: ; 81B41F0 movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 -@081B42C0: +_081B42C0: add sp, 0xC pop {r3} mov r8, r3 @@ -813416,7 +813416,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 @@ -813449,7 +813449,7 @@ sub_81B42D0: ; 81B42D0 adds r0, r1 ldr r1, =sub_81B469C str r1, [r0] -@081B432C: +_081B432C: pop {r3} mov r8, r3 pop {r4-r7} @@ -813468,7 +813468,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] @@ -813487,7 +813487,7 @@ sub_81B4350: ; 81B4350 adds r0, r1 ldr r1, =sub_81B43A8 str r1, [r0] -@081B4388: +_081B4388: pop {r4} pop {r0} bx r0 @@ -813503,7 +813503,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 @@ -813512,7 +813512,7 @@ sub_81B43A8: ; 81B43A8 adds r1, r0 ldr r0, =sub_81B43DC str r0, [r1] -@081B43CC: +_081B43CC: pop {r4} pop {r0} bx r0 @@ -813528,19 +813528,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 @@ -813551,7 +813551,7 @@ sub_81B43DC: ; 81B43DC bl bag_add_item lsls r0, 24 cmp r0, 0 - bne @081B4458 + bne _081B4458 ldrh r0, [r5] movs r1, 0x1 bl bag_add_item @@ -813567,14 +813567,14 @@ sub_81B43DC: ; 81B43DC adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] - b @081B44EC + b _081B44EC .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] @@ -813591,9 +813591,9 @@ sub_81B43DC: ; 81B43DC adds r0, r1 ldr r1, =sub_81B44FC str r1, [r0] - b @081B44EC + b _081B44EC .pool -@081B4498: +_081B4498: ldr r0, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r0, r1] @@ -813614,12 +813614,12 @@ sub_81B43DC: ; 81B43DC adds r0, r1 ldr r1, =sub_81B469C str r1, [r0] - b @081B44EC + b _081B44EC .pool -@081B44D8: +_081B44D8: movs r0, 0x5 bl audio_play -@081B44DE: +_081B44DE: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -813627,7 +813627,7 @@ sub_81B43DC: ; 81B43DC adds r1, r0 ldr r0, =sub_81B1C1C str r0, [r1] -@081B44EC: +_081B44EC: pop {r4-r6} pop {r0} bx r0 @@ -813643,14 +813643,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 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 -@081B451C: +_081B451C: pop {r4} pop {r0} bx r0 @@ -813710,7 +813710,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 @@ -813736,9 +813736,9 @@ sub_81B4578: ; 81B4578 movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 - b @081B4614 + b _081B4614 .pool -@081B45F8: +_081B45F8: ldrb r0, [r6, 0x8] lsls r0, 28 lsrs r0, 28 @@ -813752,7 +813752,7 @@ sub_81B4578: ; 81B4578 movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 -@081B4614: +_081B4614: add sp, 0xC pop {r3} mov r8, r3 @@ -813772,11 +813772,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] @@ -813789,15 +813789,15 @@ sub_81B4624: ; 81B4624 movs r2, 0 movs r3, 0 bl sub_81B1C84 - b @081B467C + b _081B467C .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 @@ -813805,7 +813805,7 @@ sub_81B4624: ; 81B4624 adds r1, r0 ldr r0, =sub_81B469C str r0, [r1] -@081B468A: +_081B468A: pop {r4} pop {r0} bx r0 @@ -813828,7 +813828,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] @@ -813841,12 +813841,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 @@ -813855,9 +813855,9 @@ sub_81B469C: ; 81B469C movs r0, 0xB movs r2, 0x1 bl sub_81B2FA8 - b @081B4716 + b _081B4716 .pool -@081B4704: +_081B4704: movs r0, 0x9 ldrsb r0, [r4, r0] lsls r0, 4 @@ -813866,10 +813866,10 @@ sub_81B469C: ; 81B469C 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 @@ -813906,16 +813906,16 @@ 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 .pool -@081B4788: +_081B4788: ldr r1, =0x02021cc4 adds r0, r5, 0 bl GetMonNickname @@ -813924,16 +813924,16 @@ sub_81B4724: ; 81B4724 adds r0, r4, 0 bl ExpandStringRefs adds r0, r4, 0 - b @081B47B4 + b _081B47B4 .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 @@ -813976,7 +813976,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 GetMonNickname @@ -813993,9 +813993,9 @@ sub_81B47E0: ; 81B47E0 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B469C - b @081B488A + b _081B488A .pool -@081B4864: +_081B4864: ldr r1, =0x02021cc4 adds r0, r5, 0 bl itemid_get_name @@ -814012,7 +814012,7 @@ sub_81B47E0: ; 81B47E0 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B48A8 -@081B488A: +_081B488A: str r1, [r0] pop {r4-r7} pop {r0} @@ -814029,7 +814029,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 @@ -814038,7 +814038,7 @@ sub_81B48A8: ; 81B48A8 adds r1, r0 ldr r0, =sub_81B48DC str r0, [r1] -@081B48CC: +_081B48CC: pop {r4} pop {r0} bx r0 @@ -814061,20 +814061,20 @@ 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 .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 @@ -814096,12 +814096,12 @@ sub_81B48DC: ; 81B48DC adds r0, r1 ldr r1, =sub_81B4988 str r1, [r0] - b @081B4978 + b _081B4978 .pool -@081B4964: +_081B4964: movs r0, 0x5 bl audio_play -@081B496A: +_081B496A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -814109,7 +814109,7 @@ sub_81B48DC: ; 81B48DC adds r1, r0 ldr r0, =sub_81B1C1C str r0, [r1] -@081B4978: +_081B4978: pop {r4,r5} pop {r0} bx r0 @@ -814133,7 +814133,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] @@ -814164,7 +814164,7 @@ sub_81B4988: ; 81B4988 adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] -@081B49EC: +_081B49EC: add sp, 0x4 pop {r4-r7} pop {r0} @@ -814328,7 +814328,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 @@ -814337,7 +814337,7 @@ sub_81B4B6C: ; 81B4B6C adds r1, r0 ldr r0, =sub_81B4BA0 str r0, [r1] -@081B4B90: +_081B4B90: pop {r4} pop {r0} bx r0 @@ -814353,19 +814353,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] @@ -814377,7 +814377,7 @@ sub_81B4BA0: ; 81B4BA0 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @081B4C0C + beq _081B4C0C ldr r0, =gUnknown_085E9877 movs r1, 0 bl sub_81B1B5C @@ -814387,9 +814387,9 @@ sub_81B4BA0: ; 81B4BA0 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B469C - b @081B4C4A + b _081B4C4A .pool -@081B4C0C: +_081B4C0C: ldr r0, =gUnknown_085E9897 movs r1, 0 bl sub_81B1B5C @@ -814399,12 +814399,12 @@ sub_81B4BA0: ; 81B4BA0 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B1C1C - b @081B4C4A + b _081B4C4A .pool -@081B4C30: +_081B4C30: movs r0, 0x5 bl audio_play -@081B4C36: +_081B4C36: ldr r0, =gUnknown_085E98B4 movs r1, 0x1 bl sub_81B1B5C @@ -814414,9 +814414,9 @@ sub_81B4BA0: ; 81B4BA0 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B4C60 -@081B4C4A: +_081B4C4A: str r1, [r0] -@081B4C4C: +_081B4C4C: pop {r4} pop {r0} bx r0 @@ -814432,7 +814432,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 @@ -814441,7 +814441,7 @@ sub_81B4C60: ; 81B4C60 adds r1, r0 ldr r0, =sub_81B4C94 str r0, [r1] -@081B4C84: +_081B4C84: pop {r4} pop {r0} bx r0 @@ -814459,19 +814459,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] @@ -814491,7 +814491,7 @@ sub_81B4C94: ; 81B4C94 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081B4D24 + bne _081B4D24 mov r1, r8 movs r0, 0x9 ldrsb r0, [r1, r0] @@ -814508,9 +814508,9 @@ sub_81B4C94: ; 81B4C94 adds r0, r1 ldr r1, =sub_81B469C str r1, [r0] - b @081B4D64 + b _081B4D64 .pool -@081B4D24: +_081B4D24: adds r0, r4, 0 bl pokemon_item_not_removed ldr r0, =0x02021fc4 @@ -814523,12 +814523,12 @@ sub_81B4C94: ; 81B4C94 adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] - b @081B4D64 + b _081B4D64 .pool -@081B4D50: +_081B4D50: movs r0, 0x5 bl audio_play -@081B4D56: +_081B4D56: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -814536,7 +814536,7 @@ sub_81B4C94: ; 81B4C94 adds r1, r0 ldr r0, =sub_81B1C1C str r0, [r1] -@081B4D64: +_081B4D64: pop {r3} mov r8, r3 pop {r4-r7} @@ -814582,14 +814582,14 @@ 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 display_pokemon_menu_message - b @081B4E02 + b _081B4E02 .pool -@081B4DE4: +_081B4DE4: movs r0, 0x1 bl sub_81B31B0 adds r0, r7, 0 @@ -814601,7 +814601,7 @@ sub_81B4D78: ; 81B4D78 bl itemid_get_name movs r0, 0x1A bl display_pokemon_menu_message -@081B4E02: +_081B4E02: ldr r1, =0x03005e00 mov r2, r8 lsls r0, r2, 2 @@ -814635,12 +814635,12 @@ 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 .pool -@081B4E5C: +_081B4E5C: ldr r0, [r5] adds r0, 0xD bl sub_81B302C @@ -814654,7 +814654,7 @@ brm_shift_sendout: ; 81B4E2C adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] -@081B4E7A: +_081B4E7A: pop {r4,r5} pop {r0} bx r0 @@ -814681,7 +814681,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 @@ -814689,12 +814689,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 @@ -814716,23 +814716,23 @@ sub_81B4E8C: ; 81B4E8C bl sub_81B2FA8 subs r0, r6, 0x1 cmp r5, r0 - bne @081B4F04 + bne _081B4F04 bl sub_81B4F88 -@081B4F04: +_081B4F04: movs r0, 0 bl display_pokemon_menu_message ldr r0, =sub_81B1370 mov r1, r8 str r0, [r1] - b @081B4F68 + b _081B4F68 .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 @@ -814754,7 +814754,7 @@ sub_81B4E8C: ; 81B4E8C adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] -@081B4F68: +_081B4F68: add sp, 0x4 pop {r3} mov r8, r3 @@ -814803,25 +814803,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 @@ -814830,20 +814830,20 @@ sub_81B4FA8: ; 81B4FA8 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 .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] @@ -814860,13 +814860,13 @@ sub_81B4FA8: ; 81B4FA8 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 @@ -814877,13 +814877,13 @@ sub_81B4FA8: ; 81B4FA8 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 display_pokemon_menu_message ldr r0, =0x03005e00 @@ -814972,26 +814972,26 @@ 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 .pool -@081B515C: +_081B515C: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA210 bl ExpandStringRefs - b @081B5178 + b _081B5178 .pool -@081B5170: +_081B5170: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA234 bl ExpandStringRefs -@081B5178: +_081B5178: movs r0, 0x20 bl audio_play ldr r4, =0x0203cec4 @@ -815015,7 +815015,7 @@ sub_81B50C8: ; 81B50C8 adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] -@081B51B0: +_081B51B0: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -815084,7 +815084,7 @@ brm_trade_1: ; 81B51D4 mov r2, r9 bl sub_807A7E0 cmp r0, 0 - beq @081B52C8 + beq _081B52C8 ldr r5, =0x02021fc4 ldr r1, =gUnknown_08615E0C subs r0, 0x1 @@ -815115,14 +815115,14 @@ brm_trade_1: ; 81B51D4 adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] - b @081B52D4 + b _081B52D4 .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 @@ -815153,36 +815153,36 @@ 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 .pool -@081B5328: +_081B5328: cmp r0, 0x3 - beq @081B5354 - b @081B5368 -@081B532E: + beq _081B5354 + b _081B5368 +_081B532E: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA1E8 bl ExpandStringRefs - b @081B53C0 + b _081B53C0 .pool -@081B5340: +_081B5340: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA210 bl ExpandStringRefs - b @081B53C0 + b _081B53C0 .pool -@081B5354: +_081B5354: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA234 bl ExpandStringRefs - b @081B53C0 + b _081B53C0 .pool -@081B5368: +_081B5368: movs r0, 0x5 bl audio_play ldr r0, =0x0203cec8 @@ -815207,9 +815207,9 @@ sub_81B52E4: ; 81B52E4 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B53FC - b @081B53E4 + b _081B53E4 .pool -@081B53C0: +_081B53C0: movs r0, 0x20 bl audio_play ldr r4, =0x02021fc4 @@ -815225,7 +815225,7 @@ sub_81B52E4: ; 81B52E4 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B1C1C -@081B53E4: +_081B53E4: str r1, [r0] pop {r4,r5} pop {r0} @@ -815242,7 +815242,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 @@ -815251,7 +815251,7 @@ sub_81B53FC: ; 81B53FC adds r1, r0 ldr r0, =sub_81B5430 str r0, [r1] -@081B5420: +_081B5420: pop {r4} pop {r0} bx r0 @@ -815267,29 +815267,29 @@ 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 @@ -815318,9 +815318,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 @@ -815331,34 +815331,34 @@ sub_81B5470: ; 81B5470 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081B54C6 + beq _081B54C6 bl InUnionRoom 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 display_pokemon_menu_message - b @081B5656 + b _081B5656 .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 FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081B5524 + beq _081B5524 ldr r0, =gUnknown_085E97FC movs r1, 0x1 bl sub_81B1B5C @@ -815369,9 +815369,9 @@ sub_81B5470: ; 81B5470 adds r0, r1 ldr r1, =sub_81B1C1C str r1, [r0] - b @081B5664 + b _081B5664 .pool -@081B5524: +_081B5524: ldr r1, =gUnknown_08615D9C lsls r0, r4, 3 adds r5, r0, r1 @@ -815380,33 +815380,33 @@ sub_81B5470: ; 81B5470 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 .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 @@ -815425,9 +815425,9 @@ sub_81B5470: ; 81B5470 bl sub_81245DC ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA196 - b @081B55E8 + b _081B55E8 .pool -@081B55B8: +_081B55B8: ldr r0, =0x03005d8c ldr r1, [r0] adds r0, r1, 0 @@ -815450,7 +815450,7 @@ sub_81B5470: ; 81B5470 bl sub_81245DC ldr r0, =0x02021fc4 ldr r1, =gUnknown_085EA16B -@081B55E8: +_081B55E8: bl ExpandStringRefs adds r0, r6, 0 bl sub_81B5674 @@ -815460,37 +815460,37 @@ sub_81B5470: ; 81B5470 lsls r1, 2 adds r0, r1 strh r4, [r0] - b @081B5664 + b _081B5664 .pool -@081B5614: +_081B5614: ldr r1, =0x0203cec8 ldr r0, =sub_8124690 - b @081B5628 + b _081B5628 .pool -@081B5624: +_081B5624: ldr r1, =0x0203cec8 ldr r0, =c2_exit_to_overworld_2_switch -@081B5628: +_081B5628: str r0, [r1] adds r0, r6, 0 bl sub_81B12C0 - b @081B5664 + b _081B5664 .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 display_pokemon_menu_message -@081B5656: +_081B5656: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -815498,7 +815498,7 @@ sub_81B5470: ; 81B5470 adds r1, r0 ldr r0, =task_brm_cancel_1_on_keypad_a_or_b str r0, [r1] -@081B5664: +_081B5664: pop {r4-r7} pop {r0} bx r0 @@ -815536,7 +815536,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 @@ -815545,7 +815545,7 @@ sub_81B56A4: ; 81B56A4 adds r1, r0 ldr r0, =sub_81B56D8 str r0, [r1] -@081B56C8: +_081B56C8: pop {r4} pop {r0} bx r0 @@ -815561,30 +815561,30 @@ 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 str r0, [r1] adds r0, r4, 0 bl sub_81B12C0 - b @081B572A + b _081B572A .pool -@081B5714: +_081B5714: movs r0, 0x5 bl audio_play -@081B571A: +_081B571A: ldr r0, =0x03005db0 movs r1, 0 str r1, [r0] @@ -815592,7 +815592,7 @@ sub_81B56D8: ; 81B56D8 str r1, [r0] adds r0, r4, 0 bl sub_81B1C1C -@081B572A: +_081B572A: pop {r4} pop {r0} bx r0 @@ -815621,7 +815621,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 @@ -815632,7 +815632,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 @@ -815668,15 +815668,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 .pool @@ -815690,15 +815690,15 @@ sub_81B57DC: ; 81B57DC lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081B57F8 + bne _081B57F8 movs r0, 0xC bl display_pokemon_menu_message - b @081B57FE + b _081B57FE .pool -@081B57F8: +_081B57F8: movs r0, 0xD bl display_pokemon_menu_message -@081B57FE: +_081B57FE: pop {r0} bx r0 thumb_func_end sub_81B57DC @@ -815725,12 +815725,12 @@ sub_81B5820: ; 81B5820 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081B585C + bne _081B585C bl IsPlayerFacingSurfableFishableWater lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081B585C + bne _081B585C ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] @@ -815738,11 +815738,11 @@ sub_81B5820: ; 81B5820 ldr r0, =hm_surf_run_dp02scr str r0, [r1] movs r0, 0x1 - b @081B585E + b _081B585E .pool -@081B585C: +_081B585C: movs r0, 0 -@081B585E: +_081B585E: pop {r1} bx r1 thumb_func_end sub_81B5820 @@ -815754,14 +815754,14 @@ sub_81B5864: ; 81B5864 bl TestPlayerAvatarFlags lsls r0, 24 cmp r0, 0 - beq @081B587A + beq _081B587A movs r0, 0x9 bl display_pokemon_menu_message - b @081B5880 -@081B587A: + b _081B5880 +_081B587A: movs r0, 0x8 bl display_pokemon_menu_message -@081B5880: +_081B5880: pop {r0} bx r0 thumb_func_end sub_81B5864 @@ -815775,13 +815775,13 @@ sub_81B5884: ; 81B5884 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081B58A0 + beq _081B58A0 movs r0, 0 - b @081B58A2 + b _081B58A2 .pool -@081B58A0: +_081B58A0: movs r0, 0x1 -@081B58A2: +_081B58A2: pop {r1} bx r1 thumb_func_end sub_81B5884 @@ -815843,12 +815843,12 @@ hm_prepare_waterfall: ; 81B58F0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081B594C + bne _081B594C bl IsPlayerSurfingNorth lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081B594C + bne _081B594C ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] @@ -815856,11 +815856,11 @@ hm_prepare_waterfall: ; 81B58F0 ldr r0, =hm2_waterfall str r0, [r1] movs r0, 0x1 - b @081B594E + b _081B594E .pool -@081B594C: +_081B594C: movs r0, 0 -@081B594E: +_081B594E: add sp, 0x4 pop {r4} pop {r1} @@ -815891,11 +815891,11 @@ sub_81B5974: ; 81B5974 lsrs r0, 24 str r0, [r1, 0x4] cmp r0, 0 - bne @081B5990 + bne _081B5990 movs r0, 0 - b @081B599E + b _081B599E .pool -@081B5990: +_081B5990: ldr r1, =0x03005db0 ldr r0, =hm_add_c3_launch_phase_2 str r0, [r1] @@ -815903,7 +815903,7 @@ sub_81B5974: ; 81B5974 ldr r0, =sub_81B5958 str r0, [r1] movs r0, 0x1 -@081B599E: +_081B599E: pop {r1} bx r1 .pool @@ -815922,7 +815922,7 @@ party_menu_icon_anim: ; 81B59B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081B59EA + bne _081B59EA ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -815930,7 +815930,7 @@ party_menu_icon_anim: ; 81B59B4 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @081B59EA + beq _081B59EA ldr r0, =gUnknown_08616020 adds r0, r4, r0 ldrb r1, [r0] @@ -815938,7 +815938,7 @@ party_menu_icon_anim: ; 81B59B4 negs r0, r1 orrs r0, r1 lsrs r6, r0, 31 -@081B59EA: +_081B59EA: adds r0, r5, 0 movs r1, 0x41 bl pokemon_getattr @@ -815976,7 +815976,7 @@ party_menu_link_mon_icon_anim: ; 81B5A2C lsls r3, 24 lsrs r7, r3, 24 cmp r5, 0 - beq @081B5A7A + beq _081B5A7A ldr r1, =sub_80D3014 ldr r0, [r4, 0x4] ldrb r2, [r0] @@ -816005,7 +816005,7 @@ party_menu_link_mon_icon_anim: ; 81B5A2C ands r0, r3 orrs r0, r2 strb r0, [r1, 0x5] -@081B5A7A: +_081B5A7A: add sp, 0xC pop {r4-r7} pop {r0} @@ -816028,17 +816028,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 @@ -816046,9 +816046,9 @@ sub_81B5A8C: ; 81B5A8C adds r0, r1 movs r1, 0 bl sub_80D32C8 - b @081B5B2C + b _081B5B2C .pool -@081B5AD4: +_081B5AD4: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -816056,9 +816056,9 @@ sub_81B5A8C: ; 81B5A8C adds r0, r1 movs r1, 0x1 bl sub_80D32C8 - b @081B5B2C + b _081B5B2C .pool -@081B5AEC: +_081B5AEC: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -816066,9 +816066,9 @@ sub_81B5A8C: ; 81B5A8C adds r0, r1 movs r1, 0x2 bl sub_80D32C8 - b @081B5B2C + b _081B5B2C .pool -@081B5B04: +_081B5B04: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -816076,9 +816076,9 @@ sub_81B5A8C: ; 81B5A8C adds r0, r1 movs r1, 0x3 bl sub_80D32C8 - b @081B5B2C + b _081B5B2C .pool -@081B5B1C: +_081B5B1C: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -816086,7 +816086,7 @@ sub_81B5A8C: ; 81B5A8C adds r0, r1 movs r1, 0x4 bl sub_80D32C8 -@081B5B2C: +_081B5B2C: pop {r4} pop {r0} bx r0 @@ -816136,21 +816136,21 @@ 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 .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 @@ -816158,16 +816158,16 @@ sub_81B5B6C: ; 81B5B6C adds r1, 0x1C adds r0, r1 ldr r1, =sub_81B5C08 - b @081B5BD0 + b _081B5BD0 .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 -@081B5BD0: +_081B5BD0: str r1, [r0] pop {r4-r7} pop {r0} @@ -816183,18 +816183,18 @@ sub_81B5BDC: ; 81B5BDC 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 .pool -@081B5C00: +_081B5C00: strh r1, [r4, 0x26] -@081B5C02: +_081B5C02: pop {r4} pop {r0} bx r0 @@ -816216,7 +816216,7 @@ party_menu_held_item_object: ; 81B5C14 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq @081B5C3C + beq _081B5C3C ldr r0, =gUnknown_08615EC0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] @@ -816227,7 +816227,7 @@ party_menu_held_item_object: ; 81B5C14 adds r0, r5, 0 adds r1, r4, 0 bl sub_81B5C94 -@081B5C3C: +_081B5C3C: pop {r4,r5} pop {r0} bx r0 @@ -816242,7 +816242,7 @@ party_menu_link_mon_held_item_object: ; 81B5C48 lsls r1, 16 lsrs r5, r1, 16 cmp r0, 0 - beq @081B5C84 + beq _081B5C84 ldr r0, =gUnknown_08615EC0 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x2] @@ -816264,7 +816264,7 @@ party_menu_link_mon_held_item_object: ; 81B5C48 adds r0, r5, 0 adds r1, r4, 0 bl sub_81B5CB0 -@081B5C84: +_081B5C84: pop {r4,r5} pop {r0} bx r0 @@ -816293,7 +816293,7 @@ sub_81B5CB0: ; 81B5CB0 lsls r0, 16 lsrs r0, 16 cmp r0, 0 - bne @081B5CD8 + bne _081B5CD8 ldr r2, =0x02020630 ldrb r1, [r4, 0xA] lsls r0, r1, 4 @@ -816304,13 +816304,13 @@ sub_81B5CB0: ; 81B5CB0 ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b @081B5D24 + b _081B5D24 .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 @@ -816319,9 +816319,9 @@ sub_81B5CB0: ; 81B5CB0 adds r0, r1 movs r1, 0x1 bl StartObjectImageAnim - b @081B5D0E + b _081B5D0E .pool -@081B5CFC: +_081B5CFC: ldrb r1, [r4, 0xA] lsls r0, r1, 4 adds r0, r1 @@ -816330,7 +816330,7 @@ sub_81B5CB0: ; 81B5CB0 adds r0, r1 movs r1, 0 bl StartObjectImageAnim -@081B5D0E: +_081B5D0E: ldr r2, =0x02020630 ldrb r1, [r4, 0xA] lsls r0, r1, 4 @@ -816342,7 +816342,7 @@ sub_81B5CB0: ; 81B5CB0 movs r1, 0x5 negs r1, r1 ands r1, r2 -@081B5D24: +_081B5D24: strb r1, [r0] pop {r4} pop {r0} @@ -816370,16 +816370,16 @@ sub_81B5D4C: ; 81B5D4C 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 @@ -816389,7 +816389,7 @@ sub_81B5D4C: ; 81B5D4C 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 @@ -816399,19 +816399,19 @@ sub_81B5D4C: ; 81B5D4C 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 .pool -@081B5DA8: +_081B5DA8: movs r5, 0 - b @081B5DDE -@081B5DAC: + b _081B5DDE +_081B5DAC: movs r0, 0x64 muls r0, r5 ldr r1, =0x02024744 @@ -816421,7 +816421,7 @@ sub_81B5D4C: ; 81B5D4C 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 @@ -816431,15 +816431,15 @@ sub_81B5D4C: ; 81B5D4C 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 @@ -816524,16 +816524,16 @@ 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 .pool -@081B5EA8: +_081B5EA8: adds r3, r4, 0 adds r3, 0x3E ldrb r1, [r3] @@ -816549,7 +816549,7 @@ sub_81B5E74: ; 81B5E74 ldrh r2, [r2, 0x22] adds r0, r2 strh r0, [r4, 0x22] -@081B5EC6: +_081B5EC6: pop {r4} pop {r0} bx r0 @@ -816562,7 +816562,7 @@ party_menu_pokeball_object: ; 81B5ECC movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq @081B5EEA + beq _081B5EEA ldr r0, =gUnknown_08615F08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] @@ -816570,7 +816570,7 @@ party_menu_pokeball_object: ; 81B5ECC movs r3, 0x8 bl AddObjectToFront strb r0, [r4, 0xB] -@081B5EEA: +_081B5EEA: pop {r4} pop {r0} bx r0 @@ -816583,7 +816583,7 @@ party_menu_link_mon_pokeball_object: ; 81B5EF4 adds r4, r1, 0 lsls r0, 16 cmp r0, 0 - beq @081B5F24 + beq _081B5F24 ldr r0, =gUnknown_08615F08 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x6] @@ -816602,7 +816602,7 @@ party_menu_link_mon_pokeball_object: ; 81B5EF4 negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] -@081B5F24: +_081B5F24: pop {r4} pop {r0} bx r0 @@ -816692,7 +816692,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 @@ -816711,9 +816711,9 @@ sub_81B5FBC: ; 81B5FBC bl StartObjectImageAnim strh r6, [r4, 0x26] strh r6, [r5, 0x26] - b @081B602C + b _081B602C .pool -@081B6000: +_081B6000: lsls r5, r0, 4 adds r5, r0 lsls r5, 2 @@ -816734,7 +816734,7 @@ sub_81B5FBC: ; 81B5FBC strh r0, [r5, 0x26] movs r0, 0x4 strh r0, [r4, 0x26] -@081B602C: +_081B602C: pop {r3} mov r8, r3 pop {r4-r7} @@ -816765,7 +816765,7 @@ party_menu_status_condition_object: ; 81B6064 movs r1, 0xB bl pokemon_getattr cmp r0, 0 - beq @081B608C + beq _081B608C ldr r0, =gUnknown_08616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] @@ -816776,7 +816776,7 @@ party_menu_status_condition_object: ; 81B6064 adds r0, r5, 0 adds r1, r4, 0 bl party_menu_get_status_condition_and_update_object -@081B608C: +_081B608C: pop {r4,r5} pop {r0} bx r0 @@ -816791,7 +816791,7 @@ party_menu_link_mon_status_condition_object: ; 81B6098 lsls r1, 24 lsrs r5, r1, 24 cmp r0, 0 - beq @081B60D4 + beq _081B60D4 ldr r0, =gUnknown_08616008 ldr r2, [r4, 0x4] ldrb r1, [r2, 0x4] @@ -816813,7 +816813,7 @@ party_menu_link_mon_status_condition_object: ; 81B6098 negs r0, r0 ands r0, r2 strb r0, [r1, 0x5] -@081B60D4: +_081B60D4: pop {r4,r5} pop {r0} bx r0 @@ -816843,10 +816843,10 @@ party_menu_update_status_condition_object: ; 81B60FC 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 @@ -816857,9 +816857,9 @@ party_menu_update_status_condition_object: ; 81B60FC ldrb r1, [r0] movs r2, 0x4 orrs r1, r2 - b @081B6152 + b _081B6152 .pool -@081B6128: +_081B6128: ldrb r1, [r5, 0xC] lsls r0, r1, 4 adds r0, r1 @@ -816880,7 +816880,7 @@ party_menu_update_status_condition_object: ; 81B60FC movs r1, 0x5 negs r1, r1 ands r1, r2 -@081B6152: +_081B6152: strb r1, [r0] pop {r4,r5} pop {r0} @@ -816915,34 +816915,34 @@ 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 .pool -@081B61B0: +_081B61B0: ldr r0, =0x0203cec8 strb r5, [r0, 0x9] - b @081B6204 + b _081B6204 .pool -@081B61BC: +_081B61BC: movs r7, 0 movs r6, 0 -@081B61C0: +_081B61C0: ldr r4, =0x0203ce7c ldrh r0, [r4] bl GetItemEffectType 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 @@ -816952,35 +816952,35 @@ sub_81B617C: ; 81B617C 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 movs r1, 0x7F - b @081B6230 + b _081B6230 .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 -@081B6230: +_081B6230: str r1, [sp] str r0, [sp, 0x4] mov r0, r8 @@ -817005,18 +817005,18 @@ c2_815ABFC: ; 81B6254 bl InBattlePyramid 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 .pool @@ -817032,24 +817032,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 str r0, [r1, 0x4] -@081B62A6: +_081B62A6: ldr r0, =0x03006328 ldr r1, =sub_81B6794 ldr r2, [r0] adds r0, r3, 0 bl _call_via_r2 -@081B62B2: +_081B62B2: pop {r0} bx r0 .pool @@ -817062,31 +817062,31 @@ IsHPRecoveryItem: ; 81B62D0 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 .pool -@081B62EC: +_081B62EC: ldr r1, =gItemEffectInfoPointers 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 .pool -@081B6308: +_081B6308: movs r0, 0x1 -@081B630A: +_081B630A: pop {r1} bx r1 thumb_func_end IsHPRecoveryItem @@ -817102,136 +817102,136 @@ GetMedicineItemEffectMessage: ; 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 .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, =gUnknown_085E9C3E bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B6394: +_081B6394: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9C7C bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B63A8: +_081B63A8: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9C8A bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B63BC: +_081B63BC: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9CA2 bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B63D0: +_081B63D0: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9C5F bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B63E4: +_081B63E4: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9DBE bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B63F8: +_081B63F8: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9DE1 bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B640C: +_081B640C: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9CE0 bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B6420: +_081B6420: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085E96E3 - b @081B6474 + b _081B6474 .pool -@081B6430: +_081B6430: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085EA33C - b @081B6474 + b _081B6474 .pool -@081B6440: +_081B6440: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085EA343 - b @081B6474 + b _081B6474 .pool -@081B6450: +_081B6450: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085EA35B - b @081B6474 + b _081B6474 .pool -@081B6460: +_081B6460: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085E96E6 - b @081B6474 + b _081B6474 .pool -@081B6470: +_081B6470: ldr r0, =0x02021dc4 ldr r1, =gUnknown_085E96EE -@081B6474: +_081B6474: bl CopyString ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9D25 bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B6494: +_081B6494: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9CF5 bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B64A8: +_081B64A8: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9CB7 bl ExpandStringRefs - b @081B64C4 + b _081B64C4 .pool -@081B64BC: +_081B64BC: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E96F6 bl ExpandStringRefs -@081B64C4: +_081B64C4: pop {r0} bx r0 .pool @@ -817248,19 +817248,19 @@ UsingHPEVItemOnShedinja: ; 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 .pool -@081B64FC: +_081B64FC: movs r0, 0x1 -@081B64FE: +_081B64FE: pop {r4} pop {r1} bx r1 @@ -817273,17 +817273,17 @@ IsBlueYellowRedFlute: ; 81B6504 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 IsBlueYellowRedFlute @@ -817305,16 +817305,16 @@ ExecuteTableBasedItemEffect__: ; 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 .pool -@081B6558: +_081B6558: movs r0, 0x64 adds r4, r3, 0 muls r4, r0 @@ -817327,7 +817327,7 @@ ExecuteTableBasedItemEffect__: ; 81B6520 lsrs r2, 24 adds r0, r4, 0 adds r1, r5, 0 -@081B6572: +_081B6572: adds r3, r6, 0 bl ExecuteTableBasedItemEffect_ lsls r0, 24 @@ -817366,14 +817366,14 @@ ItemUseCB_Medicine: ; 81B6588 bl UsingHPEVItemOnShedinja lsls r0, 24 cmp r0, 0 - beq @081B6600 + beq _081B6600 adds r0, r6, 0 bl IsHPRecoveryItem 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 @@ -817384,10 +817384,10 @@ ItemUseCB_Medicine: ; 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 @@ -817395,17 +817395,17 @@ ItemUseCB_Medicine: ; 81B6588 bl ExecuteTableBasedItemEffect__ 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, =gUnknown_085E96F6 - b @081B66F4 + b _081B66F4 .pool -@081B6624: +_081B6624: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -817413,21 +817413,21 @@ ItemUseCB_Medicine: ; 81B6588 bl IsBlueYellowRedFlute 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 .pool -@081B6650: +_081B6650: movs r0, 0x75 bl audio_play -@081B6656: +_081B6656: ldr r4, =0x0203cedc ldr r7, =0x0203cec8 movs r0, 0x9 @@ -817452,22 +817452,22 @@ ItemUseCB_Medicine: ; 81B6588 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 @@ -817486,16 +817486,16 @@ ItemUseCB_Medicine: ; 81B6588 movs r1, 0 mov r2, r10 bl sub_81B1FA8 - b @081B6710 + b _081B6710 .pool -@081B66E4: +_081B66E4: ldr r1, =0x02021cc4 adds r0, r5, 0 bl GetMonNickname adds r0, r6, 0 bl GetMedicineItemEffectMessage ldr r0, =0x02021fc4 -@081B66F4: +_081B66F4: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -817508,7 +817508,7 @@ ItemUseCB_Medicine: ; 81B6588 adds r0, r1 ldr r1, [sp, 0x4] str r1, [r0] -@081B6710: +_081B6710: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -817567,18 +817567,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 @@ -817642,23 +817642,23 @@ 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, =gUnknown_085E96F6 - b @081B68E2 + b _081B68E2 .pool -@081B6874: +_081B6874: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -817675,28 +817675,28 @@ sub_81B67C8: ; 81B67C8 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, =gUnknown_085E9D45 bl ExpandStringRefs - b @081B68E0 + b _081B68E0 .pool -@081B68C4: +_081B68C4: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9D90 bl ExpandStringRefs - b @081B68E0 + b _081B68E0 .pool -@081B68D8: +_081B68D8: ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9D6D bl ExpandStringRefs -@081B68E0: +_081B68E0: ldr r0, =0x02021fc4 -@081B68E2: +_081B68E2: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -817729,59 +817729,59 @@ 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 .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 .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 @@ -817795,49 +817795,49 @@ option_menu_get_string: ; 81B699C 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 .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, =gUnknown_085E96E3 - b @081B69F2 + b _081B69F2 .pool -@081B69D8: +_081B69D8: ldr r1, =gUnknown_085EA33C - b @081B69F2 + b _081B69F2 .pool -@081B69E0: +_081B69E0: ldr r1, =gUnknown_085EA343 - b @081B69F2 + b _081B69F2 .pool -@081B69E8: +_081B69E8: ldr r1, =gUnknown_085EA35B - b @081B69F2 + b _081B69F2 .pool -@081B69F0: +_081B69F0: ldr r1, =gUnknown_085E96E6 -@081B69F2: +_081B69F2: adds r0, r2, 0 bl CopyString - b @081B6A08 + b _081B6A08 .pool -@081B6A00: +_081B6A00: ldr r1, =gUnknown_085E96EE adds r0, r2, 0 bl CopyString -@081B6A08: +_081B6A08: pop {r0} bx r0 .pool @@ -817868,7 +817868,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 @@ -817896,16 +817896,16 @@ sub_81B6A10: ; 81B6A10 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 @@ -817935,23 +817935,23 @@ ether_effect_related_3: ; 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 ether_effect_related_2 -@081B6AF0: +_081B6AF0: pop {r4,r5} pop {r0} bx r0 @@ -817966,34 +817966,34 @@ dp05_ether: ; 81B6AFC 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 .pool -@081B6B20: +_081B6B20: ldr r1, =gItemEffectInfoPointers 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 ether_effect_related - b @081B6B6E + b _081B6B6E .pool -@081B6B4C: +_081B6B4C: movs r0, 0x5 bl audio_play movs r0, 0x16 @@ -818008,7 +818008,7 @@ dp05_ether: ; 81B6AFC adds r0, r1 ldr r1, =ether_effect_related_3 str r1, [r0] -@081B6B6E: +_081B6B6E: pop {r4} pop {r0} bx r0 @@ -818084,15 +818084,15 @@ ether_effect_related: ; 81B6BEC bl ExecuteTableBasedItemEffect__ lsls r0, 24 cmp r0, 0 - beq @081B6C34 + beq _081B6C34 ldr r0, =0x0203cee8 strb r4, [r0] movs r0, 0x5 bl audio_play ldr r0, =gUnknown_085E96F6 - b @081B6C7E + b _081B6C7E .pool -@081B6C34: +_081B6C34: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -818125,7 +818125,7 @@ ether_effect_related: ; 81B6BEC adds r0, r5, 0 bl GetMedicineItemEffectMessage ldr r0, =0x02021fc4 -@081B6C7E: +_081B6C7E: movs r1, 0x1 bl sub_81B1B5C movs r0, 0x2 @@ -818191,25 +818191,25 @@ sub_81B6D14: ; 81B6D14 lsrs r2, r0, 16 movs r1, 0 ldr r3, =gUnknown_08616040 -@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 .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 @@ -818221,23 +818221,23 @@ pokemon_has_move: ; 81B6D44 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 @@ -818327,16 +818327,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 @@ -818344,20 +818344,20 @@ sub_81B6DC4: ; 81B6DC4 adds r1, r0 ldr r0, =sub_81B6EB4 str r0, [r1] - b @081B6E9C + b _081B6E9C .pool -@081B6E70: +_081B6E70: ldr r1, =gUnknown_085E9AB4 - b @081B6E7A + b _081B6E7A .pool -@081B6E78: +_081B6E78: ldr r1, =gUnknown_085E9C00 -@081B6E7A: +_081B6E7A: adds r0, r6, 0 bl sub_81B6D98 - b @081B6E9C + b _081B6E9C .pool -@081B6E88: +_081B6E88: ldr r0, =gUnknown_085E9AE9 bl sub_81B6D74 ldr r1, =0x03005e00 @@ -818367,7 +818367,7 @@ sub_81B6DC4: ; 81B6DC4 adds r0, r1 ldr r1, =sub_81B6FF4 str r1, [r0] -@081B6E9C: +_081B6E9C: pop {r3} mov r8, r3 pop {r4-r7} @@ -818395,18 +818395,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 GetMonNickname @@ -818449,7 +818449,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 @@ -818459,7 +818459,7 @@ sub_81B6F60: ; 81B6F60 adds r0, r1 ldr r1, =sub_81B6F98 str r1, [r0] -@081B6F86: +_081B6F86: pop {r4} pop {r0} bx r0 @@ -818475,37 +818475,37 @@ 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 .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 @@ -818521,7 +818521,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 @@ -818530,7 +818530,7 @@ sub_81B6FF4: ; 81B6FF4 adds r1, r0 ldr r0, =sub_81B7028 str r0, [r1] -@081B7018: +_081B7018: pop {r4} pop {r0} bx r0 @@ -818546,19 +818546,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, =gUnknown_085E9B96 movs r1, 0x1 bl sub_81B1B5C @@ -818569,15 +818569,15 @@ sub_81B7028: ; 81B7028 adds r0, r1 ldr r1, =sub_81B7088 str r1, [r0] - b @081B7080 + b _081B7080 .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 @@ -818592,14 +818592,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 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 -@081B70A8: +_081B70A8: pop {r4} pop {r0} bx r0 @@ -818662,20 +818662,20 @@ 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 .pool -@081B7148: +_081B7148: adds r0, r5, 0 bl sub_81B7230 -@081B714E: +_081B714E: pop {r4,r5} pop {r0} bx r0 @@ -818738,7 +818738,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] @@ -818763,7 +818763,7 @@ sub_81B71D4: ; 81B71D4 bl sub_80691F4 adds r0, r6, 0 bl sub_81B6EB4 -@081B7220: +_081B7220: pop {r4-r6} pop {r0} bx r0 @@ -818816,7 +818816,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 @@ -818825,7 +818825,7 @@ sub_81B7294: ; 81B7294 adds r1, r0 ldr r0, =sub_81B72C8 str r0, [r1] -@081B72B8: +_081B72B8: pop {r4} pop {r0} bx r0 @@ -818848,20 +818848,20 @@ 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 .pool -@081B7300: +_081B7300: cmp r5, 0x1 - beq @081B7392 - b @081B73C2 -@081B7306: + beq _081B7392 + b _081B73C2 +_081B7306: ldr r1, =0x02021cc4 adds r0, r4, 0 bl GetMonNickname @@ -818883,7 +818883,7 @@ sub_81B72C8: ; 81B72C8 movs r3, 0x10 ldrsh r0, [r7, r3] cmp r0, 0x1 - bne @081B7368 + bne _081B7368 ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -818891,14 +818891,14 @@ sub_81B72C8: ; 81B72C8 adds r1, r0 ldr r0, =sub_81B73E4 str r0, [r1] - b @081B73C2 + b _081B73C2 .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 @@ -818906,12 +818906,12 @@ sub_81B72C8: ; 81B72C8 adds r1, r0 ldr r0, =sub_81B6794 str r0, [r1] - b @081B73C2 + b _081B73C2 .pool -@081B738C: +_081B738C: movs r0, 0x5 bl audio_play -@081B7392: +_081B7392: ldr r1, =0x02021cc4 adds r0, r4, 0 bl GetMonNickname @@ -818933,7 +818933,7 @@ sub_81B72C8: ; 81B72C8 adds r0, r1 ldr r1, =sub_81B6FF4 str r1, [r0] -@081B73C2: +_081B73C2: pop {r4-r7} pop {r0} bx r0 @@ -818949,10 +818949,10 @@ 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 @@ -818987,7 +818987,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 @@ -819004,15 +819004,15 @@ dp05_rare_candy: ; 81B7404 adds r1, r6, r0 adds r0, r5, 0 bl sub_81B79A0 - b @081B747A + b _081B747A .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] @@ -819027,9 +819027,9 @@ dp05_rare_candy: ; 81B7404 lsls r0, 3 adds r0, r1 mov r1, r10 - b @081B7516 + b _081B7516 .pool -@081B74B4: +_081B74B4: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -819070,7 +819070,7 @@ dp05_rare_candy: ; 81B7404 lsls r0, 3 adds r0, r1 ldr r1, =sub_81B75D4 -@081B7516: +_081B7516: str r1, [r0] pop {r3-r5} mov r8, r3 @@ -819107,12 +819107,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 @@ -819152,23 +819152,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 @@ -819180,7 +819180,7 @@ sub_81B75D4: ; 81B75D4 adds r1, r0 ldr r0, =sub_81B7634 str r0, [r1] -@081B7620: +_081B7620: pop {r4} pop {r0} bx r0 @@ -819197,12 +819197,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 @@ -819214,7 +819214,7 @@ sub_81B7634: ; 81B7634 adds r1, r0 ldr r0, =sub_81B7704 str r0, [r1] -@081B7668: +_081B7668: pop {r4} pop {r0} bx r0 @@ -819296,19 +819296,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 @@ -819324,28 +819324,28 @@ sub_81B7704: ; 81B7704 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 .pool -@081B776C: +_081B776C: ldr r0, =0x0000ffff cmp r1, r0 - beq @081B7780 - b @081B77A0 + beq _081B7780 + b _081B77A0 .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 @@ -819353,12 +819353,12 @@ sub_81B7704: ; 81B7704 adds r1, r0 ldr r0, =sub_81B77AC str r0, [r1] - b @081B77A6 + b _081B77A6 .pool -@081B77A0: +_081B77A0: adds r0, r5, 0 bl sub_81B7910 -@081B77A6: +_081B77A6: pop {r4-r6} pop {r0} bx r0 @@ -819382,31 +819382,31 @@ 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 .pool -@081B77E8: +_081B77E8: ldr r0, =0x0000ffff cmp r1, r0 - beq @081B77FC - b @081B7804 + beq _081B77FC + b _081B7804 .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 @@ -819431,7 +819431,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] @@ -819443,9 +819443,9 @@ sub_81B7810: ; 81B7810 bl sub_813DA40 adds r0, r5, 0 bl remove_task - b @081B786E + b _081B786E .pool -@081B7860: +_081B7860: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -819453,7 +819453,7 @@ sub_81B7810: ; 81B7810 adds r1, r0 ldr r0, =sub_81B6794 str r0, [r1] -@081B786E: +_081B786E: pop {r4-r7} pop {r0} bx r0 @@ -819649,7 +819649,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 @@ -819662,8 +819662,8 @@ sub_81B7A28: ; 81B7A28 bl ExecuteTableBasedItemEffect__ lsls r0, 24 cmp r0, 0 - beq @081B7A94 -@081B7A6E: + beq _081B7A94 +_081B7A6E: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -819671,9 +819671,9 @@ sub_81B7A28: ; 81B7A28 adds r1, r0 ldr r0, =task_intro_gamefreak str r0, [r1] - b @081B7B2A + b _081B7B2A .pool -@081B7A94: +_081B7A94: movs r0, 0x1 bl audio_play ldr r4, =0x0203cedc @@ -819699,12 +819699,12 @@ sub_81B7A28: ; 81B7A28 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 @@ -819742,7 +819742,7 @@ sub_81B7A28: ; 81B7A28 ldr r1, =0x0000021a adds r0, r1 strh r2, [r0] -@081B7B2A: +_081B7B2A: add sp, 0x4 pop {r3} mov r8, r3 @@ -819761,7 +819761,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 @@ -819771,7 +819771,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 @@ -819780,21 +819780,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, =gUnknown_085E96F6 @@ -819802,9 +819802,9 @@ task_intro_gamefreak: ; 81B7B4C bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - b @081B7BD8 + b _081B7BD8 .pool -@081B7BC8: +_081B7BC8: ldr r1, =0x0203cee8 movs r0, 0x1 strb r0, [r1] @@ -819812,7 +819812,7 @@ task_intro_gamefreak: ; 81B7B4C ldrh r0, [r0] movs r1, 0x1 bl sub_80D6AA4 -@081B7BD8: +_081B7BD8: ldr r1, =0x03005e00 lsls r0, r4, 2 adds r0, r4 @@ -819823,12 +819823,12 @@ task_intro_gamefreak: ; 81B7B4C ldr r1, =0x0203cec8 movs r0, 0 strb r0, [r1, 0x9] - b @081B7C0A + b _081B7C0A .pool -@081B7C04: +_081B7C04: adds r0, r4, 0 bl sub_81B7A28 -@081B7C0A: +_081B7C0A: pop {r4-r6} pop {r0} bx r0 @@ -819890,7 +819890,7 @@ sub_81B7C74: ; 81B7C74 bl ExecuteTableBasedItemEffect__ lsls r0, 24 cmp r0, 0 - beq @081B7CD8 + beq _081B7CD8 ldr r1, =0x0203cee8 movs r0, 0 strb r0, [r1] @@ -819905,14 +819905,14 @@ sub_81B7C74: ; 81B7C74 lsls r0, 3 adds r0, r1 str r6, [r0] - b @081B7CE4 + b _081B7CE4 .pool -@081B7CD8: +_081B7CD8: ldrh r0, [r4] movs r1, 0x1 bl sub_80D6AA4 bl sub_81B06F4 -@081B7CE4: +_081B7CE4: pop {r4-r6} pop {r0} bx r0 @@ -819929,194 +819929,194 @@ GetItemEffectType: ; 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 .pool -@081B7D18: +_081B7D18: ldr r1, =gItemEffectInfoPointers 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 .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 @@ -820134,7 +820134,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] @@ -820170,32 +820170,32 @@ 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 .pool -@081B7EF0: +_081B7EF0: ldr r1, =gUnknown_085E9AB4 - b @081B7EFA + b _081B7EFA .pool -@081B7EF8: +_081B7EF8: ldr r1, =gUnknown_085E9C00 -@081B7EFA: +_081B7EFA: adds r0, r6, 0 bl sub_81B6D98 - b @081B7F1C + b _081B7F1C .pool -@081B7F08: +_081B7F08: ldr r0, =gUnknown_085E9AE9 bl sub_81B6D74 ldr r1, =0x03005e00 @@ -820205,7 +820205,7 @@ sub_81B7E4C: ; 81B7E4C adds r0, r1 ldr r1, =sub_81B6FF4 str r1, [r0] -@081B7F1C: +_081B7F1C: pop {r3} mov r8, r3 pop {r4-r7} @@ -820243,9 +820243,9 @@ sub_81B7F60: ; 81B7F60 lsls r0, 24 ldr r1, =sub_81C4F84 cmp r0, 0 - bne @081B7F72 + bne _081B7F72 ldr r1, =c2_815ABFC -@081B7F72: +_081B7F72: movs r0, 0x6 str r0, [sp] ldr r0, =sub_81B1370 @@ -820293,21 +820293,21 @@ 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 .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] @@ -820325,7 +820325,7 @@ sub_81B7FAC: ; 81B7FAC adds r0, r1 ldr r1, =sub_81B82A0 str r1, [r0] -@081B8030: +_081B8030: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -820345,7 +820345,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 @@ -820354,12 +820354,12 @@ sub_81B8044: ; 81B8044 str r0, [r1, 0x4] adds r0, r4, 0 bl sub_81B12C0 - b @081B8082 + b _081B8082 .pool -@081B807C: +_081B807C: adds r0, r4, 0 bl sub_81B8088 -@081B8082: +_081B8082: pop {r4,r5} pop {r0} bx r0 @@ -820377,7 +820377,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 @@ -820410,7 +820410,7 @@ sub_81B8088: ; 81B8088 adds r0, r1 ldr r1, =sub_81B8104 str r1, [r0] -@081B80E4: +_081B80E4: pop {r3} mov r8, r3 pop {r4-r7} @@ -820430,7 +820430,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 @@ -820444,7 +820444,7 @@ sub_81B8104: ; 81B8104 bl sub_81B5C94 adds r0, r5, 0 bl sub_81B12C0 -@081B8138: +_081B8138: pop {r4,r5} pop {r0} bx r0 @@ -820508,7 +820508,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 @@ -820523,9 +820523,9 @@ sub_81B81A8: ; 81B81A8 bl sub_81B841C ldr r0, [r6] bl SetMainCallback2 - b @081B8224 + b _081B8224 .pool -@081B8208: +_081B8208: ldrb r0, [r6, 0x8] lsls r0, 28 lsrs r0, 28 @@ -820539,7 +820539,7 @@ sub_81B81A8: ; 81B81A8 movs r1, 0xFF movs r3, 0x1 bl sub_81B0038 -@081B8224: +_081B8224: add sp, 0xC pop {r4-r7} pop {r0} @@ -820557,19 +820557,19 @@ 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 .pool -@081B8264: +_081B8264: ldr r2, =0x0203cec8 movs r1, 0x9 ldrsb r1, [r2, r1] @@ -820581,7 +820581,7 @@ sub_81B8230: ; 81B8230 movs r2, 0 movs r3, 0x1 bl sub_81B1C84 -@081B827C: +_081B827C: ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -820589,7 +820589,7 @@ sub_81B8230: ; 81B8230 adds r1, r0 ldr r0, =sub_81B8104 str r0, [r1] -@081B828A: +_081B828A: pop {r4} pop {r0} bx r0 @@ -820605,7 +820605,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 @@ -820614,7 +820614,7 @@ sub_81B82A0: ; 81B82A0 adds r1, r0 ldr r0, =sub_81B82D4 str r0, [r1] -@081B82C4: +_081B82C4: pop {r4} pop {r0} bx r0 @@ -820630,19 +820630,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 @@ -820653,7 +820653,7 @@ sub_81B82D4: ; 81B82D4 bl bag_add_item lsls r0, 24 cmp r0, 0 - bne @081B8338 + bne _081B8338 adds r0, r4, 0 bl sub_81B841C ldrh r0, [r6] @@ -820661,23 +820661,23 @@ sub_81B82D4: ; 81B82D4 ldr r0, =0x02021fc4 movs r1, 0 bl sub_81B1B5C - b @081B8378 + b _081B8378 .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 str r0, [r1, 0x4] adds r0, r5, 0 bl sub_81B12C0 - b @081B83A8 + b _081B83A8 .pool -@081B835C: +_081B835C: movs r1, 0x9 ldrsb r1, [r7, r1] movs r0, 0x64 @@ -820690,7 +820690,7 @@ sub_81B82D4: ; 81B82D4 adds r0, r4, 0 movs r2, 0x1 bl sub_81B1D68 -@081B8378: +_081B8378: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -820698,12 +820698,12 @@ sub_81B82D4: ; 81B82D4 adds r0, r1 ldr r1, =sub_81B8104 str r1, [r0] - b @081B83A8 + b _081B83A8 .pool -@081B8394: +_081B8394: movs r0, 0x5 bl audio_play -@081B839A: +_081B839A: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -820711,7 +820711,7 @@ sub_81B82D4: ; 81B82D4 adds r1, r0 ldr r0, =sub_81B8104 str r0, [r1] -@081B83A8: +_081B83A8: pop {r4-r7} pop {r0} bx r0 @@ -820750,18 +820750,18 @@ sub_81B83F0: ; 81B83F0 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 .pool -@081B8410: +_081B8410: adds r0, r1, 0 movs r1, 0x1 bl sub_80D6AA4 -@081B8418: +_081B8418: pop {r0} bx r0 thumb_func_end sub_81B83F0 @@ -820774,17 +820774,17 @@ sub_81B841C: ; 81B841C 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 .pool -@081B8438: +_081B8438: adds r0, r1, 0 movs r1, 0x1 bl bag_add_item -@081B8440: +_081B8440: lsls r0, 24 lsrs r0, 24 pop {r1} @@ -820844,13 +820844,13 @@ sub_81B8474: ; 81B8474 movs r1, 0xC bl pokemon_getattr cmp r0, 0 - beq @081B84DC + beq _081B84DC ldr r0, =gUnknown_085E9A08 movs r1, 0x1 bl sub_81B1B5C - b @081B84F2 + b _081B84F2 .pool -@081B84DC: +_081B84DC: adds r0, r5, 0 adds r1, r4, 0 bl sub_80D460C @@ -820859,7 +820859,7 @@ sub_81B8474: ; 81B8474 ldr r0, =gUnknown_085E9A40 movs r1, 0x1 bl sub_81B1B5C -@081B84F2: +_081B84F2: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram ldr r0, =0x03005e00 @@ -820925,11 +820925,11 @@ sub_81B856C: ; 81B856C bl sub_81B85AC lsls r0, 24 cmp r0, 0 - bne @081B858C + bne _081B858C movs r0, 0x2 - b @081B85A4 + b _081B85A4 .pool -@081B858C: +_081B858C: adds r0, r4, 0x1 lsls r0, 24 lsrs r0, 24 @@ -820937,12 +820937,12 @@ sub_81B856C: ; 81B856C 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 @@ -820956,7 +820956,7 @@ sub_81B85AC: ; 81B85AC movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - bne @081B8608 + bne _081B8608 adds r0, r5, 0 movs r1, 0x38 bl pokemon_getattr @@ -820965,37 +820965,37 @@ 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 VarGet 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 .pool -@081B8618: +_081B8618: adds r0, r5, 0 movs r1, 0xB bl pokemon_getattr @@ -821007,12 +821007,12 @@ sub_81B85AC: ; 81B85AC 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 @@ -821020,10 +821020,10 @@ sub_81B85AC: ; 81B85AC 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 @@ -821046,21 +821046,21 @@ 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 .pool -@081B8688: +_081B8688: ldr r0, =0x02021cc4 movs r2, 0 movs r3, 0x1 bl ConvertIntToDecimalString movs r0, 0x11 - b @081B8758 + b _081B8758 .pool -@081B869C: +_081B869C: ldr r0, =0x000040cf bl VarGet lsls r0, 24 @@ -821069,23 +821069,23 @@ sub_81B865C: ; 81B865C adds r0, r1 lsrs r0, 24 cmp r0, 0x1 - bhi @081B86C0 - b @081B8756 + bhi _081B86C0 + b _081B8756 .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] @@ -821114,9 +821114,9 @@ sub_81B865C: ; 81B865C 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] @@ -821127,9 +821127,9 @@ sub_81B865C: ; 81B865C 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 @@ -821138,25 +821138,25 @@ sub_81B865C: ; 81B865C 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 @@ -821174,22 +821174,22 @@ sub_81B8770: ; 81B8770 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 .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 @@ -821203,7 +821203,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 @@ -821215,14 +821215,14 @@ sub_81B879C: ; 81B879C adds r1, r0 ldr r0, =sub_81B87E8 str r0, [r1] - b @081B87E0 + b _081B87E0 .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 @@ -821238,12 +821238,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 @@ -821255,7 +821255,7 @@ sub_81B87E8: ; 81B87E8 adds r1, r0 ldr r0, =sub_81B1370 str r0, [r1] -@081B881C: +_081B881C: pop {r4} pop {r0} bx r0 @@ -821270,19 +821270,19 @@ sub_81B8830: ; 81B8830 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 .pool -@081B884C: +_081B884C: movs r0, 0x2 - b @081B8854 -@081B8850: + b _081B8854 +_081B8850: ldr r0, =0x020375e2 ldrb r0, [r0] -@081B8854: +_081B8854: pop {r1} bx r1 .pool @@ -821296,19 +821296,19 @@ sub_81B885C: ; 81B885C 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 .pool -@081B8878: +_081B8878: movs r0, 0x2 - b @081B8880 -@081B887C: + b _081B8880 +_081B887C: ldr r0, =0x020375e2 ldrb r0, [r0] -@081B8880: +_081B8880: pop {r1} bx r1 .pool @@ -821322,23 +821322,23 @@ sub_81B8888: ; 81B8888 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 .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 .pool @@ -821356,23 +821356,23 @@ sub_81B88BC: ; 81B88BC adds r0, r2 lsrs r0, 24 cmp r0, 0x1 - bhi @081B88E0 + bhi _081B88E0 ldr r0, =gUnknown_085EA126 - b @081B88FA + b _081B88FA .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, =gUnknown_085EA139 - b @081B88FA + b _081B88FA .pool -@081B88F8: +_081B88F8: ldr r0, =gUnknown_085EA155 -@081B88FA: +_081B88FA: pop {r1} bx r1 .pool @@ -821447,20 +821447,20 @@ sub_81B8984: ; 81B8984 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 @@ -821529,33 +821529,33 @@ sub_81B8A2C: ; 81B8A2C 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 .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 .pool -@081B8A74: +_081B8A74: movs r0, 0x7 -@081B8A76: +_081B8A76: pop {r4} pop {r1} bx r1 @@ -821573,14 +821573,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 @@ -821588,9 +821588,9 @@ sub_81B8A7C: ; 81B8A7C bl CopyString ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E97B2 - b @081B8C42 + b _081B8C42 .pool -@081B8AC4: +_081B8AC4: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -821600,23 +821600,23 @@ sub_81B8A7C: ; 81B8A7C movs r1, 0x39 bl pokemon_getattr cmp r0, 0 - bne @081B8AF8 + bne _081B8AF8 ldr r1, =0x02021cc4 adds r0, r4, 0 bl GetMonNickname ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E978F - b @081B8C42 + b _081B8C42 .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 @@ -821626,16 +821626,16 @@ sub_81B8A7C: ; 81B8A7C 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 @@ -821646,12 +821646,12 @@ sub_81B8A7C: ; 81B8A7C movs r1, 0x2D bl pokemon_getattr cmp r0, 0 - beq @081B8B60 + beq _081B8B60 ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E97E5 - b @081B8C42 + b _081B8C42 .pool -@081B8B60: +_081B8B60: adds r0, r5, 0 bl sub_81B8F38 ldr r1, =0x0202449c @@ -821661,25 +821661,25 @@ sub_81B8A7C: ; 81B8A7C lsrs r0, 24 ldrb r1, [r1] cmp r0, r1 - bne @081B8B94 + bne _081B8B94 ldr r1, =0x02021cc4 adds r0, r6, 0 bl GetMonNickname ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E976F - b @081B8C42 + b _081B8C42 .pool -@081B8B94: +_081B8B94: ldr r0, =0x0203cec8 ldrb r0, [r0, 0xB] cmp r0, 0x4 - bne @081B8BA8 + bne _081B8BA8 bl sub_806E994 - b @081B8C46 + b _081B8C46 .pool -@081B8BA8: +_081B8BA8: cmp r0, 0x2 - beq @081B8C20 + beq _081B8C20 adds r0, r5, 0 bl sub_81B8F38 ldr r1, =0x0203cee9 @@ -821706,9 +821706,9 @@ sub_81B8A7C: ; 81B8A7C adds r1, r6, 0 bl sub_81B1288 movs r0, 0x1 - b @081B8C48 + b _081B8C48 .pool -@081B8BFC: +_081B8BFC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -821717,9 +821717,9 @@ sub_81B8A7C: ; 81B8A7C bl GetMonNickname ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9754 - b @081B8C42 + b _081B8C42 .pool -@081B8C20: +_081B8C20: ldr r0, =0x020244b8 ldrb r0, [r0] ldr r1, =0x0202406e @@ -821735,11 +821735,11 @@ sub_81B8A7C: ; 81B8A7C bl GetMonNickname ldr r0, =0x02021fc4 ldr r1, =gUnknown_085E9738 -@081B8C42: +_081B8C42: bl ExpandStringRefs -@081B8C46: +_081B8C46: movs r0, 0 -@081B8C48: +_081B8C48: pop {r3} mov r8, r3 pop {r4-r7} @@ -821775,29 +821775,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 @@ -821810,21 +821810,21 @@ sub_81B8C88: ; 81B8C88 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 .pool -@081B8CFC: +_081B8CFC: movs r5, 0x2 movs r0, 0 bl battle_get_side_with_given_state @@ -821844,25 +821844,25 @@ sub_81B8C88: ; 81B8C88 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 @@ -821872,8 +821872,8 @@ sub_81B8C88: ; 81B8C88 adds r3, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble @081B8D44 -@081B8D58: + ble _081B8D44 +_081B8D58: add sp, 0x8 pop {r4-r6} pop {r0} @@ -821914,20 +821914,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 @@ -821935,29 +821935,29 @@ sub_81B8D88: ; 81B8D88 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 @@ -821967,21 +821967,21 @@ sub_81B8D88: ; 81B8D88 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 .pool -@081B8E28: +_081B8E28: movs r3, 0x2 mov r1, sp ldr r2, =0x0202406e @@ -821994,25 +821994,25 @@ sub_81B8D88: ; 81B8D88 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 @@ -822022,8 +822022,8 @@ sub_81B8D88: ; 81B8D88 adds r3, 0x2 adds r4, 0x1 cmp r4, 0x2 - ble @081B8E5E -@081B8E72: + ble _081B8E5E +_081B8E72: add sp, 0x8 pop {r4-r7} pop {r0} @@ -822045,7 +822045,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 @@ -822057,7 +822057,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 @@ -822070,33 +822070,33 @@ sub_81B8E80: ; 81B8E80 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 .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 @@ -822120,7 +822120,7 @@ sub_81B8E80: ; 81B8E80 ldrb r1, [r1, 0x5] orrs r0, r1 strb r0, [r4, 0x2] -@081B8F2E: +_081B8F2E: add sp, 0x8 pop {r4-r7} pop {r0} @@ -822136,20 +822136,20 @@ 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 .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 @@ -822167,7 +822167,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] @@ -822175,9 +822175,9 @@ sub_81B8F6C: ; 81B8F6C ands r1, r2 orrs r1, r4 strb r1, [r0] - b @081B8FA4 + b _081B8FA4 .pool -@081B8F94: +_081B8F94: ldr r2, =0x0203cf00 adds r2, r3, r2 ldrb r1, [r2] @@ -822186,7 +822186,7 @@ sub_81B8F6C: ; 81B8F6C lsls r1, r4, 4 orrs r0, r1 strb r0, [r2] -@081B8FA4: +_081B8FA4: pop {r4} pop {r0} bx r0 @@ -822230,24 +822230,24 @@ pokemon_order_func: ; 81B8FEC 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 .pool -@081B9018: +_081B9018: adds r0, r2, 0x1 lsls r0, 24 lsrs r2, r0, 24 @@ -822255,9 +822255,9 @@ pokemon_order_func: ; 81B8FEC 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 @@ -822276,7 +822276,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 @@ -822293,7 +822293,7 @@ pokemon_change_order: ; 81B9030 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @081B904A + bls _081B904A adds r0, r5, 0 bl Free pop {r4-r6} @@ -822315,7 +822315,7 @@ sub_81B9080: ; 81B9080 bl memcpy movs r4, 0 movs r6, 0x64 -@081B909A: +_081B909A: adds r0, r4, 0 bl sub_81B8F38 lsls r0, 24 @@ -822332,7 +822332,7 @@ sub_81B9080: ; 81B9080 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x5 - bls @081B909A + bls _081B909A adds r0, r5, 0 bl Free pop {r4-r6} @@ -822350,7 +822350,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 @@ -822362,12 +822362,12 @@ sub_81B90D0: ; 81B90D0 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 @@ -822381,15 +822381,15 @@ sub_81B90D0: ; 81B90D0 add r0, r8 adds r1, r5, 0 bl sub_81B1288 - b @081B9136 + b _081B9136 .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} @@ -822471,7 +822471,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] @@ -822480,16 +822480,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 @@ -822497,12 +822497,12 @@ sub_81B91B4: ; 81B91B4 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 @@ -822511,7 +822511,7 @@ sub_81B91B4: ; 81B91B4 adds r1, r0 ldr r0, =sub_81B9240 str r0, [r1] -@081B9220: +_081B9220: pop {r4-r7} pop {r0} bx r0 @@ -822535,10 +822535,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 .pool @@ -822552,14 +822552,14 @@ sub_81B9270: ; 81B9270 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 .pool @@ -822577,14 +822577,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 @@ -822618,12 +822618,12 @@ sub_81B9294: ; 81B9294 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 @@ -822690,10 +822690,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 str r1, [r0] @@ -822726,12 +822726,12 @@ task_hm_without_phase_2: ; 81B93E0 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 @@ -822765,7 +822765,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 @@ -822779,7 +822779,7 @@ sub_81B9424: ; 81B9424 bl sub_81B0038 adds r0, r5, 0 bl remove_task -@081B945C: +_081B945C: add sp, 0xC pop {r4,r5} pop {r0} @@ -822796,10 +822796,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] @@ -822841,7 +822841,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 @@ -822855,7 +822855,7 @@ sub_81B94D0: ; 81B94D0 bl sub_81B0038 adds r0, r5, 0 bl remove_task -@081B9508: +_081B9508: add sp, 0xC pop {r4,r5} pop {r0} @@ -822891,7 +822891,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 @@ -822905,7 +822905,7 @@ sub_81B953C: ; 81B953C bl sub_81B0038 adds r0, r5, 0 bl remove_task -@081B9574: +_081B9574: add sp, 0xC pop {r4,r5} pop {r0} @@ -822922,12 +822922,12 @@ 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 .pool -@081B95A4: +_081B95A4: ldr r4, =0x020375e2 ldrh r1, [r5] movs r0, 0x64 @@ -822938,7 +822938,7 @@ sub_81B9588: ; 81B9588 lsls r0, 24 lsrs r0, 24 strh r0, [r4] -@081B95BA: +_081B95BA: ldr r0, =0x03005db0 ldr r1, =hm_add_c3_without_phase_2 str r1, [r0] @@ -822958,15 +822958,15 @@ sub_81B95E0: ; 81B95E0 strh r0, [r1] movs r4, 0 adds r5, r1, 0 - b @081B95FA + b _081B95FA .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 @@ -822974,10 +822974,10 @@ sub_81B95E0: ; 81B95E0 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 @@ -823012,7 +823012,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 @@ -823026,7 +823026,7 @@ sub_81B9640: ; 81B9640 bl sub_81B0038 adds r0, r5, 0 bl remove_task -@081B9678: +_081B9678: add sp, 0xC pop {r4,r5} pop {r0} @@ -823067,7 +823067,7 @@ sub_81B96D0: ; 81B96D0 strh r0, [r1] movs r4, 0 adds r5, r1, 0 -@081B96DC: +_081B96DC: ldr r0, =0x020375e0 ldrh r1, [r0] movs r0, 0x64 @@ -823078,16 +823078,16 @@ sub_81B96D0: ; 81B96D0 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 @@ -823151,8 +823151,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 @@ -823168,8 +823168,8 @@ sub_81B9770: ; 81B9770 lsls r4, 16 lsrs r4, 16 cmp r4, 0x2 - bls @081B97A2 -@081B97C4: + bls _081B97A2 +_081B97C4: pop {r3} mov r8, r3 pop {r4-r6} @@ -823312,16 +823312,16 @@ 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 .pool -@081B990C: +_081B990C: ldr r0, =0x020375f0 strh r1, [r0] -@081B9910: +_081B9910: pop {r0} bx r0 .pool @@ -823349,46 +823349,46 @@ sub_81B9918: ; 81B9918 lsrs r0, 16 mov r8, r0 cmp r0, 0x39 - bne @081B999C + bne _081B999C movs r6, 0 - b @081B9980 + b _081B9980 .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} @@ -823504,7 +823504,7 @@ sub_81B9A90: ; 81B9A90 ldrh r1, [r3] ldr r0, =0x0000012b cmp r1, r0 - bhi @081B9AAC + bhi _081B9AAC ldr r2, =0x0203bc88 movs r0, 0x34 muls r1, r0 @@ -823512,7 +823512,7 @@ sub_81B9A90: ; 81B9A90 adds r0, r1 adds r0, 0xC bl ConvertBattleFrontierTrainerSpeechToString -@081B9AAC: +_081B9AAC: pop {r0} bx r0 .pool @@ -823576,7 +823576,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 @@ -823590,13 +823590,13 @@ sub_81B9B28: ; 81B9B28 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b @081B9B76 + b _081B9B76 .pool -@081B9B70: +_081B9B70: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -@081B9B76: +_081B9B76: pop {r4,r5} pop {r0} bx r0 @@ -823737,7 +823737,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 @@ -823751,13 +823751,13 @@ sub_81B9C98: ; 81B9C98 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b @081B9CE6 + b _081B9CE6 .pool -@081B9CE0: +_081B9CE0: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -@081B9CE6: +_081B9CE6: pop {r4,r5} pop {r0} bx r0 @@ -823910,7 +823910,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 @@ -823924,13 +823924,13 @@ sub_81B9E20: ; 81B9E20 strh r1, [r0] ldr r0, =0x020375f0 strh r5, [r0] - b @081B9E6E + b _081B9E6E .pool -@081B9E68: +_081B9E68: ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] -@081B9E6E: +_081B9E6E: pop {r4,r5} pop {r0} bx r0 @@ -823961,7 +823961,7 @@ sub_81B9E94: ; 81B9E94 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] @@ -823969,9 +823969,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 @@ -824002,7 +824002,7 @@ sub_81B9EC0: ; 81B9EC0 mov r0, sp movs r6, 0x5 mov r8, r6 -@081B9EEC: +_081B9EEC: strh r2, [r0] strh r2, [r1] strh r2, [r3] @@ -824014,7 +824014,7 @@ sub_81B9EC0: ; 81B9EC0 add r8, r7 mov r6, r8 cmp r6, 0 - bge @081B9EEC + bge _081B9EEC str r4, [r5] movs r7, 0 mov r10, r7 @@ -824028,7 +824028,7 @@ sub_81B9EC0: ; 81B9EC0 str r6, [sp, 0x24] add r6, r9 str r6, [sp, 0x28] -@081B9F1E: +_081B9F1E: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -824040,11 +824040,11 @@ sub_81B9EC0: ; 81B9EC0 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 @@ -824055,43 +824055,43 @@ sub_81B9EC0: ; 81B9EC0 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, =gBattleFrontierHeldItems 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 @@ -824100,22 +824100,22 @@ sub_81B9EC0: ; 81B9EC0 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 .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 @@ -824150,12 +824150,12 @@ sub_81B9EC0: ; 81B9EC0 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 @@ -824186,10 +824186,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 @@ -824203,33 +824203,33 @@ sub_81BA040: ; 81BA040 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] @@ -824242,38 +824242,38 @@ sub_81BA040: ; 81BA040 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 .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 @@ -824284,7 +824284,7 @@ sub_81BA040: ; 81BA040 movs r5, 0 ldr r7, =0x03001298 mov r8, sp -@081BA13E: +_081BA13E: bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -824303,7 +824303,7 @@ sub_81BA040: ; 81BA040 ldr r1, =0x03005d90 ldrh r6, [r0] ldr r1, [r1] -@081BA166: +_081BA166: movs r4, 0xE7 lsls r4, 4 adds r0, r1, r4 @@ -824312,29 +824312,29 @@ sub_81BA040: ; 81BA040 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 @@ -824342,20 +824342,20 @@ sub_81BA040: ; 81BA040 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, =gBattleFrontierHeldItems 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 @@ -824367,15 +824367,15 @@ sub_81BA040: ; 81BA040 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 @@ -824403,9 +824403,9 @@ sub_81BA040: ; 81BA040 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 @@ -824426,45 +824426,45 @@ Font6Func: ; 81BA250 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 .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 @@ -824472,37 +824472,37 @@ Font6Func: ; 81BA250 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 .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 .pool -@081BA2FC: +_081BA2FC: ldrb r0, [r6, 0x1D] -@081BA2FE: +_081BA2FE: strb r0, [r6, 0x1E] ldr r0, [r6] ldrb r3, [r0] @@ -824511,26 +824511,26 @@ Font6Func: ; 81BA250 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 .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] @@ -824546,49 +824546,49 @@ Font6Func: ; 81BA250 ldrb r0, [r6, 0x9] adds r0, r1 strb r0, [r6, 0x9] -@081BA35E: +_081BA35E: movs r0, 0x2 - b @081BA662 + b _081BA662 .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 .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 @@ -824605,8 +824605,8 @@ Font6Func: ; 81BA250 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 @@ -824624,8 +824624,8 @@ Font6Func: ; 81BA250 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 @@ -824638,8 +824638,8 @@ Font6Func: ; 81BA250 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 @@ -824671,19 +824671,19 @@ Font6Func: ; 81BA250 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 GenerateFontHalfRowLookupTable - 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 @@ -824696,8 +824696,8 @@ Font6Func: ; 81BA250 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] @@ -824705,51 +824705,51 @@ Font6Func: ; 81BA250 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 @@ -824757,20 +824757,20 @@ Font6Func: ; 81BA250 orrs r1, r2 lsrs r1, 24 bl FillWindowPixelBuffer - 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 TextPrinterInitDownArrowCounters -@081BA50E: +_081BA50E: movs r0, 0x3 - b @081BA662 -@081BA512: + b _081BA662 +_081BA512: ldr r0, [r6] ldrb r3, [r0] movs r2, 0x80 @@ -824779,14 +824779,14 @@ Font6Func: ; 81BA250 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 @@ -824800,23 +824800,23 @@ Font6Func: ; 81BA250 adds r0, r1 strb r0, [r6, 0x8] movs r0, 0 - b @081BA662 + b _081BA662 .pool -@081BA554: +_081BA554: adds r0, r6, 0 bl TextPrinterWait 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 TextPrinterWaitWithDownArrow lsls r0, 16 cmp r0, 0 - beq @081BA50E + beq _081BA50E ldrb r0, [r6, 0x4] ldrb r2, [r6, 0xD] lsls r2, 28 @@ -824830,13 +824830,13 @@ Font6Func: ; 81BA250 ldrb r0, [r6, 0x7] strb r0, [r6, 0x9] strb r1, [r6, 0x1C] - b @081BA50E -@081BA590: + b _081BA50E +_081BA590: adds r0, r6, 0 bl TextPrinterWaitWithDownArrow lsls r0, 16 cmp r0, 0 - beq @081BA50E + beq _081BA50E adds r0, r6, 0 bl TextPrinterClearDownArrow ldrb r1, [r6, 0x5] @@ -824854,12 +824854,12 @@ Font6Func: ; 81BA250 strb r0, [r6, 0x8] movs r0, 0x4 strb r0, [r6, 0x1C] - b @081BA50E + b _081BA50E .pool -@081BA5C8: +_081BA5C8: ldrb r2, [r6, 0x1F] cmp r2, 0 - beq @081BA638 + beq _081BA638 ldr r4, =gUnknown_08616124 ldr r5, =0x03005d90 ldr r0, [r5] @@ -824869,7 +824869,7 @@ Font6Func: ; 81BA250 adds r0, r4 ldrb r0, [r0] cmp r2, r0 - bcs @081BA604 + bcs _081BA604 ldrb r0, [r6, 0x4] ldrb r1, [r6, 0xD] lsls r1, 28 @@ -824880,9 +824880,9 @@ Font6Func: ; 81BA250 bl ScrollWindow movs r0, 0 strb r0, [r6, 0x1F] - b @081BA62E + b _081BA62E .pool -@081BA604: +_081BA604: ldrb r0, [r6, 0x4] lsrs r1, 29 adds r1, r4 @@ -824903,38 +824903,38 @@ Font6Func: ; 81BA250 ldrb r0, [r0] subs r1, r0 strb r1, [r6, 0x1F] -@081BA62E: +_081BA62E: ldrb r0, [r6, 0x4] movs r1, 0x2 bl CopyWindowToVram - 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 @@ -825073,24 +825073,24 @@ 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, =gUnknown_08617170 ldrb r1, [r1] lsls r1, 2 adds r1, r0 ldr r0, [r1] bl _call_via_r0 - b @081BAE5C + b _081BAE5C .pool -@081BAE58: +_081BAE58: bl dp01_tbl3_exec_completed -@081BAE5C: +_081BAE5C: pop {r0} bx r0 thumb_func_end bx_exec_buffer_A_ch0_tbl3 @@ -825112,9 +825112,9 @@ sub_81BAE60: ; 81BAE60 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081BAE84 + bne _081BAE84 bl dp01_tbl3_exec_completed -@081BAE84: +_081BAE84: pop {r0} bx r0 .pool @@ -825138,7 +825138,7 @@ sub_81BAE98: ; 81BAE98 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081BAEE8 + bne _081BAEE8 movs r0, 0 bl nullsub_25 ldrb r0, [r4] @@ -825158,7 +825158,7 @@ sub_81BAE98: ; 81BAE98 adds r0, r6 bl RemoveObjectAndFreeTiles bl dp01_tbl3_exec_completed -@081BAEE8: +_081BAEE8: pop {r4-r6} pop {r0} bx r0 @@ -825183,7 +825183,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] @@ -825194,7 +825194,7 @@ sub_81BAF00: ; 81BAF00 movs r1, 0 strb r1, [r0, 0x9] bl dp01_tbl3_exec_completed -@081BAF38: +_081BAF38: pop {r4} pop {r0} bx r0 @@ -825208,18 +825208,18 @@ sub_81BAF48: ; 81BAF48 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 @@ -825234,10 +825234,10 @@ sub_81BAF48: ; 81BAF48 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081BAFD8 - b @081BAFD6 + bne _081BAFD8 + b _081BAFD6 .pool -@081BAFA0: +_081BAFA0: ldr r2, =0x02020630 ldr r5, =0x03005d70 ldr r0, =0x02024064 @@ -825253,7 +825253,7 @@ sub_81BAF48: ; 81BAF48 ldr r2, [r0] ldr r0, =DummyObjectCallback cmp r2, r0 - bne @081BAFD8 + bne _081BAFD8 movs r0, 0x2 eors r3, r0 adds r0, r3, r5 @@ -825264,18 +825264,18 @@ sub_81BAF48: ; 81BAF48 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 @@ -825293,7 +825293,7 @@ sub_81BAF48: ; 81BAF48 adds r0, r1 ldr r1, =sub_81BAF00 str r1, [r0] -@081BB00A: +_081BB00A: pop {r4-r6} pop {r0} bx r0 @@ -825322,9 +825322,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 @@ -825340,9 +825340,9 @@ sub_81BB02C: ; 81BB02C 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 @@ -825358,7 +825358,7 @@ sub_81BB02C: ; 81BB02C ldr r3, [r0] ldr r0, =DummyObjectCallback cmp r3, r0 - bne @081BB196 + bne _081BB196 ldr r0, =0x020241e4 adds r0, r2, r0 ldrb r1, [r0] @@ -825368,14 +825368,14 @@ sub_81BB02C: ; 81BB02C 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] @@ -825388,13 +825388,13 @@ sub_81BB02C: ; 81BB02C 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 @@ -825431,7 +825431,7 @@ sub_81BB02C: ; 81BB02C adds r0, r4 ldrb r0, [r0] bl sub_80729D0 -@081BB134: +_081BB134: ldr r1, =0x03005d7c ldr r4, =0x02024064 ldrb r0, [r4] @@ -825477,7 +825477,7 @@ sub_81BB02C: ; 81BB02C adds r0, r1 ldr r1, =sub_81BAF48 str r1, [r0] -@081BB196: +_081BB196: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -825506,13 +825506,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 .pool @@ -825541,15 +825541,15 @@ 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 .pool -@081BB25C: +_081BB25C: ldr r2, =0x0202406e ldrb r1, [r5] lsls r0, r1, 1 @@ -825561,7 +825561,7 @@ bx_t3_healthbar_update: ; 81BB214 adds r0, r2 bl sub_805E990 bl dp01_tbl3_exec_completed -@081BB276: +_081BB276: pop {r4-r6} pop {r0} bx r0 @@ -825575,9 +825575,9 @@ sub_81BB284: ; 81BB284 bl IsTextPrinterActive 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 @@ -825610,15 +825610,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 @@ -825661,7 +825661,7 @@ sub_81BB29C: ; 81BB29C asrs r1, 16 adds r0, r1 cmp r0, r2 - bcc @081BB3D0 + bcc _081BB3D0 adds r0, r6, 0 movs r1, 0x19 mov r2, sp @@ -825687,26 +825687,26 @@ sub_81BB29C: ; 81BB29C 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 - b @081BB3FA + b _081BB3FA .pool -@081BB3B8: +_081BB3B8: ldr r0, =0x03005e00 mov r2, r9 lsls r1, r2, 2 @@ -825714,9 +825714,9 @@ sub_81BB29C: ; 81BB29C lsls r1, 3 adds r1, r0 ldr r0, =sub_81BB740 - b @081BB3FC + b _081BB3FC .pool -@081BB3D0: +_081BB3D0: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r6, 0 @@ -825730,15 +825730,15 @@ sub_81BB29C: ; 81BB29C str r1, [r0] mov r0, r9 bl remove_task - b @081BB3FE + b _081BB3FE .pool -@081BB3F8: +_081BB3F8: ldr r0, =sub_81BB414 -@081BB3FA: +_081BB3FA: mov r1, r8 -@081BB3FC: +_081BB3FC: str r0, [r1] -@081BB3FE: +_081BB3FE: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -825862,12 +825862,12 @@ 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 .pool -@081BB514: +_081BB514: ldrb r0, [r6, 0x8] mov r9, r0 ldrh r2, [r6, 0xA] @@ -825890,7 +825890,7 @@ sub_81BB4E4: ; 81BB4E4 movs r0, 0x1 negs r0, r0 cmp r4, r0 - bne @081BB610 + bne _081BB610 movs r0, 0x21 bl m4aSongNumStop movs r0, 0x64 @@ -825935,7 +825935,7 @@ sub_81BB4E4: ; 81BB4E4 ldr r0, [sp, 0x4] adds r0, r4 cmp r0, r1 - blt @081BB5F4 + blt _081BB5F4 adds r0, r5, 0 movs r1, 0x19 mov r2, sp @@ -825958,9 +825958,9 @@ sub_81BB4E4: ; 81BB4E4 strb r5, [r4] ldr r0, =sub_81BB628 str r0, [r6] - b @081BB610 + b _081BB610 .pool -@081BB5F4: +_081BB5F4: str r0, [sp, 0x4] add r2, sp, 0x4 adds r0, r5, 0 @@ -825973,7 +825973,7 @@ sub_81BB4E4: ; 81BB4E4 str r1, [r0] mov r0, r8 bl remove_task -@081BB610: +_081BB610: add sp, 0x8 pop {r3-r5} mov r8, r3 @@ -826001,7 +826001,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 @@ -826010,9 +826010,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 @@ -826053,7 +826053,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 @@ -826067,7 +826067,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 @@ -826076,16 +826076,16 @@ 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 .pool -@081BB708: +_081BB708: ldr r0, =0x03005d70 adds r0, r5, r0 ldrb r0, [r0] @@ -826095,7 +826095,7 @@ sub_81BB688: ; 81BB688 adds r1, r2 movs r2, 0 bl healthbar_draw_field_maybe -@081BB71C: +_081BB71C: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -826103,7 +826103,7 @@ sub_81BB688: ; 81BB688 adds r1, r0 ldr r0, =sub_81BB740 str r0, [r1] -@081BB72A: +_081BB72A: pop {r4-r7} pop {r0} bx r0 @@ -826161,7 +826161,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 @@ -826200,7 +826200,7 @@ sub_81BB78C: ; 81BB78C ldrb r0, [r0] bl sub_8072984 bl dp01_tbl3_exec_completed -@081BB808: +_081BB808: pop {r4-r6} pop {r0} bx r0 @@ -826223,7 +826223,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] @@ -826247,7 +826247,7 @@ sub_81BB828: ; 81BB828 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl3_exec_completed -@081BB87C: +_081BB87C: pop {r4-r6} pop {r0} bx r0 @@ -826261,9 +826261,9 @@ sub_81BB898: ; 81BB898 bl IsTextPrinterActive 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 @@ -826284,7 +826284,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] @@ -826297,14 +826297,14 @@ bx_blink_t3: ; 81BB8B0 ldr r0, =0x020244b9 strb r3, [r0] bl dp01_tbl3_exec_completed - b @081BB926 + b _081BB926 .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] @@ -826318,11 +826318,11 @@ bx_blink_t3: ; 81BB8B0 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 @@ -826345,7 +826345,7 @@ sub_81BB92C: ; 81BB92C ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081BB97E + bne _081BB97E adds r0, r3, 0 bl sub_805E408 ldr r0, =0x020244d0 @@ -826358,19 +826358,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 str r0, [r1] -@081BB97E: +_081BB97E: pop {r4} pop {r0} bx r0 @@ -826393,7 +826393,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 @@ -826406,9 +826406,9 @@ dp01t_35_3_free_vram: ; 81BB9A0 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081BB9DC + bne _081BB9DC bl dp01_tbl3_exec_completed -@081BB9DC: +_081BB9DC: pop {r0} bx r0 .pool @@ -826432,7 +826432,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 @@ -826502,7 +826502,7 @@ sub_81BB9F4: ; 81BB9F4 adds r0, r1 ldr r1, =sub_81BB92C str r1, [r0] -@081BBAB0: +_081BBAB0: pop {r3} mov r8, r3 pop {r4-r7} @@ -826527,7 +826527,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] @@ -826537,7 +826537,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] @@ -826552,7 +826552,7 @@ sub_81BBAE8: ; 81BBAE8 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081BBB60 + bne _081BBB60 ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -826563,7 +826563,7 @@ sub_81BBAE8: ; 81BBAE8 movs r0, 0x8 ands r0, r1 cmp r0, 0 - bne @081BBB60 + bne _081BBB60 adds r0, r3, r5 bl RemoveObjectAndFreeTiles ldr r1, =0x03005d60 @@ -826572,7 +826572,7 @@ sub_81BBAE8: ; 81BBAE8 adds r0, r1 ldr r1, =sub_81BB9F4 str r1, [r0] -@081BBB60: +_081BBB60: pop {r4-r6} pop {r0} bx r0 @@ -826595,7 +826595,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] @@ -826609,9 +826609,9 @@ dp01_tbl3_exec_completed: ; 81BBB8C adds r0, r1 movs r1, 0x38 strb r1, [r0] - b @081BBBF2 + b _081BBBF2 .pool -@081BBBE0: +_081BBBE0: ldr r2, =0x02024068 ldr r1, =gUnknown_0832A328 ldrb r0, [r4] @@ -826621,7 +826621,7 @@ dp01_tbl3_exec_completed: ; 81BBB8C ldr r0, [r2] bics r0, r1 str r0, [r2] -@081BBBF2: +_081BBBF2: add sp, 0x4 pop {r4} pop {r0} @@ -826645,9 +826645,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 .pool @@ -826669,9 +826669,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 .pool @@ -826690,7 +826690,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 @@ -826698,28 +826698,28 @@ dp01t_00_3_getattr: ; 81BBC64 mov r1, sp bl dp01_getattr_by_ch1_for_player_pokemon adds r6, r0, 0 - b @081BBCBE + b _081BBCBE .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 @@ -826752,78 +826752,78 @@ 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 .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 @@ -826860,7 +826860,7 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 str r0, [sp, 0x88] mov r8, r4 add r4, sp, 0xC -@081BBE54: +_081BBE54: adds r1, r6, 0 adds r1, 0xD mov r0, r8 @@ -826876,7 +826876,7 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 adds r4, 0x2 adds r6, 0x1 cmp r6, 0x3 - ble @081BBE54 + ble _081BBE54 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -827054,33 +827054,33 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 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 .pool -@081BC02C: +_081BC02C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xB - b @081BC3A6 + b _081BC3A6 .pool -@081BC03C: +_081BC03C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0xC - b @081BC3A6 + b _081BC3A6 .pool -@081BC04C: +_081BC04C: movs r6, 0 add r2, sp, 0x58 mov r9, r2 @@ -827092,7 +827092,7 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 ldr r0, =0x020244ec adds r4, r1, r0 mov r8, r9 -@081BC062: +_081BC062: adds r1, r6, 0 adds r1, 0xD adds r0, r4, 0 @@ -827110,7 +827110,7 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 add r8, r0 adds r6, 0x1 cmp r6, 0x3 - ble @081BC062 + ble _081BC062 movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -827121,17 +827121,17 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 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 .pool -@081BC0B4: +_081BC0B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -827142,16 +827142,16 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 adds r1, r2 ldrb r1, [r1] adds r1, 0x9 - b @081BC3A6 + b _081BC3A6 .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 @@ -827161,7 +827161,7 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 strb r0, [r1] adds r6, 0x1 cmp r6, 0x3 - ble @081BC0DC + ble _081BC0DC movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -827171,9 +827171,9 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 adds r1, r7, r6 strb r0, [r1] adds r6, 0x1 - b @081BC46E + b _081BC46E .pool -@081BC10C: +_081BC10C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -827184,23 +827184,23 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 adds r1, r2 ldrb r1, [r1] adds r1, 0x8 - b @081BC466 + b _081BC466 .pool -@081BC128: +_081BC128: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1 - b @081BC142 + b _081BC142 .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] @@ -827215,105 +827215,105 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 lsrs r0, 16 strb r0, [r7, 0x2] movs r6, 0x3 - b @081BC46E + b _081BC46E .pool -@081BC168: +_081BC168: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1A - b @081BC466 + b _081BC466 .pool -@081BC178: +_081BC178: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1B - b @081BC466 + b _081BC466 .pool -@081BC188: +_081BC188: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1C - b @081BC466 + b _081BC466 .pool -@081BC198: +_081BC198: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1D - b @081BC466 + b _081BC466 .pool -@081BC1A8: +_081BC1A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1E - b @081BC466 + b _081BC466 .pool -@081BC1B8: +_081BC1B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x1F - b @081BC466 + b _081BC466 .pool -@081BC1C8: +_081BC1C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x20 - b @081BC466 + b _081BC466 .pool -@081BC1D8: +_081BC1D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x22 - b @081BC466 + b _081BC466 .pool -@081BC1E8: +_081BC1E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x23 - b @081BC466 + b _081BC466 .pool -@081BC1F8: +_081BC1F8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x24 - b @081BC466 + b _081BC466 .pool -@081BC208: +_081BC208: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x25 - b @081BC466 + b _081BC466 .pool -@081BC218: +_081BC218: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x26 - b @081BC466 + b _081BC466 .pool -@081BC228: +_081BC228: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -827344,79 +827344,79 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 bl pokemon_getattr strb r0, [r7, 0x5] movs r6, 0x6 - b @081BC46E + b _081BC46E .pool -@081BC278: +_081BC278: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x27 - b @081BC466 + b _081BC466 .pool -@081BC288: +_081BC288: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x28 - b @081BC466 + b _081BC466 .pool -@081BC298: +_081BC298: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x29 - b @081BC466 + b _081BC466 .pool -@081BC2A8: +_081BC2A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2A - b @081BC466 + b _081BC466 .pool -@081BC2B8: +_081BC2B8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2B - b @081BC466 + b _081BC466 .pool -@081BC2C8: +_081BC2C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2C - b @081BC466 + b _081BC466 .pool -@081BC2D8: +_081BC2D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0 - b @081BC302 + b _081BC302 .pool -@081BC2E8: +_081BC2E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x9 - b @081BC3A6 + b _081BC3A6 .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] @@ -827433,71 +827433,71 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 lsrs r0, r1, 24 strb r0, [r7, 0x3] movs r6, 0x4 - b @081BC46E + b _081BC46E .pool -@081BC32C: +_081BC32C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x38 - b @081BC466 + b _081BC466 .pool -@081BC33C: +_081BC33C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x39 - b @081BC3A6 + b _081BC3A6 .pool -@081BC34C: +_081BC34C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3A - b @081BC3A6 + b _081BC3A6 .pool -@081BC35C: +_081BC35C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3B - b @081BC3A6 + b _081BC3A6 .pool -@081BC36C: +_081BC36C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3C - b @081BC3A6 + b _081BC3A6 .pool -@081BC37C: +_081BC37C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3D - b @081BC3A6 + b _081BC3A6 .pool -@081BC38C: +_081BC38C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x3E - b @081BC3A6 + b _081BC3A6 .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 @@ -827505,99 +827505,99 @@ dp01_getattr_by_ch1_for_player_pokemon: ; 81BBCD8 lsrs r0, 8 strb r0, [r7, 0x1] movs r6, 0x2 - b @081BC46E + b _081BC46E .pool -@081BC3BC: +_081BC3BC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x16 - b @081BC466 + b _081BC466 .pool -@081BC3CC: +_081BC3CC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x17 - b @081BC466 + b _081BC466 .pool -@081BC3DC: +_081BC3DC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x18 - b @081BC466 + b _081BC466 .pool -@081BC3EC: +_081BC3EC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x21 - b @081BC466 + b _081BC466 .pool -@081BC3FC: +_081BC3FC: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x2F - b @081BC466 + b _081BC466 .pool -@081BC40C: +_081BC40C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x30 - b @081BC466 + b _081BC466 .pool -@081BC41C: +_081BC41C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b @081BC466 + b _081BC466 .pool -@081BC42C: +_081BC42C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b @081BC466 + b _081BC466 .pool -@081BC43C: +_081BC43C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b @081BC466 + b _081BC466 .pool -@081BC44C: +_081BC44C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b @081BC466 + b _081BC466 .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} @@ -827629,32 +827629,32 @@ 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 .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} @@ -827682,78 +827682,78 @@ 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 .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 @@ -827803,7 +827803,7 @@ sub_81BC4E8: ; 81BC4E8 adds r7, 0x24 adds r4, r6, 0 adds r4, 0xC -@081BC682: +_081BC682: mov r1, r8 adds r1, 0xD mov r0, r9 @@ -827820,7 +827820,7 @@ sub_81BC4E8: ; 81BC4E8 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @081BC682 + ble _081BC682 movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -827932,9 +827932,9 @@ sub_81BC4E8: ; 81BC4E8 movs r1, 0x3F ldr r2, [sp, 0x14] bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC7B4: +_081BC7B4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -827945,9 +827945,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0xB bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC7D4: +_081BC7D4: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -827958,9 +827958,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0xC bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC7F4: +_081BC7F4: movs r0, 0 mov r8, r0 movs r0, 0xC @@ -827974,7 +827974,7 @@ sub_81BC4E8: ; 81BC4E8 adds r6, r3, 0 adds r6, 0x8 adds r4, r3, 0 -@081BC80E: +_081BC80E: mov r1, r8 adds r1, 0xD adds r0, r7, 0 @@ -827991,7 +827991,7 @@ sub_81BC4E8: ; 81BC4E8 add r8, r0 mov r0, r8 cmp r0, 0x3 - ble @081BC80E + ble _081BC80E movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -827999,9 +827999,9 @@ sub_81BC4E8: ; 81BC4E8 movs r1, 0x15 mov r2, r9 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC84C: +_081BC84C: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828014,9 +828014,9 @@ sub_81BC4E8: ; 81BC4E8 adds r1, r2, r1 ldrb r1, [r1] adds r1, 0x9 - b @081BC8F0 + b _081BC8F0 .pool -@081BC874: +_081BC874: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -828057,9 +828057,9 @@ sub_81BC4E8: ; 81BC4E8 adds r0, r4, 0 movs r1, 0x15 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC8D8: +_081BC8D8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828072,13 +828072,13 @@ sub_81BC4E8: ; 81BC4E8 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 .pool -@081BC908: +_081BC908: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828089,9 +828089,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x1 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC928: +_081BC928: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828102,9 +828102,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x19 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC948: +_081BC948: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828115,9 +828115,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x1A bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC968: +_081BC968: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828128,9 +828128,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x1B bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC988: +_081BC988: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828141,9 +828141,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x1C bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC9A8: +_081BC9A8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828154,9 +828154,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x1D bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC9C8: +_081BC9C8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828167,9 +828167,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x1E bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BC9E8: +_081BC9E8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828180,9 +828180,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x1F bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCA08: +_081BCA08: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828193,9 +828193,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x20 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCA28: +_081BCA28: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828206,9 +828206,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x22 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCA48: +_081BCA48: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828219,9 +828219,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x23 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCA68: +_081BCA68: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828232,9 +828232,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x24 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCA88: +_081BCA88: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828245,9 +828245,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x25 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCAA8: +_081BCAA8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828258,9 +828258,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x26 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCAC8: +_081BCAC8: movs r0, 0x64 adds r4, r5, 0 muls r4, r0 @@ -828306,9 +828306,9 @@ sub_81BC4E8: ; 81BC4E8 adds r0, r7, 0x5 adds r2, r0 adds r0, r4, 0 - b @081BCBE8 + b _081BCBE8 .pool -@081BCB38: +_081BCB38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828319,9 +828319,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x27 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCB58: +_081BCB58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828332,9 +828332,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x28 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCB78: +_081BCB78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828345,9 +828345,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x29 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCB98: +_081BCB98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828358,9 +828358,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x2A bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCBB8: +_081BCBB8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828371,9 +828371,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x2B bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCBD8: +_081BCBD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828382,12 +828382,12 @@ sub_81BC4E8: ; 81BC4E8 ldrb r2, [r1] lsls r2, 9 adds r2, r7 -@081BCBE8: +_081BCBE8: movs r1, 0x2C bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCBF8: +_081BCBF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828398,9 +828398,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCC18: +_081BCC18: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828411,9 +828411,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x9 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCC38: +_081BCC38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828424,9 +828424,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x37 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCC58: +_081BCC58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828437,9 +828437,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x38 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCC78: +_081BCC78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828450,9 +828450,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x39 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCC98: +_081BCC98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828463,9 +828463,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x3A bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCCB8: +_081BCCB8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828476,9 +828476,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x3B bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCCD8: +_081BCCD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828489,9 +828489,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x3C bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCCF8: +_081BCCF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828502,9 +828502,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x3D bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCD18: +_081BCD18: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828515,9 +828515,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x3E bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCD38: +_081BCD38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828528,9 +828528,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x3F bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCD58: +_081BCD58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828541,9 +828541,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x16 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCD78: +_081BCD78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828554,9 +828554,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x17 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCD98: +_081BCD98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828567,9 +828567,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x18 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCDB8: +_081BCDB8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828580,9 +828580,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x21 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCDD8: +_081BCDD8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828593,9 +828593,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x2F bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCDF8: +_081BCDF8: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828606,9 +828606,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x30 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCE18: +_081BCE18: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828619,9 +828619,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x32 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCE38: +_081BCE38: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828632,9 +828632,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x33 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCE58: +_081BCE58: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828645,9 +828645,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x34 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCE78: +_081BCE78: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828658,9 +828658,9 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x35 bl pokemon_setattr - b @081BCEAE + b _081BCEAE .pool -@081BCE98: +_081BCE98: movs r0, 0x64 muls r0, r5 ldr r1, =0x020244ec @@ -828671,7 +828671,7 @@ sub_81BC4E8: ; 81BC4E8 adds r2, r7 movs r1, 0x36 bl pokemon_setattr -@081BCEAE: +_081BCEAE: ldr r2, =0x0202406e ldr r0, =0x02024064 ldrb r1, [r0] @@ -828719,11 +828719,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 @@ -828740,8 +828740,8 @@ sub_81BCEE4: ; 81BCEE4 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} @@ -829086,7 +829086,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] @@ -829101,9 +829101,9 @@ sub_81BD260: ; 81BD260 adds r0, r1 ldr r1, =sub_81BD2F0 str r1, [r0] - b @081BD2DE + b _081BD2DE .pool -@081BD2A8: +_081BD2A8: ldr r5, =0x020241e4 adds r0, r2, r5 ldrb r1, [r0] @@ -829127,7 +829127,7 @@ sub_81BD260: ; 81BD260 ldrb r0, [r0] bl sub_8072984 bl dp01_tbl3_exec_completed -@081BD2DE: +_081BD2DE: pop {r4-r6} pop {r0} bx r0 @@ -829148,12 +829148,12 @@ 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 .pool -@081BD318: +_081BD318: ldr r1, [r4] lsls r0, r2, 2 adds r0, r1 @@ -829161,12 +829161,12 @@ sub_81BD2F0: ; 81BD2F0 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] @@ -829176,15 +829176,15 @@ sub_81BD2F0: ; 81BD2F0 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 @@ -829197,7 +829197,7 @@ sub_81BD2F0: ; 81BD2F0 adds r0, r1 ldr r1, =sub_81BB828 str r1, [r0] -@081BD36E: +_081BD36E: pop {r4-r6} pop {r0} bx r0 @@ -829214,15 +829214,15 @@ 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, =gUnknown_08305D2C ldrb r1, [r0, 0x1C] - b @081BD3BE + b _081BD3BE .pool -@081BD3A8: +_081BD3A8: ldrh r0, [r2] bl sub_8162AA0 lsls r0, 24 @@ -829233,7 +829233,7 @@ sub_81BD37C: ; 81BD37C lsls r0, r4, 2 adds r0, r1 ldrb r1, [r0] -@081BD3BE: +_081BD3BE: movs r0, 0x8 subs r0, r1 lsls r0, 18 @@ -829245,7 +829245,7 @@ sub_81BD37C: ; 81BD37C ldrh r1, [r0] ldr r0, =0x00000c03 cmp r1, r0 - bne @081BD494 + bne _081BD494 ldr r5, =0x02024064 ldrb r1, [r5] adds r0, r4, 0 @@ -829316,9 +829316,9 @@ sub_81BD37C: ; 81BD37C adds r0, r4 ldr r1, =sub_805D7AC str r1, [r0] - b @081BD57C + b _081BD57C .pool -@081BD494: +_081BD494: adds r5, r4, 0 ldr r6, =0x02024064 ldrb r1, [r6] @@ -829429,7 +829429,7 @@ sub_81BD37C: ; 81BD37C movs r2, 0x1 orrs r1, r2 strb r1, [r0] -@081BD57C: +_081BD57C: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -829541,7 +829541,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 @@ -829549,12 +829549,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] @@ -829565,16 +829565,16 @@ sub_81BD674: ; 81BD674 ldrb r1, [r0, 0x4] adds r1, 0x1 strb r1, [r0, 0x4] - b @081BD73E + b _081BD73E .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] @@ -829625,7 +829625,7 @@ sub_81BD674: ; 81BD674 adds r0, r1 ldr r1, =sub_81BB78C str r1, [r0] -@081BD73E: +_081BD73E: pop {r4-r6} pop {r0} bx r0 @@ -829672,9 +829672,9 @@ sub_81BD790: ; 81BD790 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] @@ -829774,11 +829774,11 @@ sub_81BD790: ; 81BD790 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0 - beq @081BD898 + beq _081BD898 bl dp01_tbl3_exec_completed - b @081BD8B6 + b _081BD8B6 .pool -@081BD898: +_081BD898: ldr r0, =0x020244d0 ldr r0, [r0] ldrb r1, [r6] @@ -829794,7 +829794,7 @@ sub_81BD790: ; 81BD790 adds r0, r1 ldr r1, =bx_move_anim_3 str r1, [r0] -@081BD8B6: +_081BD8B6: pop {r4-r6} pop {r0} bx r0 @@ -829835,20 +829835,20 @@ 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 .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 @@ -829856,7 +829856,7 @@ bx_move_anim_3: ; 81BD8C8 movs r0, 0xC ands r0, r2 cmp r0, 0x4 - bne @081BD94C + bne _081BD94C movs r0, 0x8 orrs r0, r2 strb r0, [r1] @@ -829865,7 +829865,7 @@ bx_move_anim_3: ; 81BD8C8 adds r1, r2, 0 movs r3, 0x5 bl move_anim_start_t4 -@081BD94C: +_081BD94C: ldr r0, [r7] ldrb r1, [r6] ldr r2, [r0, 0x4] @@ -829875,13 +829875,13 @@ bx_move_anim_3: ; 81BD8C8 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 @@ -829895,15 +829895,15 @@ bx_move_anim_3: ; 81BD8C8 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] @@ -829915,10 +829915,10 @@ bx_move_anim_3: ; 81BD8C8 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 @@ -829933,7 +829933,7 @@ bx_move_anim_3: ; 81BD8C8 negs r0, r0 ands r0, r2 strb r0, [r1] -@081BD9D8: +_081BD9D8: ldr r0, =0x020244d0 ldr r2, [r0] ldr r0, =0x02024064 @@ -829945,16 +829945,16 @@ bx_move_anim_3: ; 81BD8C8 adds r0, r2 movs r1, 0x3 strb r1, [r0, 0x4] - b @081BDA3C + b _081BDA3C .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 @@ -829975,7 +829975,7 @@ bx_move_anim_3: ; 81BD8C8 adds r0, r2 strb r4, [r0, 0x4] bl dp01_tbl3_exec_completed -@081BDA3C: +_081BDA3C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -830065,11 +830065,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 @@ -830079,7 +830079,7 @@ sub_81BDAC8: ; 81BDAC8 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 @@ -830093,11 +830093,11 @@ sub_81BDAC8: ; 81BDAC8 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 @@ -830127,7 +830127,7 @@ sub_81BDB7C: ; 81BDB7C 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 @@ -830137,12 +830137,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 @@ -830150,19 +830150,19 @@ sub_81BDB7C: ; 81BDB7C 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 @@ -830216,7 +830216,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 @@ -830246,9 +830246,9 @@ sub_81BDC10: ; 81BDC10 str r7, [sp] mov r2, r8 bl sub_807294C - b @081BDCCA + b _081BDCCA .pool -@081BDCA0: +_081BDCA0: ldr r1, =0x0202406e lsls r0, r4, 1 adds r0, r1 @@ -830268,7 +830268,7 @@ sub_81BDC10: ; 81BDC10 str r7, [sp] movs r3, 0 bl sub_807294C -@081BDCCA: +_081BDCCA: ldr r1, =0x03005d60 ldr r0, =0x02024064 ldrb r0, [r0] @@ -830305,11 +830305,11 @@ 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 .pool -@081BDD38: +_081BDD38: movs r0, 0x1 bl load_gfxc_health_bar adds r0, r4, 0 @@ -830345,7 +830345,7 @@ sub_81BDD00: ; 81BDD00 adds r0, r1 ldr r1, =nullsub_21 str r1, [r0] -@081BDD84: +_081BDD84: pop {r4-r7} pop {r0} bx r0 @@ -830360,7 +830360,7 @@ sub_81BDD9C: ; 81BDD9C bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @081BDDF0 + bne _081BDDF0 ldr r0, =0x03005d70 ldrb r1, [r4] adds r0, r1, r0 @@ -830394,7 +830394,7 @@ sub_81BDD9C: ; 81BDD9C adds r0, r1 ldr r1, =sub_81BBC04 str r1, [r0] -@081BDDF0: +_081BDDF0: pop {r4} pop {r0} bx r0 @@ -830409,7 +830409,7 @@ sub_81BDE14: ; 81BDE14 bl mplay_80342A4 lsls r0, 24 cmp r0, 0 - bne @081BDE64 + bne _081BDE64 ldr r4, =0x02023064 ldrb r3, [r5] lsls r3, 9 @@ -830441,7 +830441,7 @@ sub_81BDE14: ; 81BDE14 adds r0, r1 ldr r1, =sub_81BBC04 str r1, [r0] -@081BDE64: +_081BDE64: pop {r4,r5} pop {r0} bx r0 @@ -830612,11 +830612,11 @@ 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 .pool -@081BDFB0: +_081BDFB0: ldr r1, =0x020244b9 movs r0, 0x1 strb r0, [r1] @@ -830637,7 +830637,7 @@ dp01t_29_3_blink: ; 81BDF7C adds r0, r1 ldr r1, =bx_blink_t3 str r1, [r0] -@081BDFDA: +_081BDFDA: pop {r4} pop {r0} bx r0 @@ -830661,9 +830661,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 @@ -830696,7 +830696,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 @@ -830709,9 +830709,9 @@ sub_81BE03C: ; 81BE03C lsls r1, 8 orrs r0, r1 bl song_play_for_text - b @081BE08C + b _081BE08C .pool -@081BE078: +_081BE078: adds r0, r4, 0x1 adds r0, r3, r0 ldrb r0, [r0] @@ -830721,7 +830721,7 @@ sub_81BE03C: ; 81BE03C lsls r1, 8 orrs r0, r1 bl fanfare_play -@081BE08C: +_081BE08C: bl dp01_tbl3_exec_completed pop {r4,r5} pop {r0} @@ -830863,7 +830863,7 @@ sub_81BE10C: ; 81BE10C ldrh r1, [r2] ldr r0, =0x00000c03 cmp r1, r0 - bne @081BE1FC + bne _081BE1FC ldr r0, =gTrainerBackPicPaletteTable ldr r0, [r0, 0x38] lsls r4, 4 @@ -830872,9 +830872,9 @@ sub_81BE10C: ; 81BE10C adds r1, r4, r2 movs r2, 0x20 bl decompress_palette - b @081BE21A + b _081BE21A .pool -@081BE1FC: +_081BE1FC: ldrh r0, [r2] bl sub_8162AA0 lsls r0, 24 @@ -830888,7 +830888,7 @@ sub_81BE10C: ; 81BE10C adds r1, r4, r2 movs r2, 0x20 bl decompress_palette -@081BE21A: +_081BE21A: ldr r2, =0x02020630 ldr r1, =0x020241e4 ldr r5, =0x02024064 @@ -830928,7 +830928,7 @@ sub_81BE10C: ; 81BE10C movs r0, 0x1 ands r0, r1 cmp r0, 0 - beq @081BE27E + beq _081BE27E ldr r0, =0x020244b4 adds r0, r2, r0 ldrb r1, [r0] @@ -830938,7 +830938,7 @@ sub_81BE10C: ; 81BE10C adds r0, r4 ldr r1, =sub_8073C30 str r1, [r0] -@081BE27E: +_081BE27E: ldr r0, [r3] ldr r2, [r0, 0x8] ldrb r0, [r2, 0x9] @@ -830975,12 +830975,12 @@ 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 .pool -@081BE2F4: +_081BE2F4: ldr r7, =0x02024064 ldrb r0, [r7] mov r9, r0 @@ -830989,14 +830989,14 @@ sub_81BE2C8: ; 81BE2C8 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 @@ -831010,9 +831010,9 @@ sub_81BE2C8: ; 81BE2C8 ldrb r0, [r7] movs r1, 0 bl sub_81BD0E4 - b @081BE398 + b _081BE398 .pool -@081BE344: +_081BE344: ldr r4, =0x02023064 ldrb r0, [r7] lsls r1, r0, 9 @@ -831052,7 +831052,7 @@ sub_81BE2C8: ; 81BE2C8 ldrb r0, [r7] eors r0, r6 strb r0, [r7] -@081BE398: +_081BE398: ldr r1, =0x03005d60 ldr r2, =0x02024064 ldrb r0, [r2] @@ -831064,7 +831064,7 @@ sub_81BE2C8: ; 81BE2C8 strb r3, [r2] mov r0, r8 bl remove_task -@081BE3B0: +_081BE3B0: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -831085,16 +831085,16 @@ 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 .pool -@081BE404: +_081BE404: ldr r6, =0x020244d0 ldr r0, [r6] ldr r5, =0x02024064 @@ -831137,7 +831137,7 @@ dp01t_30_3_80EB11C: ; 81BE3D4 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @081BE46C + beq _081BE46C ldr r0, [r6] ldr r1, [r0, 0x4] lsls r0, r2, 1 @@ -831146,14 +831146,14 @@ dp01t_30_3_80EB11C: ; 81BE3D4 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 str r0, [r1] -@081BE478: +_081BE478: pop {r4-r6} pop {r0} bx r0 @@ -831178,7 +831178,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] @@ -831189,7 +831189,7 @@ sub_81BE498: ; 81BE498 movs r1, 0 strb r1, [r0, 0x5] bl dp01_tbl3_exec_completed -@081BE4D0: +_081BE4D0: pop {r4} pop {r0} bx r0 @@ -831212,7 +831212,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 @@ -831223,7 +831223,7 @@ sub_81BE4E0: ; 81BE4E0 adds r0, r2 ldr r1, =sub_8073C30 str r1, [r0] -@081BE512: +_081BE512: bl dp01_tbl3_exec_completed pop {r0} bx r0 @@ -831246,7 +831246,7 @@ sub_81BE53C: ; 81BE53C bl sub_80A6A90 lsls r0, 24 cmp r0, 0 - beq @081BE582 + beq _081BE582 ldr r3, =0x02020630 ldr r0, =0x020241e4 ldrb r1, [r4] @@ -831273,7 +831273,7 @@ sub_81BE53C: ; 81BE53C strb r0, [r2] ldrb r0, [r4] bl sub_805E408 -@081BE582: +_081BE582: bl dp01_tbl3_exec_completed pop {r4} pop {r0} @@ -831290,7 +831290,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 @@ -831311,18 +831311,18 @@ 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 .pool -@081BE5E8: +_081BE5E8: ldr r0, =0x03005d60 ldrb r1, [r6] lsls r1, 2 adds r1, r0 ldr r0, =bx_80E8A6C str r0, [r1] -@081BE5F4: +_081BE5F4: add sp, 0x4 pop {r4-r6} pop {r0} @@ -831389,17 +831389,17 @@ sub_81BE66C: ; 81BE66C movs r0, 0xD0 lsls r0, 5 cmp r1, r0 - bne @081BE690 + bne _081BE690 movs r0, 0xA7 lsls r0, 1 bl FlagGet lsls r0, 24 lsrs r0, 24 - b @081BE692 + b _081BE692 .pool -@081BE690: +_081BE690: movs r0, 0 -@081BE692: +_081BE692: pop {r1} bx r1 thumb_func_end sub_81BE66C @@ -831431,25 +831431,25 @@ sub_81BE6B8: ; 81BE6B8 ldr r4, =0x0203cf18 ldr r0, [r4] cmp r0, 0 - beq @081BE6CC + beq _081BE6CC movs r0, 0 str r0, [r4] - b @081BE718 + b _081BE718 .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 FlagGet lsls r0, 24 cmp r0, 0 - beq @081BE718 + beq _081BE718 movs r0, 0xC8 bl AllocZeroed str r0, [r4] @@ -831469,7 +831469,7 @@ sub_81BE6B8: ; 81BE6B8 bl AddTask ldr r1, [r4] strb r0, [r1] -@081BE718: +_081BE718: pop {r4} pop {r0} bx r0 @@ -831485,26 +831485,26 @@ sub_81BE72C: ; 81BE72C movs r0, 0xD0 lsls r0, 5 cmp r1, r0 - bne @081BE788 + bne _081BE788 movs r0, 0xA7 lsls r0, 1 bl FlagGet 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 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 @@ -831519,7 +831519,7 @@ sub_81BE72C: ; 81BE72C bl Free movs r0, 0 str r0, [r4] -@081BE788: +_081BE788: pop {r4} pop {r0} bx r0 @@ -831533,13 +831533,13 @@ sub_81BE79C: ; 81BE79C bl VarGet lsls r0, 16 cmp r0, 0 - beq @081BE7B8 + beq _081BE7B8 movs r0, 0xA7 lsls r0, 1 bl FlagReset - b @081BE7EE + b _081BE7EE .pool -@081BE7B8: +_081BE7B8: bl GenerateRandomNumber lsls r0, 16 lsrs r4, r0, 16 @@ -831550,21 +831550,21 @@ sub_81BE79C: ; 81BE79C 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 FlagSet bl sub_81BE6B8 - b @081BE7EE -@081BE7E6: + b _081BE7EE +_081BE7E6: movs r0, 0xA7 lsls r0, 1 bl FlagReset -@081BE7EE: +_081BE7EE: pop {r4} pop {r0} bx r0 @@ -831637,11 +831637,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} @@ -831715,7 +831715,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 @@ -831734,12 +831734,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 InstallCameraPanAheadCallback -@081BE95C: +_081BE95C: pop {r4,r5} pop {r0} bx r0 @@ -831754,7 +831754,7 @@ sub_81BE968: ; 81BE968 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xFF - beq @081BE988 + beq _081BE988 ldr r0, =0x03005e00 lsls r1, r2, 2 adds r1, r2 @@ -831763,7 +831763,7 @@ sub_81BE968: ; 81BE968 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@081BE988: +_081BE988: pop {r0} bx r0 .pool @@ -831805,17 +831805,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 str r1, [r0] -@081BE9F0: +_081BE9F0: pop {r4} pop {r0} bx r0 @@ -831846,7 +831846,7 @@ sub_81BEA20: ; 81BEA20 ldr r5, =gUnknown_08617D64 adds r7, r5, 0x2 ldr r6, =0x02020630 -@081BEA2A: +_081BEA2A: lsls r0, r4, 1 adds r0, r4 lsls r0, 1 @@ -831880,12 +831880,12 @@ sub_81BEA20: ; 81BEA20 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls @081BEA2A + bls _081BEA2A movs r4, 0 ldr r5, =gUnknown_08617D64 adds r7, r5, 0x2 ldr r6, =0x02020630 -@081BEA78: +_081BEA78: lsls r0, r4, 1 adds r0, r4 lsls r0, 1 @@ -831921,7 +831921,7 @@ sub_81BEA20: ; 81BEA20 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls @081BEA78 + bls _081BEA78 pop {r4-r7} pop {r0} bx r0 @@ -831957,11 +831957,11 @@ sub_81BEAD8: ; 81BEAD8 movs r1, 0 ldrsh r0, [r0, r1] cmp r3, r0 - ble @081BEB1A + ble _081BEB1A adds r0, r4, 0 bl RemoveObjectAndFreeTiles bl sub_81BE968 -@081BEB1A: +_081BEB1A: pop {r4} pop {r0} bx r0 @@ -831973,7 +831973,7 @@ sub_81BEB24: ; 81BEB24 push {r4,r5,lr} movs r4, 0 ldr r5, =gUnknown_08617DA4 -@081BEB2A: +_081BEB2A: lsls r2, r4, 2 adds r2, r5 ldrb r0, [r2] @@ -831986,7 +831986,7 @@ sub_81BEB24: ; 81BEB24 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x11 - bls @081BEB2A + bls _081BEB2A bl DrawWholeMapView pop {r4,r5} pop {r0} @@ -832059,7 +832059,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] @@ -832068,12 +832068,12 @@ sub_81BEBB4: ; 81BEBB4 movs r0, 0x2 strh r0, [r2, 0x8] bl sub_81BEB90 - b @081BEBF0 + b _081BEBF0 .pool -@081BEBEC: +_081BEBEC: subs r0, r1, 0x1 strh r0, [r2, 0x8] -@081BEBF0: +_081BEBF0: pop {r0} bx r0 thumb_func_end sub_81BEBB4 @@ -832092,32 +832092,32 @@ 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 .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 FreeAllWindowBuffers movs r0, 0 movs r1, 0x7 movs r2, 0x2 bl SetBgAttribute - b @081BED04 -@081BEC50: + b _081BED04 +_081BEC50: ldr r4, =0x0203cf04 movs r0, 0x92 lsls r0, 4 @@ -832136,9 +832136,9 @@ sub_81BEBF4: ; 81BEBF4 movs r1, 0 movs r2, 0 bl ChangeBgY - b @081BECD8 + b _081BECD8 .pool -@081BEC88: +_081BEC88: ldr r0, =gUnknown_08617274 ldr r4, =0x0203cf04 ldr r1, [r4] @@ -832151,9 +832151,9 @@ sub_81BEBF4: ; 81BEBF4 movs r0, 0 movs r3, 0 bl LoadBgTiles - b @081BECD8 + b _081BECD8 .pool -@081BECB0: +_081BECB0: ldr r0, =0x0203cf08 ldr r1, [r0] movs r0, 0 @@ -832171,7 +832171,7 @@ sub_81BEBF4: ; 81BEBF4 bl CopyToBgTilemapBufferRect_ChangePalette movs r0, 0 bl CopyBgTilemapBufferToVram -@081BECD8: +_081BECD8: ldr r1, =0x03005e00 lsls r0, r5, 2 adds r0, r5 @@ -832180,15 +832180,15 @@ sub_81BEBF4: ; 81BEBF4 ldrh r1, [r0, 0x8] adds r1, 0x1 strh r1, [r0, 0x8] - b @081BED40 + b _081BED40 .pool -@081BECF8: +_081BECF8: movs r0, 0 bl ShowBg - b @081BED04 -@081BED00: + b _081BED04 +_081BED00: bl sub_81BEB24 -@081BED04: +_081BED04: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -832197,9 +832197,9 @@ sub_81BEBF4: ; 81BEBF4 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] - b @081BED40 + b _081BED40 .pool -@081BED1C: +_081BED1C: ldr r4, =0x0203cf14 movs r0, 0x4 bl Alloc @@ -832214,7 +832214,7 @@ sub_81BEBF4: ; 81BEBF4 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} @@ -832244,34 +832244,34 @@ 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 .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 AllocZeroed str r0, [r4] - b @081BF002 + b _081BF002 .pool -@081BEDC4: +_081BEDC4: mov r1, r10 lsls r0, r1, 2 adds r1, r0, r1 @@ -832282,11 +832282,11 @@ sub_81BED50: ; 81BED50 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 @@ -832298,7 +832298,7 @@ sub_81BED50: ; 81BED50 str r0, [r1] movs r5, 0 adds r4, r2, 0 -@081BEDFA: +_081BEDFA: ldr r0, [r3] adds r0, r4, r0 ldr r0, [r0] @@ -832308,11 +832308,11 @@ sub_81BED50: ; 81BED50 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 @@ -832345,7 +832345,7 @@ sub_81BED50: ; 81BED50 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0x2F - bls @081BEE14 + bls _081BEE14 ldr r0, =0x03005e00 ldr r1, [sp, 0x8] add r1, r10 @@ -832356,13 +832356,13 @@ sub_81BED50: ; 81BED50 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 @@ -832370,7 +832370,7 @@ sub_81BED50: ; 81BED50 ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] -@081BEE8A: +_081BEE8A: ldr r0, [sp, 0x8] add r0, r10 lsls r0, 3 @@ -832379,9 +832379,9 @@ sub_81BED50: ; 81BED50 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] @@ -832392,7 +832392,7 @@ sub_81BED50: ; 81BED50 adds r0, r1 lsls r0, 4 mov r9, r0 -@081BEEB2: +_081BEEB2: ldr r0, =0x0203cf04 ldr r0, [r0] ldr r7, =0x0203cf10 @@ -832419,12 +832419,12 @@ sub_81BED50: ; 81BED50 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] @@ -832442,21 +832442,21 @@ sub_81BED50: ; 81BED50 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 @@ -832471,10 +832471,10 @@ sub_81BED50: ; 81BED50 adds r0, r4 ldrb r0, [r0, 0x4] cmp r0, 0x2F - bhi @081BF002 - b @081BF014 + bhi _081BF002 + b _081BF014 .pool -@081BEF64: +_081BEF64: movs r0, 0 bl UnsetBgTilemap ldr r0, =sub_81BEBB4 @@ -832482,18 +832482,18 @@ sub_81BED50: ; 81BED50 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 .pool -@081BEF94: +_081BEF94: ldr r4, =0x0203cf14 ldr r0, [r4] bl Free @@ -832511,9 +832511,9 @@ sub_81BED50: ; 81BED50 ldr r0, [r4] bl Free str r5, [r4] - b @081BF002 + b _081BF002 .pool -@081BEFD0: +_081BEFD0: movs r0, 0xC movs r1, 0x2 bl SetGpuRegBits @@ -832525,16 +832525,16 @@ sub_81BED50: ; 81BED50 movs r2, 0 bl SetBgAttribute bl sub_81971D0 - b @081BF002 -@081BEFF0: + b _081BF002 +_081BEFF0: movs r0, 0 bl ShowBg - 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 @@ -832544,7 +832544,7 @@ sub_81BED50: ; 81BED50 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@081BF014: +_081BF014: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -832574,26 +832574,26 @@ 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 .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 AllocZeroed @@ -832613,15 +832613,15 @@ sub_81BF028: ; 81BF028 str r0, [r1, 0xC] movs r0, 0 strh r0, [r1, 0x10] - b @081BF228 + b _081BF228 .pool -@081BF0B4: +_081BF0B4: ldr r0, =0x0203cf0c ldr r0, [r0] ldr r1, [r0] movs r5, 0 ldr r2, =gUnknown_08617C44 -@081BF0BE: +_081BF0BE: adds r0, r5, r2 ldrb r0, [r0] strb r0, [r1] @@ -832630,10 +832630,10 @@ sub_81BF028: ; 81BF028 lsrs r5, r0, 16 adds r1, 0x1 cmp r5, 0x7F - bls @081BF0BE - b @081BF228 + bls _081BF0BE + b _081BF228 .pool -@081BF0DC: +_081BF0DC: ldr r0, =0x0203cf0c ldr r0, [r0] ldr r1, [r0, 0x4] @@ -832641,9 +832641,9 @@ sub_81BF028: ; 81BF028 str r0, [r1] movs r0, 0x80 strh r0, [r1, 0x4] - b @081BF228 + b _081BF228 .pool -@081BF0F0: +_081BF0F0: mov r1, sp ldr r0, =gUnknown_08617E00 ldm r0!, {r2-r4} @@ -832687,10 +832687,10 @@ sub_81BF028: ; 81BF028 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 @@ -832700,15 +832700,15 @@ sub_81BF028: ; 81BF028 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0xFF - bls @081BF14C - b @081BF228 + bls _081BF14C + b _081BF228 .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 @@ -832730,7 +832730,7 @@ sub_81BF028: ; 81BF028 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 @@ -832740,9 +832740,9 @@ sub_81BF028: ; 81BF028 adds r0, r2 ldr r1, =sub_81BF248 str r1, [r0] - b @081BF228 + b _081BF228 .pool -@081BF1CC: +_081BF1CC: ldr r3, =0x02020630 ldr r5, =0x0203cf0c ldr r0, [r5] @@ -832756,7 +832756,7 @@ sub_81BF028: ; 81BF028 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - bne @081BF238 + bne _081BF238 adds r0, r2, r3 bl RemoveObjectAndFreeTiles ldr r0, [r5] @@ -832775,11 +832775,11 @@ sub_81BF028: ; 81BF028 str r4, [r0] bl Free str r4, [r5] - b @081BF228 + b _081BF228 .pool -@081BF224: +_081BF224: bl script_env_2_enable_and_set_ctx_running -@081BF228: +_081BF228: ldr r0, =0x03005e00 lsls r1, r7, 2 adds r1, r7 @@ -832788,7 +832788,7 @@ sub_81BF028: ; 81BF028 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@081BF238: +_081BF238: add sp, 0x18 pop {r3} mov r8, r3 @@ -832807,19 +832807,19 @@ sub_81BF248: ; 81BF248 ldr r0, [r0] ldrh r0, [r0, 0x10] cmp r0, 0xFF - bls @081BF268 + bls _081BF268 ldr r0, =DummyObjectCallback str r0, [r5, 0x1C] - b @081BF2B0 + b _081BF2B0 .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] @@ -832839,16 +832839,16 @@ sub_81BF248: ; 81BF248 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1 - bls @081BF274 + bls _081BF274 adds r0, r5, 0 movs r1, 0 bl StartObjectImageAnim - b @081BF2B0 + b _081BF2B0 .pool -@081BF2AC: +_081BF2AC: adds r0, r1, 0x1 strh r0, [r5, 0x22] -@081BF2B0: +_081BF2B0: add sp, 0x4 pop {r4,r5} pop {r0} @@ -833000,79 +833000,79 @@ 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 .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 .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 .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 .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, =gUnknown_089A6550 @@ -833086,9 +833086,9 @@ sub_81BF3DC: ; 81BF3DC ldr r1, [r4] strh r5, [r1, 0x2] movs r0, 0x4 - b @081BF590 + b _081BF590 .pool -@081BF4BC: +_081BF4BC: adds r4, r5, 0 ldr r0, [r4] adds r0, 0x4 @@ -833096,25 +833096,25 @@ sub_81BF3DC: ; 81BF3DC 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 .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, =gMultiBootProgram_BerryGlitchFix_Start ldr r2, =gMultiBootProgram_BerryGlitchFix_End @@ -833125,14 +833125,14 @@ sub_81BF3DC: ; 81BF3DC bl MultiBootStartMaster ldr r1, [r5] movs r0, 0x5 - b @081BF590 + b _081BF590 .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 @@ -833141,52 +833141,52 @@ sub_81BF3DC: ; 81BF3DC adds r0, 0x4 bl MultiBootCheckComplete cmp r0, 0 - beq @081BF540 + beq _081BF540 ldr r1, [r5] movs r0, 0x6 - b @081BF590 + b _081BF590 .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 Reset - b @081BF592 + b _081BF592 .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} @@ -833407,28 +833407,28 @@ sub_81BF7A4: ; 81BF7A4 ldr r0, [r5] ldrb r0, [r0, 0x1] cmp r0, r4 - bne @081BF7BC + bne _081BF7BC adds r0, r4, 0 - b @081BF7DC + b _081BF7DC .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 @@ -833472,32 +833472,32 @@ sub_81BF7E8: ; 81BF7E8 movs r1, 0x2 bl CopyWindowToVram cmp r6, 0x5 - bhi @081BF87E - ldr r0, =@081BF850 + bhi _081BF87E + ldr r0, =_081BF850 adds r0, r4, r0 ldr r0, [r0] mov pc, r0 .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 PutWindowTilemap - b @081BF87E -@081BF870: + b _081BF87E +_081BF870: movs r0, 0x3 bl PutWindowTilemap - b @081BF87E -@081BF878: + b _081BF87E +_081BF878: movs r0, 0 bl PutWindowTilemap -@081BF87E: +_081BF87E: movs r0, 0 bl CopyBgTilemapBufferToVram ldr r5, =gUnknown_08618178 @@ -833577,36 +833577,36 @@ 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 .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 .pool -@081BF96C: +_081BF96C: cmp r7, 0x2 - beq @081BF97C + beq _081BF97C cmp r7, 0x3 - beq @081BF9D0 + beq _081BF9D0 ldr r2, =0x0203cf1c - b @081BF9EE + b _081BF9EE .pool -@081BF97C: +_081BF97C: ldr r2, =0x0203cf1c ldr r0, [r2] ldr r1, =0x000040c1 @@ -833617,9 +833617,9 @@ sub_81BF8EC: ; 81BF8EC ldr r1, =0x000040c2 adds r0, r1 movs r1, 0x3 - b @081BF9EC + b _081BF9EC .pool -@081BF9A0: +_081BF9A0: ldr r2, =0x0203cf1c ldr r0, [r2] ldr r1, =0x000040c1 @@ -833635,9 +833635,9 @@ sub_81BF8EC: ; 81BF8EC ldr r1, =0x000040c8 adds r0, r1 strb r7, [r0] - b @081BF9EE + b _081BF9EE .pool -@081BF9D0: +_081BF9D0: ldr r2, =0x0203cf1c ldr r0, [r2] ldr r1, =0x000040c1 @@ -833652,9 +833652,9 @@ sub_81BF8EC: ; 81BF8EC 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 @@ -833667,11 +833667,11 @@ sub_81BF8EC: ; 81BF8EC 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 bl SetMainCallback2 pop {r3} @@ -833769,23 +833769,23 @@ sub_81BFAD0: ; 81BFAD0 thumb_func_start sub_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 @@ -833800,75 +833800,75 @@ 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 .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 .pool -@081BFBBC: +_081BFBBC: bl sub_80A1A74 ldr r2, =0x02037fd4 ldrb r0, [r2, 0x8] movs r1, 0x80 orrs r0, r1 - b @081BFDE4 + b _081BFDE4 .pool -@081BFBD0: +_081BFBD0: bl ResetAllObjectData ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081BFDEE + b _081BFDEE .pool -@081BFBE4: +_081BFBE4: bl ResetObjectPaletteAllocator - b @081BFDE6 -@081BFBEA: + b _081BFDE6 +_081BFBEA: bl sub_81BFE24 ldr r0, =0x0203cf1c ldr r0, [r0] @@ -833876,33 +833876,33 @@ sub_81BFB10: ; 81BFB10 adds r0, r1 movs r1, 0 strh r1, [r0] - b @081BFDE6 + b _081BFDE6 .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 .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 .pool -@081BFC38: +_081BFC38: ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC @@ -833912,62 +833912,62 @@ sub_81BFB10: ; 81BFB10 adds r0, r1 movs r1, 0 strh r1, [r0] - b @081BFDE6 + b _081BFDE6 .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 .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 .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 .pool -@081BFCAC: +_081BFCAC: bl sub_81C0348 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081BFDEE + b _081BFDEE .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 .pool -@081BFCD8: +_081BFCD8: bl sub_81C4190 bl sub_81C42C8 ldr r0, =0x0203cf1c @@ -833976,9 +833976,9 @@ sub_81BFB10: ; 81BFB10 adds r0, r1 movs r1, 0 strh r1, [r0] - b @081BFDE6 + b _081BFDE6 .pool -@081BFCF8: +_081BFCF8: ldr r4, =0x0203cf1c ldr r1, [r4] adds r0, r1, 0 @@ -833994,16 +833994,16 @@ sub_81BFB10: ; 81BFB10 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 .pool -@081BFD34: +_081BFD34: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC @@ -834012,46 +834012,46 @@ sub_81BFB10: ; 81BFB10 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081BFDEE + b _081BFDEE .pool -@081BFD50: +_081BFD50: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C4A08 - b @081BFDE6 + b _081BFDE6 .pool -@081BFD60: +_081BFD60: bl sub_81C4A88 ldr r1, =0x030022c0 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081BFDEE + b _081BFDEE .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 movs r1, 0 bl AddTask - b @081BFDE6 + b _081BFDE6 .pool -@081BFDA0: +_081BFDA0: ldr r0, =sub_81C171C movs r1, 0 bl AddTask - b @081BFDE6 + b _081BFDE6 .pool -@081BFDB0: +_081BFDB0: movs r0, 0x1 negs r0, r0 movs r1, 0x10 @@ -834061,9 +834061,9 @@ sub_81BFB10: ; 81BFB10 movs r0, 0x87 lsls r0, 3 adds r1, r0 - b @081BFDEE + b _081BFDEE .pool -@081BFDCC: +_081BFDCC: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -834075,30 +834075,30 @@ sub_81BFB10: ; 81BFB10 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 .pool -@081BFE00: +_081BFE00: ldr r0, =sub_81BFAD0 bl SetVBlankCallback ldr r0, =sub_81BFAB4 bl SetMainCallback2 movs r0, 0x1 - b @081BFE1A + b _081BFE1A .pool -@081BFE18: +_081BFE18: movs r0, 0 -@081BFE1A: +_081BFE1A: add sp, 0x4 pop {r4} pop {r1} @@ -834169,31 +834169,31 @@ 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 .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, =gUnknown_08D97D0C movs r0, 0 @@ -834202,16 +834202,16 @@ sub_81BFEB0: ; 81BFEB0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @081C0046 + b _081C0046 .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, =gUnknown_08D9862C ldr r4, =0x0203cf1c ldr r1, [r4] @@ -834220,45 +834220,45 @@ sub_81BFEB0: ; 81BFEB0 ldr r1, [r4] ldr r2, =0x000040f0 adds r1, r2 - b @081C004E + b _081C004E .pool -@081BFF60: +_081BFF60: ldr r0, =gUnknown_08D98CC8 ldr r1, [r4] ldr r2, =0x000008bc adds r1, r2 bl LZDecompressWram ldr r1, [r4] - b @081C004A + b _081C004A .pool -@081BFF78: +_081BFF78: ldr r0, =gUnknown_08D987FC ldr r1, [r4] ldr r2, =0x000018bc adds r1, r2 bl LZDecompressWram ldr r1, [r4] - b @081C004A + b _081C004A .pool -@081BFF90: +_081BFF90: ldr r0, =gUnknown_08D9898C ldr r1, [r4] ldr r2, =0x000028bc adds r1, r2 bl LZDecompressWram ldr r1, [r4] - b @081C004A + b _081C004A .pool -@081BFFA8: +_081BFFA8: ldr r0, =gUnknown_08D98B28 ldr r1, [r4] ldr r2, =0x000038bc adds r1, r2 bl LZDecompressWram ldr r1, [r4] - b @081C004A + b _081C004A .pool -@081BFFC0: +_081BFFC0: ldr r0, =gUnknown_08D9853C movs r2, 0x80 lsls r2, 1 @@ -834272,52 +834272,52 @@ sub_81BFEB0: ; 81BFEB0 ldr r1, [r0] ldr r2, =0x000040f0 adds r1, r2 - b @081C004E + b _081C004E .pool -@081BFFF0: +_081BFFF0: ldr r0, =gUnknown_0861CFBC bl LoadCompressedObjectPic - b @081C0046 + b _081C0046 .pool -@081BFFFC: +_081BFFFC: ldr r0, =gUnknown_0861D074 bl LoadCompressedObjectPic ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040f0 adds r1, r2 - b @081C004E + b _081C004E .pool -@081C0018: +_081C0018: ldr r0, =gUnknown_0861D0F8 bl LoadCompressedObjectPic - b @081C0046 + b _081C0046 .pool -@081C0024: +_081C0024: ldr r0, =gUnknown_0861D100 bl LoadCompressedObjectPalette ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040f0 adds r1, r2 - b @081C004E + b _081C004E .pool -@081C0040: +_081C0040: ldr r0, =gUnknown_0861D07C bl LoadCompressedObjectPalette -@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 .pool -@081C0064: +_081C0064: ldr r0, =gUnknown_08D97B84 movs r1, 0xE8 lsls r1, 1 @@ -834330,11 +834330,11 @@ sub_81BFEB0: ; 81BFEB0 movs r1, 0 strh r1, [r0] movs r0, 0x1 - b @081C008E + b _081C008E .pool -@081C008C: +_081C008C: movs r0, 0 -@081C008E: +_081C008E: add sp, 0x4 pop {r4} pop {r1} @@ -834351,7 +834351,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 @@ -834362,9 +834362,9 @@ sub_81C0098: ; 81C0098 adds r0, r3, 0 movs r2, 0x64 bl memcpy - b @081C00E6 + b _081C00E6 .pool -@081C00D0: +_081C00D0: ldr r0, [r1] ldr r2, =0x000040be adds r1, r2 @@ -834375,7 +834375,7 @@ sub_81C0098: ; 81C0098 adds r0, r1 adds r1, r3, 0 bl sub_8069004 -@081C00E6: +_081C00E6: pop {r4} pop {r0} bx r0 @@ -834398,22 +834398,22 @@ 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 .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 @@ -834450,17 +834450,17 @@ sub_81C00F0: ; 81C00F0 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 @@ -834470,7 +834470,7 @@ sub_81C00F0: ; 81C00F0 mov r9, r1 adds r6, r7, 0 adds r6, 0x84 -@081C01AA: +_081C01AA: adds r1, r4, 0 adds r1, 0xD adds r0, r5, 0 @@ -834486,29 +834486,29 @@ sub_81C00F0: ; 81C00F0 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 @@ -834540,9 +834540,9 @@ sub_81C00F0: ; 81C00F0 strh r0, [r6, 0x2A] adds r0, r5, 0 movs r1, 0x3D - b @081C02A0 + b _081C02A0 .pool -@081C0254: +_081C0254: adds r0, r5, 0 bl GetNature adds r1, r7, 0 @@ -834574,11 +834574,11 @@ sub_81C00F0: ; 81C00F0 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 @@ -834622,15 +834622,15 @@ sub_81C00F0: ; 81C00F0 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 @@ -834639,7 +834639,7 @@ sub_81C00F0: ; 81C00F0 adds r0, 0x1 strh r0, [r1] movs r0, 0 -@081C0332: +_081C0332: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -834661,7 +834661,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 @@ -834669,9 +834669,9 @@ sub_81C0348: ; 81C0348 movs r1, 0xFF movs r2, 0 bl sub_81C1EFC - b @081C03D8 + b _081C03D8 .pool -@081C037C: +_081C037C: ldr r1, =0x000040c6 adds r0, r2, r1 ldrb r1, [r0] @@ -834710,20 +834710,20 @@ sub_81C0348: ; 81C0348 bl ClearWindowTilemap movs r0, 0xD bl ClearWindowTilemap -@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 .pool -@081C0400: +_081C0400: ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] @@ -834731,10 +834731,10 @@ sub_81C0348: ; 81C0348 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bls @081C0416 + bls _081C0416 movs r0, 0xD bl PutWindowTilemap -@081C0416: +_081C0416: bl sub_81C2524 ldr r0, =0x0203cf1c ldr r0, [r0] @@ -834795,13 +834795,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] @@ -834824,14 +834824,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 @@ -834847,106 +834847,106 @@ 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 .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 GetLRKeysState 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 GetLRKeysState 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 .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 @@ -834967,17 +834967,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 @@ -834986,14 +834986,14 @@ sub_81C0604: ; 81C0604 orrs r0, r1 asrs r0, 31 ands r4, r0 - b @081C065C + b _081C065C .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 @@ -835004,23 +835004,23 @@ sub_81C0604: ; 81C0604 ldrb r2, [r2] adds r3, r4, 0 bl sub_80D214C - b @081C0696 + b _081C0696 .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 @@ -835028,7 +835028,7 @@ sub_81C0604: ; 81C0604 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @081C06EE + beq _081C06EE movs r0, 0x5 bl audio_play ldr r5, =0x0203cf1c @@ -835036,7 +835036,7 @@ sub_81C0604: ; 81C0604 adds r0, 0x77 ldrb r0, [r0] cmp r0, 0 - beq @081C06D4 + beq _081C06D4 movs r0, 0x2 movs r1, 0x1 bl sub_81C4204 @@ -835047,7 +835047,7 @@ sub_81C0604: ; 81C0604 movs r0, 0 movs r1, 0x2 bl sub_81C2074 -@081C06D4: +_081C06D4: ldr r0, [r5] ldr r1, =0x000040be adds r0, r1 @@ -835061,7 +835061,7 @@ sub_81C0604: ; 81C0604 strh r2, [r0, 0x8] ldr r1, =sub_81C0704 str r1, [r0] -@081C06EE: +_081C06EE: pop {r4-r7} pop {r0} bx r0 @@ -835081,45 +835081,45 @@ 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 .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 .pool -@081C0780: +_081C0780: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040d4 -@081C0786: +_081C0786: adds r0, r1 ldrb r1, [r0] lsls r0, r1, 4 @@ -835128,9 +835128,9 @@ sub_81C0704: ; 81C0704 ldr r1, =0x02020630 adds r0, r1 bl RemoveObjectAndFreeResources - b @081C08EC + b _081C08EC .pool -@081C07A8: +_081C07A8: ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC @@ -835140,54 +835140,54 @@ sub_81C0704: ; 81C0704 adds r0, r1 movs r1, 0 strh r1, [r0] - b @081C08EC + b _081C08EC .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 .pool -@081C07E0: +_081C07E0: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C49E0 - b @081C08EC + b _081C08EC .pool -@081C07F0: +_081C07F0: ldr r0, =0x0203cf1c ldr r0, [r0] adds r0, 0xC bl sub_81C4A08 - b @081C08EC + b _081C08EC .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 .pool -@081C0828: +_081C0828: ldr r4, =0x0203cf1c ldr r0, [r4] adds r0, 0xC @@ -835201,7 +835201,7 @@ sub_81C0704: ; 81C0704 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 @@ -835213,15 +835213,15 @@ sub_81C0704: ; 81C0704 bl sub_81C0E24 movs r0, 0 strh r0, [r5, 0x2] - b @081C08EC + b _081C08EC .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 @@ -835229,9 +835229,9 @@ sub_81C0704: ; 81C0704 ldrb r0, [r0] bl sub_81C2D9C bl sub_81C2524 - b @081C08EC + b _081C08EC .pool -@081C0894: +_081C0894: ldr r2, =0x02020630 ldr r0, =0x0203cf1c ldr r0, [r0] @@ -835244,32 +835244,32 @@ sub_81C0704: ; 81C0704 adds r0, r2 movs r1, 0 strh r1, [r0, 0x32] - b @081C08EC + b _081C08EC .pool -@081C08BC: +_081C08BC: bl sub_81221EC lsls r0, 24 cmp r0, 0 - bne @081C08F2 + bne _081C08F2 ldr r0, =sub_81C20F0 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 str r1, [r0] - b @081C08F2 + b _081C08F2 .pool -@081C08EC: +_081C08EC: ldrh r0, [r5] adds r0, 0x1 strh r0, [r5] -@081C08F2: +_081C08F2: pop {r4-r6} pop {r0} bx r0 @@ -835288,23 +835288,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 @@ -835313,8 +835313,8 @@ sub_81C08F8: ; 81C08F8 ldrb r1, [r1] ldrb r0, [r0] cmp r1, r0 - bcs @081C0988 -@081C0940: + bcs _081C0988 +_081C0940: ldr r0, [r5] ldr r1, =0x000040be adds r0, r1 @@ -835322,14 +835322,14 @@ sub_81C08F8: ; 81C08F8 adds r0, r4 lsls r0, 24 asrs r0, 24 - b @081C09AE + b _081C09AE .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 @@ -835338,29 +835338,29 @@ sub_81C08F8: ; 81C08F8 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 .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 @@ -835387,15 +835387,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] @@ -835403,13 +835403,13 @@ sub_81C09B4: ; 81C09B4 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, =gUnknown_0861CC1C -@081C0A02: +_081C0A02: lsls r0, r5, 24 asrs r0, 24 asrs r1, r6, 24 @@ -835419,7 +835419,7 @@ sub_81C09B4: ; 81C09B4 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 @@ -835431,14 +835431,14 @@ sub_81C09B4: ; 81C09B4 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081C0A02 + bne _081C0A02 adds r0, r4, 0 - b @081C0A44 + b _081C0A44 .pool -@081C0A40: +_081C0A40: movs r0, 0x1 negs r0, r0 -@081C0A44: +_081C0A44: pop {r3} mov r8, r3 pop {r4-r7} @@ -835453,26 +835453,26 @@ sub_81C0A50: ; 81C0A50 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 .pool -@081C0A84: +_081C0A84: movs r0, 0 -@081C0A86: +_081C0A86: pop {r4} pop {r1} bx r1 @@ -835507,13 +835507,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 @@ -835521,10 +835521,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 @@ -835532,8 +835532,8 @@ sub_81C0A8C: ; 81C0A8C ldrb r0, [r0] ldrb r1, [r1] cmp r0, r1 - beq @081C0B6E -@081C0AF4: + beq _081C0B6E +_081C0AF4: movs r0, 0x5 bl audio_play mov r1, r8 @@ -835553,7 +835553,7 @@ sub_81C0A8C: ; 81C0A8C ldr r0, [sp, 0x8] strh r1, [r0] cmp r5, 0x1 - bne @081C0B4C + bne _081C0B4C ldr r1, =sub_81C0B8C mov r0, r9 subs r0, 0x8 @@ -835561,9 +835561,9 @@ sub_81C0A8C: ; 81C0A8C ldr r2, [r0] adds r0, r6, 0 bl set_task_function_and_args_14_15 - b @081C0B5C + b _081C0B5C .pool -@081C0B4C: +_081C0B4C: ldr r1, =sub_81C0CC4 mov r0, r9 subs r0, 0x8 @@ -835571,7 +835571,7 @@ sub_81C0A8C: ; 81C0A8C 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 @@ -835579,7 +835579,7 @@ sub_81C0A8C: ; 81C0A8C ldrb r0, [r0] bl sub_81C2DE4 bl sub_81C424C -@081C0B6E: +_081C0B6E: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -835604,14 +835604,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 @@ -835624,9 +835624,9 @@ sub_81C0B8C: ; 81C0B8C bl SetBgAttribute movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram - b @081C0BFE + b _081C0BFE .pool -@081C0BE0: +_081C0BE0: movs r0, 0x2 strh r0, [r4, 0x2] movs r0, 0x2 @@ -835639,7 +835639,7 @@ sub_81C0B8C: ; 81C0B8C bl SetBgAttribute movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -@081C0BFE: +_081C0BFE: ldrb r0, [r4, 0x2] movs r1, 0 movs r2, 0 @@ -835658,7 +835658,7 @@ sub_81C0B8C: ; 81C0B8C bl ShowBg movs r0, 0x2 bl ShowBg -@081C0C2A: +_081C0C2A: ldrb r0, [r4, 0x2] movs r1, 0x80 lsls r1, 6 @@ -835670,7 +835670,7 @@ sub_81C0B8C: ; 81C0B8C lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - ble @081C0C52 + ble _081C0C52 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -835678,7 +835678,7 @@ sub_81C0B8C: ; 81C0B8C adds r1, r0 ldr r0, =sub_81C0C68 str r0, [r1] -@081C0C52: +_081C0C52: pop {r4,r5} pop {r0} bx r0 @@ -835736,27 +835736,27 @@ 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 .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 ChangeBgX -@081C0D0C: +_081C0D0C: ldrb r0, [r4, 0x2] movs r1, 0x80 lsls r1, 6 @@ -835768,7 +835768,7 @@ sub_81C0CC4: ; 81C0CC4 lsls r0, 16 asrs r0, 16 cmp r0, 0xFF - ble @081C0D34 + ble _081C0D34 ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -835776,7 +835776,7 @@ sub_81C0CC4: ; 81C0CC4 adds r1, r0 ldr r0, =sub_81C0D44 str r0, [r1] -@081C0D34: +_081C0D34: pop {r4,r5} pop {r0} bx r0 @@ -835799,7 +835799,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 @@ -835810,9 +835810,9 @@ sub_81C0D44: ; 81C0D44 bl SetBgAttribute movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - b @081C0DA6 + b _081C0DA6 .pool -@081C0D8C: +_081C0D8C: movs r0, 0x2 movs r1, 0x7 movs r2, 0x1 @@ -835823,14 +835823,14 @@ sub_81C0D44: ; 81C0D44 bl SetBgAttribute 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 @@ -835843,7 +835843,7 @@ sub_81C0D44: ; 81C0D44 lsls r1, 9 movs r2, 0 bl ChangeBgX -@081C0DD0: +_081C0DD0: movs r0, 0x1 bl ShowBg movs r0, 0x2 @@ -835882,11 +835882,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 .pool @@ -835928,10 +835928,10 @@ sub_81C0E48: ; 81C0E48 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @081C0E96 + blt _081C0E96 movs r0, 0xD bl ClearWindowTilemap -@081C0E96: +_081C0E96: movs r4, 0x3 negs r4, r4 movs r0, 0x9 @@ -835946,12 +835946,12 @@ sub_81C0E48: ; 81C0E48 adds r0, r1 ldrb r0, [r0] cmp r0, 0 - bne @081C0EC4 + bne _081C0EC4 movs r0, 0x5 bl ClearWindowTilemap movs r0, 0x6 bl PutWindowTilemap -@081C0EC4: +_081C0EC4: ldr r0, [r5] ldr r1, =0x000020bc adds r0, r1 @@ -836006,13 +836006,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 @@ -836023,13 +836023,13 @@ sub_81C0F44: ; 81C0F44 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 - b @081C103A + b _081C103A .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 @@ -836039,20 +836039,20 @@ sub_81C0F44: ; 81C0F44 adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 - b @081C103A + b _081C103A .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] @@ -836061,39 +836061,39 @@ sub_81C0F44: ; 81C0F44 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 .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 @@ -836107,23 +836107,23 @@ sub_81C1040: ; 81C1040 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 .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 @@ -836151,7 +836151,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 @@ -836159,21 +836159,21 @@ sub_81C1070: ; 81C1070 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 @@ -836181,7 +836181,7 @@ sub_81C1070: ; 81C1070 adds r0, r1 ldrh r5, [r0] cmp r5, 0 - bne @081C10E2 + bne _081C10E2 lsls r0, r2, 24 movs r1, 0x80 lsls r1, 17 @@ -836189,8 +836189,8 @@ sub_81C1070: ; 81C1070 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 @@ -836202,20 +836202,20 @@ sub_81C1070: ; 81C1070 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 ClearWindowTilemap ldr r2, =0x02020630 @@ -836232,10 +836232,10 @@ sub_81C1070: ; 81C1070 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @081C1142 + blt _081C1142 movs r0, 0xD bl ClearWindowTilemap -@081C1142: +_081C1142: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram movs r4, 0x3 @@ -836247,22 +836247,22 @@ sub_81C1070: ; 81C1070 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 ClearWindowTilemap movs r0, 0xF @@ -836276,7 +836276,7 @@ sub_81C1070: ; 81C1070 movs r1, 0x3 movs r2, 0 bl sub_81C1EFC -@081C11A0: +_081C11A0: mov r0, r8 strb r6, [r0] ldr r0, =0x0203cf1c @@ -836284,23 +836284,23 @@ sub_81C1070: ; 81C1070 ldr r1, =0x000040c6 adds r0, r1 cmp r8, r0 - bne @081C11E0 + bne _081C11E0 movs r0, 0x8 bl sub_81C4D18 - b @081C11E6 + b _081C11E6 .pool -@081C11CC: +_081C11CC: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c4 adds r0, r1 ldrh r5, [r0] - b @081C10E2 + b _081C10E2 .pool -@081C11E0: +_081C11E0: movs r0, 0x12 bl sub_81C4D18 -@081C11E6: +_081C11E6: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -836341,7 +836341,7 @@ sub_81C11F4: ; 81C11F4 adds r0, r1 ldrb r0, [r0] cmp r0, 0x4 - beq @081C125E + beq _081C125E movs r0, 0xE bl ClearWindowTilemap movs r0, 0xF @@ -836353,7 +836353,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 @@ -836419,13 +836419,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 @@ -836436,13 +836436,13 @@ sub_81C12E4: ; 81C12E4 adds r2, r0 adds r0, r4, 0 bl sub_81C1070 - b @081C13AA + b _081C13AA .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 @@ -836452,13 +836452,13 @@ sub_81C12E4: ; 81C12E4 adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 - b @081C13AA + b _081C13AA .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 @@ -836468,26 +836468,26 @@ sub_81C12E4: ; 81C12E4 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 .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 @@ -836508,14 +836508,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 @@ -836530,9 +836530,9 @@ sub_81C13B0: ; 81C13B0 adds r2, r3, r4 ldrb r2, [r2] bl sub_81C14BC - b @081C1430 + b _081C1430 .pool -@081C1410: +_081C1410: ldr r0, [r3] ldr r2, =0x000040be adds r1, r3, r2 @@ -836548,7 +836548,7 @@ sub_81C13B0: ; 81C13B0 adds r2, r3, r4 ldrb r2, [r2] bl sub_81C15EC -@081C1430: +_081C1430: ldr r5, =0x0203cf1c ldr r0, [r5] adds r0, 0xC @@ -836572,7 +836572,7 @@ sub_81C13B0: ; 81C13B0 ldrb r1, [r4] adds r0, r6 strb r1, [r0] -@081C1464: +_081C1464: ldr r0, =0x0203cf1c ldr r1, [r0] ldr r2, =0x000040c6 @@ -836935,24 +836935,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 @@ -836963,13 +836963,13 @@ sub_81C174C: ; 81C174C adds r2, r0 adds r0, r4, 0 bl sub_81C1070 - b @081C189A + b _081C189A .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 @@ -836979,51 +836979,51 @@ sub_81C174C: ; 81C174C adds r0, r4, 0 movs r1, 0x1 bl sub_81C1070 - b @081C189A + b _081C189A .pool -@081C17DC: +_081C17DC: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne @081C17F0 + bne _081C17F0 bl GetLRKeysState 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 GetLRKeysState 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 @@ -837039,19 +837039,19 @@ sub_81C174C: ; 81C174C strh r0, [r1] adds r0, r5, 0 bl sub_81C044C - b @081C189A + b _081C189A .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 @@ -837063,7 +837063,7 @@ sub_81C174C: ; 81C174C strh r0, [r1] adds r0, r5, 0 bl sub_81C044C -@081C189A: +_081C189A: pop {r4-r6} pop {r0} bx r0 @@ -837079,12 +837079,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 @@ -837095,14 +837095,14 @@ 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 .pool -@081C18EC: +_081C18EC: movs r0, 0 -@081C18EE: +_081C18EE: pop {r1} bx r1 thumb_func_end sub_81C18A8 @@ -837161,9 +837161,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 @@ -837171,7 +837171,7 @@ sub_81C1940: ; 81C1940 lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq @081C19B0 + beq _081C19B0 movs r0, 0x1 strh r0, [r4, 0x2] movs r0, 0x4 @@ -837186,13 +837186,13 @@ sub_81C1940: ; 81C1940 bl sub_81C1070 movs r0, 0 strh r0, [r4, 0x2] - b @081C1B6A + b _081C1B6A .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 @@ -837205,28 +837205,28 @@ sub_81C1940: ; 81C1940 movs r1, 0x1 bl sub_81C1070 strh r5, [r4, 0x2] - b @081C1B6A + b _081C1B6A .pool -@081C19DC: +_081C19DC: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne @081C19F0 + bne _081C19F0 bl GetLRKeysState 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 ClearWindowTilemap ldr r2, =0x02020630 @@ -837242,10 +837242,10 @@ sub_81C1940: ; 81C1940 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @081C1A28 + blt _081C1A28 movs r0, 0xD bl ClearWindowTilemap -@081C1A28: +_081C1A28: ldr r1, [r4] ldr r2, =0x000040c6 adds r0, r1, r2 @@ -837262,27 +837262,27 @@ sub_81C1940: ; 81C1940 movs r1, 0x1 negs r1, r1 adds r0, r7, 0 - b @081C1ACE + b _081C1ACE .pool -@081C1A64: +_081C1A64: ldrh r1, [r6, 0x2E] movs r0, 0x10 ands r0, r1 cmp r0, 0 - bne @081C1A7A + bne _081C1A7A bl GetLRKeysState 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 ClearWindowTilemap ldr r2, =0x02020630 @@ -837298,10 +837298,10 @@ sub_81C1940: ; 81C1940 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @081C1AB0 + blt _081C1AB0 movs r0, 0xD bl ClearWindowTilemap -@081C1AB0: +_081C1AB0: ldr r1, [r4] ldr r2, =0x000040c6 adds r0, r1, r2 @@ -837317,7 +837317,7 @@ sub_81C1940: ; 81C1940 str r1, [r0] adds r0, r7, 0 movs r1, 0x1 -@081C1ACE: +_081C1ACE: bl sub_81C0A8C movs r4, 0x2 negs r4, r4 @@ -837328,14 +837328,14 @@ sub_81C1940: ; 81C1940 adds r1, r4, 0 adds r2, r5, 0 bl sub_81C1EFC - b @081C1B74 + b _081C1B74 .pool -@081C1B04: +_081C1B04: ldrh r1, [r6, 0x2E] movs r0, 0x3 ands r0, r1 cmp r0, 0 - beq @081C1B74 + beq _081C1B74 movs r0, 0x13 bl ClearWindowTilemap ldr r2, =0x02020630 @@ -837352,10 +837352,10 @@ sub_81C1940: ; 81C1940 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @081C1B38 + blt _081C1B38 movs r0, 0xD bl ClearWindowTilemap -@081C1B38: +_081C1B38: ldr r1, [r4] ldr r2, =0x000040c6 adds r0, r1, r2 @@ -837377,13 +837377,13 @@ sub_81C1940: ; 81C1940 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 str r1, [r0] -@081C1B74: +_081C1B74: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -837409,7 +837409,7 @@ sub_81C1BA0: ; 81C1BA0 bl Alloc adds r4, r0, 0 movs r5, 0 -@081C1BAE: +_081C1BAE: lsls r0, r5, 25 lsrs r1, r0, 24 adds r6, r1, 0 @@ -837419,38 +837419,38 @@ sub_81C1BA0: ; 81C1BA0 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 .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 .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 @@ -837460,13 +837460,13 @@ sub_81C1BA0: ; 81C1BA0 movs r0, 0x56 strh r0, [r1, 0x10] movs r0, 0x57 - b @081C1C76 + b _081C1C76 .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 @@ -837476,8 +837476,8 @@ sub_81C1BA0: ; 81C1BA0 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 @@ -837487,10 +837487,10 @@ sub_81C1BA0: ; 81C1BA0 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 @@ -837500,8 +837500,8 @@ sub_81C1BA0: ; 81C1BA0 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 @@ -837511,14 +837511,14 @@ sub_81C1BA0: ; 81C1BA0 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 @@ -837573,14 +837573,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 @@ -837599,15 +837599,15 @@ sub_81C1CB0: ; 81C1CB0 lsrs r5, r0, 16 ldrb r3, [r4, 0x7] cmp r5, r3 - bcc @081C1D00 - b @081C1D60 + bcc _081C1D00 + b _081C1D60 .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 @@ -837626,12 +837626,12 @@ sub_81C1CB0: ; 81C1CB0 lsrs r5, r0, 16 ldrb r3, [r4, 0x7] cmp r5, r3 - bcc @081C1D38 -@081C1D60: + bcc _081C1D38 +_081C1D60: movs r5, 0 - b @081C1D8A + b _081C1D8A .pool -@081C1D68: +_081C1D68: ldrb r2, [r4, 0x6] adds r0, r2, 0 muls r0, r5 @@ -837648,10 +837648,10 @@ sub_81C1CB0: ; 81C1CB0 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 @@ -837673,16 +837673,16 @@ sub_81C1DA4: ; 81C1DA4 ldr r3, =gUnknown_0861CC04 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 @@ -837692,22 +837692,22 @@ sub_81C1DA4: ; 81C1DA4 adds r0, r3, 0 movs r3, 0x1 bl sub_81C1CB0 - b @081C1E12 + b _081C1E12 .pool -@081C1DE8: +_081C1DE8: ldr r5, =sub_81C1E20 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 @@ -837715,7 +837715,7 @@ sub_81C1DA4: ; 81C1DA4 adds r0, r1 strh r4, [r0, 0x8] strh r6, [r0, 0xA] -@081C1E12: +_081C1E12: pop {r4-r6} pop {r0} bx r0 @@ -837738,22 +837738,22 @@ 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, =gUnknown_0861CC04 - b @081C1E60 + b _081C1E60 .pool -@081C1E50: +_081C1E50: movs r0, 0x2 ldrsh r1, [r4, r0] ldr r0, =gUnknown_0861CC04 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 @@ -837765,26 +837765,26 @@ sub_81C1E20: ; 81C1E20 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 PutWindowTilemap - b @081C1ED4 + b _081C1ED4 .pool -@081C1EAC: +_081C1EAC: ldr r2, =0x02020630 ldr r0, [r5] ldr r1, =0x000040d5 @@ -837798,18 +837798,18 @@ sub_81C1E20: ; 81C1E20 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @081C1ECE + blt _081C1ECE movs r0, 0xD bl PutWindowTilemap -@081C1ECE: +_081C1ECE: movs r0, 0x13 bl PutWindowTilemap -@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 @@ -837833,16 +837833,16 @@ sub_81C1EFC: ; 81C1EFC ldr r3, =gUnknown_0861CC10 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 @@ -837852,22 +837852,22 @@ sub_81C1EFC: ; 81C1EFC adds r0, r3, 0 movs r3, 0x1 bl sub_81C1CB0 - b @081C1F70 + b _081C1F70 .pool -@081C1F44: +_081C1F44: ldr r5, =sub_81C1F80 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 @@ -837876,7 +837876,7 @@ sub_81C1EFC: ; 81C1EFC strh r4, [r0, 0x8] strh r7, [r0, 0xA] strh r6, [r0, 0xC] -@081C1F70: +_081C1F70: pop {r4-r7} pop {r0} bx r0 @@ -837899,22 +837899,22 @@ 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, =gUnknown_0861CC10 - b @081C1FC0 + b _081C1FC0 .pool -@081C1FB0: +_081C1FB0: movs r0, 0x2 ldrsh r1, [r4, r0] ldr r0, =gUnknown_0861CC10 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 @@ -837926,34 +837926,34 @@ sub_81C1F80: ; 81C1F80 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 bl is_function_an_active_task lsls r0, 24 cmp r0, 0 - bne @081C2006 + bne _081C2006 movs r0, 0xF bl PutWindowTilemap -@081C2006: +_081C2006: ldrh r0, [r4, 0x4] bl sub_81C240C - b @081C204C + b _081C204C .pool -@081C2024: +_081C2024: ldr r2, =0x02020630 ldr r0, [r5] ldr r1, =0x000040d5 @@ -837967,18 +837967,18 @@ sub_81C1F80: ; 81C1F80 ldrb r0, [r0] lsls r0, 29 cmp r0, 0 - blt @081C2046 + blt _081C2046 movs r0, 0xD bl PutWindowTilemap -@081C2046: +_081C2046: movs r0, 0x13 bl PutWindowTilemap -@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 @@ -838000,16 +838000,16 @@ sub_81C2074: ; 81C2074 ldr r3, =gUnknown_0861CBEC 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 @@ -838025,9 +838025,9 @@ sub_81C2074: ; 81C2074 adds r2, r4, 0 movs r3, 0 bl sub_81C1CB0 - b @081C20E2 + b _081C20E2 .pool -@081C20C8: +_081C20C8: ldr r0, =sub_81C20F0 movs r1, 0x8 bl AddTask @@ -838040,7 +838040,7 @@ sub_81C2074: ; 81C2074 adds r1, r2 strh r4, [r1, 0x8] strh r5, [r1, 0xA] -@081C20E2: +_081C20E2: pop {r4,r5} pop {r0} bx r0 @@ -838063,22 +838063,22 @@ 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, =gUnknown_0861CBEC - b @081C2130 + b _081C2130 .pool -@081C2120: +_081C2120: movs r0, 0x2 ldrsh r1, [r5, r0] ldr r0, =gUnknown_0861CBEC 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 @@ -838097,24 +838097,24 @@ sub_81C20F0: ; 81C20F0 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 PutWindowTilemap 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 @@ -838130,10 +838130,10 @@ sub_81C2194: ; 81C2194 lsrs r4, r1, 16 ldr r7, =0x0000056a cmp r2, 0 - bne @081C21E4 + bne _081C21E4 movs r3, 0 ldr r5, =gUnknown_08DC3CD4 -@081C21A8: +_081C21A8: adds r2, r7, r3 lsls r2, 1 adds r2, r6 @@ -838157,13 +838157,13 @@ sub_81C2194: ; 81C2194 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x13 - bls @081C21A8 - b @081C221C + bls _081C21A8 + b _081C221C .pool -@081C21E4: +_081C21E4: movs r3, 0 ldr r5, =gUnknown_08DC3CD4 -@081C21E8: +_081C21E8: adds r1, r7, r3 lsls r1, 1 adds r1, r6 @@ -838189,8 +838189,8 @@ sub_81C2194: ; 81C2194 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x13 - bls @081C21E8 -@081C221C: + bls _081C21E8 +_081C221C: pop {r4-r7} pop {r0} bx r0 @@ -838205,27 +838205,27 @@ sub_81C2228: ; 81C2228 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 .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 @@ -838245,7 +838245,7 @@ sub_81C228C: ; 81C228C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @081C22AC + bne _081C22AC movs r0, 0x8 str r0, [sp] str r1, [sp, 0x4] @@ -838254,8 +838254,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 @@ -838265,7 +838265,7 @@ sub_81C228C: ; 81C228C movs r2, 0x4 movs r3, 0x8 bl sub_8199C30 -@081C22C0: +_081C22C0: movs r0, 0x3 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -838287,7 +838287,7 @@ sub_81C22CC: ; 81C22CC ldrb r1, [r6, 0x5] mov r8, r0 cmp r1, 0x63 - bhi @081C2340 + bhi _081C2340 ldr r5, =gExperienceTables adds r2, r1, 0 adds r1, r2, 0x1 @@ -838319,17 +838319,17 @@ 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 .pool -@081C2340: +_081C2340: movs r6, 0 movs r7, 0 -@081C2344: +_081C2344: mov r1, r8 ldr r0, [r1] ldr r2, =0x00001d66 @@ -838339,23 +838339,23 @@ sub_81C22CC: ; 81C22CC 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 .pool -@081C237C: +_081C237C: mov r1, r12 lsls r0, r1, 1 add r0, r9 @@ -838363,12 +838363,12 @@ sub_81C22CC: ; 81C22CC 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 @@ -838386,24 +838386,24 @@ sub_81C22CC: ; 81C22CC 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 GetBgTilemap ldr r1, =0x0203cf1c @@ -838411,15 +838411,15 @@ sub_81C22CC: ; 81C22CC 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 .pool -@081C23F8: +_081C23F8: movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram -@081C23FE: +_081C23FE: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -838443,7 +838443,7 @@ sub_81C240C: ; 81C240C ldr r1, =0x000038bc adds r5, r0, r1 cmp r3, 0 - beq @081C2510 + beq _081C2510 ldr r1, =gContestEffects ldr r2, =gContestMoves lsls r3, 3 @@ -838456,22 +838456,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 @@ -838481,9 +838481,9 @@ sub_81C240C: ; 81C240C adds r0, r5 adds r0, r3 ldr r7, =0x0000103a - b @081C2496 + b _081C2496 .pool -@081C2484: +_081C2484: lsrs r0, r2, 2 adds r1, r2, 0 ands r1, r6 @@ -838493,14 +838493,14 @@ sub_81C240C: ; 81C240C 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] @@ -838508,21 +838508,21 @@ sub_81C240C: ; 81C240C 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 @@ -838532,9 +838532,9 @@ sub_81C240C: ; 81C240C adds r0, r5 adds r0, r3 ldr r7, =0x0000103c - b @081C2502 + b _081C2502 .pool -@081C24F0: +_081C24F0: lsrs r0, r2, 2 adds r1, r2, 0 ands r1, r6 @@ -838544,15 +838544,15 @@ sub_81C240C: ; 81C240C 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 @@ -838571,20 +838571,20 @@ sub_81C2524: ; 81C2524 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 ChangeBgX - b @081C254E + b _081C254E .pool -@081C2544: +_081C2544: movs r0, 0x3 movs r1, 0 movs r2, 0 bl ChangeBgX -@081C254E: +_081C254E: pop {r0} bx r0 thumb_func_end sub_81C2524 @@ -838596,7 +838596,7 @@ sub_81C2554: ; 81C2554 bl InitWindows bl DeactivateAllTextPrinters movs r4, 0 -@081C2562: +_081C2562: adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -838604,12 +838604,12 @@ sub_81C2554: ; 81C2554 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 @@ -838620,7 +838620,7 @@ sub_81C2554: ; 81C2554 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls @081C257C + bls _081C257C pop {r4,r5} pop {r0} bx r0 @@ -838679,13 +838679,13 @@ sub_81C25E8: ; 81C25E8 adds r0, 0x74 ldrb r0, [r0] cmp r0, 0 - bne @081C2618 + bne _081C2618 bl sub_81C2628 - b @081C261C + b _081C261C .pool -@081C2618: +_081C2618: bl sub_81C2794 -@081C261C: +_081C261C: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram pop {r0} @@ -838711,7 +838711,7 @@ sub_81C2628: ; 81C2628 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq @081C26CE + beq _081C26CE ldr r6, =0x02021cc4 ldr r1, =gUnknown_085E8D4F adds r0, r6, 0 @@ -838730,7 +838730,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] @@ -838741,9 +838741,9 @@ sub_81C2628: ; 81C2628 bl sub_81C25A4 movs r0, 0 bl sub_81C228C - b @081C26C6 + b _081C26C6 .pool -@081C26AC: +_081C26AC: movs r0, 0 str r0, [sp] movs r0, 0x7 @@ -838755,25 +838755,25 @@ sub_81C2628: ; 81C2628 bl sub_81C25A4 movs r0, 0x1 bl sub_81C228C -@081C26C6: +_081C26C6: movs r0, 0x11 bl PutWindowTilemap - b @081C26EE -@081C26CE: + b _081C26EE +_081C26CE: movs r0, 0x11 bl ClearWindowTilemap 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, =gUnknown_085E8D4D adds r0, r4, 0 @@ -838879,18 +838879,18 @@ sub_81C27DC: ; 81C27DC 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, =gUnknown_085E8D49 str r0, [sp] movs r0, 0x3 @@ -838899,9 +838899,9 @@ sub_81C27DC: ; 81C27DC movs r2, 0x39 movs r3, 0x11 bl sub_81C25A4 - b @081C282C + b _081C282C .pool -@081C2818: +_081C2818: ldr r1, =gUnknown_085E8D4B movs r0, 0 str r0, [sp] @@ -838911,7 +838911,7 @@ sub_81C27DC: ; 81C27DC movs r2, 0x39 movs r3, 0x11 bl sub_81C25A4 -@081C282C: +_081C282C: add sp, 0x8 pop {r0} bx r0 @@ -838927,9 +838927,9 @@ sub_81C2838: ; 81C2838 lsls r1, 24 ldr r3, =gUnknown_0861CDD3 cmp r1, 0 - bne @081C284A + bne _081C284A subs r3, 0x80 -@081C284A: +_081C284A: lsls r2, 16 lsrs r2, 16 movs r0, 0x10 @@ -838989,9 +838989,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 @@ -839012,9 +839012,9 @@ sub_81C286C: ; 81C286C 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 @@ -839035,9 +839035,9 @@ sub_81C286C: ; 81C286C 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 @@ -839218,19 +839218,19 @@ sub_81C2AFC: ; 81C2AFC movs r0, 0x3 bl ClearWindowTilemap 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 PutWindowTilemap movs r0, 0x4 @@ -839239,20 +839239,20 @@ sub_81C2AFC: ; 81C2AFC 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 PutWindowTilemap -@081C2B5E: +_081C2B5E: movs r0, 0x9 bl PutWindowTilemap - b @081C2C06 -@081C2B66: + b _081C2C06 +_081C2B66: movs r0, 0x1 bl PutWindowTilemap movs r0, 0xA @@ -839261,8 +839261,8 @@ sub_81C2AFC: ; 81C2AFC bl PutWindowTilemap movs r0, 0xC bl PutWindowTilemap - b @081C2C06 -@081C2B80: + b _081C2C06 +_081C2B80: movs r0, 0x2 bl PutWindowTilemap ldr r0, =0x0203cf1c @@ -839271,7 +839271,7 @@ sub_81C2AFC: ; 81C2AFC adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne @081C2BBC + bne _081C2BBC adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] @@ -839280,16 +839280,16 @@ sub_81C2AFC: ; 81C2AFC movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq @081C2C06 + beq _081C2C06 movs r0, 0xE bl PutWindowTilemap - b @081C2C06 + b _081C2C06 .pool -@081C2BBC: +_081C2BBC: movs r0, 0x5 bl PutWindowTilemap - b @081C2C06 -@081C2BC4: + b _081C2C06 +_081C2BC4: movs r0, 0x3 bl PutWindowTilemap ldr r0, =0x0203cf1c @@ -839298,7 +839298,7 @@ sub_81C2AFC: ; 81C2AFC adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x3 - bne @081C2C00 + bne _081C2C00 adds r2, 0x8 adds r0, r1, r2 ldr r0, [r0] @@ -839307,18 +839307,18 @@ sub_81C2AFC: ; 81C2AFC movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq @081C2C06 + beq _081C2C06 movs r0, 0xF bl PutWindowTilemap - b @081C2C06 + b _081C2C06 .pool -@081C2C00: +_081C2C00: movs r0, 0x5 bl PutWindowTilemap -@081C2C06: +_081C2C06: movs r4, 0 ldr r5, =0x0203cf1c -@081C2C0A: +_081C2C0A: ldr r0, [r5] ldr r1, =0x000040cb adds r0, r1 @@ -839329,7 +839329,7 @@ sub_81C2AFC: ; 81C2AFC 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} @@ -839345,54 +839345,54 @@ sub_81C2C38: ; 81C2C38 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 ClearWindowTilemap 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 ClearWindowTilemap -@081C2C7C: +_081C2C7C: movs r0, 0x9 bl ClearWindowTilemap - b @081C2D0E -@081C2C84: + b _081C2D0E +_081C2C84: movs r0, 0xA bl ClearWindowTilemap movs r0, 0xB bl ClearWindowTilemap movs r0, 0xC bl ClearWindowTilemap - 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] @@ -839401,23 +839401,23 @@ sub_81C2C38: ; 81C2C38 movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq @081C2D0E + beq _081C2D0E movs r0, 0xE bl ClearWindowTilemap - b @081C2D0E + b _081C2D0E .pool -@081C2CCC: +_081C2CCC: movs r0, 0x5 bl ClearWindowTilemap - 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] @@ -839426,24 +839426,24 @@ sub_81C2C38: ; 81C2C38 movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq @081C2D0E + beq _081C2D0E movs r0, 0xF bl ClearWindowTilemap - b @081C2D0E + b _081C2D0E .pool -@081C2D08: +_081C2D08: movs r0, 0x5 bl ClearWindowTilemap -@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} @@ -839464,7 +839464,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 AddWindow @@ -839472,7 +839472,7 @@ sub_81C2D2C: ; 81C2D2C ldrb r0, [r4] movs r1, 0 bl FillWindowPixelBuffer -@081C2D56: +_081C2D56: ldrb r0, [r4] pop {r4} pop {r1} @@ -839492,13 +839492,13 @@ sub_81C2D68: ; 81C2D68 adds r4, r1, r0 ldrb r0, [r4] cmp r0, 0xFF - beq @081C2D8C + beq _081C2D8C bl ClearWindowTilemap ldrb r0, [r4] bl RemoveWindow movs r0, 0xFF strb r0, [r4] -@081C2D8C: +_081C2D8C: pop {r4} pop {r0} bx r0 @@ -839511,7 +839511,7 @@ sub_81C2D9C: ; 81C2D9C lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 -@081C2DA4: +_081C2DA4: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040cb @@ -839519,15 +839519,15 @@ sub_81C2D9C: ; 81C2D9C adds r1, r0, r4 ldrb r0, [r1] cmp r0, 0xFF - beq @081C2DBA + beq _081C2DBA movs r1, 0 bl FillWindowPixelBuffer -@081C2DBA: +_081C2DBA: adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x7 - bls @081C2DA4 + bls _081C2DA4 ldr r0, =gUnknown_0861CE54 lsls r1, r5, 2 adds r1, r0 @@ -839562,21 +839562,21 @@ sub_81C2E00: ; 81C2E00 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 .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 @@ -839596,49 +839596,49 @@ 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 .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 @@ -839652,12 +839652,12 @@ sub_81C2EC4: ; 81C2EC4 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, =gUnknown_0861CCCC movs r1, 0 bl sub_81C2D2C @@ -839684,7 +839684,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 @@ -839694,9 +839694,9 @@ sub_81C2EC4: ; 81C2EC4 adds r0, r5, 0 movs r3, 0x1 bl sub_81C25A4 - b @081C2F54 + b _081C2F54 .pool -@081C2F40: +_081C2F40: adds r1, 0xA6 lsls r2, 24 lsrs r2, 24 @@ -839706,7 +839706,7 @@ sub_81C2EC4: ; 81C2EC4 adds r0, r5, 0 movs r3, 0x1 bl sub_81C25A4 -@081C2F54: +_081C2F54: add sp, 0x8 pop {r4-r6} pop {r0} @@ -839721,12 +839721,12 @@ sub_81C2F5C: ; 81C2F5C 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, =gUnknown_085E8D59 adds r0, r5, 0 @@ -839758,7 +839758,7 @@ sub_81C2F5C: ; 81C2F5C adds r2, r4, 0 movs r3, 0x1 bl sub_81C25A4 -@081C2FC0: +_081C2FC0: add sp, 0x8 pop {r4,r5} pop {r0} @@ -839859,24 +839859,24 @@ 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, =gUnknown_085EA5DB bl sub_81AFC28 - b @081C3182 + b _081C3182 .pool -@081C30E0: +_081C30E0: movs r0, 0x20 bl Alloc adds r6, r0, 0 @@ -839887,65 +839887,65 @@ sub_81C307C: ; 81C307C 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, =gUnknown_085EA516 cmp r0, 0xD4 - bls @081C3170 + bls _081C3170 ldr r1, =gUnknown_085EA617 - b @081C3170 + b _081C3170 .pool -@081C3134: +_081C3134: ldrb r0, [r4, 0x9] ldr r1, =gUnknown_085EA4EC cmp r0, 0xD4 - bls @081C3170 + bls _081C3170 ldr r1, =gUnknown_085EA5EB - b @081C3170 + b _081C3170 .pool -@081C3148: +_081C3148: ldrb r0, [r4, 0x9] cmp r0, 0xFF - bne @081C3158 + bne _081C3158 ldr r1, =gUnknown_085EA56A - b @081C3170 + b _081C3170 .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, =gUnknown_085EA5A8 cmp r0, 0xD4 - bls @081C3170 -@081C316E: + bls _081C3170 +_081C316E: ldr r1, =gUnknown_085EA544 -@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 @@ -840003,9 +840003,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 @@ -840029,7 +840029,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 @@ -840048,9 +840048,9 @@ sub_81C3220: ; 81C3220 adds r2, 0x8 adds r1, r2 bl CopyString - b @081C3282 + b _081C3282 .pool -@081C326C: +_081C326C: bl sub_80F0020 adds r4, r0, 0 ldr r0, =0x0000ffff @@ -840060,30 +840060,30 @@ sub_81C3220: ; 81C3220 ldrb r5, [r1, 0x8] ldr r0, =0x02021cc4 bl CopyString -@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 CompareStringWithoutExtendedControlCodes cmp r0, 0 - beq @081C32B4 -@081C32A4: + beq _081C32B4 +_081C32A4: movs r0, 0 - b @081C32B6 + b _081C32B6 .pool -@081C32B4: +_081C32B4: movs r0, 0x1 -@081C32B6: +_081C32B6: pop {r4-r6} pop {r1} bx r1 @@ -840100,13 +840100,13 @@ sub_81C32BC: ; 81C32BC lsls r0, 24 lsrs r0, 24 cmp r0, 0x4 - bls @081C32D8 + bls _081C32D8 movs r0, 0 - b @081C32DA + b _081C32DA .pool -@081C32D8: +_081C32D8: movs r0, 0x1 -@081C32DA: +_081C32DA: pop {r1} bx r1 thumb_func_end sub_81C32BC @@ -840122,13 +840122,13 @@ sub_81C32E0: ; 81C32E0 lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 - bls @081C32FC + bls _081C32FC movs r0, 0 - b @081C32FE + b _081C32FE .pool -@081C32FC: +_081C32FC: movs r0, 0x1 -@081C32FE: +_081C32FE: pop {r1} bx r1 thumb_func_end sub_81C32E0 @@ -840142,7 +840142,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 @@ -840150,25 +840150,25 @@ 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 .pool -@081C3354: +_081C3354: movs r0, 0 -@081C3356: +_081C3356: pop {r1} bx r1 thumb_func_end sub_81C3304 @@ -840272,29 +840272,29 @@ sub_81C3428: ; 81C3428 adds r0, 0xA5 ldrb r0, [r0] cmp r0, 0x1 - bne @081C3448 + bne _081C3448 ldr r4, =gUnknown_085EA40B - b @081C346C + b _081C346C .pool -@081C3448: +_081C3448: ldrh r0, [r1, 0x30] cmp r0, 0x5 - bhi @081C3458 + bhi _081C3458 ldr r4, =gUnknown_085EA4A2 - b @081C346C + b _081C346C .pool -@081C3458: +_081C3458: cmp r0, 0xA - bhi @081C3464 + bhi _081C3464 ldr r4, =gUnknown_085EA475 - b @081C346C + b _081C346C .pool -@081C3464: +_081C3464: ldr r4, =gUnknown_085EA40B cmp r0, 0x28 - bhi @081C346C + bhi _081C346C ldr r4, =gUnknown_085EA442 -@081C346C: +_081C346C: ldr r0, =gUnknown_0861CCCC movs r1, 0x2 bl sub_81C2D2C @@ -840325,42 +840325,42 @@ 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, =gUnknown_085EA678 - b @081C3502 + b _081C3502 .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, =gUnknown_085EA6AB - b @081C3502 + b _081C3502 .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, =gUnknown_085EA702 cmp r0, 0x1 - bne @081C3502 + bne _081C3502 ldr r4, =gUnknown_085EA6D7 - b @081C3502 + b _081C3502 .pool -@081C3500: +_081C3500: ldr r4, =gUnknown_085EA647 -@081C3502: +_081C3502: ldr r0, =gUnknown_0861CCCC movs r1, 0x3 bl sub_81C2D2C @@ -840409,53 +840409,53 @@ 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 .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 @@ -840470,46 +840470,46 @@ 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 .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, =gUnknown_085E8D26 - b @081C3650 + b _081C3650 .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 @@ -840547,11 +840547,11 @@ sub_81C3690: ; 81C3690 adds r1, 0x76 ldrb r0, [r1] cmp r0, 0 - bne @081C36B0 + bne _081C36B0 ldr r5, =gUnknown_085E8D26 - b @081C36C8 + b _081C36C8 .pool -@081C36B0: +_081C36B0: ldr r0, =0x02021cc4 ldrb r1, [r1] movs r2, 0x1 @@ -840562,7 +840562,7 @@ sub_81C3690: ; 81C3690 adds r0, r4, 0 bl ExpandStringRefs adds r5, r4, 0 -@081C36C8: +_081C36C8: movs r0, 0x1 adds r1, r5, 0 movs r2, 0x46 @@ -840801,7 +840801,7 @@ sub_81C38C0: ; 81C38C0 bl sub_81C25A4 ldrb r0, [r5, 0x5] cmp r0, 0x63 - bhi @081C3948 + bhi _081C3948 ldr r4, =gExperienceTables adds r1, r0, 0 adds r1, 0x1 @@ -840821,11 +840821,11 @@ sub_81C38C0: ; 81C38C0 ldr r1, [r1] ldr r0, [r5, 0x10] subs r1, r0 - b @081C394A + b _081C394A .pool -@081C3948: +_081C3948: movs r1, 0 -@081C394A: +_081C394A: ldr r4, =0x02021cc4 adds r0, r4, 0 movs r2, 0x1 @@ -840869,30 +840869,30 @@ 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 .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 @@ -840913,85 +840913,85 @@ 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 .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 .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 .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] @@ -841000,20 +841000,20 @@ sub_81C39F0: ; 81C39F0 movs r1, 0x80 lsls r1, 11 cmp r0, r1 - beq @081C3AFC + beq _081C3AFC ldrh r0, [r4, 0x2] bl sub_81C3E9C - b @081C3AFC + b _081C3AFC .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 @@ -841051,7 +841051,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] @@ -841118,9 +841118,9 @@ sub_81C3B08: ; 81C3B08 movs r2, 0x2C bl GetStringRightAlignXOffset mov r4, r9 - b @081C3C26 + b _081C3C26 .pool -@081C3C00: +_081C3C00: ldr r1, =gUnknown_085E8D40 lsls r4, r7, 4 adds r3, r4, 0x1 @@ -841138,7 +841138,7 @@ sub_81C3B08: ; 81C3B08 adds r1, r7, 0 movs r2, 0x2C bl GetStringCenterAlignXOffset -@081C3C26: +_081C3C26: lsls r2, r0, 24 lsrs r2, 24 adds r3, r4, 0x1 @@ -841170,7 +841170,7 @@ sub_81C3C5C: ; 81C3C5C lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq @081C3CFC + beq _081C3CFC movs r0, 0x13 str r0, [sp] movs r0, 0x20 @@ -841188,11 +841188,11 @@ sub_81C3C5C: ; 81C3C5C ldrb r0, [r2, 0x1] adds r6, r1, 0 cmp r0, 0x1 - bhi @081C3C9C + bhi _081C3C9C ldr r1, =gUnknown_085E8D45 - b @081C3CAC + b _081C3CAC .pool -@081C3C9C: +_081C3C9C: ldr r4, =0x02021cc4 ldrb r1, [r2, 0x1] adds r0, r4, 0 @@ -841200,7 +841200,7 @@ sub_81C3C5C: ; 81C3C5C movs r3, 0x3 bl ConvertIntToDecimalString adds r1, r4, 0 -@081C3CAC: +_081C3CAC: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -841214,11 +841214,11 @@ sub_81C3C5C: ; 81C3C5C adds r1, r0, r1 ldrb r0, [r1, 0x3] cmp r0, 0 - bne @081C3CDC + bne _081C3CDC ldr r1, =gUnknown_085E8D45 - b @081C3CEC + b _081C3CEC .pool -@081C3CDC: +_081C3CDC: ldr r4, =0x02021cc4 ldrb r1, [r1, 0x3] adds r0, r4, 0 @@ -841226,7 +841226,7 @@ sub_81C3C5C: ; 81C3C5C movs r3, 0x3 bl ConvertIntToDecimalString adds r1, r4, 0 -@081C3CEC: +_081C3CEC: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -841234,7 +841234,7 @@ sub_81C3C5C: ; 81C3C5C movs r2, 0x35 movs r3, 0x11 bl sub_81C25A4 -@081C3CFC: +_081C3CFC: add sp, 0x8 pop {r4-r6} pop {r0} @@ -841259,14 +841259,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 @@ -841288,57 +841288,57 @@ 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 .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 .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] @@ -841347,22 +841347,22 @@ sub_81C3D54: ; 81C3D54 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 .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 @@ -841375,22 +841375,22 @@ sub_81C3E2C: ; 81C3E2C 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 .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, =gUnknown_0861CD14 movs r1, 0x2 bl sub_81C2D2C @@ -841410,7 +841410,7 @@ sub_81C3E2C: ; 81C3E2C movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 -@081C3E82: +_081C3E82: add sp, 0x8 pop {r4} pop {r0} @@ -841434,14 +841434,14 @@ sub_81C3E9C: ; 81C3E9C movs r1, 0 bl FillWindowPixelBuffer 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, =gMoveDescriptionPointers @@ -841456,9 +841456,9 @@ sub_81C3E9C: ; 81C3E9C movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 - b @081C3F20 + b _081C3F20 .pool -@081C3F00: +_081C3F00: ldr r2, =gContestEffectDescriptionPointers ldr r1, =gContestMoves lsls r0, r6, 3 @@ -841474,15 +841474,15 @@ sub_81C3E9C: ; 81C3E9C movs r2, 0x6 movs r3, 0x1 bl sub_81C25A4 -@081C3F20: +_081C3F20: adds r0, r5, 0 bl PutWindowTilemap - b @081C3F36 + b _081C3F36 .pool -@081C3F30: +_081C3F30: adds r0, r5, 0 bl ClearWindowTilemap -@081C3F36: +_081C3F36: movs r0, 0 bl schedule_bg_copy_tilemap_to_vram add sp, 0x8 @@ -841516,7 +841516,7 @@ sub_81C3F44: ; 81C3F44 adds r0, r1, r2 ldrh r2, [r0] cmp r2, 0 - bne @081C3F9C + bne _081C3F9C ldr r1, =gUnknown_085E8CF0 str r2, [sp] movs r0, 0x1 @@ -841525,15 +841525,15 @@ sub_81C3F44: ; 81C3F44 movs r2, 0 movs r3, 0x41 bl sub_81C25A4 - b @081C4044 + b _081C4044 .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 @@ -841547,9 +841547,9 @@ sub_81C3F44: ; 81C3F44 movs r2, 0 movs r3, 0x41 bl sub_81C25A4 - b @081C3FEC + b _081C3FEC .pool -@081C3FD0: +_081C3FD0: movs r0, 0xD adds r1, r5, 0 muls r1, r0 @@ -841563,7 +841563,7 @@ sub_81C3F44: ; 81C3F44 movs r2, 0 movs r3, 0x41 bl sub_81C25A4 -@081C3FEC: +_081C3FEC: ldr r4, =0x02021cc4 ldr r1, =gBattleMoves lsls r0, r5, 1 @@ -841601,7 +841601,7 @@ sub_81C3F44: ; 81C3F44 adds r1, r4, 0 movs r3, 0x41 bl sub_81C25A4 -@081C4044: +_081C4044: add sp, 0x8 pop {r3} mov r8, r3 @@ -841760,7 +841760,7 @@ sub_81C4190: ; 81C4190 ldr r5, =0x0203cf1c ldr r4, =0x000040d3 movs r3, 0xFF -@081C419A: +_081C419A: ldr r0, [r5] adds r0, r4 adds r0, r2 @@ -841771,7 +841771,7 @@ sub_81C4190: ; 81C4190 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x1B - bls @081C419A + bls _081C419A pop {r4,r5} pop {r0} bx r0 @@ -841790,7 +841790,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 @@ -841804,7 +841804,7 @@ sub_81C41C0: ; 81C41C0 adds r0, r4 movs r1, 0xFF strb r1, [r0] -@081C41F2: +_081C41F2: pop {r4,r5} pop {r0} bx r0 @@ -841849,7 +841849,7 @@ sub_81C4204: ; 81C4204 sub_81C424C: ; 81C424C push {r4,lr} movs r4, 0x3 -@081C4250: +_081C4250: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040d3 @@ -841857,16 +841857,16 @@ sub_81C424C: ; 81C424C 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 @@ -841882,28 +841882,28 @@ 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 .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 @@ -841913,14 +841913,14 @@ 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, =gUnknown_0861CFC4 movs r1, 0 movs r2, 0 @@ -841931,7 +841931,7 @@ sub_81C42C8: ; 81C42C8 adds r1, r2 adds r1, r4 strb r0, [r1] -@081C42F2: +_081C42F2: adds r0, r4, 0 movs r1, 0x1 bl sub_81C4204 @@ -841939,7 +841939,7 @@ sub_81C42C8: ; 81C42C8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x7 - bls @081C42CE + bls _081C42CE pop {r4,r5} pop {r0} bx r0 @@ -842017,7 +842017,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 @@ -842026,9 +842026,9 @@ sub_81C43A0: ; 81C43A0 movs r0, 0x4 movs r1, 0x1 bl sub_81C4204 - b @081C4418 + b _081C4418 .pool -@081C43CC: +_081C43CC: ldr r4, =gBaseStats ldrh r1, [r5] lsls r0, r1, 3 @@ -842048,7 +842048,7 @@ sub_81C43A0: ; 81C43A0 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 @@ -842057,13 +842057,13 @@ sub_81C43A0: ; 81C43A0 movs r0, 0x4 movs r1, 0 bl sub_81C4204 - b @081C4418 + b _081C4418 .pool -@081C4410: +_081C4410: movs r0, 0x4 movs r1, 0x1 bl sub_81C4204 -@081C4418: +_081C4418: pop {r4,r5} pop {r0} bx r0 @@ -842078,14 +842078,14 @@ sub_81C4420: ; 81C4420 adds r5, 0x70 movs r4, 0 ldr r6, =gBattleMoves -@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 @@ -842102,20 +842102,20 @@ sub_81C4420: ; 81C4420 lsrs r3, 24 movs r1, 0x55 bl sub_81C4318 - b @081C4474 + b _081C4474 .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 @@ -842129,14 +842129,14 @@ sub_81C4484: ; 81C4484 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, =gContestMoves lsls r0, 3 adds r0, r1 @@ -842157,20 +842157,20 @@ sub_81C4484: ; 81C4484 lsrs r3, 24 movs r1, 0x55 bl sub_81C4318 - b @081C44E0 + b _081C44E0 .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 @@ -842185,18 +842185,18 @@ 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 .pool -@081C4514: +_081C4514: ldr r2, =0x000040c0 adds r0, r1, r2 ldrb r0, [r0] cmp r0, 0x2 - bne @081C4540 + bne _081C4540 ldr r2, =gBattleMoves ldrh r1, [r3] lsls r0, r1, 1 @@ -842208,9 +842208,9 @@ sub_81C44F0: ; 81C44F0 movs r2, 0x60 movs r3, 0x7 bl sub_81C4318 - b @081C4560 + b _081C4560 .pool -@081C4540: +_081C4540: ldr r1, =gContestMoves ldrh r0, [r3] lsls r0, 3 @@ -842226,7 +842226,7 @@ sub_81C44F0: ; 81C44F0 movs r2, 0x60 movs r3, 0x7 bl sub_81C4318 -@081C4560: +_081C4560: pop {r0} bx r0 .pool @@ -842312,18 +842312,18 @@ 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 .pool -@081C4620: +_081C4620: ldr r0, =0x030022c0 ldr r1, =0x00000439 adds r0, r1 @@ -842331,7 +842331,7 @@ sub_81C45F4: ; 81C45F4 movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @081C4680 + beq _081C4680 ldr r1, =0x000040be adds r0, r2, r1 ldrb r1, [r0] @@ -842339,7 +842339,7 @@ sub_81C45F4: ; 81C45F4 bl sub_80688F8 lsls r0, 24 cmp r0, 0 - beq @081C4668 + beq _081C4668 ldrh r2, [r5, 0x2] lsls r0, r2, 3 ldr r1, =gMonFrontPicTable @@ -842347,76 +842347,76 @@ sub_81C45F4: ; 81C45F4 ldr r1, =0x020244d4 ldr r1, [r1] ldr r1, [r1, 0x8] - b @081C46D6 + b _081C46D6 .pool -@081C4668: +_081C4668: ldrh r2, [r5, 0x2] lsls r0, r2, 3 ldr r1, =gMonFrontPicTable adds r0, r1 ldr r1, =0x020244d4 ldr r1, [r1] - b @081C46B0 + b _081C46B0 .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, =gMonFrontPicTable adds r0, r1 ldr r1, [r4] -@081C46B0: +_081C46B0: ldr r1, [r1, 0x8] ldr r3, [r5, 0xC] bl DecompressMonPic_DetectFrontOrBack_2 - b @081C4768 + b _081C4768 .pool -@081C46CC: +_081C46CC: ldrh r2, [r5, 0x2] lsls r0, r2, 3 ldr r1, =gMonFrontPicTable adds r0, r1 ldr r1, [r3, 0x8] -@081C46D6: +_081C46D6: ldr r3, [r5, 0xC] bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack - b @081C4768 + b _081C4768 .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, =gMonFrontPicTable @@ -842429,9 +842429,9 @@ sub_81C45F4: ; 81C45F4 ldr r3, [r5, 0xC] adds r0, r4, 0 bl DecompressMonPic_DetectFrontOrBack_2 - b @081C4768 + b _081C4768 .pool -@081C472C: +_081C472C: ldrh r4, [r5, 0x2] lsls r4, 3 ldr r0, =gMonFrontPicTable @@ -842444,9 +842444,9 @@ sub_81C45F4: ; 81C45F4 ldr r3, [r5, 0xC] adds r0, r4, 0 bl DecompressMonPicWithoutDuplicatingDeoxysTiles_DetectFrontOrBack - b @081C4768 + b _081C4768 .pool -@081C4750: +_081C4750: ldrh r0, [r5, 0x2] ldr r1, [r5, 0x48] ldr r2, [r5, 0xC] @@ -842456,12 +842456,12 @@ sub_81C45F4: ; 81C45F4 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 @@ -842476,24 +842476,24 @@ 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 .pool -@081C47A4: +_081C47A4: ldrh r0, [r4, 0x2] movs r1, 0 movs r2, 0xB bl sub_80A32E4 -@081C47AE: +_081C47AE: pop {r4} pop {r0} bx r0 @@ -842539,16 +842539,16 @@ 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 .pool -@081C4828: +_081C4828: adds r2, r7, 0 adds r2, 0x3F ldrb r1, [r2] @@ -842556,7 +842556,7 @@ sub_81C47B4: ; 81C47B4 negs r0, r0 ands r0, r1 strb r0, [r2] -@081C4836: +_081C4836: mov r0, r8 pop {r3} mov r8, r3 @@ -842578,11 +842578,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 @@ -842593,7 +842593,7 @@ sub_81C4844: ; 81C4844 ldrb r2, [r5, 0x4] adds r0, r4, 0 bl sub_806EE0C -@081C487E: +_081C487E: pop {r4,r5} pop {r0} bx r0 @@ -842614,11 +842614,11 @@ sub_81C4898: ; 81C4898 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 @@ -842642,13 +842642,13 @@ sub_81C48B4: ; 81C48B4 ldr r1, [r0] ldr r0, =DummyObjectCallback cmp r1, r0 - beq @081C48E8 + beq _081C48E8 movs r0, 0x1 - b @081C48EA + b _081C48EA .pool -@081C48E8: +_081C48E8: movs r0, 0 -@081C48EA: +_081C48EA: pop {r1} bx r1 thumb_func_end sub_81C48B4 @@ -842700,7 +842700,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 @@ -842712,7 +842712,7 @@ sub_81C48F0: ; 81C48F0 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0xF - bls @081C494C + bls _081C494C pop {r4-r6} pop {r0} bx r0 @@ -842732,7 +842732,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 @@ -842755,7 +842755,7 @@ sub_81C4984: ; 81C4984 movs r1, 0x4 orrs r0, r1 strb r0, [r2, 0x5] -@081C49CE: +_081C49CE: pop {r4-r6} pop {r0} bx r0 @@ -842843,21 +842843,21 @@ sub_81C4A88: ; 81C4A88 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne @081C4AA6 + bne _081C4AA6 ldr r0, =gUnknown_0861D108 movs r1, 0x40 movs r2, 0x98 movs r3, 0 bl AddObjectToFront 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 @@ -842871,13 +842871,13 @@ sub_81C4A88: ; 81C4A88 movs r0, 0x2 movs r1, 0 bl sub_81C4204 - b @081C4AF0 + b _081C4AF0 .pool -@081C4AE8: +_081C4AE8: movs r0, 0x2 movs r1, 0x1 bl sub_81C4204 -@081C4AF0: +_081C4AF0: pop {r4,r5} pop {r0} bx r0 @@ -842902,19 +842902,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 @@ -842928,7 +842928,7 @@ sub_81C4AF8: ; 81C4AF8 strb r0, [r1] adds r4, r1, 0 cmp r5, 0 - bne @081C4B74 + bne _081C4B74 ldrb r1, [r7] lsls r0, r1, 4 adds r0, r1 @@ -842936,11 +842936,11 @@ sub_81C4AF8: ; 81C4AF8 adds r0, r6 movs r1, 0x4 bl StartObjectImageAnim - b @081C4B9A + b _081C4B9A .pool -@081C4B74: +_081C4B74: cmp r5, 0x9 - bne @081C4B8A + bne _081C4B8A ldrb r1, [r7, 0x9] lsls r0, r1, 4 adds r0, r1 @@ -842948,8 +842948,8 @@ sub_81C4AF8: ; 81C4AF8 adds r0, r6 movs r1, 0x5 bl StartObjectImageAnim - b @081C4B9A -@081C4B8A: + b _081C4B9A +_081C4B8A: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -842957,7 +842957,7 @@ sub_81C4AF8: ; 81C4AF8 adds r0, r6 movs r1, 0x6 bl StartObjectImageAnim -@081C4B9A: +_081C4B9A: ldrb r1, [r4] lsls r0, r1, 4 adds r0, r1 @@ -842985,8 +842985,8 @@ sub_81C4AF8: ; 81C4AF8 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 @@ -843007,52 +843007,52 @@ 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 .pool -@081C4C44: +_081C4C44: ldr r0, =0x0203cf1c ldr r0, [r0] ldr r1, =0x000040c7 -@081C4C4A: +_081C4C4A: adds r0, r1 ldrb r0, [r0] lsls r0, 4 @@ -843068,7 +843068,7 @@ sub_81C4C60: ; 81C4C60 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 -@081C4C68: +_081C4C68: adds r0, r5, r4 lsls r0, 24 lsrs r0, 24 @@ -843077,7 +843077,7 @@ sub_81C4C60: ; 81C4C60 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x9 - bls @081C4C68 + bls _081C4C68 pop {r4,r5} pop {r0} bx r0 @@ -843109,31 +843109,31 @@ 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 .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 StartObjectImageAnim - b @081C4D02 -@081C4CEC: + b _081C4D02 +_081C4CEC: adds r0, r5, r4 ldrb r1, [r0] lsls r0, r1, 4 @@ -843144,12 +843144,12 @@ sub_81C4C84: ; 81C4C84 lsls r1, 24 lsrs r1, 24 bl StartObjectImageAnim -@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 @@ -843173,7 +843173,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 @@ -843195,7 +843195,7 @@ sub_81C4D18: ; 81C4D18 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x9 - bls @081C4D32 + bls _081C4D32 pop {r4-r7} pop {r0} bx r0 @@ -843215,7 +843215,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 @@ -843246,9 +843246,9 @@ sub_81C4D70: ; 81C4D70 movs r2, 0x20 movs r3, 0x20 bl sub_8199D3C - b @081C4E2E + b _081C4E2E .pool -@081C4DDC: +_081C4DDC: lsls r0, r1, 30 lsrs r0, 30 movs r1, 0x8 @@ -843285,7 +843285,7 @@ sub_81C4D70: ; 81C4D70 movs r2, 0x40 movs r3, 0x40 bl sub_8199D3C -@081C4E2E: +_081C4E2E: ldr r0, [r5] lsls r0, 30 lsrs r0, 30 @@ -843327,16 +843327,16 @@ sub_81C4E90: ; 81C4E90 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 ShowBg movs r0, 0 -@081C4EAC: +_081C4EAC: pop {r1} bx r1 .pool @@ -843348,11 +843348,11 @@ sub_81C4EB4: ; 81C4EB4 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 @@ -843431,7 +843431,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 @@ -843441,7 +843441,7 @@ sub_81C4F44: ; 81C4F44 bl sub_81C4F98 adds r0, r4, 0 bl remove_task -@081C4F6E: +_081C4F6E: pop {r4} pop {r0} bx r0 @@ -843471,15 +843471,15 @@ sub_81C4F98: ; 81C4F98 bl AllocZeroed 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] @@ -843538,23 +843538,23 @@ sub_81C5038: ; 81C5038 thumb_func_start sub_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 @@ -843569,63 +843569,63 @@ 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 .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 ResetObjectPaletteAllocator - 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 .pool -@081C510C: +_081C510C: bl ResetAllObjectData - 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] @@ -843633,45 +843633,45 @@ sub_81C5078: ; 81C5078 adds r0, r1 movs r1, 0 strh r1, [r0] - b @081C51A2 + b _081C51A2 .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 @@ -843683,9 +843683,9 @@ sub_81C5078: ; 81C5078 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 @@ -843693,19 +843693,19 @@ sub_81C5078: ; 81C5078 ldrb r0, [r1] adds r0, 0x1 strb r0, [r1] - b @081C51D4 + b _081C51D4 .pool -@081C51BC: +_081C51BC: ldr r0, =sub_81C5038 bl SetVBlankCallback ldr r0, =sub_81C501C bl SetMainCallback2 movs r0, 0x1 - b @081C51D6 + b _081C51D6 .pool -@081C51D4: +_081C51D4: movs r0, 0 -@081C51D6: +_081C51D6: add sp, 0x4 pop {r1} bx r1 @@ -843758,21 +843758,21 @@ 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 .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, =gUnknown_08D9A620 movs r0, 0 @@ -843781,48 +843781,48 @@ sub_81C5238: ; 81C5238 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - b @081C52D8 + b _081C52D8 .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, =gUnknown_08D9AE04 ldr r4, =0x0203cf2c ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram ldr r1, [r4] - b @081C52DC + b _081C52DC .pool -@081C52B8: +_081C52B8: ldr r0, =gUnknown_08D9AF44 movs r1, 0 movs r2, 0x20 bl decompress_palette - b @081C52D8 + b _081C52D8 .pool -@081C52C8: +_081C52C8: ldr r0, =gUnknown_0861F3CC bl LoadCompressedObjectPic - b @081C52D8 + b _081C52D8 .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 .pool -@081C52F0: +_081C52F0: bl sub_8122328 ldr r0, [r4] ldr r1, =0x00000984 @@ -843830,11 +843830,11 @@ sub_81C5238: ; 81C5238 movs r1, 0 strh r1, [r0] movs r0, 0x1 - b @081C530A + b _081C530A .pool -@081C5308: +_081C5308: movs r0, 0 -@081C530A: +_081C530A: add sp, 0x4 pop {r4} pop {r1} @@ -843865,9 +843865,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 @@ -843897,8 +843897,8 @@ sub_81C5314: ; 81C5314 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 @@ -843957,7 +843957,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 @@ -843970,13 +843970,13 @@ sub_81C540C: ; 81C540C ldr r1, =gUnknown_085E9210 adds r0, r5, 0 bl ExpandStringRefs - b @081C5458 + b _081C5458 .pool -@081C5450: +_081C5450: adds r0, r4, 0 adds r1, r5, 0 bl itemid_get_name -@081C5458: +_081C5458: pop {r4,r5} pop {r0} bx r0 @@ -843989,18 +843989,18 @@ sub_81C5460: ; 81C5460 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] @@ -844010,7 +844010,7 @@ sub_81C5460: ; 81C5460 movs r0, 0x2 negs r0, r0 cmp r4, r0 - beq @081C54E0 + beq _081C54E0 ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, r4, 1 @@ -844032,16 +844032,16 @@ sub_81C5460: ; 81C5460 adds r1, r2 ldrb r1, [r1] bl sub_81C6F90 - b @081C54EE + b _081C54EE .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 @@ -844052,7 +844052,7 @@ sub_81C5460: ; 81C5460 strb r0, [r1] adds r0, r4, 0 bl sub_81C55D8 -@081C5504: +_081C5504: pop {r4,r5} pop {r0} bx r0 @@ -844071,28 +844071,28 @@ 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 .pool -@081C5558: +_081C5558: adds r0, r5, 0 movs r1, 0xFF bl sub_81C5AB8 -@081C5560: +_081C5560: ldr r0, =0x02021cc4 ldr r1, =0x03005d90 ldr r3, [r1] @@ -844133,7 +844133,7 @@ sub_81C5518: ; 81C5518 adds r1, r4, 0 adds r3, r5, 0 bl sub_81C6C94 -@081C55B8: +_081C55B8: add sp, 0x10 pop {r4-r6} pop {r0} @@ -844149,7 +844149,7 @@ sub_81C55D8: ; 81C55D8 movs r0, 0x2 negs r0, r0 cmp r3, r0 - beq @081C561C + beq _081C561C ldr r0, =0x03005d90 ldr r2, [r0] lsls r3, 1 @@ -844168,9 +844168,9 @@ sub_81C55D8: ; 81C55D8 ldrh r0, [r2] bl itemid_get_description adds r4, r0, 0 - b @081C5638 + b _081C5638 .pool -@081C561C: +_081C561C: ldr r0, =0x02021cc4 ldr r2, =gUnknown_085E91B0 ldr r1, =0x0203cf30 @@ -844183,7 +844183,7 @@ sub_81C55D8: ; 81C55D8 ldr r1, =gUnknown_085E91C0 adds r0, r4, 0 bl ExpandStringRefs -@081C5638: +_081C5638: movs r0, 0x1 movs r1, 0 bl FillWindowPixelBuffer @@ -844214,7 +844214,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] @@ -844237,7 +844237,7 @@ sub_81C5674: ; 81C5674 ldr r2, =0x00000816 adds r1, r2 strb r0, [r1] -@081C56B4: +_081C56B4: add sp, 0x10 pop {r4} pop {r0} @@ -844254,14 +844254,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 @@ -844379,7 +844379,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] @@ -844388,14 +844388,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 @@ -844408,14 +844408,14 @@ sub_81C57A8: ; 81C57A8 lsls r2, 16 asrs r0, r2, 16 cmp r0, r5 - blt @081C5802 - b @081C5854 + blt _081C5802 + b _081C5854 .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 @@ -844430,8 +844430,8 @@ sub_81C57A8: ; 81C57A8 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 @@ -844439,7 +844439,7 @@ sub_81C57A8: ; 81C57A8 adds r0, r3, r5 mov r1, r8 strb r1, [r0] -@081C5862: +_081C5862: pop {r3} mov r8, r3 pop {r4-r7} @@ -844477,7 +844477,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 @@ -844485,54 +844485,54 @@ sub_81C586C: ; 81C586C 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 @@ -844567,24 +844567,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 @@ -844595,18 +844595,18 @@ sub_81C5924: ; 81C5924 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 .pool -@081C59AC: +_081C59AC: ldr r1, =0x00000822 adds r0, r1 strb r2, [r0] -@081C59B2: +_081C59B2: pop {r4-r6} pop {r0} bx r0 @@ -844621,7 +844621,7 @@ sub_81C59BC: ; 81C59BC adds r3, r0, 0 ldr r4, =0x0203cf2c cmp r1, 0 - beq @081C59E4 + beq _081C59E4 ldrh r0, [r3, 0x8] ldr r1, [r4] ldr r5, =0x00000822 @@ -844632,10 +844632,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] @@ -844645,17 +844645,17 @@ sub_81C59BC: ; 81C59BC 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 .pool -@081C5A14: +_081C5A14: subs r0, 0x1 strh r0, [r3, 0x6] -@081C5A18: +_081C5A18: pop {r4,r5} pop {r0} bx r0 @@ -844668,12 +844668,12 @@ sub_81C5A20: ; 81C5A20 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] @@ -844685,9 +844685,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] @@ -844700,7 +844700,7 @@ sub_81C5A20: ; 81C5A20 ldrh r0, [r3, 0x6] subs r0, 0x4 cmp r4, r0 - bgt @081C5A80 + bgt _081C5A80 ldrh r2, [r5, 0x8] ldr r1, [r6] ldr r7, =0x00000822 @@ -844711,8 +844711,8 @@ sub_81C5A20: ; 81C5A20 adds r1, r0 ldrb r1, [r1] cmp r2, r1 - bne @081C5A50 -@081C5A80: + bne _081C5A50 +_081C5A80: pop {r4-r7} pop {r0} bx r0 @@ -844746,7 +844746,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 @@ -844765,8 +844765,8 @@ sub_81C5AB8: ; 81C5AB8 movs r2, 0 adds r3, r5, 0 bl FillWindowPixelRect - b @081C5B08 -@081C5AF4: + b _081C5B08 +_081C5AF4: ldr r1, =gUnknown_085E8D60 movs r0, 0 str r0, [sp] @@ -844776,7 +844776,7 @@ sub_81C5AB8: ; 81C5AB8 movs r2, 0 adds r3, r5, 0 bl sub_81C6C3C -@081C5B08: +_081C5B08: add sp, 0x10 pop {r4,r5} pop {r0} @@ -844827,7 +844827,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 @@ -844837,16 +844837,16 @@ sub_81C5B4C: ; 81C5B4C ldr r0, [r0] ldr r0, [r0] cmp r0, 0 - beq @081C5B94 + beq _081C5B94 bl SetMainCallback2 - b @081C5B9E + b _081C5B9E .pool -@081C5B94: +_081C5B94: adds r0, r4, 0 subs r0, 0x8 ldr r0, [r0] bl SetMainCallback2 -@081C5B9E: +_081C5B9E: bl sub_81C56CC bl ResetAllObjectData bl ResetObjectPaletteAllocator @@ -844856,7 +844856,7 @@ sub_81C5B4C: ; 81C5B4C bl Free adds r0, r5, 0 bl remove_task -@081C5BBC: +_081C5BBC: pop {r4,r5} pop {r0} bx r0 @@ -844879,17 +844879,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 @@ -844897,13 +844897,13 @@ sub_81C5BC8: ; 81C5BC8 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 @@ -844919,14 +844919,14 @@ sub_81C5BC8: ; 81C5BC8 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 .pool -@081C5C5C: +_081C5C5C: ldrb r0, [r7] bl sub_81AE604 adds r6, r0, 0 @@ -844939,22 +844939,22 @@ sub_81C5BC8: ; 81C5BC8 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 .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 .pool -@081C5CA0: +_081C5CA0: movs r0, 0x5 bl audio_play ldr r2, =0x0203ce7c @@ -844994,15 +844994,15 @@ sub_81C5BC8: ; 81C5BC8 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 .pool -@081C5D10: +_081C5D10: adds r0, r5, 0 bl sub_81C5D20 -@081C5D16: +_081C5D16: pop {r3} mov r8, r3 pop {r4-r7} @@ -845028,9 +845028,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 @@ -845041,23 +845041,23 @@ sub_81C5D20: ; 81C5D20 lsls r0, 4 adds r1, r0 movs r0, 0x4 - b @081C5DD8 + b _081C5DD8 .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, =gUnknown_0861F30E - b @081C5DCE + b _081C5DCE .pool -@081C5DA0: +_081C5DA0: ldr r0, =0x0203cf2c ldr r0, [r0] ldr r1, =0x00000818 @@ -845068,23 +845068,23 @@ sub_81C5D20: ; 81C5D20 lsls r1, 4 adds r0, r1 strb r4, [r0] - b @081C5DDA + b _081C5DDA .pool -@081C5DC4: +_081C5DC4: ldr r0, =0x0203cf2c ldr r1, [r0] ldr r0, =0x00000818 adds r2, r1, r0 ldr r0, =gUnknown_0861F30C -@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 @@ -845113,21 +845113,21 @@ sub_81C5D20: ; 81C5D20 adds r0, r1 ldrb r0, [r0] cmp r0, 0x1 - bne @081C5E3C + bne _081C5E3C movs r0, 0 - b @081C5E42 + b _081C5E42 .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 @@ -845135,7 +845135,7 @@ sub_81C5D20: ; 81C5D20 movs r1, 0x2 movs r2, 0x2 bl sub_81C5F08 -@081C5E62: +_081C5E62: ldr r0, =0x0203cf2c ldr r0, [r0] movs r1, 0x82 @@ -845143,23 +845143,23 @@ sub_81C5D20: ; 81C5D20 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 - b @081C5E98 + b _081C5E98 .pool -@081C5E8C: +_081C5E8C: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 lsls r1, 3 adds r1, r0 ldr r0, =sub_81C5F68 -@081C5E98: +_081C5E98: str r0, [r1] add sp, 0x10 pop {r4,r5} @@ -845264,26 +845264,26 @@ 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, =gUnknown_0861F2D8 ldr r1, [r0, 0x1C] adds r0, r5, 0 bl _call_via_r1 - b @081C5FD0 + b _081C5FD0 .pool -@081C5FA8: +_081C5FA8: movs r0, 0x5 bl audio_play ldr r1, =gUnknown_0861F2D8 @@ -845299,10 +845299,10 @@ sub_81C5F68: ; 81C5F68 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 @@ -845318,9 +845318,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 @@ -845329,35 +845329,35 @@ sub_81C5FE4: ; 81C5FE4 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 .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 @@ -845368,90 +845368,90 @@ sub_81C5FE4: ; 81C5FE4 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 .pool -@081C6084: +_081C6084: movs r0, 0x20 ands r0, r1 cmp r0, 0 - bne @081C6098 + bne _081C6098 bl GetLRKeysState 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 GetLRKeysState 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, =gUnknown_0861F2D8 @@ -845469,23 +845469,23 @@ sub_81C5FE4: ; 81C5FE4 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 .pool -@081C6148: +_081C6148: movs r0, 0x2 ands r0, r1 cmp r0, 0 - beq @081C6160 + beq _081C6160 movs r0, 0x5 bl audio_play ldr r0, =gUnknown_0861F2D8 ldr r1, [r0, 0x1C] adds r0, r6, 0 bl _call_via_r1 -@081C6160: +_081C6160: pop {r4-r6} pop {r0} bx r0 @@ -845498,7 +845498,7 @@ sub_81C616C: ; 81C616C lsls r0, 24 asrs r1, r0, 24 cmp r1, 0 - blt @081C61A0 + blt _081C61A0 ldr r0, =0x0203cf2c ldr r2, [r0] movs r3, 0x82 @@ -845506,20 +845506,20 @@ 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 .pool -@081C61A0: +_081C61A0: movs r0, 0 -@081C61A2: +_081C61A2: pop {r1} bx r1 thumb_func_end sub_81C616C @@ -845534,21 +845534,21 @@ 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 .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 @@ -845564,30 +845564,30 @@ 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, =gUnknown_085E8F31 ldr r2, =sub_81C6714 adds r0, r5, 0 bl DisplayItemMessageInBattlePyramid - b @081C6252 + b _081C6252 .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 @@ -845599,7 +845599,7 @@ sub_81C61E0: ; 81C61E0 adds r1, r0, 0 adds r0, r5, 0 bl _call_via_r1 -@081C6252: +_081C6252: pop {r4,r5} pop {r0} bx r0 @@ -845672,12 +845672,12 @@ 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 .pool -@081C62F4: +_081C62F4: ldr r0, =0x0203ce7c ldrh r0, [r0] ldr r1, =0x02021cc4 @@ -845705,7 +845705,7 @@ sub_81C62C4: ; 81C62C4 adds r0, r6, r0 ldr r1, =sub_81C64B4 str r1, [r0] -@081C6334: +_081C6334: add sp, 0x10 pop {r4-r7} pop {r0} @@ -845881,19 +845881,19 @@ 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 .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 @@ -845905,13 +845905,13 @@ sub_81C64B4: ; 81C64B4 bl schedule_bg_copy_tilemap_to_vram adds r0, r5, 0 bl sub_81C6350 - b @081C6544 + b _081C6544 .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 @@ -845923,7 +845923,7 @@ sub_81C64B4: ; 81C64B4 bl schedule_bg_copy_tilemap_to_vram adds r0, r6, 0 bl sub_81C63D0 -@081C6544: +_081C6544: pop {r4-r6} pop {r0} bx r0 @@ -845995,7 +845995,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 @@ -846020,7 +846020,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 @@ -846040,31 +846040,31 @@ sub_81C6648: ; 81C6648 lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081C667C + bne _081C667C ldr r1, =gUnknown_085E8DCE ldr r2, =sub_81C66EC adds r0, r4, 0 bl DisplayItemMessageInBattlePyramid - b @081C66A6 + b _081C66A6 .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 str r0, [r1] adds r0, r4, 0 bl sub_81C5B14 - b @081C66A6 + b _081C66A6 .pool -@081C66A0: +_081C66A0: adds r0, r6, 0 bl sub_81C66AC -@081C66A6: +_081C66A6: pop {r4-r6} pop {r0} bx r0 @@ -846104,12 +846104,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 @@ -846153,26 +846153,26 @@ sub_81C674C: ; 81C674C bl itemid_80BF6D8_mail_related lsls r0, 24 cmp r0, 0 - bne @081C677C + bne _081C677C ldr r1, =gUnknown_085E8DCE ldr r2, =sub_81C66EC adds r0, r4, 0 bl DisplayItemMessageInBattlePyramid - b @081C6796 + b _081C6796 .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 @@ -846187,14 +846187,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 @@ -846304,22 +846304,22 @@ 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 .pool -@081C68F8: +_081C68F8: ldrb r0, [r4] bl sub_81AE604 adds r6, r0, 0 @@ -846336,34 +846336,34 @@ sub_81C68B0: ; 81C68B0 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 .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 @@ -846392,16 +846392,16 @@ 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 .pool -@081C69A8: +_081C69A8: ldrb r0, [r5, 0x2] lsls r1, r4, 24 lsrs r1, 24 @@ -846421,13 +846421,13 @@ sub_81C6964: ; 81C6964 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] @@ -846439,7 +846439,7 @@ sub_81C6964: ; 81C6964 strh r0, [r5] adds r0, r6, 0 bl sub_81C629C -@081C69FC: +_081C69FC: pop {r3} mov r8, r3 pop {r4-r7} @@ -846479,13 +846479,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] @@ -846550,7 +846550,7 @@ sub_81C6A94: ; 81C6A94 movs r2, 0xA bl memcpy movs r6, 0 -@081C6AF8: +_081C6AF8: movs r0, 0x64 muls r0, r6 add r0, r9 @@ -846561,12 +846561,12 @@ sub_81C6A94: ; 81C6A94 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 @@ -846604,20 +846604,20 @@ sub_81C6A94: ; 81C6A94 ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] - b @081C6BC6 + b _081C6BC6 .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 @@ -846628,7 +846628,7 @@ sub_81C6A94: ; 81C6A94 lsls r0, 24 lsrs r6, r0, 24 cmp r6, 0x2 - bls @081C6B9C + bls _081C6B9C ldr r1, =0x020375f0 movs r0, 0 strh r0, [r1] @@ -846636,7 +846636,7 @@ sub_81C6A94: ; 81C6A94 bl Free adds r0, r5, 0 bl Free -@081C6BC6: +_081C6BC6: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -846666,7 +846666,7 @@ sub_81C6BD8: ; 81C6BD8 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -@081C6C04: +_081C6C04: adds r0, r4, 0 movs r1, 0 bl FillWindowPixelBuffer @@ -846674,7 +846674,7 @@ sub_81C6BD8: ; 81C6BD8 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 - bls @081C6C04 + bls _081C6C04 movs r0, 0 bl PutWindowTilemap movs r0, 0x1 @@ -846822,7 +846822,7 @@ sub_81C6D24: ; 81C6D24 adds r4, r0, r1 ldrb r0, [r4] cmp r0, 0xFF - bne @081C6D58 + bne _081C6D58 lsls r0, r2, 3 ldr r1, =gUnknown_0861F350 adds r0, r1 @@ -846835,7 +846835,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} @@ -846855,7 +846855,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] @@ -846866,7 +846866,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 @@ -846957,7 +846957,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 @@ -846979,7 +846979,7 @@ sub_81C6E38: ; 81C6E38 bl RemoveObjectAndFreeTiles movs r0, 0xFF strb r0, [r5] -@081C6E80: +_081C6E80: pop {r4,r5} pop {r0} bx r0 @@ -847060,13 +847060,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 StartObjectRotScalAnim ldr r0, =sub_81C6F68 str r0, [r4, 0x1C] -@081C6F50: +_081C6F50: pop {r4} pop {r0} bx r0 @@ -847082,13 +847082,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 StartObjectRotScalAnim ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] -@081C6F84: +_081C6F84: pop {r4} pop {r0} bx r0 @@ -847109,7 +847109,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 @@ -847123,7 +847123,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 @@ -847134,7 +847134,7 @@ sub_81C6F90: ; 81C6F90 strh r1, [r0, 0x24] movs r1, 0x58 strh r1, [r0, 0x26] -@081C6FE0: +_081C6FE0: pop {r4-r6} pop {r0} bx r0 @@ -847214,13 +847214,13 @@ sub_81C7078: ; 81C7078 adds r4, r1, 0 bl is_c1_link_related_active cmp r0, 0 - bne @081C7090 + bne _081C7090 ldr r0, =sub_81C7170 - b @081C7092 + b _081C7092 .pool -@081C7090: +_081C7090: ldr r0, =sub_81C71E4 -@081C7092: +_081C7092: lsls r1, r4, 24 lsrs r1, 24 bl AddTask @@ -847263,25 +847263,25 @@ 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 cmp r2, r0 - beq @081C70FE + beq _081C70FE ldr r0, =sub_81C71E4 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 .pool -@081C711C: +_081C711C: movs r0, 0 -@081C711E: +_081C711E: pop {r1} bx r1 thumb_func_end sub_81C70D8 @@ -847292,34 +847292,34 @@ sub_81C7124: ; 81C7124 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 cmp r1, r0 - beq @081C7140 + beq _081C7140 ldr r0, =sub_81C71E4 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 .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 @@ -847340,46 +847340,46 @@ 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 .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 @@ -847392,7 +847392,7 @@ sub_81C71E4: ; 81C71E4 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 @@ -847406,33 +847406,33 @@ 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 .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 @@ -847446,12 +847446,12 @@ CB2_PokeNav: ; 81C7250 bl Alloc str r0, [r4] cmp r0, 0 - bne @081C7270 + bne _081C7270 ldr r0, =sub_8086194 bl SetMainCallback2 - b @081C7292 + b _081C7292 .pool -@081C7270: +_081C7270: bl sub_81C7360 bl clear_tasks movs r0, 0 @@ -847463,7 +847463,7 @@ CB2_PokeNav: ; 81C7250 bl SetMainCallback2 ldr r0, =sub_81C7418 bl SetVBlankCallback -@081C7292: +_081C7292: pop {r4} pop {r0} bx r0 @@ -847492,18 +847492,18 @@ sub_81C72BC: ; 81C72BC movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081C7320 + bne _081C7320 ldr r4, =0x0203cf40 movs r0, 0x5C bl Alloc str r0, [r4] cmp r0, 0 - bne @081C72F0 + bne _081C72F0 ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 - b @081C7320 + b _081C7320 .pool -@081C72F0: +_081C72F0: bl sub_81C7360 ldr r1, [r4] movs r0, 0x1 @@ -847520,7 +847520,7 @@ sub_81C72BC: ; 81C72BC bl SetMainCallback2 ldr r0, =sub_81C7418 bl SetVBlankCallback -@081C7320: +_081C7320: pop {r4} pop {r0} bx r0 @@ -847531,12 +847531,12 @@ sub_81C72BC: ; 81C72BC 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 @@ -847556,12 +847556,12 @@ sub_81C7360: ; 81C7360 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] @@ -847577,7 +847577,7 @@ sub_81C7360: ; 81C7360 sub_81C7388: ; 81C7388 push {r4-r6,lr} movs r5, 0 -@081C738C: +_081C738C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -847587,51 +847587,51 @@ sub_81C7388: ; 81C7388 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 .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 @@ -847671,52 +847671,52 @@ 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 .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 .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, =gUnknown_0861F3EC ldr r5, =0x0203cf40 ldr r0, [r5] @@ -847741,39 +847741,39 @@ sub_81C742C: ; 81C742C 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 .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] @@ -847783,15 +847783,15 @@ sub_81C742C: ; 81C742C bl sub_81C9430 bl sub_81C7334 cmp r4, 0 - beq @081C755C + beq _081C755C ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music bl SetMainCallback2 - b @081C7562 + b _081C7562 .pool -@081C755C: +_081C755C: ldr r0, =sub_8086194 bl SetMainCallback2 -@081C7562: +_081C7562: pop {r4-r7} pop {r0} bx r0 @@ -847812,14 +847812,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 @@ -847837,11 +847837,11 @@ sub_81C756C: ; 81C756C str r0, [r1] str r6, [r1, 0x4] movs r0, 0x1 - b @081C75CE + b _081C75CE .pool -@081C75CC: +_081C75CC: movs r0, 0 -@081C75CE: +_081C75CE: pop {r4-r6} pop {r1} bx r1 @@ -847933,14 +847933,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 @@ -847970,9 +847970,9 @@ 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] @@ -848007,7 +848007,7 @@ sub_81C76C4: ; 81C76C4 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081C76F4 + beq _081C76F4 bl ResetAllObjectData bl ResetObjectPaletteAllocator ldr r0, =sub_81C7764 @@ -848015,11 +848015,11 @@ sub_81C76C4: ; 81C76C4 bl sub_81C7078 str r0, [r4, 0xC] movs r0, 0x1 - b @081C76F6 + b _081C76F6 .pool -@081C76F4: +_081C76F4: movs r0, 0 -@081C76F6: +_081C76F6: pop {r4} pop {r1} bx r1 @@ -848064,16 +848064,16 @@ sub_81C7738: ; 81C7738 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @081C7750 + beq _081C7750 movs r0, 0x1 - b @081C775E + b _081C775E .pool -@081C7750: +_081C7750: bl sub_81C99D4 bl sub_81C7C94 bl FreeAllWindowBuffers movs r0, 0 -@081C775E: +_081C775E: pop {r1} bx r1 thumb_func_end sub_81C7738 @@ -848083,19 +848083,19 @@ 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 @@ -848110,9 +848110,9 @@ sub_81C7764: ; 81C7764 bl sub_8199D98 bl reset_temp_tile_data_buffers movs r0, 0x1 - b @081C782C + b _081C782C .pool -@081C77B0: +_081C77B0: movs r0, 0 bl sub_81C763C adds r4, r0, 0 @@ -848138,32 +848138,32 @@ sub_81C7764: ; 81C7764 movs r0, 0 bl CopyBgTilemapBufferToVram movs r0, 0 - b @081C782C + b _081C782C .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 IsDma3ManagerBusyWithBgCopy 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 ShowBg -@081C782A: +_081C782A: movs r0, 0x4 -@081C782C: +_081C782C: add sp, 0x4 pop {r4} pop {r1} @@ -848260,20 +848260,20 @@ sub_81C78C0: ; 81C78C0 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 @@ -848281,19 +848281,19 @@ atk47_cmd47: ; 81C78D4 bl ChangeBgY ldr r1, =0x00001fff cmp r0, r1 - bhi @081C7908 + bhi _081C7908 movs r0, 0x2 - b @081C7916 + b _081C7916 .pool -@081C7908: +_081C7908: movs r1, 0x80 lsls r1, 6 movs r0, 0 movs r2, 0 bl ChangeBgY -@081C7914: +_081C7914: movs r0, 0x4 -@081C7916: +_081C7916: pop {r1} bx r1 thumb_func_end atk47_cmd47 @@ -848307,16 +848307,16 @@ sub_81C791C: ; 81C791C movs r2, 0x2 bl ChangeBgY 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 ChangeBgY movs r0, 0x4 -@081C793E: +_081C793E: pop {r1} bx r1 thumb_func_end sub_81C791C @@ -848339,8 +848339,8 @@ sub_81C7944: ; 81C7944 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 @@ -848349,17 +848349,17 @@ sub_81C795C: ; 81C795C 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 AllocObjectPalette lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0xFF - bne @081C7962 -@081C7988: + bne _081C7962 +_081C7988: pop {r4} pop {r0} bx r0 @@ -848401,33 +848401,33 @@ 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 .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 .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 @@ -848504,12 +848504,12 @@ sub_81C79BC: ; 81C79BC 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 @@ -848528,26 +848528,26 @@ sub_81C7AC0: ; 81C7AC0 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 @@ -848556,19 +848556,19 @@ sub_81C7AC0: ; 81C7AC0 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - 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 pal_fade_maybe - b @081C7B2C -@081C7B18: + b _081C7B2C +_081C7B18: movs r0, 0x1 negs r0, r0 movs r1, 0x2 @@ -848578,7 +848578,7 @@ sub_81C7AC0: ; 81C7AC0 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@081C7B2C: +_081C7B2C: add sp, 0x4 pop {r4} pop {r0} @@ -848611,16 +848611,16 @@ 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 InitBgFromTemplate subs r4, 0x1 cmp r4, 0 - bne @081C7B5E -@081C7B6C: + bne _081C7B5E +_081C7B6C: pop {r4,r5} pop {r0} bx r0 @@ -848722,13 +848722,13 @@ sub_81C7C28: ; 81C7C28 adds r6, r0, 0 movs r5, 0 ldr r4, =gUnknown_0861FA4C -@081C7C36: +_081C7C36: adds r0, r4, 0 bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq @081C7C36 + beq _081C7C36 ldr r0, =gUnknown_0861FA54 bl sub_81C795C movs r0, 0 @@ -848857,7 +848857,7 @@ sub_81C7D28: ; 81C7D28 ldr r0, =0x02020630 mov r8, r0 movs r7, 0x4 -@081C7D50: +_081C7D50: ldr r0, =gUnknown_0861FB2C movs r1, 0 movs r2, 0 @@ -848923,7 +848923,7 @@ sub_81C7D28: ; 81C7D28 strh r2, [r3, 0x4] adds r5, 0x1 cmp r5, 0x1 - ble @081C7D50 + ble _081C7D50 pop {r3} mov r8, r3 pop {r4-r7} @@ -848936,13 +848936,13 @@ sub_81C7D28: ; 81C7D28 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 @@ -848955,18 +848955,18 @@ sub_81C7E14: ; 81C7E14 bl sub_81C763C adds r5, r0, 0 cmp r4, 0x4 - bne @081C7E30 + bne _081C7E30 movs r0, 0x2 bl GetObjectTileRangeStartByTag ldr r3, [r5, 0x20] adds r0, 0x20 - b @081C7E3A -@081C7E30: + b _081C7E3A +_081C7E30: movs r0, 0x2 bl GetObjectTileRangeStartByTag ldr r3, [r5, 0x20] adds r0, 0x40 -@081C7E3A: +_081C7E3A: ldr r2, =0x000003ff adds r1, r2, 0 ands r0, r1 @@ -848989,7 +848989,7 @@ sub_81C7E58: ; 81C7E58 push {r6,r7} mov r9, r0 cmp r0, 0x5 - bhi @081C7F16 + bhi _081C7F16 movs r0, 0 bl sub_81C763C adds r7, r0, 0 @@ -849051,17 +849051,17 @@ 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 .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 @@ -849074,7 +849074,7 @@ sub_81C7E58: ; 81C7E58 sub_81C7F24: ; 81C7F24 push {r4-r6,lr} cmp r0, 0x6 - bhi @081C7F8A + bhi _081C7F8A ldr r2, =gUnknown_0861FA9C lsls r1, r0, 3 adds r0, r2, 0x4 @@ -849117,7 +849117,7 @@ sub_81C7F24: ; 81C7F24 adds r2, r5, 0 movs r3, 0x1 bl RequestDma3Copy -@081C7F8A: +_081C7F8A: pop {r4-r6} pop {r0} bx r0 @@ -849130,18 +849130,18 @@ sub_81C7FA0: ; 81C7FA0 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 @@ -849150,14 +849150,14 @@ sub_81C7FA0: ; 81C7FA0 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 @@ -849171,7 +849171,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] @@ -849185,7 +849185,7 @@ sub_81C7FDC: ; 81C7FDC adds r2, 0x4 subs r3, 0x1 cmp r3, 0 - bge @081C7FEC + bge _081C7FEC pop {r4} pop {r0} bx r0 @@ -849201,17 +849201,17 @@ sub_81C8010: ; 81C8010 ldr r2, [r0, 0x1C] ldr r0, =DummyObjectCallback 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 .pool -@081C8034: +_081C8034: movs r0, 0x1 -@081C8036: +_081C8036: pop {r1} bx r1 thumb_func_end sub_81C8010 @@ -849226,20 +849226,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] @@ -849250,7 +849250,7 @@ sub_81C803C: ; 81C803C bl sub_81C814C subs r5, 0x1 cmp r5, 0 - bge @081C8064 + bge _081C8064 pop {r3} mov r8, r3 pop {r4-r7} @@ -849268,20 +849268,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] @@ -849292,7 +849292,7 @@ sub_81C8088: ; 81C8088 bl sub_81C814C subs r5, 0x1 cmp r5, 0 - bge @081C80B0 + bge _081C80B0 pop {r3} mov r8, r3 pop {r4-r7} @@ -849307,20 +849307,20 @@ sub_81C80D4: ; 81C80D4 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 @@ -849328,7 +849328,7 @@ sub_81C80D4: ; 81C80D4 bl sub_81C814C subs r4, 0x1 cmp r4, 0 - bge @081C80F6 + bge _081C80F6 pop {r4-r7} pop {r0} bx r0 @@ -849341,20 +849341,20 @@ sub_81C8110: ; 81C8110 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 @@ -849362,7 +849362,7 @@ sub_81C8110: ; 81C8110 bl sub_81C814C subs r4, 0x1 cmp r4, 0 - bge @081C8132 + bge _081C8132 pop {r4-r7} pop {r0} bx r0 @@ -849401,7 +849401,7 @@ sub_81C817C: ; 81C817C 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] @@ -849416,28 +849416,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, =DummyObjectCallback str r0, [r2, 0x1C] -@081C81CC: +_081C81CC: pop {r0} bx r0 .pool @@ -849454,7 +849454,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 @@ -849465,16 +849465,16 @@ sub_81C81D4: ; 81C81D4 adds r3, r7, 0 bl sub_81C91AC cmp r0, 0 - beq @081C821C + beq _081C821C ldr r0, =sub_81C8254 movs r1, 0x6 bl sub_81C7078 movs r0, 0x1 - b @081C821E + b _081C821E .pool -@081C821C: +_081C821C: movs r0, 0 -@081C821E: +_081C821E: pop {r4-r7} pop {r1} bx r1 @@ -849513,62 +849513,62 @@ sub_81C8254: ; 81C8254 bl IsDma3ManagerBusyWithBgCopy 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 .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 .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 @@ -849658,9 +849658,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 @@ -849681,7 +849681,7 @@ sub_81C83AC: ; 81C83AC 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 @@ -849696,7 +849696,7 @@ sub_81C83AC: ; 81C83AC ldr r0, =sub_81C83F0 movs r1, 0x5 bl sub_81C7078 -@081C83D6: +_081C83D6: pop {r4,r5} pop {r0} bx r0 @@ -849722,11 +849722,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 @@ -849742,12 +849742,12 @@ sub_81C83F0: ; 81C83F0 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 @@ -849767,22 +849767,22 @@ sub_81C83F0: ; 81C83F0 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 CopyWindowToVram - b @081C8476 -@081C846E: + b _081C8476 +_081C846E: ldrb r0, [r4, 0x8] movs r1, 0x2 bl CopyWindowToVram -@081C8476: +_081C8476: movs r0, 0 - b @081C849C -@081C847A: + b _081C849C +_081C847A: ldr r0, [r4, 0x1C] ldr r1, [r4, 0x18] adds r0, r1 @@ -849791,17 +849791,17 @@ sub_81C83F0: ; 81C83F0 adds r0, 0x1 str r0, [r4, 0x14] movs r0, 0x3 - b @081C849C -@081C848C: + b _081C849C +_081C848C: bl IsDma3ManagerBusyWithBgCopy 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} @@ -849837,9 +849837,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 @@ -849858,15 +849858,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 @@ -849874,11 +849874,11 @@ sub_81C84E8: ; 81C84E8 str r6, [sp] str r7, [sp, 0x4] bl sub_81C83AC - b @081C854E + b _081C854E .pool -@081C8524: +_081C8524: cmp r4, 0 - beq @081C854E + beq _081C854E ldr r2, =0x0203cf44 ldrh r1, [r5] ldrh r0, [r5, 0x8] @@ -849887,9 +849887,9 @@ sub_81C84E8: ; 81C84E8 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] @@ -849898,7 +849898,7 @@ sub_81C84E8: ; 81C84E8 adds r1, r4, 0 adds r2, r6, 0 bl sub_81C83AC -@081C854E: +_081C854E: adds r0, r6, 0 adds r1, r7, 0 bl sub_81C8568 @@ -849924,12 +849924,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 @@ -849950,18 +849950,18 @@ sub_81C85A0: ; 81C85A0 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 GetBgY @@ -849976,32 +849976,32 @@ sub_81C85A0: ; 81C85A0 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 @@ -850013,10 +850013,10 @@ sub_81C85A0: ; 81C85A0 movs r2, 0 bl ChangeBgY movs r0, 0x4 - b @081C862A -@081C8628: + b _081C862A +_081C8628: movs r0, 0x2 -@081C862A: +_081C862A: pop {r4-r6} pop {r1} bx r1 @@ -850052,24 +850052,24 @@ sub_81C8658: ; 81C8658 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 @@ -850085,28 +850085,28 @@ 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 @@ -850119,31 +850119,31 @@ sub_81C86CC: ; 81C86CC 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 @@ -850156,41 +850156,41 @@ sub_81C870C: ; 81C870C 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 @@ -850343,25 +850343,25 @@ sub_81C8870: ; 81C8870 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 .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 @@ -850369,23 +850369,23 @@ sub_81C8870: ; 81C8870 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 .pool -@081C88D8: +_081C88D8: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @081C8942 + bne _081C8942 ldr r2, =0x0000089c adds r0, r4, r2 subs r2, 0xC @@ -850393,51 +850393,51 @@ sub_81C8870: ; 81C8870 ldr r3, [r0] ldrh r1, [r1] cmp r3, r1 - beq @081C88FC + beq _081C88FC movs r0, 0x6 - b @081C894E + b _081C894E .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 .pool -@081C8918: +_081C8918: bl IsDma3ManagerBusyWithBgCopy 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 .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 @@ -850454,88 +850454,88 @@ sub_81C8958: ; 81C8958 bl IsDma3ManagerBusyWithBgCopy 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 .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 .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 .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 .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 .pool -@081C8A08: +_081C8A08: ldr r1, =0x00000888 adds r0, r4, r1 adds r1, r4, 0 movs r2, 0x3 bl sub_81C8E54 - b @081C8A20 + b _081C8A20 .pool -@081C8A1C: +_081C8A1C: movs r0, 0x4 - b @081C8A22 -@081C8A20: + b _081C8A22 +_081C8A20: movs r0, 0 -@081C8A22: +_081C8A22: pop {r4,r5} pop {r1} bx r1 @@ -850549,7 +850549,7 @@ sub_81C8A28: ; 81C8A28 bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @081C8AA6 + bne _081C8AA6 movs r0, 0x11 bl sub_81C763C adds r4, r0, 0 @@ -850557,31 +850557,31 @@ 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 .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] @@ -850592,35 +850592,35 @@ sub_81C8A28: ; 81C8A28 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 .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 @@ -850629,29 +850629,29 @@ sub_81C8A28: ; 81C8A28 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 .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 .pool -@081C8B14: +_081C8B14: ldr r0, [r6, 0x10] ldrh r1, [r6] ldr r3, =0x0000089c @@ -850664,12 +850664,12 @@ sub_81C8A28: ; 81C8A28 movs r2, 0x1 bl sub_81C83AC movs r0, 0 - b @081C8B66 + b _081C8B66 .pool -@081C8B34: +_081C8B34: bl sub_81C83E0 cmp r0, 0 - bne @081C8AA6 + bne _081C8AA6 ldr r0, =0x0000089c adds r1, r4, r0 ldr r0, [r1] @@ -850677,21 +850677,21 @@ sub_81C8A28: ; 81C8A28 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 .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} @@ -850722,7 +850722,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 @@ -850742,9 +850742,9 @@ sub_81C8B70: ; 81C8B70 ldrb r0, [r1, 0x8] movs r1, 0x2 bl CopyWindowToVram - b @081C8C1E + b _081C8C1E .pool -@081C8BD4: +_081C8BD4: movs r2, 0x10 subs r2, r7 subs r0, r6, r2 @@ -850779,15 +850779,15 @@ sub_81C8B70: ; 81C8B70 ldrb r0, [r1, 0x8] movs r1, 0x2 bl CopyWindowToVram -@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 @@ -850796,8 +850796,8 @@ sub_81C8B70: ; 81C8B70 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 @@ -850833,17 +850833,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 @@ -851074,7 +851074,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] @@ -851107,7 +851107,7 @@ sub_81C8E54: ; 81C8E54 movs r2, 0 adds r3, r4, 0 bl CopyWindowRectToVram -@081C8EC0: +_081C8EC0: add sp, 0xC pop {r3} mov r8, r3 @@ -851122,13 +851122,13 @@ sub_81C8ED0: ; 81C8ED0 push {r4,r5,lr} movs r5, 0 ldr r4, =gUnknown_0861FBFC -@081C8ED6: +_081C8ED6: adds r0, r4, 0 bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq @081C8ED6 + beq _081C8ED6 ldr r0, =gUnknown_0861FC04 bl sub_81C795C pop {r4,r5} @@ -851266,7 +851266,7 @@ sub_81C9008: ; 81C9008 adds r5, r0, 0 adds r4, r1, 0 cmp r4, 0 - beq @081C9028 + beq _081C9028 ldr r2, [r5, 0x3C] ldr r1, =DummyObjectCallback str r1, [r2, 0x1C] @@ -851274,9 +851274,9 @@ sub_81C9008: ; 81C9008 str r1, [r0, 0x1C] ldr r0, [r5, 0x44] str r1, [r0, 0x1C] - b @081C903A + b _081C903A .pool -@081C9028: +_081C9028: ldr r2, [r5, 0x3C] ldr r0, =sub_81C9080 str r0, [r2, 0x1C] @@ -851286,7 +851286,7 @@ sub_81C9008: ; 81C9008 ldr r1, [r5, 0x44] ldr r0, =sub_81C90A0 str r0, [r1, 0x1C] -@081C903A: +_081C903A: adds r3, r2, 0 adds r3, 0x3E movs r0, 0x1 @@ -851342,24 +851342,24 @@ sub_81C90A0: ; 81C90A0 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 @@ -851367,7 +851367,7 @@ sub_81C90A0: ; 81C90A0 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @081C90EC + ble _081C90EC movs r0, 0 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x30] @@ -851376,7 +851376,7 @@ sub_81C90A0: ; 81C90A0 ands r0, r1 strh r0, [r4, 0x30] strh r0, [r4, 0x26] -@081C90EC: +_081C90EC: pop {r4} pop {r0} bx r0 @@ -851389,24 +851389,24 @@ sub_81C90F4: ; 81C90F4 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 @@ -851414,7 +851414,7 @@ sub_81C90F4: ; 81C90F4 lsls r0, 16 asrs r0, 16 cmp r0, 0x3 - ble @081C9142 + ble _081C9142 movs r0, 0 strh r0, [r4, 0x2E] ldrh r0, [r4, 0x30] @@ -851424,7 +851424,7 @@ sub_81C90F4: ; 81C90F4 strh r0, [r4, 0x30] negs r0, r0 strh r0, [r4, 0x26] -@081C9142: +_081C9142: pop {r4} pop {r0} bx r0 @@ -851463,12 +851463,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] @@ -851476,15 +851476,15 @@ sub_81C9160: ; 81C9160 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 @@ -851558,7 +851558,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 @@ -851566,11 +851566,11 @@ sub_81C91AC: ; 81C91AC str r0, [r7, 0x40] str r0, [r7, 0x44] movs r0, 0x1 - b @081C925A + b _081C925A .pool -@081C9258: +_081C9258: movs r0, 0 -@081C925A: +_081C925A: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -851589,15 +851589,15 @@ sub_81C9268: ; 81C9268 bl FlagGet lsls r0, 24 cmp r0, 0 - beq @081C928A + beq _081C928A movs r4, 0x1 ldr r0, =0x0000089b bl FlagGet lsls r0, 24 cmp r0, 0 - beq @081C928A + beq _081C928A movs r4, 0x2 -@081C928A: +_081C928A: adds r0, r4, 0 pop {r4} pop {r1} @@ -851613,7 +851613,7 @@ sub_81C9298: ; 81C9298 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081C92C4 + beq _081C92C4 bl sub_81C9268 lsls r0, 24 lsrs r0, 24 @@ -851625,10 +851625,10 @@ 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 @@ -851642,7 +851642,7 @@ sub_81C92CC: ; 81C92CC bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081C92FA + beq _081C92FA bl sub_81C9268 lsls r0, 24 lsrs r0, 24 @@ -851655,10 +851655,10 @@ 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 @@ -851672,7 +851672,7 @@ sub_81C9304: ; 81C9304 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081C932E + beq _081C932E bl sub_81C9268 lsls r0, 24 lsrs r0, 24 @@ -851683,10 +851683,10 @@ 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 @@ -851700,7 +851700,7 @@ sub_81C9338: ; 81C9338 bl sub_81C761C adds r2, r0, 0 cmp r2, 0 - beq @081C9360 + beq _081C9360 movs r0, 0 movs r1, 0x3 strh r1, [r2] @@ -851711,10 +851711,10 @@ 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 @@ -851727,7 +851727,7 @@ sub_81C9368: ; 81C9368 bl sub_81C761C adds r5, r0, 0 cmp r5, 0 - beq @081C9394 + beq _081C9394 movs r4, 0 movs r0, 0x4 strh r0, [r5] @@ -851739,10 +851739,10 @@ 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 @@ -851754,35 +851754,35 @@ sub_81C939C: ; 81C939C 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 .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 - b @081C93DE + b _081C93DE .pool -@081C93DC: +_081C93DC: ldr r0, =sub_81C96FC -@081C93DE: +_081C93DE: str r0, [r4, 0xC] -@081C93E0: +_081C93E0: pop {r4} pop {r0} bx r0 @@ -851794,22 +851794,22 @@ 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 - b @081C9412 + b _081C9412 .pool -@081C9408: +_081C9408: ldr r0, =sub_81C9520 - b @081C9412 + b _081C9412 .pool -@081C9410: +_081C9410: ldr r0, =c2_pre_battle_1 -@081C9412: +_081C9412: pop {r1} bx r1 .pool @@ -851841,17 +851841,17 @@ sub_81C943C: ; 81C943C 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, =gUnknown_0861FC59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -851863,21 +851863,21 @@ sub_81C943C: ; 81C943C 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 .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] @@ -851885,14 +851885,14 @@ sub_81C943C: ; 81C943C 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 .pool -@081C94BC: +_081C94BC: movs r1, 0 movs r0, 0x3 strh r0, [r4] @@ -851902,45 +851902,45 @@ sub_81C943C: ; 81C943C ldr r0, =sub_81C963C str r0, [r4, 0xC] movs r0, 0x2 - b @081C951A + b _081C951A .pool -@081C94D4: +_081C94D4: movs r0, 0x6 strh r0, [r4, 0x6] ldr r1, =0x000186ab - b @081C94EE + b _081C94EE .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 .pool -@081C94FC: +_081C94FC: ldr r0, =sub_81C9600 str r0, [r4, 0xC] movs r0, 0x6 - b @081C951A + b _081C951A .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 @@ -851952,16 +851952,16 @@ sub_81C9520: ; 81C9520 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, =gUnknown_0861FC59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -851973,26 +851973,26 @@ sub_81C9520: ; 81C9520 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 .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 @@ -852004,16 +852004,16 @@ c2_pre_battle_1: ; 81C9588 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, =gUnknown_0861FC59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -852025,34 +852025,34 @@ c2_pre_battle_1: ; 81C9588 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 .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 .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 @@ -852064,26 +852064,26 @@ sub_81C9600: ; 81C9600 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 .pool -@081C962C: +_081C962C: bl sub_81C93EC str r0, [r4, 0xC] movs r0, 0x7 -@081C9634: +_081C9634: pop {r4} pop {r1} bx r1 @@ -852096,17 +852096,17 @@ sub_81C963C: ; 81C963C 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, =gUnknown_0861FC59 movs r1, 0x2 ldrsh r0, [r4, r1] @@ -852118,18 +852118,18 @@ sub_81C963C: ; 81C963C 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 .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] @@ -852138,22 +852138,22 @@ sub_81C963C: ; 81C963C ldr r0, =sub_81C96FC str r0, [r4, 0xC] movs r0, 0x4 - b @081C96F6 + b _081C96F6 .pool -@081C96A4: +_081C96A4: strh r3, [r4, 0x6] ldr r1, =0x000186a7 adds r0, r4, 0 bl sub_81C97B0 movs r0, 0x8 - b @081C96F6 + b _081C96F6 .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, =gUnknown_0861FC54 @@ -852161,23 +852161,23 @@ sub_81C963C: ; 81C963C adds r0, r1 ldrb r0, [r0] cmp r2, r0 - beq @081C96E4 + beq _081C96E4 strh r0, [r4, 0x2] ldr r0, =sub_81C9798 str r0, [r4, 0xC] movs r0, 0x1 - b @081C96F6 + b _081C96F6 .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 @@ -852189,16 +852189,16 @@ sub_81C96FC: ; 81C96FC 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, =gUnknown_0861FC59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -852210,7 +852210,7 @@ sub_81C96FC: ; 81C96FC adds r1, r3 ldrb r0, [r1] cmp r0, 0xD - beq @081C9780 + beq _081C9780 subs r0, 0x8 bl sub_81C7694 ldr r1, =0x000186a8 @@ -852219,13 +852219,13 @@ sub_81C96FC: ; 81C96FC movs r0, 0x3 strh r0, [r4, 0x6] movs r0, 0x8 - b @081C9792 + b _081C9792 .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, =gUnknown_0861FC54 @@ -852233,23 +852233,23 @@ sub_81C96FC: ; 81C96FC adds r0, r1 ldrb r0, [r0] cmp r2, r0 - beq @081C9780 + beq _081C9780 strh r0, [r4, 0x2] ldr r0, =sub_81C97A4 str r0, [r4, 0xC] movs r0, 0x1 - b @081C9792 + b _081C9792 .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 @@ -852341,25 +852341,25 @@ 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, =gUnknown_0861FC54 adds r0, r3, r0 ldrb r0, [r0] strh r0, [r4, 0x2] - b @081C986A + b _081C986A .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] @@ -852371,9 +852371,9 @@ sub_81C9814: ; 81C9814 adds r3, r1, 0 ldrb r0, [r0] cmp r2, r0 - ble @081C986A + ble _081C986A strh r5, [r4, 0x2] -@081C986A: +_081C986A: ldr r2, =gUnknown_0861FC59 movs r0, 0x2 ldrsh r1, [r4, r0] @@ -852385,11 +852385,11 @@ sub_81C9814: ; 81C9814 ldrb r0, [r1] strh r0, [r4, 0x4] movs r0, 0x1 - b @081C988E + b _081C988E .pool -@081C988C: +_081C988C: movs r0, 0 -@081C988E: +_081C988E: pop {r4,r5} pop {r1} bx r1 @@ -852440,7 +852440,7 @@ sub_81C98C4: ; 81C98C4 sub_81C98D4: ; 81C98D4 push {r4,lr} movs r4, 0 -@081C98D8: +_081C98D8: adds r0, r4, 0 bl sub_81CB0C8 ldr r1, =0x02037318 @@ -852448,11 +852448,11 @@ sub_81C98D4: ; 81C98D4 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 @@ -852460,16 +852460,16 @@ sub_81C98D4: ; 81C98D4 adds r0, r4 ldrb r0, [r0] cmp r0, 0 - beq @081C9914 + beq _081C9914 movs r0, 0x1 - b @081C991C + b _081C991C .pool -@081C9914: +_081C9914: adds r4, 0x1 cmp r4, 0x4D - ble @081C98D8 + ble _081C98D8 movs r0, 0 -@081C991C: +_081C991C: pop {r4} pop {r1} bx r1 @@ -852481,14 +852481,14 @@ sub_81C9924: ; 81C9924 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 @@ -852499,13 +852499,13 @@ sub_81C9940: ; 81C9940 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 @@ -852518,7 +852518,7 @@ sub_81C9958: ; 81C9958 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 @@ -852527,7 +852527,7 @@ sub_81C9958: ; 81C9958 str r0, [r4, 0x4] ldr r0, =sub_81C99FC str r0, [r4] -@081C997A: +_081C997A: adds r0, r4, 0 pop {r4} pop {r1} @@ -852606,28 +852606,28 @@ 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 .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, =gUnknown_08620194 movs r1, 0x3 bl sub_81C7B54 @@ -852677,18 +852677,18 @@ sub_81C9A10: ; 81C9A10 movs r1, 0 movs r2, 0 bl ChangeBgY -@081C9AD6: +_081C9AD6: movs r0, 0 - b @081C9C62 + b _081C9C62 .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, =gUnknown_0861FD6C str r0, [sp] movs r0, 0x2 @@ -852706,16 +852706,16 @@ sub_81C9A10: ; 81C9A10 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 - b @081C9AD6 + b _081C9AD6 .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, =gUnknown_0861FC98 str r0, [sp] movs r0, 0x3 @@ -852735,39 +852735,39 @@ sub_81C9A10: ; 81C9A10 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 .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 ShowBg movs r0, 0x2 @@ -852776,72 +852776,72 @@ sub_81C9A10: ; 81C9A10 bl ShowBg 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} @@ -852852,31 +852852,31 @@ sub_81C9A10: ; 81C9A10 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 @@ -852885,19 +852885,19 @@ sub_81C9C6C: ; 81C9C6C 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 @@ -852906,20 +852906,20 @@ sub_81C9CA8: ; 81C9CA8 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 @@ -852928,28 +852928,28 @@ sub_81C9CA8: ; 81C9CA8 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 @@ -852958,39 +852958,39 @@ sub_81C9CA8: ; 81C9CA8 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 @@ -852999,28 +852999,28 @@ sub_81C9D44: ; 81C9D44 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 @@ -853029,35 +853029,35 @@ sub_81C9D44: ; 81C9D44 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 @@ -853065,25 +853065,25 @@ sub_81C9DD8: ; 81C9DD8 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 @@ -853092,56 +853092,56 @@ sub_81C9DD8: ; 81C9DD8 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 @@ -853150,26 +853150,26 @@ sub_81C9E58: ; 81C9E58 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 IsDma3ManagerBusyWithBgCopy 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 @@ -853178,26 +853178,26 @@ sub_81C9EC8: ; 81C9EC8 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 IsDma3ManagerBusyWithBgCopy 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 @@ -853206,75 +853206,75 @@ sub_81C9EF8: ; 81C9EF8 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 @@ -853284,13 +853284,13 @@ sub_81C9FC4: ; 81C9FC4 push {r4,r5,lr} movs r5, 0 ldr r4, =gUnknown_086201C4 -@081C9FCA: +_081C9FCA: adds r0, r4, 0 bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0x1 - bls @081C9FCA + bls _081C9FCA ldr r0, =gUnknown_086201D4 bl sub_81C795C pop {r4,r5} @@ -853334,7 +853334,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 @@ -853346,7 +853346,7 @@ sub_81CA02C: ; 81CA02C adds r5, r0, r2 mov r0, r8 adds r6, r1, r0 -@081CA054: +_081CA054: ldr r0, =gUnknown_0862034C movs r1, 0x8C asrs r2, r5, 16 @@ -853364,10 +853364,10 @@ sub_81CA02C: ; 81CA02C 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} @@ -853384,22 +853384,22 @@ sub_81CA094: ; 81CA094 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 RemoveObjectAndFreeTiles 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 @@ -853444,10 +853444,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 @@ -853466,7 +853466,7 @@ sub_81CA0EC: ; 81CA0EC adds r1, 0x1 str r1, [sp, 0x10] adds r4, r2, r0 -@081CA13E: +_081CA13E: ldr r3, [r4] ldr r0, [r6] ldrh r2, [r0] @@ -853514,13 +853514,13 @@ sub_81CA0EC: ; 81CA0EC 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 .pool -@081CA1B0: +_081CA1B0: lsls r2, r1, 4 mov r0, r10 adds r0, 0x2C @@ -853540,7 +853540,7 @@ sub_81CA0EC: ; 81CA0EC movs r3, 0x4 adds r2, r0 movs r5, 0x3 -@081CA1D6: +_081CA1D6: ldm r2!, {r1} adds r1, 0x3E ldrb r0, [r1] @@ -853548,18 +853548,18 @@ sub_81CA0EC: ; 81CA0EC 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 @@ -853584,24 +853584,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 @@ -853610,16 +853610,16 @@ sub_81CA20C: ; 81CA20C 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} @@ -853639,26 +853639,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 @@ -853689,32 +853689,32 @@ 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 @@ -853730,24 +853730,24 @@ sub_81CA324: ; 81CA324 ldr r4, =DummyObjectCallback 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 .pool -@081CA354: +_081CA354: movs r0, 0x1 -@081CA356: +_081CA356: pop {r4} pop {r1} bx r1 @@ -853772,7 +853772,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] @@ -853789,7 +853789,7 @@ sub_81CA35C: ; 81CA35C str r7, [r0, 0x1C] subs r1, 0x1 cmp r1, 0 - bge @081CA380 + bge _081CA380 pop {r3,r4} mov r8, r3 mov r9, r4 @@ -853810,7 +853810,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 @@ -853842,7 +853842,7 @@ sub_81CA3B4: ; 81CA3B4 bl StartObjectRotScalAnim adds r5, 0x1 cmp r5, 0x3 - ble @081CA3C8 + ble _081CA3C8 movs r0, 0x52 movs r1, 0x10 bl SetGpuReg @@ -853878,7 +853878,7 @@ sub_81CA448: ; 81CA448 movs r6, 0x5 negs r6, r6 movs r3, 0x3 -@081CA458: +_081CA458: ldm r5!, {r0} adds r0, 0x3E ldrb r2, [r0] @@ -853888,7 +853888,7 @@ sub_81CA448: ; 81CA448 strb r1, [r0] subs r3, 0x1 cmp r3, 0 - bge @081CA458 + bge _081CA458 pop {r4-r6} pop {r0} bx r0 @@ -853906,7 +853906,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 @@ -853914,13 +853914,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, =DummyObjectCallback str r0, [r2, 0x1C] -@081CA4A2: +_081CA4A2: pop {r0} bx r0 .pool @@ -853934,11 +853934,11 @@ sub_81CA4AC: ; 81CA4AC 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 StartObjectRotScalAnim @@ -853953,8 +853953,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] @@ -853969,40 +853969,40 @@ sub_81CA4AC: ; 81CA4AC 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] @@ -854030,12 +854030,12 @@ sub_81CA4AC: ; 81CA4AC strb r0, [r4, 0x1] ldr r0, =DummyObjectCallback str r0, [r4, 0x1C] - b @081CA578 + b _081CA578 .pool -@081CA574: +_081CA574: subs r0, r1, 0x1 strh r0, [r4, 0x2E] -@081CA578: +_081CA578: pop {r4,r5} pop {r0} bx r0 @@ -854055,16 +854055,16 @@ 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 .pool -@081CA5AC: +_081CA5AC: movs r0, 0x10 strh r0, [r4, 0x4] strh r2, [r4, 0x6] @@ -854078,31 +854078,31 @@ sub_81CA580: ; 81CA580 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] @@ -854117,7 +854117,7 @@ sub_81CA580: ; 81CA580 lsls r0, 16 asrs r0, 16 cmp r0, 0xC - bne @081CA638 + bne _081CA638 movs r0, 0x2 bl sub_81C763C ldrb r1, [r0, 0xC] @@ -854129,11 +854129,11 @@ sub_81CA580: ; 81CA580 bl SetGpuReg 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 @@ -854160,20 +854160,20 @@ 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 str r0, [r1, 0x1C] - b @081CA690 + b _081CA690 .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 @@ -854200,7 +854200,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 @@ -854215,7 +854215,7 @@ sub_81CA6AC: ; 81CA6AC ands r0, r2 orrs r0, r1 strb r0, [r3] -@081CA6DA: +_081CA6DA: pop {r0} bx r0 thumb_func_end sub_81CA6AC @@ -854484,10 +854484,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} @@ -854603,7 +854603,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] @@ -854623,7 +854623,7 @@ sub_81CA9EC: ; 81CA9EC lsrs r1, 16 movs r0, 0x54 bl SetGpuReg -@081CAA30: +_081CAA30: pop {r0} bx r0 .pool @@ -854714,7 +854714,7 @@ sub_81CAAE8: ; 81CAAE8 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CAB1C + beq _081CAB1C ldr r0, =sub_81CAB44 str r0, [r4, 0x18] movs r0, 0 @@ -854725,11 +854725,11 @@ sub_81CAAE8: ; 81CAAE8 bl sub_81C7078 str r0, [r4, 0x14] movs r0, 0x1 - b @081CAB1E + b _081CAB1E .pool -@081CAB1C: +_081CAB1C: movs r0, 0 -@081CAB1E: +_081CAB1E: pop {r4} pop {r1} bx r1 @@ -854764,40 +854764,40 @@ sub_81CAB44: ; 81CAB44 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @081CAB5C + beq _081CAB5C movs r0, 0x2 - b @081CABF4 + b _081CABF4 .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 str r0, [r4, 0x18] strh r2, [r4] @@ -854806,45 +854806,45 @@ sub_81CAB44: ; 81CAB44 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, =gUnknown_0862250A str r0, [r4, 0x4] movs r0, 0x2 strh r0, [r4, 0x2] - b @081CABC6 + b _081CABC6 .pool -@081CABC0: +_081CABC0: ldr r0, =gUnknown_08622508 str r0, [r4, 0x4] strh r5, [r4, 0x2] -@081CABC6: +_081CABC6: movs r0, 0x5 - b @081CABF4 + b _081CABF4 .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 str r0, [r4, 0x18] movs r0, 0xF - b @081CABF4 + b _081CABF4 .pool -@081CABEC: +_081CABEC: movs r0, 0x20 bl audio_play -@081CABF2: +_081CABF2: movs r0, 0 -@081CABF4: +_081CABF4: pop {r4,r5} pop {r1} bx r1 @@ -854866,86 +854866,86 @@ 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 .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 str r0, [r4, 0x18] bl sub_81CB1D0 cmp r0, 0 - beq @081CAC88 + beq _081CAC88 movs r0, 0x9 - b @081CACAC + b _081CACAC .pool -@081CAC88: +_081CAC88: movs r0, 0x8 - b @081CACAC -@081CAC8C: + b _081CACAC +_081CAC8C: ldr r0, =sub_81CACB8 str r0, [r4, 0x18] movs r0, 0xB - b @081CACAC + b _081CACAC .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 str r0, [r4, 0x18] movs r0, 0x7 -@081CACAC: +_081CACAC: pop {r4} pop {r1} bx r1 @@ -854961,30 +854961,30 @@ sub_81CACB8: ; 81CACB8 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @081CACD0 + beq _081CACD0 movs r0, 0xC - b @081CACF0 + b _081CACF0 .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 str r0, [r3, 0x18] movs r0, 0xE -@081CACF0: +_081CACF0: pop {r1} bx r1 .pool @@ -854999,15 +854999,15 @@ sub_81CACF8: ; 81CACF8 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne @081CAD10 + bne _081CAD10 movs r0, 0 - b @081CAD16 + b _081CAD16 .pool -@081CAD10: +_081CAD10: ldr r0, =sub_81CAB44 str r0, [r2, 0x18] movs r0, 0xA -@081CAD16: +_081CAD16: pop {r1} bx r1 .pool @@ -855021,32 +855021,32 @@ sub_81CAD20: ; 81CAD20 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 @@ -855065,7 +855065,7 @@ sub_81CAD20: ; 81CAD20 ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] -@081CAD80: +_081CAD80: ldrh r0, [r4, 0x8] adds r1, r0, 0x1 movs r2, 0 @@ -855073,26 +855073,26 @@ sub_81CAD20: ; 81CAD20 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 @@ -855111,30 +855111,30 @@ sub_81CAD20: ; 81CAD20 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 @@ -855144,10 +855144,10 @@ sub_81CAD20: ; 81CAD20 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 @@ -855156,7 +855156,7 @@ sub_81CAE08: ; 81CAE08 bl FlagGet lsls r0, 24 lsrs r0, 24 -@081CAE24: +_081CAE24: pop {r1} bx r1 thumb_func_end sub_81CAE08 @@ -855215,14 +855215,14 @@ 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 @@ -855262,16 +855262,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 @@ -855281,11 +855281,11 @@ sub_81CAEBC: ; 81CAEBC negs r0, r1 orrs r0, r1 lsrs r0, 31 - b @081CAEFE + b _081CAEFE .pool -@081CAEFC: +_081CAEFC: movs r0, 0 -@081CAEFE: +_081CAEFE: pop {r4} pop {r1} bx r1 @@ -855301,7 +855301,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 @@ -855311,24 +855311,24 @@ sub_81CAF04: ; 81CAF04 lsls r0, 3 adds r0, r1 ldrb r0, [r0, 0x3] - b @081CAF6C + b _081CAF6C .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, =gTrainerPicIndices adds r0, r4, r0 ldrb r0, [r0] - b @081CAF6C + b _081CAF6C .pool -@081CAF58: +_081CAF58: adds r0, r4, 0 bl sub_81D15BC adds r4, r0, 0 @@ -855338,7 +855338,7 @@ sub_81CAF04: ; 81CAF04 lsls r1, 3 adds r1, r0 ldrb r0, [r1, 0x3] -@081CAF6C: +_081CAF6C: pop {r4,r5} pop {r1} bx r1 @@ -855360,30 +855360,30 @@ sub_81CAF78: ; 81CAF78 bl is_light_level_1_2_3_or_6 lsls r0, 24 cmp r0, 0 - bne @081CAFA4 + bne _081CAFA4 ldr r0, =gUnknown_085EEB0B - b @081CAFCE + b _081CAFCE .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 .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 @@ -855401,26 +855401,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, =gUnknown_08622028 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 @@ -855446,14 +855446,14 @@ 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 @@ -855467,7 +855467,7 @@ sub_81CB050: ; 81CB050 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 @@ -855483,20 +855483,20 @@ sub_81CB050: ; 81CB050 str r0, [sp] adds r1, 0x4 str r1, [sp, 0x4] - b @081CB092 + b _081CB092 .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 @@ -855505,14 +855505,14 @@ sub_81CB050: ; 81CB050 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} @@ -855546,31 +855546,31 @@ 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 @@ -855587,30 +855587,30 @@ 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 @@ -855620,11 +855620,11 @@ sub_81CB128: ; 81CB128 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 @@ -855632,17 +855632,17 @@ sub_81CB16C: ; 81CB16C 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 @@ -855652,17 +855652,17 @@ sub_81CB16C: ; 81CB16C adds r1, r0 ldrb r0, [r1] cmp r0, 0 - beq @081CB1C0 -@081CB1B2: + beq _081CB1C0 +_081CB1B2: movs r0, 0x1 - b @081CB1C8 + b _081CB1C8 .pool -@081CB1C0: +_081CB1C0: adds r4, 0x1 cmp r4, 0x14 - ble @081CB192 + ble _081CB192 movs r0, 0 -@081CB1C8: +_081CB1C8: pop {r4} pop {r1} bx r1 @@ -855680,7 +855680,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 @@ -855688,7 +855688,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 @@ -855696,12 +855696,12 @@ sub_81CB1D0: ; 81CB1D0 ldrh r4, [r4, 0x1E] adds r0, r4 ldrb r0, [r0] - b @081CB246 + b _081CB246 .pool -@081CB218: +_081CB218: ldrh r0, [r4, 0x1E] cmp r0, 0xB - bne @081CB258 + bne _081CB258 adds r0, r1, 0 bl sub_81CAEA4 ldr r1, =0x02037318 @@ -855709,25 +855709,25 @@ sub_81CB1D0: ; 81CB1D0 lsrs r0, 16 ldrb r1, [r1, 0x14] cmp r0, r1 - bne @081CB258 + bne _081CB258 ldr r0, =0x0000086b bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - bne @081CB258 + bne _081CB258 movs r0, 0x5B bl FlagGet lsls r0, 24 -@081CB246: +_081CB246: cmp r0, 0 - bne @081CB258 + bne _081CB258 movs r0, 0x1 - b @081CB25A + b _081CB25A .pool -@081CB258: +_081CB258: movs r0, 0 -@081CB25A: +_081CB25A: pop {r4} pop {r1} bx r1 @@ -855741,7 +855741,7 @@ sub_81CB260: ; 81CB260 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 @@ -855751,11 +855751,11 @@ sub_81CB260: ; 81CB260 ldr r0, =sub_81CB310 str r0, [r4] movs r0, 0x1 - b @081CB296 + b _081CB296 .pool -@081CB294: +_081CB294: movs r0, 0 -@081CB296: +_081CB296: pop {r4} pop {r1} bx r1 @@ -855835,26 +855835,26 @@ 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 .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, =gUnknown_0862278C movs r1, 0x3 bl sub_81C7B54 @@ -855889,15 +855889,15 @@ sub_81CB324: ; 81CB324 movs r2, 0x20 bl sub_81C7944 movs r0, 0x2 - b @081CB418 + b _081CB418 .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 @@ -855922,17 +855922,17 @@ sub_81CB324: ; 81CB324 movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 -@081CB418: +_081CB418: bl CopyBgTilemapBufferToVram movs r0, 0 - b @081CB506 + b _081CB506 .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, =gUnknown_08622760 @@ -855950,36 +855950,36 @@ sub_81CB324: ; 81CB324 movs r2, 0x20 bl sub_81C7944 movs r0, 0 - b @081CB506 + b _081CB506 .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 @@ -856004,23 +856004,23 @@ sub_81CB324: ; 81CB324 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} @@ -856035,62 +856035,62 @@ sub_81CB510: ; 81CB510 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 IsDma3ManagerBusyWithBgCopy 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 @@ -856104,62 +856104,62 @@ sub_81CB588: ; 81CB588 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 IsDma3ManagerBusyWithBgCopy 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 @@ -856173,62 +856173,62 @@ sub_81CB600: ; 81CB600 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 IsDma3ManagerBusyWithBgCopy 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 @@ -856242,62 +856242,62 @@ sub_81CB678: ; 81CB678 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 IsDma3ManagerBusyWithBgCopy 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 @@ -856311,11 +856311,11 @@ sub_81CB6F0: ; 81CB6F0 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 @@ -856323,17 +856323,17 @@ sub_81CB6F0: ; 81CB6F0 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 @@ -856367,11 +856367,11 @@ sub_81CB75C: ; 81CB75C 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 @@ -856379,17 +856379,17 @@ sub_81CB75C: ; 81CB75C 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 @@ -856403,59 +856403,59 @@ sub_81CB7A0: ; 81CB7A0 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 .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 @@ -856469,17 +856469,17 @@ sub_81CB824: ; 81CB824 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 @@ -856489,27 +856489,27 @@ sub_81CB824: ; 81CB824 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 @@ -856524,79 +856524,79 @@ 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 .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 IsDma3ManagerBusyWithBgCopy 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} @@ -856611,62 +856611,62 @@ sub_81CB93C: ; 81CB93C 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 @@ -856680,69 +856680,69 @@ sub_81CB9C8: ; 81CB9C8 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 .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 @@ -856756,49 +856756,49 @@ sub_81CBA68: ; 81CBA68 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 IsDma3ManagerBusyWithBgCopy 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 @@ -856812,69 +856812,69 @@ sub_81CBAD4: ; 81CBAD4 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 .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 @@ -856884,11 +856884,11 @@ sub_81CBAD4: ; 81CBAD4 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 @@ -856897,22 +856897,22 @@ sub_81CBB74: ; 81CBB74 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 @@ -856982,14 +856982,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 @@ -857010,7 +857010,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 @@ -857041,12 +857041,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} @@ -857073,7 +857073,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 @@ -857083,16 +857083,16 @@ sub_81CBCEC: ; 81CBCEC ldr r2, =0x00005001 adds r0, r2, 0 strh r0, [r1] - b @081CBD3C + b _081CBD3C .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 @@ -857236,9 +857236,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 @@ -857327,16 +857327,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, =gUnknown_085EC00F add r0, sp, 0xC bl CopyString -@081CBF24: +_081CBF24: movs r0, 0x7 add r1, sp, 0xC movs r2, 0x58 @@ -857375,8 +857375,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, =gUnknown_086227E8 lsls r1, 2 @@ -857395,16 +857395,16 @@ sub_81CBF60: ; 81CBF60 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 CopyWindowToVram @@ -857422,10 +857422,10 @@ sub_81CBFC4: ; 81CBFC4 bl IsDma3ManagerBusyWithBgCopy 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 @@ -857433,7 +857433,7 @@ sub_81CBFC4: ; 81CBFC4 adds r0, r4, 0 bl sub_81CC2F0 movs r0, 0 -@081CBFE8: +_081CBFE8: pop {r4} pop {r1} bx r1 @@ -857668,22 +857668,22 @@ 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 .pool -@081CC1B8: +_081CC1B8: ldr r2, =0x03003014 ldrb r1, [r2] movs r0, 0x2 negs r0, r0 ands r0, r1 strb r0, [r2] -@081CC1C4: +_081CC1C4: bl RunTextPrinters ldrb r0, [r4, 0x14] bl IsTextPrinterActive @@ -857735,13 +857735,13 @@ sub_81CC214: ; 81CC214 adds r6, r0, 0 movs r5, 0 ldr r4, =gUnknown_08622810 -@081CC224: +_081CC224: adds r0, r4, 0 bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq @081CC224 + beq _081CC224 ldr r0, =gUnknown_08622818 bl sub_81C795C movs r0, 0 @@ -857800,14 +857800,14 @@ sub_81CC2B4: ; 81CC2B4 adds r4, r0, 0 ldr r0, [r4, 0x1C] cmp r0, 0 - beq @081CC2C8 + beq _081CC2C8 bl RemoveObjectAndFreeTiles -@081CC2C8: +_081CC2C8: ldr r0, [r4, 0x20] cmp r0, 0 - beq @081CC2D2 + beq _081CC2D2 bl RemoveObjectAndFreeTiles -@081CC2D2: +_081CC2D2: movs r0, 0x8 bl FreeObjectTilesByTag movs r0, 0x7 @@ -857828,7 +857828,7 @@ sub_81CC2F0: ; 81CC2F0 adds r5, r1, 0 ldr r0, [r4, 0x1C] cmp r0, 0 - bne @081CC320 + bne _081CC320 ldr r0, =gUnknown_08622830 movs r1, 0x4 movs r2, 0x50 @@ -857845,7 +857845,7 @@ sub_81CC2F0: ; 81CC2F0 adds r0, r4, 0 adds r1, r5, 0 bl sub_81CC344 -@081CC320: +_081CC320: pop {r4,r5} pop {r0} bx r0 @@ -857883,7 +857883,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] @@ -857891,7 +857891,7 @@ sub_81CC34C: ; 81CC34C movs r1, 0x7 ands r0, r1 strh r0, [r2, 0x24] -@081CC36C: +_081CC36C: pop {r0} bx r0 thumb_func_end sub_81CC34C @@ -857924,7 +857924,7 @@ sub_81CC39C: ; 81CC39C bl sub_81C875C bl sub_81CAF04 cmp r0, 0 - blt @081CC400 + blt _081CC400 lsls r4, r0, 3 ldr r0, =gTrainerFrontPicTable adds r0, r4, r0 @@ -857963,7 +857963,7 @@ sub_81CC39C: ; 81CC39C ldr r1, [r7, 0x20] ldr r0, =sub_81CC440 str r0, [r1, 0x1C] -@081CC400: +_081CC400: pop {r4-r7} pop {r0} bx r0 @@ -857999,11 +857999,11 @@ sub_81CC440: ; 81CC440 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 @@ -858012,7 +858012,7 @@ sub_81CC440: ; 81CC440 movs r1, 0x1 negs r1, r1 cmp r0, r1 - beq @081CC498 + beq _081CC498 ldr r0, =0x0000ffb0 strh r0, [r4, 0x24] adds r2, r4, 0 @@ -858025,20 +858025,20 @@ sub_81CC440: ; 81CC440 ldrh r0, [r4, 0x2E] adds r0, 0x1 strh r0, [r4, 0x2E] - b @081CC498 + b _081CC498 .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, =DummyObjectCallback str r0, [r4, 0x1C] -@081CC498: +_081CC498: pop {r4} pop {r0} bx r0 @@ -858057,7 +858057,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] @@ -858066,7 +858066,7 @@ sub_81CC4A4: ; 81CC4A4 strb r0, [r2] ldr r0, =DummyObjectCallback str r0, [r3, 0x1C] -@081CC4CA: +_081CC4CA: pop {r0} bx r0 .pool @@ -858080,32 +858080,32 @@ sub_81CC4D4: ; 81CC4D4 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 .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 - b @081CC516 + b _081CC516 .pool -@081CC514: +_081CC514: ldr r0, =sub_81CC5B4 -@081CC516: +_081CC516: str r0, [r4, 0x10] movs r0, 0x1 -@081CC51A: +_081CC51A: pop {r4} pop {r1} bx r1 @@ -858155,38 +858155,38 @@ sub_81CC568: ; 81CC568 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 str r0, [r4, 0x10] movs r0, 0x4 - b @081CC5AE + b _081CC5AE .pool -@081CC5AC: +_081CC5AC: movs r0, 0 -@081CC5AE: +_081CC5AE: pop {r4} pop {r1} bx r1 @@ -858201,15 +858201,15 @@ sub_81CC5B4: ; 81CC5B4 movs r0, 0x2 ands r0, r1 cmp r0, 0 - bne @081CC5CC + bne _081CC5CC movs r0, 0 - b @081CC5D2 + b _081CC5D2 .pool -@081CC5CC: +_081CC5CC: ldr r0, =sub_81CC5DC str r0, [r2, 0x10] movs r0, 0x4 -@081CC5D2: +_081CC5D2: pop {r1} bx r1 .pool @@ -858240,7 +858240,7 @@ sub_81CC5F4: ; 81CC5F4 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CC624 + beq _081CC624 ldr r0, =sub_81CC6F4 movs r1, 0x1 bl sub_81C7078 @@ -858248,11 +858248,11 @@ sub_81CC5F4: ; 81CC5F4 ldr r0, =sub_81CC6BC str r0, [r4] movs r0, 0x1 - b @081CC626 + b _081CC626 .pool -@081CC624: +_081CC624: movs r0, 0 -@081CC626: +_081CC626: pop {r4} pop {r1} bx r1 @@ -858340,18 +858340,18 @@ 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 .pool -@081CC6EC: +_081CC6EC: movs r0, 0 -@081CC6EE: +_081CC6EE: pop {r1} bx r1 thumb_func_end sub_81CC6D0 @@ -858364,26 +858364,26 @@ sub_81CC6F4: ; 81CC6F4 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 .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 @@ -858410,18 +858410,18 @@ sub_81CC6F4: ; 81CC6F4 adds r1, r4, 0 bl sub_8122CF8 bl sub_81CC9C0 -@081CC77C: +_081CC77C: movs r0, 0 - b @081CC840 + b _081CC840 .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 @@ -858429,53 +858429,53 @@ sub_81CC6F4: ; 81CC6F4 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 ShowBg movs r0, 0x2 bl ShowBg ldr r0, =sub_81CC6A4 bl c3args_set_0toR1_1to0 - b @081CC77C + b _081CC77C .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 @@ -858484,20 +858484,20 @@ sub_81CC6F4: ; 81CC6F4 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 @@ -858510,23 +858510,23 @@ sub_81CC848: ; 81CC848 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 @@ -858536,49 +858536,49 @@ sub_81CC848: ; 81CC848 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 @@ -858591,60 +858591,60 @@ sub_81CC8D8: ; 81CC8D8 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 @@ -858654,39 +858654,39 @@ sub_81CC8D8: ; 81CC8D8 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 HideBg movs r0, 0x2 @@ -858694,10 +858694,10 @@ sub_81CC95C: ; 81CC95C movs r0, 0x3 bl HideBg movs r0, 0 - b @081CC9BA -@081CC9B8: + b _081CC9BA +_081CC9B8: movs r0, 0x4 -@081CC9BA: +_081CC9BA: pop {r1} bx r1 thumb_func_end sub_81CC95C @@ -858707,13 +858707,13 @@ sub_81CC9C0: ; 81CC9C0 push {r4,r5,lr} movs r5, 0 ldr r4, =gUnknown_086230F8 -@081CC9C6: +_081CC9C6: adds r0, r4, 0 bl LoadCompressedObjectPic adds r4, 0x8 adds r5, 0x1 cmp r5, 0 - beq @081CC9C6 + beq _081CC9C6 ldr r0, =gUnknown_08623100 bl sub_81C795C bl sub_81CCE58 @@ -858736,12 +858736,12 @@ sub_81CC9EC: ; 81CC9EC adds r5, r4, 0 adds r5, 0xC movs r4, 0x2 -@081CCA08: +_081CCA08: ldm r5!, {r0} bl RemoveObjectAndFreeTiles subs r4, 0x1 cmp r4, 0 - bge @081CCA08 + bge _081CCA08 pop {r4,r5} pop {r0} bx r0 @@ -858814,19 +858814,19 @@ 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 ChangeBgY - b @081CCAEA + b _081CCAEA .pool -@081CCAE0: +_081CCAE0: movs r0, 0x1 movs r1, 0 movs r2, 0 bl ChangeBgY -@081CCAEA: +_081CCAEA: movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -858857,23 +858857,23 @@ 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 .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 FillWindowPixelBuffer @@ -858904,8 +858904,8 @@ sub_81CCB0C: ; 81CCB0C bl CopyWindowToVram movs r0, 0 bl sub_81CCFA4 - b @081CCC40 -@081CCB8E: + b _081CCC40 +_081CCB8E: ldrb r0, [r4, 0x8] movs r1, 0x11 bl FillWindowPixelBuffer @@ -858938,9 +858938,9 @@ sub_81CCB0C: ; 81CCB0C movs r2, 0x11 movs r3, 0x6 bl FillBgTilemapBufferRect - b @081CCC0C + b _081CCC0C .pool -@081CCBDC: +_081CCBDC: ldrb r0, [r4, 0x8] movs r1, 0x11 bl FillWindowPixelBuffer @@ -858961,14 +858961,14 @@ sub_81CCB0C: ; 81CCB0C ldrb r2, [r5, 0x3] adds r0, r4, 0 bl sub_81CCDE8 -@081CCC0C: +_081CCC0C: ldrb r0, [r4, 0x8] movs r1, 0x3 bl CopyWindowToVram movs r0, 0x1 bl sub_81CCFA4 - b @081CCC40 -@081CCC1C: + b _081CCC40 +_081CCC1C: ldr r1, =0x00001041 movs r0, 0xC str r0, [sp] @@ -858984,7 +858984,7 @@ sub_81CCB0C: ; 81CCB0C bl CopyBgTilemapBufferToVram movs r0, 0x1 bl sub_81CCFA4 -@081CCC40: +_081CCC40: add sp, 0xC pop {r4,r5} pop {r0} @@ -859049,25 +859049,25 @@ 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 ChangeBgY cmp r0, 0 - blt @081CCCD6 + blt _081CCCD6 movs r0, 0x1 movs r1, 0 movs r2, 0 bl ChangeBgY adds r0, r4, 0 bl remove_task -@081CCCD6: +_081CCCD6: bl sub_81CCF78 - b @081CCD04 + b _081CCD04 .pool -@081CCCE0: +_081CCCE0: movs r1, 0x90 lsls r1, 3 movs r0, 0x1 @@ -859075,15 +859075,15 @@ sub_81CCC9C: ; 81CCC9C bl ChangeBgY ldr r1, =0xffffa000 cmp r0, r1 - bgt @081CCD00 + bgt _081CCD00 movs r0, 0x1 movs r2, 0 bl ChangeBgY adds r0, r5, 0 bl remove_task -@081CCD00: +_081CCD00: bl sub_81CCF78 -@081CCD04: +_081CCD04: pop {r4,r5} pop {r0} bx r0 @@ -859119,10 +859119,10 @@ sub_81CCD34: ; 81CCD34 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, =gUnknown_08623118 lsls r1, r4, 3 adds r0, 0x4 @@ -859135,7 +859135,7 @@ sub_81CCD34: ; 81CCD34 adds r1, r2, r1 bl LZ77UnCompWram movs r0, 0x1 -@081CCD62: +_081CCD62: pop {r4} pop {r1} bx r1 @@ -859153,25 +859153,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] @@ -859194,7 +859194,7 @@ sub_81CCD70: ; 81CCD70 movs r2, 0x12 movs r3, 0x6 bl CopyToBgTilemapBufferRect -@081CCDD4: +_081CCDD4: add sp, 0x8 pop {r4-r6} pop {r0} @@ -859217,9 +859217,9 @@ sub_81CCDE8: ; 81CCDE8 lsls r1, 24 mov r8, r1 lsls r7, r2, 24 - b @081CCE34 + b _081CCE34 .pool -@081CCE08: +_081CCE08: adds r0, r6, 0 movs r2, 0 movs r3, 0xC @@ -859240,7 +859240,7 @@ sub_81CCDE8: ; 81CCDE8 lsls r0, 21 adds r4, r0 adds r5, 0x1 -@081CCE34: +_081CCE34: lsls r2, r5, 24 lsrs r2, 24 mov r1, r8 @@ -859249,7 +859249,7 @@ sub_81CCDE8: ; 81CCDE8 bl sub_8145CF4 adds r1, r0, 0 cmp r1, 0 - bne @081CCE08 + bne _081CCE08 add sp, 0xC pop {r3,r4} mov r8, r3 @@ -859271,16 +859271,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, =gUnknown_086231D0 asrs r2, r7, 16 @@ -859324,7 +859324,7 @@ sub_81CCE58: ; 81CCE58 adds r6, r4 adds r5, 0x1 cmp r5, 0x2 - ble @081CCE80 + ble _081CCE80 pop {r3} mov r8, r3 pop {r4-r7} @@ -859341,28 +859341,28 @@ sub_81CCEF4: ; 81CCEF4 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 @@ -859378,29 +859378,29 @@ sub_81CCEF4: ; 81CCEF4 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 .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 @@ -859419,12 +859419,12 @@ 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 @@ -859444,7 +859444,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] @@ -859454,7 +859454,7 @@ sub_81CCFA4: ; 81CCFA4 strb r1, [r0] subs r3, 0x1 cmp r3, 0 - bge @081CCFBE + bge _081CCFBE pop {r4-r6} pop {r0} bx r0 @@ -859468,7 +859468,7 @@ sub_81CCFD8: ; 81CCFD8 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CD01C + beq _081CD01C ldr r1, =0x00006428 adds r0, r4, r1 bl sub_81D1ED4 @@ -859481,11 +859481,11 @@ sub_81CCFD8: ; 81CCFD8 ldr r0, =sub_81CD08C str r0, [r1] movs r0, 0x1 - b @081CD01E + b _081CD01E .pool -@081CD01C: +_081CD01C: movs r0, 0 -@081CD01E: +_081CD01E: pop {r4} pop {r1} bx r1 @@ -859499,7 +859499,7 @@ sub_81CD024: ; 81CD024 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CD068 + beq _081CD068 ldr r1, =0x00006428 adds r0, r4, r1 bl sub_81D1ED4 @@ -859512,11 +859512,11 @@ sub_81CD024: ; 81CD024 ldr r0, =sub_81CD08C str r0, [r1] movs r0, 0x1 - b @081CD06A + b _081CD06A .pool -@081CD068: +_081CD068: movs r0, 0 -@081CD06A: +_081CD06A: pop {r4} pop {r1} bx r1 @@ -859548,29 +859548,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 @@ -859578,9 +859578,9 @@ sub_81CD08C: ; 81CD08C ldr r0, =sub_81CD19C str r0, [r1] movs r2, 0x2 - b @081CD100 + b _081CD100 .pool -@081CD0F0: +_081CD0F0: movs r0, 0x5 bl audio_play movs r2, 0x5 @@ -859588,7 +859588,7 @@ sub_81CD08C: ; 81CD08C adds r1, r4, r0 ldr r0, =sub_81CD110 str r0, [r1] -@081CD100: +_081CD100: adds r0, r2, 0 pop {r4,r5} pop {r1} @@ -859605,7 +859605,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 @@ -859629,7 +859629,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 @@ -859637,21 +859637,21 @@ sub_81CD110: ; 81CD110 movs r1, 0x8 mov r2, sp bl pokemon_setattr - b @081CD180 + b _081CD180 .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 str r0, [r1] movs r4, 0x6 -@081CD18A: +_081CD18A: adds r0, r4, 0 add sp, 0x4 pop {r4-r6} @@ -859668,13 +859668,13 @@ sub_81CD19C: ; 81CD19C adds r0, r1 ldrb r0, [r0] cmp r0, 0 - beq @081CD1B4 + beq _081CD1B4 ldr r0, =0x000186aa - b @081CD1B6 + b _081CD1B6 .pool -@081CD1B4: +_081CD1B4: ldr r0, =0x000186a2 -@081CD1B6: +_081CD1B6: pop {r1} bx r1 .pool @@ -859690,10 +859690,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} @@ -859713,47 +859713,47 @@ 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 .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} @@ -859776,15 +859776,15 @@ 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 .pool -@081CD284: +_081CD284: ldr r2, =0x00006787 adds r0, r4, r2 -@081CD288: +_081CD288: ldrb r0, [r0] lsls r0, 24 asrs r0, 24 @@ -859812,14 +859812,14 @@ sub_81CD258: ; 81CD258 ldrh r6, [r5, 0x2] bl sub_81CDD5C cmp r0, 0 - beq @081CD2D8 + beq _081CD2D8 ldrh r1, [r5] - b @081CD2DC + b _081CD2DC .pool -@081CD2D8: +_081CD2D8: ldrh r1, [r5] subs r1, 0x1 -@081CD2DC: +_081CD2DC: eors r1, r6 negs r0, r1 orrs r0, r1 @@ -859827,7 +859827,7 @@ sub_81CD258: ; 81CD258 adds r6, r0, 0 mov r0, r8 cmp r0, 0 - beq @081CD332 + beq _081CD332 ldr r1, =0x00006787 adds r2, r4, r1 ldrb r0, [r2] @@ -859845,22 +859845,22 @@ sub_81CD258: ; 81CD258 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 .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] @@ -859880,54 +859880,54 @@ sub_81CD258: ; 81CD258 ldrh r0, [r5] subs r0, 0x1 cmp r1, r0 - bge @081CD370 + bge _081CD370 adds r0, r1, 0x1 - b @081CD372 + b _081CD372 .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 .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} @@ -859948,49 +859948,49 @@ 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 .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 @@ -860005,9 +860005,9 @@ sub_81CD3C4: ; 81CD3C4 adds r0, r4, r2 strb r1, [r0] movs r0, 0x1 - b @081CD53C + b _081CD53C .pool -@081CD468: +_081CD468: ldr r0, =0x00006786 adds r1, r4, r0 movs r0, 0 @@ -860020,81 +860020,81 @@ sub_81CD3C4: ; 81CD3C4 adds r1, r4, r0 movs r0, 0x2 strb r0, [r1] - b @081CD530 + b _081CD530 .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 @@ -860104,16 +860104,16 @@ sub_81CD3C4: ; 81CD3C4 movs r0, 0 strb r0, [r1] movs r0, 0x1 - b @081CD53C + b _081CD53C .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 @@ -860130,17 +860130,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 @@ -860149,9 +860149,9 @@ sub_81CD548: ; 81CD548 adds r1, r2 ldrb r1, [r1] bl sub_81CD824 - b @081CD5C4 + b _081CD5C4 .pool -@081CD588: +_081CD588: ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 @@ -860160,9 +860160,9 @@ sub_81CD548: ; 81CD548 adds r1, r2 ldrb r1, [r1] bl sub_81CDA1C - b @081CD5C4 + b _081CD5C4 .pool -@081CD5A4: +_081CD5A4: ldr r2, =0x00006302 adds r0, r1, r2 movs r2, 0 @@ -860172,11 +860172,11 @@ sub_81CD548: ; 81CD548 ldrb r1, [r1] bl sub_81CDB98 movs r0, 0x1 - b @081CD5C6 + b _081CD5C6 .pool -@081CD5C4: +_081CD5C4: movs r0, 0 -@081CD5C6: +_081CD5C6: pop {r4,r5} pop {r1} bx r1 @@ -860188,8 +860188,8 @@ sub_81CD5CC: ; 81CD5CC 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 @@ -860197,11 +860197,11 @@ sub_81CD5CC: ; 81CD5CC 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 @@ -860209,9 +860209,9 @@ sub_81CD5CC: ; 81CD5CC 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 @@ -860221,8 +860221,8 @@ sub_81CD5CC: ; 81CD5CC 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 @@ -860275,15 +860275,15 @@ sub_81CD624: ; 81CD624 movs r3, 0 bl sub_81D2C68 cmp r0, 0 - beq @081CD690 + beq _081CD690 ldr r1, =gUnknown_085E8264 adds r0, r5, 0 movs r2, 0 movs r3, 0xC bl CopyStringPadded - b @081CD80E + b _081CD80E .pool -@081CD690: +_081CD690: adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x2 @@ -860299,7 +860299,7 @@ sub_81CD624: ; 81CD624 lsls r0, 16 lsrs r7, r0, 16 cmp r4, 0xE - bne @081CD6E0 + bne _081CD6E0 movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -860315,9 +860315,9 @@ sub_81CD624: ; 81CD624 bl pokemon_get_gender lsls r0, 24 lsrs r6, r0, 24 - b @081CD6FE + b _081CD6FE .pool -@081CD6E0: +_081CD6E0: mov r0, r8 mov r1, r9 bl get_pokemon_by_box_and_pos @@ -860330,12 +860330,12 @@ sub_81CD624: ; 81CD624 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 @@ -860344,18 +860344,18 @@ sub_81CD624: ; 81CD624 adds r0, r5, 0 bl CompareString cmp r0, 0 - bne @081CD71C + bne _081CD71C movs r6, 0xFF -@081CD71C: +_081CD71C: adds r3, r5, 0 - b @081CD726 + b _081CD726 .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 @@ -860366,12 +860366,12 @@ sub_81CD624: ; 81CD624 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 @@ -860389,8 +860389,8 @@ sub_81CD624: ; 81CD624 strb r0, [r3] adds r3, 0x1 movs r0, 0xB5 - b @081CD790 -@081CD76E: + b _081CD790 +_081CD76E: strb r1, [r3] adds r3, 0x1 movs r0, 0x1 @@ -860408,7 +860408,7 @@ sub_81CD624: ; 81CD624 strb r0, [r3] adds r3, 0x1 movs r0, 0xB6 -@081CD790: +_081CD790: strb r0, [r3] adds r3, 0x1 movs r0, 0xFC @@ -860449,7 +860449,7 @@ sub_81CD624: ; 81CD624 adds r3, 0x1 mov r0, r10 cmp r0, 0 - bne @081CD808 + bne _081CD808 movs r0, 0x3 subs r0, r4 lsls r0, 16 @@ -860458,22 +860458,22 @@ sub_81CD624: ; 81CD624 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 @@ -860505,17 +860505,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 @@ -860557,14 +860557,14 @@ sub_81CD824: ; 81CD824 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, =gUnknown_085EBFCE - b @081CD8F4 + b _081CD8F4 .pool -@081CD8E4: +_081CD8E4: adds r4, r5 ldr r2, =0x00006325 adds r4, r2 @@ -860572,12 +860572,12 @@ sub_81CD824: ; 81CD824 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 .pool -@081CD900: +_081CD900: movs r1, 0 lsls r4, r6, 6 lsls r0, r6, 1 @@ -860586,7 +860586,7 @@ sub_81CD824: ; 81CD824 ldr r0, =0x00006368 adds r2, r5, r0 movs r7, 0 -@081CD910: +_081CD910: adds r0, r1, r3 adds r0, r2, r0 strb r7, [r0] @@ -860594,7 +860594,7 @@ sub_81CD824: ; 81CD824 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0xB - bls @081CD910 + bls _081CD910 adds r1, r4 ldr r2, =0x00006368 adds r0, r5, r2 @@ -860608,7 +860608,7 @@ sub_81CD824: ; 81CD824 ldr r0, =0x00006320 adds r2, r5, r0 movs r4, 0 -@081CD93A: +_081CD93A: adds r0, r1, r3 adds r0, r2, r0 strb r4, [r0] @@ -860616,7 +860616,7 @@ sub_81CD824: ; 81CD824 lsls r0, 16 lsrs r1, r0, 16 cmp r1, 0x7 - bls @081CD93A + bls _081CD93A mov r2, r8 adds r0, r2, r6 lsls r0, 3 @@ -860626,7 +860626,7 @@ sub_81CD824: ; 81CD824 adds r1, r0 movs r0, 0xFF strb r0, [r1] -@081CD95C: +_081CD95C: pop {r3} mov r8, r3 pop {r4-r7} @@ -860652,9 +860652,9 @@ sub_81CD970: ; 81CD970 strb r0, [r1] movs r4, 0 movs r5, 0 - b @081CD9C4 + b _081CD9C4 .pool -@081CD998: +_081CD998: movs r0, 0x64 muls r0, r4 ldr r1, =0x020244ec @@ -860663,7 +860663,7 @@ sub_81CD970: ; 81CD970 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 @@ -860673,16 +860673,16 @@ sub_81CD970: ; 81CD970 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 @@ -860742,17 +860742,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 @@ -860817,7 +860817,7 @@ sub_81CDA1C: ; 81CDA1C movs r3, 0 bl sub_81D2C68 cmp r0, 0xFF - beq @081CDB10 + beq _081CDB10 adds r0, r6, 0 adds r1, r7, 0 movs r2, 0x30 @@ -860825,11 +860825,11 @@ sub_81CDA1C: ; 81CDA1C bl sub_81D2C68 movs r1, 0x1D bl __udivsi3 - b @081CDB12 + b _081CDB12 .pool -@081CDB10: +_081CDB10: movs r0, 0x9 -@081CDB12: +_081CDB12: strb r0, [r4] adds r0, r6, 0 adds r1, r7, 0 @@ -860850,9 +860850,9 @@ sub_81CDA1C: ; 81CDA1C adds r1, r2 add r1, r8 bl sub_81D2754 - b @081CDB80 + b _081CDB80 .pool -@081CDB48: +_081CDB48: movs r2, 0 mov r0, r9 lsls r5, r0, 2 @@ -860863,7 +860863,7 @@ sub_81CDA1C: ; 81CDA1C mov r9, r2 ldr r7, =0x0000643c movs r6, 0x9B -@081CDB5C: +_081CDB5C: adds r0, r2, r5 adds r0, r4, r0 mov r1, r9 @@ -860881,8 +860881,8 @@ sub_81CDA1C: ; 81CDA1C 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 @@ -860914,15 +860914,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 @@ -860970,7 +860970,7 @@ sub_81CDB98: ; 81CDB98 lsls r1, r2, 7 adds r1, r7, r1 bl LZ77UnCompWram -@081CDC3E: +_081CDC3E: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -861146,12 +861146,12 @@ 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 @@ -861167,10 +861167,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 @@ -861179,7 +861179,7 @@ sub_81CDD7C: ; 81CDD7C adds r0, r2, r3 adds r0, r1 ldrb r0, [r0] -@081CDDA6: +_081CDDA6: pop {r1} bx r1 .pool @@ -861212,7 +861212,7 @@ sub_81CDDD4: ; 81CDDD4 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CDE24 + beq _081CDE24 ldr r0, =0x00001816 adds r1, r4, r0 movs r0, 0xFF @@ -861230,11 +861230,11 @@ sub_81CDDD4: ; 81CDDD4 movs r0, 0 strb r0, [r1] movs r0, 0x1 - b @081CDE26 + b _081CDE26 .pool -@081CDE24: +_081CDE24: movs r0, 0 -@081CDE26: +_081CDE26: pop {r4} pop {r1} bx r1 @@ -861298,46 +861298,46 @@ 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 .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, =gUnknown_08623358 movs r1, 0x3 bl sub_81C7B54 @@ -861378,34 +861378,34 @@ sub_81CDE94: ; 81CDE94 movs r0, 0 str r0, [sp] movs r0, 0x3 - b @081CDFA8 + b _081CDFA8 .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, =gUnknown_08623228 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 .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, =gUnknown_08DC6DFC adds r4, r5, 0x4 adds r1, r4, 0 @@ -861415,7 +861415,7 @@ sub_81CDE94: ; 81CDE94 bl SetBgTilemap bl sub_81CDD5C cmp r0, 0x1 - bne @081CDFF2 + bne _081CDFF2 ldr r1, =gUnknown_08DC7070 movs r0, 0x9 str r0, [sp] @@ -861425,7 +861425,7 @@ sub_81CDE94: ; 81CDE94 movs r2, 0 movs r3, 0x5 bl CopyToBgTilemapBufferRect -@081CDFF2: +_081CDFF2: movs r0, 0x3 bl CopyBgTilemapBufferToVram ldr r0, =gUnknown_08DC6528 @@ -861440,15 +861440,15 @@ sub_81CDE94: ; 81CDE94 adds r1, r5, r0 ldr r0, =0x0000ffb0 strh r0, [r1] - b @081CDFB0 + b _081CDFB0 .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, =gUnknown_0862323C ldr r1, =0x00001004 adds r4, r5, r1 @@ -861465,9 +861465,9 @@ sub_81CDE94: ; 81CDE94 bl sub_81C7944 movs r0, 0x2 bl sub_81D21DC - b @081CDFB0 + b _081CDFB0 .pool -@081CE074: +_081CE074: movs r0, 0x1 movs r1, 0 movs r2, 0 @@ -861489,15 +861489,15 @@ sub_81CDE94: ; 81CDE94 movs r0, 0x1 adds r1, r4, 0 bl SetBgTilemap - b @081CDFB0 + b _081CDFB0 .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, =gUnknown_08623364 bl AddWindow movs r2, 0xC1 @@ -861506,7 +861506,7 @@ sub_81CDE94: ; 81CDE94 strb r0, [r1] bl sub_81CDD5C cmp r0, 0x1 - bne @081CE0F6 + bne _081CE0F6 ldr r0, =gUnknown_0862336C bl AddWindow ldr r2, =0x00001821 @@ -861522,53 +861522,53 @@ sub_81CDE94: ; 81CDE94 ldr r2, =0x00001823 adds r1, r5, r2 strb r0, [r1] -@081CE0F6: +_081CE0F6: bl DeactivateAllTextPrinters - b @081CDFB0 + b _081CDFB0 .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 @@ -861578,9 +861578,9 @@ sub_81CDE94: ; 81CDE94 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 @@ -861588,9 +861588,9 @@ sub_81CDE94: ; 81CDE94 bl PutWindowTilemap 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] @@ -861603,9 +861603,9 @@ sub_81CDE94: ; 81CDE94 adds r0, r5, r2 ldrb r0, [r0] bl PutWindowTilemap - b @081CDFB0 + b _081CDFB0 .pool -@081CE1C8: +_081CE1C8: movs r0, 0x1 bl ShowBg movs r0, 0x2 @@ -861614,20 +861614,20 @@ sub_81CDE94: ; 81CDE94 bl ShowBg 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 @@ -861638,61 +861638,61 @@ sub_81CDE94: ; 81CDE94 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 bl c3args_set_0toR1_1to0 - b @081CDFB0 + b _081CDFB0 .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] @@ -861703,14 +861703,14 @@ sub_81CDE94: ; 81CDE94 adds r0, r6, 0 adds r1, r4, 0 bl sub_81D3480 - b @081CE2C4 + b _081CE2C4 .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} @@ -861725,60 +861725,60 @@ sub_81CE2D0: ; 81CE2D0 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 .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 .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 @@ -861789,11 +861789,11 @@ sub_81CE2D0: ; 81CE2D0 movs r0, 0x3 bl HideBg movs r0, 0x1 - b @081CE376 + b _081CE376 .pool -@081CE374: +_081CE374: movs r0, 0x4 -@081CE376: +_081CE376: pop {r4,r5} pop {r1} bx r1 @@ -861809,90 +861809,90 @@ 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 .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 .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 .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 @@ -861902,9 +861902,9 @@ sub_81CE37C: ; 81CE37C 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 @@ -861913,21 +861913,21 @@ sub_81CE37C: ; 81CE37C 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 @@ -861940,14 +861940,14 @@ sub_81CE37C: ; 81CE37C adds r0, r5, 0 adds r1, r4, 0 bl sub_81D3480 - b @081CE3D6 + b _081CE3D6 .pool -@081CE4CC: +_081CE4CC: movs r0, 0x2 - b @081CE4D2 -@081CE4D0: + b _081CE4D2 +_081CE4D0: movs r0, 0x4 -@081CE4D2: +_081CE4D2: pop {r4-r6} pop {r1} bx r1 @@ -861961,72 +861961,72 @@ sub_81CE4D8: ; 81CE4D8 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 .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 @@ -862036,17 +862036,17 @@ sub_81CE4D8: ; 81CE4D8 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 @@ -862062,14 +862062,14 @@ sub_81CE4D8: ; 81CE4D8 adds r1, r5, 0 bl sub_81D3480 movs r0, 0x1 - b @081CE5DE + b _081CE5DE .pool -@081CE5D8: +_081CE5D8: movs r0, 0x2 - b @081CE5DE -@081CE5DC: + b _081CE5DE +_081CE5DC: movs r0, 0x4 -@081CE5DE: +_081CE5DE: pop {r4,r5} pop {r1} bx r1 @@ -862083,79 +862083,79 @@ sub_81CE5E4: ; 81CE5E4 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 .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 .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 .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 @@ -862165,13 +862165,13 @@ sub_81CE5E4: ; 81CE5E4 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 @@ -862181,39 +862181,39 @@ sub_81CE5E4: ; 81CE5E4 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 @@ -862222,34 +862222,34 @@ sub_81CE6BC: ; 81CE6BC 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 @@ -862287,21 +862287,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 @@ -862310,17 +862310,17 @@ sub_81CE754: ; 81CE754 bl FillWindowPixelBuffer 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 FillWindowPixelBuffer - b @081CE924 + b _081CE924 .pool -@081CE7B8: +_081CE7B8: bl sub_81CDC60 adds r4, r0, 0 lsls r4, 16 @@ -862330,12 +862330,12 @@ sub_81CE754: ; 81CE754 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 @@ -862352,14 +862352,14 @@ sub_81CE754: ; 81CE754 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 @@ -862419,73 +862419,73 @@ sub_81CE754: ; 81CE754 add r2, sp, 0xC movs r3, 0x1C bl Print - b @081CE924 + b _081CE924 .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 .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 CopyWindowToVram - b @081CE8D2 -@081CE8C4: + b _081CE8D2 +_081CE8C4: movs r1, 0xC1 lsls r1, 5 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x2 bl CopyWindowToVram -@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 .pool -@081CE8EC: +_081CE8EC: cmp r5, 0 - beq @081CE904 + beq _081CE904 ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x3 bl CopyWindowToVram - b @081CE910 + b _081CE910 .pool -@081CE904: +_081CE904: ldr r1, =0x00001821 adds r0, r6, r1 ldrb r0, [r0] movs r1, 0x2 bl CopyWindowToVram -@081CE910: +_081CE910: ldr r0, =0x00002908 adds r1, r6, r0 movs r0, 0 strb r0, [r1] movs r0, 0x1 - b @081CE926 + b _081CE926 .pool -@081CE924: +_081CE924: movs r0, 0 -@081CE926: +_081CE926: add sp, 0x2C pop {r3} mov r8, r3 @@ -862526,16 +862526,16 @@ sub_81CE964: ; 81CE964 lsls r0, 16 lsrs r0, 16 cmp r4, r0 - bne @081CE982 + bne _081CE982 adds r0, r5, 0 movs r1, 0 bl StartObjectImageAnim - b @081CE98A -@081CE982: + b _081CE98A +_081CE982: adds r0, r5, 0 movs r1, 0x1 bl StartObjectImageAnim -@081CE98A: +_081CE98A: pop {r4,r5} pop {r0} bx r0 @@ -862554,12 +862554,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 IndexOfObjectPaletteTag lsls r0, 4 ldrb r2, [r5, 0x5] @@ -862608,7 +862608,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 @@ -862643,9 +862643,9 @@ sub_81CE9E4: ; 81CE9E4 bl sub_81C7990 add r3, sp, 0x50 mov r8, r3 - b @081CEBC6 + b _081CEBC6 .pool -@081CEA78: +_081CEA78: mov r0, sp bl LoadObjectPics mov r0, r10 @@ -862653,8 +862653,8 @@ sub_81CE9E4: ; 81CE9E4 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 @@ -862669,7 +862669,7 @@ sub_81CE9E4: ; 81CE9E4 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @081CEAD8 + beq _081CEAD8 ldr r2, =0x00001806 adds r0, r6, r2 adds r0, r4 @@ -862684,36 +862684,36 @@ sub_81CE9E4: ; 81CE9E4 adds r0, r2 ldr r1, =sub_81CE964 str r1, [r0] - b @081CEAE2 + b _081CEAE2 .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, =DummyObjectCallback 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 @@ -862728,7 +862728,7 @@ sub_81CE9E4: ; 81CE9E4 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 @@ -862739,19 +862739,19 @@ sub_81CE9E4: ; 81CE9E4 movs r0, 0x3F ands r0, r2 strb r0, [r1, 0x3] - b @081CEB52 + b _081CEB52 .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 @@ -862770,7 +862770,7 @@ sub_81CE9E4: ; 81CE9E4 lsls r0, 24 lsrs r3, r0, 24 cmp r3, 0x40 - beq @081CEBBC + beq _081CEBBC ldr r1, =0x00001806 adds r0, r6, r1 adds r0, r4 @@ -862792,15 +862792,15 @@ sub_81CE9E4: ; 81CE9E4 movs r0, 0x80 orrs r1, r0 strb r1, [r2, 0x3] - b @081CEBC6 + b _081CEBC6 .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 @@ -862828,7 +862828,7 @@ sub_81CEBF4: ; 81CEBF4 adds r5, r0, 0 bl sub_81CDD5C cmp r0, 0x1 - bne @081CEC28 + bne _081CEC28 ldr r1, =0x000028dc adds r0, r5, r1 ldr r0, [r0] @@ -862841,11 +862841,11 @@ sub_81CEBF4: ; 81CEBF4 bl FreeObjectPaletteByTag movs r0, 0x69 bl FreeObjectPaletteByTag - b @081CEC68 + b _081CEC68 .pool -@081CEC28: +_081CEC28: movs r4, 0 -@081CEC2A: +_081CEC2A: ldr r1, =0x00001806 adds r0, r5, r1 adds r0, r4 @@ -862860,7 +862860,7 @@ sub_81CEBF4: ; 81CEBF4 lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x6 - bls @081CEC2A + bls _081CEC2A movs r0, 0x65 bl FreeObjectTilesByTag movs r0, 0x66 @@ -862871,12 +862871,12 @@ sub_81CEBF4: ; 81CEBF4 bl FreeObjectPaletteByTag movs r0, 0x66 bl FreeObjectPaletteByTag -@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 @@ -862888,7 +862888,7 @@ sub_81CEBF4: ; 81CEBF4 bl FreeObjectTilesByTag movs r0, 0x64 bl FreeObjectPaletteByTag -@081CEC8E: +_081CEC8E: pop {r4,r5} pop {r0} bx r0 @@ -862908,7 +862908,7 @@ sub_81CECA0: ; 81CECA0 bl RemoveWindow bl sub_81CDD5C cmp r0, 0x1 - bne @081CECEC + bne _081CECEC ldr r1, =0x00001821 adds r0, r4, r1 ldrb r0, [r0] @@ -862921,11 +862921,11 @@ sub_81CECA0: ; 81CECA0 adds r0, r4, r1 ldrb r0, [r0] bl RemoveWindow - b @081CECF0 + b _081CECF0 .pool -@081CECEC: +_081CECEC: bl sub_81C7FDC -@081CECF0: +_081CECF0: movs r1, 0x8A lsls r1, 5 movs r0, 0 @@ -862972,7 +862972,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 @@ -863006,16 +863006,16 @@ sub_81CED30: ; 81CED30 lsrs r0, 24 strb r0, [r7] cmp r0, 0x40 - bne @081CEDBC + bne _081CEDBC movs r0, 0x64 bl FreeObjectTilesByTag movs r0, 0x64 bl FreeObjectPaletteByTag movs r0, 0xFF strb r0, [r7] - b @081CEE26 + b _081CEE26 .pool -@081CEDBC: +_081CEDBC: strb r0, [r7] ldr r2, =0x02020630 ldrb r1, [r7] @@ -863039,9 +863039,9 @@ sub_81CED30: ; 81CED30 lsls r1, 1 adds r0, r1 strh r0, [r4] - b @081CEE26 + b _081CEE26 .pool -@081CEDFC: +_081CEDFC: adds r0, r6, 0 bl sub_81CDCB4 ldr r1, =0x0000181c @@ -863060,7 +863060,7 @@ sub_81CED30: ; 81CED30 ldrh r1, [r1] movs r2, 0x20 bl gpu_pal_apply -@081CEE26: +_081CEE26: add sp, 0x28 pop {r3} mov r8, r3 @@ -863099,14 +863099,14 @@ sub_81CEE74: ; 81CEE74 push {lr} lsls r0, 24 cmp r0, 0 - beq @081CEE84 + beq _081CEE84 movs r0, 0x2 bl ShowBg - b @081CEE8A -@081CEE84: + b _081CEE8A +_081CEE84: movs r0, 0x2 bl HideBg -@081CEE8A: +_081CEE8A: pop {r0} bx r0 thumb_func_end sub_81CEE74 @@ -863145,7 +863145,7 @@ sub_81CEEC8: ; 81CEEC8 adds r5, r0, 0 bl sub_81CDD5C cmp r0, 0 - bne @081CEEF0 + bne _081CEEF0 bl sub_81CDC60 adds r4, r0, 0 lsls r4, 16 @@ -863155,8 +863155,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 @@ -863169,7 +863169,7 @@ sub_81CEEC8: ; 81CEEC8 adds r2, 0x50 adds r0, r5, 0 bl sub_81D1F84 -@081CEF0C: +_081CEF0C: pop {r4,r5} pop {r0} bx r0 @@ -863183,14 +863183,14 @@ sub_81CEF14: ; 81CEF14 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 @@ -863205,13 +863205,13 @@ sub_81CEF3C: ; 81CEF3C 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 str r0, [r4] ldr r0, =sub_81CF11C @@ -863227,11 +863227,11 @@ sub_81CEF3C: ; 81CEF3C ldr r0, [r0] str r0, [r4, 0x14] movs r0, 0x1 - b @081CEF92 + b _081CEF92 .pool -@081CEF90: +_081CEF90: movs r0, 0 -@081CEF92: +_081CEF92: pop {r4} pop {r1} bx r1 @@ -863245,7 +863245,7 @@ sub_81CEF98: ; 81CEF98 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CEFD4 + beq _081CEFD4 movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x20] @@ -863260,11 +863260,11 @@ sub_81CEF98: ; 81CEF98 ldr r0, [r0] str r0, [r4, 0x14] movs r0, 0x1 - b @081CEFD6 + b _081CEFD6 .pool -@081CEFD4: +_081CEFD4: movs r0, 0 -@081CEFD6: +_081CEFD6: pop {r4} pop {r1} bx r1 @@ -863288,10 +863288,10 @@ sub_81CEFF0: ; 81CEFF0 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} @@ -863305,10 +863305,10 @@ sub_81CF010: ; 81CF010 ldr r0, [r4, 0x4] bl sub_81C70D8 cmp r0, 0 - bne @081CF022 + bne _081CF022 ldr r0, =sub_81CF030 str r0, [r4] -@081CF022: +_081CF022: movs r0, 0 pop {r4} pop {r1} @@ -863325,54 +863325,54 @@ sub_81CF030: ; 81CF030 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @081CF048 + beq _081CF048 movs r0, 0x1 - b @081CF0A6 + b _081CF0A6 .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 str r0, [r4] movs r0, 0x5 - b @081CF0A6 + b _081CF0A6 .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] @@ -863380,7 +863380,7 @@ sub_81CF030: ; 81CF030 ldr r0, =sub_81CF0B8 str r0, [r4] movs r0, 0x6 -@081CF0A6: +_081CF0A6: pop {r4,r5} pop {r1} bx r1 @@ -863492,7 +863492,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 @@ -863502,12 +863502,12 @@ sub_81CF134: ; 81CF134 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 @@ -863527,11 +863527,11 @@ sub_81CF134: ; 81CF134 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} @@ -863567,18 +863567,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 @@ -863602,29 +863602,29 @@ sub_81CF1D8: ; 81CF1D8 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 .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 @@ -863646,30 +863646,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 @@ -863688,34 +863688,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 @@ -863726,8 +863726,8 @@ sub_81CF2C4: ; 81CF2C4 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 @@ -863751,7 +863751,7 @@ sub_81CF330: ; 81CF330 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CF360 + beq _081CF360 ldr r0, =sub_81CF418 movs r1, 0x1 bl sub_81C7078 @@ -863761,11 +863761,11 @@ sub_81CF330: ; 81CF330 movs r0, 0 str r0, [r4, 0xC] movs r0, 0x1 - b @081CF362 + b _081CF362 .pool -@081CF360: +_081CF360: movs r0, 0 -@081CF362: +_081CF362: pop {r4} pop {r1} bx r1 @@ -863780,7 +863780,7 @@ sub_81CF368: ; 81CF368 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CF398 + beq _081CF398 ldr r0, =sub_81CF418 movs r1, 0x1 bl sub_81C7078 @@ -863789,11 +863789,11 @@ sub_81CF368: ; 81CF368 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] - b @081CF39A + b _081CF39A .pool -@081CF398: +_081CF398: movs r0, 0 -@081CF39A: +_081CF39A: pop {r4} pop {r1} bx r1 @@ -863868,24 +863868,24 @@ 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 .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, =gUnknown_08623590 movs r1, 0x2 bl sub_81C7B54 @@ -863913,45 +863913,45 @@ sub_81CF418: ; 81CF418 bl sub_81C7944 movs r0, 0x1 bl CopyBgTilemapBufferToVram -@081CF498: +_081CF498: movs r0, 0 - b @081CF570 + b _081CF570 .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, =gUnknown_08623570 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 bl sub_81CF88C - b @081CF498 + b _081CF498 .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 @@ -863968,7 +863968,7 @@ sub_81CF418: ; 81CF418 bl HideBg ldr r0, [r5, 0xC] cmp r0, 0 - bne @081CF552 + bne _081CF552 bl sub_81C76AC adds r4, r0, 0 adds r4, 0x8 @@ -863984,23 +863984,23 @@ sub_81CF418: ; 81CF418 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} @@ -864015,61 +864015,61 @@ sub_81CF578: ; 81CF578 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 IsDma3ManagerBusyWithBgCopy 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 @@ -864083,61 +864083,61 @@ sub_81CF5F0: ; 81CF5F0 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 IsDma3ManagerBusyWithBgCopy 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 @@ -864151,61 +864151,61 @@ sub_81CF668: ; 81CF668 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 IsDma3ManagerBusyWithBgCopy 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 @@ -864219,61 +864219,61 @@ sub_81CF6E0: ; 81CF6E0 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 IsDma3ManagerBusyWithBgCopy 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 @@ -864283,33 +864283,33 @@ sub_81CF6E0: ; 81CF6E0 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 @@ -864318,26 +864318,26 @@ sub_81CF758: ; 81CF758 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 @@ -864478,7 +864478,7 @@ sub_81CF8E4: ; 81CF8E4 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 @@ -864497,9 +864497,9 @@ sub_81CF8E4: ; 81CF8E4 adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr - b @081CF94A + b _081CF94A .pool -@081CF924: +_081CF924: ldrb r0, [r2] ldrb r1, [r2, 0x1] bl get_pokemon_by_box_and_pos @@ -864515,7 +864515,7 @@ sub_81CF8E4: ; 81CF8E4 adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr_encrypted -@081CF94A: +_081CF94A: ldr r4, =0x02021ec4 adds r0, r4, 0 bl GetStringEnd_Limit7 @@ -864526,19 +864526,19 @@ sub_81CF8E4: ; 81CF8E4 bl sub_81DB494 adds r6, r0, 0 cmp r5, 0 - beq @081CF974 + beq _081CF974 cmp r5, 0xFE - beq @081CF97C + beq _081CF97C ldr r1, =gUnknown_086235D4 - b @081CF97E + b _081CF97E .pool -@081CF974: +_081CF974: ldr r1, =gUnknown_086235BC - b @081CF97E + b _081CF97E .pool -@081CF97C: +_081CF97C: ldr r1, =gUnknown_086235C8 -@081CF97E: +_081CF97E: ldr r4, =0x02021cc4 adds r0, r4, 0 bl CopyString @@ -864574,13 +864574,13 @@ sub_81CF9BC: ; 81CF9BC 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 str r0, [r4] ldr r0, =sub_81CFB74 @@ -864590,11 +864590,11 @@ sub_81CF9BC: ; 81CF9BC movs r0, 0 str r0, [r4, 0x14] movs r0, 0x1 - b @081CF9FE + b _081CF9FE .pool -@081CF9FC: +_081CF9FC: movs r0, 0 -@081CF9FE: +_081CF9FE: pop {r4} pop {r1} bx r1 @@ -864608,7 +864608,7 @@ sub_81CFA04: ; 81CFA04 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CFA2C + beq _081CFA2C movs r0, 0x12 bl sub_81C763C str r0, [r4, 0x1C] @@ -864616,11 +864616,11 @@ sub_81CFA04: ; 81CFA04 str r0, [r4] movs r0, 0x1 str r0, [r4, 0x14] - b @081CFA2E + b _081CFA2E .pool -@081CFA2C: +_081CFA2C: movs r0, 0 -@081CFA2E: +_081CFA2E: pop {r4} pop {r1} bx r1 @@ -864644,10 +864644,10 @@ sub_81CFA48: ; 81CFA48 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} @@ -864661,10 +864661,10 @@ sub_81CFA68: ; 81CFA68 ldr r0, [r4, 0x4] bl sub_81C70D8 cmp r0, 0 - bne @081CFA7A + bne _081CFA7A ldr r0, =sub_81CFA88 str r0, [r4] -@081CFA7A: +_081CFA7A: movs r0, 0 pop {r4} pop {r1} @@ -864681,54 +864681,54 @@ sub_81CFA88: ; 81CFA88 movs r0, 0x40 ands r0, r1 cmp r0, 0 - beq @081CFAA0 + beq _081CFAA0 movs r0, 0x1 - b @081CFAFE + b _081CFAFE .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 str r0, [r4] movs r0, 0x5 - b @081CFAFE + b _081CFAFE .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] @@ -864736,7 +864736,7 @@ sub_81CFA88: ; 81CFA88 ldr r0, =sub_81CFB10 str r0, [r4] movs r0, 0x6 -@081CFAFE: +_081CFAFE: pop {r4,r5} pop {r1} bx r1 @@ -864848,7 +864848,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 @@ -864858,23 +864858,23 @@ sub_81CFB8C: ; 81CFB8C 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 @@ -864889,11 +864889,11 @@ sub_81CFB8C: ; 81CFB8C 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} @@ -864930,14 +864930,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 @@ -864948,7 +864948,7 @@ sub_81CFC40: ; 81CFC40 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 @@ -864965,32 +864965,32 @@ sub_81CFC40: ; 81CFC40 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 .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 @@ -865010,34 +865010,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 @@ -865048,8 +865048,8 @@ sub_81CFCEC: ; 81CFCEC 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 @@ -865068,7 +865068,7 @@ sub_81CFCEC: ; 81CFCEC sub_81CFD58: ; 81CFD58 push {r4-r6,lr} movs r5, 0 -@081CFD5C: +_081CFD5C: movs r0, 0x64 adds r1, r5, 0 muls r1, r0 @@ -865078,51 +865078,51 @@ sub_81CFD58: ; 81CFD58 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 .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 @@ -865137,7 +865137,7 @@ sub_81CFDD0: ; 81CFDD0 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CFE00 + beq _081CFE00 ldr r0, =sub_81CFEB8 movs r1, 0x1 bl sub_81C7078 @@ -865147,11 +865147,11 @@ sub_81CFDD0: ; 81CFDD0 movs r0, 0 str r0, [r4, 0xC] movs r0, 0x1 - b @081CFE02 + b _081CFE02 .pool -@081CFE00: +_081CFE00: movs r0, 0 -@081CFE02: +_081CFE02: pop {r4} pop {r1} bx r1 @@ -865166,7 +865166,7 @@ sub_81CFE08: ; 81CFE08 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081CFE38 + beq _081CFE38 ldr r0, =sub_81CFEB8 movs r1, 0x1 bl sub_81C7078 @@ -865175,11 +865175,11 @@ sub_81CFE08: ; 81CFE08 str r0, [r4] movs r0, 0x1 str r0, [r4, 0xC] - b @081CFE3A + b _081CFE3A .pool -@081CFE38: +_081CFE38: movs r0, 0 -@081CFE3A: +_081CFE3A: pop {r4} pop {r1} bx r1 @@ -865254,24 +865254,24 @@ 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 .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, =gUnknown_086237B0 movs r1, 0x2 bl sub_81C7B54 @@ -865297,18 +865297,18 @@ sub_81CFEB8: ; 81CFEB8 bl sub_81C7944 movs r0, 0x1 bl CopyBgTilemapBufferToVram -@081CFF32: +_081CFF32: movs r0, 0 - b @081CFFF4 + b _081CFFF4 .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 @@ -865319,31 +865319,31 @@ sub_81CFEB8: ; 81CFEB8 bl ChangeBgY movs r0, 0x1 bl ShowBg - 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, =gUnknown_08623790 movs r1, 0x20 movs r2, 0x20 bl sub_81C7944 bl sub_81D0304 - b @081CFF32 + b _081CFF32 .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 ShowBg movs r0, 0x3 @@ -865354,27 +865354,27 @@ sub_81CFEB8: ; 81CFEB8 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} @@ -865389,61 +865389,61 @@ sub_81CFFFC: ; 81CFFFC 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 IsDma3ManagerBusyWithBgCopy 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 @@ -865457,61 +865457,61 @@ sub_81D0074: ; 81D0074 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 IsDma3ManagerBusyWithBgCopy 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 @@ -865525,61 +865525,61 @@ sub_81D00EC: ; 81D00EC 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 IsDma3ManagerBusyWithBgCopy 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 @@ -865593,61 +865593,61 @@ sub_81D0164: ; 81D0164 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 IsDma3ManagerBusyWithBgCopy 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 @@ -865657,33 +865657,33 @@ sub_81D0164: ; 81D0164 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 @@ -865692,26 +865692,26 @@ sub_81D01DC: ; 81D01DC 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 @@ -865854,7 +865854,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 @@ -865874,9 +865874,9 @@ sub_81D035C: ; 81D035C adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr - b @081D03CC + b _081D03CC .pool -@081D03A4: +_081D03A4: ldrb r0, [r7] ldrb r1, [r7, 0x1] bl get_pokemon_by_box_and_pos @@ -865893,7 +865893,7 @@ sub_81D035C: ; 81D035C adds r0, r4, 0 movs r1, 0x2 bl pokemon_getattr_encrypted -@081D03CC: +_081D03CC: ldr r4, =0x02021ec4 adds r0, r4, 0 bl GetStringEnd_Limit7 @@ -865904,19 +865904,19 @@ sub_81D035C: ; 81D035C bl sub_81DB494 adds r6, r0, 0 cmp r5, 0 - beq @081D03F8 + beq _081D03F8 cmp r5, 0xFE - beq @081D0400 + beq _081D0400 ldr r1, =gUnknown_086237F4 - b @081D0402 + b _081D0402 .pool -@081D03F8: +_081D03F8: ldr r1, =gUnknown_086237DC - b @081D0402 + b _081D0402 .pool -@081D0400: +_081D0400: ldr r1, =gUnknown_086237E8 -@081D0402: +_081D0402: ldr r4, =0x02021cc4 adds r0, r4, 0 bl CopyString @@ -865959,12 +865959,12 @@ sub_81D0450: ; 81D0450 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 @@ -865978,11 +865978,11 @@ sub_81D0450: ; 81D0450 movs r0, 0xA strh r0, [r1] movs r0, 0x1 - b @081D049A + b _081D049A .pool -@081D0498: +_081D0498: movs r0, 0 -@081D049A: +_081D049A: pop {r4} pop {r1} bx r1 @@ -866019,62 +866019,62 @@ 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 .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 str r0, [r1] movs r0, 0x2 - b @081D053E + b _081D053E .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 str r0, [r1] movs r0, 0x5 -@081D053E: +_081D053E: pop {r4} pop {r1} bx r1 @@ -866090,65 +866090,65 @@ 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 .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 .pool -@081D05C0: +_081D05C0: adds r1, r4, 0 adds r1, 0x98 ldr r0, =sub_81D04C4 str r0, [r1] movs r0, 0x4 -@081D05CA: +_081D05CA: pop {r4} pop {r1} bx r1 @@ -866169,16 +866169,16 @@ sub_81D05DC: ; 81D05DC 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] @@ -866187,16 +866187,16 @@ sub_81D05DC: ; 81D05DC 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 @@ -866209,40 +866209,40 @@ sub_81D061C: ; 81D061C 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 @@ -866257,14 +866257,14 @@ 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 @@ -866281,27 +866281,27 @@ 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 @@ -866344,7 +866344,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 @@ -866361,9 +866361,9 @@ sub_81D06E4: ; 81D06E4 adds r0, r4, 0 bl pokemon_get_gender strb r0, [r6] - b @081D0752 + b _081D0752 .pool -@081D0730: +_081D0730: ldrb r0, [r1] ldrb r1, [r1, 0x1] bl get_pokemon_by_box_and_pos @@ -866377,7 +866377,7 @@ sub_81D06E4: ; 81D06E4 movs r1, 0x2 adds r2, r5, 0 bl pokemon_getattr_encrypted -@081D0752: +_081D0752: adds r0, r5, 0 bl GetStringEnd_Limit7 pop {r4-r7} @@ -866400,7 +866400,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 @@ -866418,9 +866418,9 @@ sub_81D0760: ; 81D0760 adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr - b @081D07D0 + b _081D07D0 .pool -@081D07AC: +_081D07AC: ldrb r0, [r1] ldrb r1, [r1, 0x1] bl get_pokemon_by_box_and_pos @@ -866435,7 +866435,7 @@ sub_81D0760: ; 81D0760 adds r0, r4, 0 movs r1, 0x1 bl pokemon_getattr_encrypted -@081D07D0: +_081D07D0: str r0, [r7] pop {r4-r7} pop {r0} @@ -866454,12 +866454,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 @@ -866467,7 +866467,7 @@ sub_81D07D8: ; 81D07D8 adds r0, r1 movs r1, 0x52 bl pokemon_getattr -@081D080A: +_081D080A: pop {r1} bx r1 .pool @@ -866488,7 +866488,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 @@ -866496,14 +866496,14 @@ sub_81D0814: ; 81D0814 adds r0, r1 movs r1, 0x53 bl pokemon_getattr - b @081D0852 + b _081D0852 .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] @@ -866512,7 +866512,7 @@ sub_81D0814: ; 81D0814 ldr r0, =gUnknown_086237F8 mov r9, r0 mov r10, r9 -@081D0862: +_081D0862: lsls r2, r6, 2 mov r3, r9 adds r1, r2, r3 @@ -866525,18 +866525,18 @@ sub_81D0814: ; 81D0814 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] @@ -866547,21 +866547,21 @@ sub_81D0814: ; 81D0814 str r1, [r0] adds r3, 0x1 cmp r3, r4 - blt @081D0890 - b @081D08D6 + blt _081D0890 + b _081D08D6 .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] @@ -866572,8 +866572,8 @@ sub_81D0814: ; 81D0814 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 @@ -866582,10 +866582,10 @@ sub_81D0814: ; 81D0814 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 @@ -866593,11 +866593,11 @@ sub_81D0814: ; 81D0814 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 @@ -866654,15 +866654,15 @@ sub_81D0954: ; 81D0954 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} @@ -866677,7 +866677,7 @@ sub_81D0978: ; 81D0978 bl sub_81C761C adds r4, r0, 0 cmp r4, 0 - beq @081D09A8 + beq _081D09A8 ldr r0, =sub_81D0A6C movs r1, 0x1 bl sub_81C7078 @@ -866685,11 +866685,11 @@ sub_81D0978: ; 81D0978 ldr r0, =sub_81D0A58 str r0, [r4] movs r0, 0x1 - b @081D09AA + b _081D09AA .pool -@081D09A8: +_081D09A8: movs r0, 0 -@081D09AA: +_081D09AA: pop {r4} pop {r1} bx r1 @@ -866787,28 +866787,28 @@ 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 .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, =gUnknown_08624B98 movs r1, 0x2 bl sub_81C7B54 @@ -866832,16 +866832,16 @@ sub_81D0A6C: ; 81D0A6C movs r1, 0x10 movs r2, 0x20 bl sub_81C7944 - b @081D0BBA + b _081D0BBA .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 @@ -866875,67 +866875,67 @@ sub_81D0A6C: ; 81D0A6C movs r2, 0x20 bl sub_81C7944 movs r0, 0x1 - b @081D0BBC + b _081D0BBC .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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @081D0C44 -@081D0BBA: + bne _081D0C44 +_081D0BBA: movs r0, 0x2 -@081D0BBC: +_081D0BBC: bl CopyBgTilemapBufferToVram movs r0, 0 - b @081D0C4A -@081D0BC4: + b _081D0C4A +_081D0BC4: bl IsDma3ManagerBusyWithBgCopy 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 IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 - bne @081D0C44 + bne _081D0C44 adds r0, r5, 0 bl sub_81D13FC movs r0, 0x1 @@ -866963,17 +866963,17 @@ sub_81D0A6C: ; 81D0A6C 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} @@ -866984,26 +866984,26 @@ sub_81D0A6C: ; 81D0A6C 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 @@ -867016,73 +867016,73 @@ sub_81D0C84: ; 81D0C84 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 .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 IsDma3ManagerBusyWithBgCopy 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 @@ -867096,45 +867096,45 @@ sub_81D0D2C: ; 81D0D2C 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 IsDma3ManagerBusyWithBgCopy 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 @@ -867148,54 +867148,54 @@ sub_81D0D8C: ; 81D0D8C 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 IsDma3ManagerBusyWithBgCopy 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 @@ -867209,45 +867209,45 @@ sub_81D0E00: ; 81D0E00 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 IsDma3ManagerBusyWithBgCopy 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 @@ -867336,14 +867336,14 @@ sub_81D0EFC: ; 81D0EFC movs r1, 0x44 bl FillWindowPixelBuffer cmp r5, 0x18 - bhi @081D0F60 + bhi _081D0F60 lsls r1, r5, 3 ldr r0, =gRibbonDescriptionPointers 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 @@ -867361,10 +867361,10 @@ sub_81D0EFC: ; 81D0EFC adds r5, r0 subs r4, 0x1 cmp r4, 0 - bge @081D0F2E - b @081D0FAA + bge _081D0F2E + b _081D0FAA .pool -@081D0F60: +_081D0F60: ldr r0, =0x03005d8c ldr r0, [r0] adds r0, r5 @@ -867372,14 +867372,14 @@ sub_81D0EFC: ; 81D0EFC adds r0, r1 ldrb r5, [r0] cmp r5, 0 - beq @081D0FB2 + beq _081D0FB2 subs r5, 0x1 movs r4, 0 ldr r0, =gGiftRibbonDescriptionPointers mov r8, r0 movs r6, 0x80 lsls r6, 17 -@081D0F7C: +_081D0F7C: ldrb r0, [r7, 0xA] lsrs r3, r6, 24 add r1, sp, 0xC @@ -867401,12 +867401,12 @@ sub_81D0EFC: ; 81D0EFC adds r6, r0 adds r4, 0x1 cmp r4, 0x1 - ble @081D0F7C -@081D0FAA: + ble _081D0F7C +_081D0FAA: ldrb r0, [r7, 0xA] movs r1, 0x2 bl CopyWindowToVram -@081D0FB2: +_081D0FB2: add sp, 0x10 pop {r3} mov r8, r3 @@ -867463,19 +867463,19 @@ sub_81D0FF0: ; 81D0FF0 bl Print ldrb r0, [r6] cmp r0, 0 - beq @081D1040 + beq _081D1040 cmp r0, 0xFE - beq @081D1048 + beq _081D1048 ldr r1, =gUnknown_08624BE4 - b @081D104A + b _081D104A .pool -@081D1040: +_081D1040: ldr r1, =gUnknown_08624BCC - b @081D104A + b _081D104A .pool -@081D1048: +_081D1048: ldr r1, =gUnknown_08624BD8 -@081D104A: +_081D104A: ldr r5, =0x02021cc4 adds r0, r5, 0 bl CopyString @@ -867763,7 +867763,7 @@ sub_81D1284: ; 81D1284 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] @@ -867776,28 +867776,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, =DummyObjectCallback str r0, [r2, 0x1C] -@081D12D0: +_081D12D0: pop {r0} bx r0 .pool @@ -867816,9 +867816,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 @@ -867827,8 +867827,8 @@ sub_81D12D8: ; 81D12D8 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 @@ -867838,9 +867838,9 @@ sub_81D12D8: ; 81D12D8 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} @@ -867851,8 +867851,8 @@ sub_81D12D8: ; 81D12D8 ldr r0, =0x030012c0 ldr r0, [r0] cmp r1, r0 - bcc @081D1322 -@081D133A: + bcc _081D1322 +_081D133A: movs r0, 0x1 bl CopyBgTilemapBufferToVram pop {r4-r6} @@ -868106,7 +868106,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 @@ -868124,7 +868124,7 @@ sub_81D1538: ; 81D1538 strb r0, [r1] ldr r0, =DummyObjectCallback str r0, [r3, 0x1C] -@081D156A: +_081D156A: pop {r0} bx r0 .pool @@ -868135,36 +868135,36 @@ 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 .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 @@ -868185,21 +868185,21 @@ sub_81D15CC: ; 81D15CC adds r3, r0, 0 movs r1, 0 ldr r2, =gUnknown_085500A4 -@081D15D4: +_081D15D4: ldrh r0, [r2] cmp r0, r3 - bne @081D15E4 + bne _081D15E4 adds r0, r1, 0 - b @081D15F0 + b _081D15F0 .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 @@ -868208,7 +868208,7 @@ sub_81D15CC: ; 81D15CC sub_81D15F4: ; 81D15F4 push {r4,lr} cmp r0, 0x14 - bhi @081D1620 + bhi _081D1620 ldr r1, =gUnknown_086252A8 lsls r0, 2 adds r0, r1 @@ -868221,11 +868221,11 @@ sub_81D15F4: ; 81D15F4 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - b @081D1622 + b _081D1622 .pool -@081D1620: +_081D1620: movs r0, 0 -@081D1622: +_081D1622: pop {r4} pop {r1} bx r1 @@ -868238,16 +868238,16 @@ sub_81D1628: ; 81D1628 ldrh r1, [r2, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - beq @081D1644 + beq _081D1644 adds r0, r1, 0 bl FlagGet lsls r0, 24 lsrs r0, 24 - b @081D1646 + b _081D1646 .pool -@081D1644: +_081D1644: movs r0, 0x1 -@081D1646: +_081D1646: pop {r1} bx r1 thumb_func_end sub_81D1628 @@ -868259,16 +868259,16 @@ sub_81D164C: ; 81D164C ldrh r1, [r2, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - beq @081D1668 + beq _081D1668 adds r0, r1, 0 bl FlagGet lsls r0, 24 lsrs r0, 24 - b @081D166A + b _081D166A .pool -@081D1668: +_081D1668: movs r0, 0x1 -@081D166A: +_081D166A: pop {r1} bx r1 thumb_func_end sub_81D164C @@ -868280,16 +868280,16 @@ sub_81D1670: ; 81D1670 ldrh r1, [r2, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - beq @081D168C + beq _081D168C adds r0, r1, 0 bl FlagGet lsls r0, 24 lsrs r0, 24 - b @081D168E + b _081D168E .pool -@081D168C: +_081D168C: movs r0, 0x1 -@081D168E: +_081D168E: pop {r1} bx r1 thumb_func_end sub_81D1670 @@ -868303,24 +868303,24 @@ 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 .pool -@081D16AC: +_081D16AC: ldrh r1, [r2, 0x2] ldr r0, =0x0000ffff cmp r1, r0 - beq @081D16C4 + beq _081D16C4 adds r0, r1, 0 bl FlagGet lsls r0, 24 lsrs r0, 24 - b @081D16C6 + b _081D16C6 .pool -@081D16C4: +_081D16C4: movs r0, 0x1 -@081D16C6: +_081D16C6: pop {r1} bx r1 thumb_func_end sub_81D1694 @@ -868340,7 +868340,7 @@ sub_81D16CC: ; 81D16CC sub_81D16DC: ; 81D16DC push {r4,lr} cmp r0, 0x14 - bhi @081D170C + bhi _081D170C ldr r1, =gUnknown_086252A8 lsls r0, 2 adds r0, r1 @@ -868355,11 +868355,11 @@ sub_81D16DC: ; 81D16DC bl _call_via_r1 lsls r0, 24 lsrs r0, 24 - b @081D170E + b _081D170E .pool -@081D170C: +_081D170C: movs r0, 0 -@081D170E: +_081D170E: pop {r4} pop {r1} bx r1 @@ -868383,22 +868383,22 @@ sub_81D171C: ; 81D171C adds r5, r0, 0 movs r6, 0 ldr r7, =0x0000ffff - b @081D172E + b _081D172E .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 FlagGet lsls r0, 24 cmp r0, 0 - bne @081D172C -@081D1744: + bne _081D172C +_081D1744: ldr r0, [r5, 0x10] adds r0, r4, r0 ldrb r0, [r0, 0x2] @@ -868423,7 +868423,7 @@ sub_81D1754: ; 81D1754 sub_81D1758: ; 81D1758 push {r4,lr} cmp r0, 0x14 - bhi @081D1784 + bhi _081D1784 ldr r1, =gUnknown_086252A8 lsls r0, 2 adds r0, r1 @@ -868436,11 +868436,11 @@ sub_81D1758: ; 81D1758 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - b @081D1786 + b _081D1786 .pool -@081D1784: +_081D1784: movs r0, 0 -@081D1786: +_081D1786: pop {r4} pop {r1} bx r1 @@ -868458,7 +868458,7 @@ sub_81D1790: ; 81D1790 adds r1, r0, 0 ldrh r0, [r1, 0x4] cmp r0, 0x48 - bhi @081D17B8 + bhi _081D17B8 ldr r0, =0x03005d8c ldr r0, [r0] ldr r2, =0x000009ca @@ -868469,11 +868469,11 @@ sub_81D1790: ; 81D1790 negs r0, r1 orrs r0, r1 lsrs r0, 31 - b @081D17BA + b _081D17BA .pool -@081D17B8: +_081D17B8: movs r0, 0 -@081D17BA: +_081D17BA: pop {r1} bx r1 thumb_func_end sub_81D1790 @@ -868511,7 +868511,7 @@ sub_81D17E8: ; 81D17E8 push {r4,r5,lr} adds r5, r0, 0 cmp r5, 0x14 - bhi @081D1832 + bhi _081D1832 ldr r1, =gUnknown_086252A8 lsls r0, r5, 2 adds r0, r1 @@ -868526,25 +868526,25 @@ 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 .pool -@081D1820: +_081D1820: movs r2, 0 ldr r1, =gUnknown_08625388 -@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 @@ -868585,7 +868585,7 @@ sub_81D1850: ; 81D1850 sub_81D1854: ; 81D1854 push {r4,lr} cmp r0, 0x14 - bhi @081D1880 + bhi _081D1880 ldr r1, =gUnknown_086252A8 lsls r0, 2 adds r0, r1 @@ -868598,11 +868598,11 @@ sub_81D1854: ; 81D1854 ldr r1, [r0] adds r0, r4, 0 bl _call_via_r1 - b @081D1882 + b _081D1882 .pool -@081D1880: +_081D1880: movs r0, 0x4E -@081D1882: +_081D1882: pop {r4} pop {r1} bx r1 @@ -868643,7 +868643,7 @@ sub_81D189C: ; 81D189C push {r4,r5,lr} adds r5, r1, 0 cmp r0, 0x14 - bhi @081D18C2 + bhi _081D18C2 ldr r1, =gUnknown_086252A8 lsls r0, 2 adds r0, r1 @@ -868657,7 +868657,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 @@ -868680,15 +868680,15 @@ sub_81D18DC: ; 81D18DC 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 @@ -868731,50 +868731,50 @@ 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 .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 FlagGet 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 FlagSet -@081D1984: +_081D1984: ldr r1, [r4] mov r0, r9 bl ExpandStringRefs @@ -868801,69 +868801,69 @@ 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 FlagGet 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 FlagSet -@081D1A0A: +_081D1A0A: ldr r1, [r4] mov r0, r10 bl ExpandStringRefs - b @081D1A5C + b _081D1A5C .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 FlagGet lsls r0, 24 cmp r0, 0 - beq @081D1A50 + beq _081D1A50 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x000009ca @@ -868871,21 +868871,21 @@ sub_81D199C: ; 81D199C 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 ExpandStringRefs -@081D1A5C: +_081D1A5C: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -868902,7 +868902,7 @@ sub_81D1A78: ; 81D1A78 adds r5, r1, 0 adds r6, r2, 0 cmp r0, 0x14 - bhi @081D1AA2 + bhi _081D1AA2 ldr r1, =gUnknown_086252A8 lsls r0, 2 adds r0, r1 @@ -868917,7 +868917,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 @@ -868940,13 +868940,13 @@ sub_81D1ABC: ; 81D1ABC 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} @@ -869023,28 +869023,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, =gUnknown_08625388 -@081D1B7C: +_081D1B7C: lsls r0, r4, 1 adds r0, r4 lsls r0, 3 @@ -869054,33 +869054,33 @@ sub_81D1B40: ; 81D1B40 bl FlagGet 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 .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 @@ -869095,21 +869095,21 @@ sub_81D1BD0: ; 81D1BD0 adds r3, r0, 0 movs r2, 0 ldr r1, =gUnknown_08625388 -@081D1BD8: +_081D1BD8: ldrh r0, [r1] cmp r0, r3 - bne @081D1BE8 + bne _081D1BE8 ldrh r0, [r1, 0x2] - b @081D1BF4 + b _081D1BF4 .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 @@ -869119,21 +869119,21 @@ 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 @@ -869146,14 +869146,14 @@ sub_81D1C20: ; 81D1C20 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 FlagSet -@081D1C3C: +_081D1C3C: pop {r0} bx r0 .pool @@ -869169,15 +869169,15 @@ sub_81D1C44: ; 81D1C44 bl Alloc str r0, [r4] cmp r0, 0 - bne @081D1C60 + bne _081D1C60 movs r0, 0 - b @081D1C7A + b _081D1C7A .pool -@081D1C60: +_081D1C60: movs r2, 0 ldr r4, =0x0203cf48 movs r3, 0xFF -@081D1C66: +_081D1C66: adds r0, r2, r4 ldrb r1, [r0] orrs r1, r3 @@ -869186,9 +869186,9 @@ sub_81D1C44: ; 81D1C44 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 @@ -869205,9 +869205,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, =gUnknown_086253E8 ldr r1, [r0, 0x14] ldr r0, [r0, 0x10] @@ -869225,21 +869225,21 @@ sub_81D1C84: ; 81D1C84 mov r0, sp bl AddWindow strb r0, [r6, 0x2] - b @081D1CE0 + b _081D1CE0 .pool -@081D1CD4: +_081D1CD4: lsls r0, r4, 3 ldr r1, =gUnknown_086253E8 adds r0, r1 bl AddWindow 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] @@ -869296,7 +869296,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 @@ -869314,11 +869314,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 StopMusicWhileStringIsPrinted -@081D1D8C: +_081D1D8C: movs r0, 0 str r0, [sp] str r0, [sp, 0x4] @@ -869334,7 +869334,7 @@ sub_81D1D44: ; 81D1D44 movs r2, 0x8 adds r3, r5, 0 bl AddTextPrinterParametrized2 -@081D1DAC: +_081D1DAC: add sp, 0x34 pop {r4,r5} pop {r0} @@ -869363,10 +869363,10 @@ sub_81D1DC0: ; 81D1DC0 mov r10, r0 ldrb r1, [r5, 0x5] cmp r3, r1 - bcs @081D1E02 + bcs _081D1E02 adds r6, r7, 0 ldr r2, =gUnknown_08625403 -@081D1DEC: +_081D1DEC: ldr r1, [r6] lsls r0, r3, 3 adds r0, r1 @@ -869377,8 +869377,8 @@ sub_81D1DC0: ; 81D1DC0 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 @@ -869434,10 +869434,10 @@ sub_81D1E7C: ; 81D1E7C 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 @@ -869491,13 +869491,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 @@ -869512,7 +869512,7 @@ sub_81D1ED4: ; 81D1ED4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x9 - bls @081D1EF0 + bls _081D1EF0 movs r2, 0 mov r9, r2 str r5, [sp] @@ -869520,7 +869520,7 @@ sub_81D1ED4: ; 81D1ED4 mov r8, r1 movs r4, 0x5B mov r12, r4 -@081D1F1C: +_081D1F1C: lsls r0, r2, 2 adds r0, r2 adds r1, r6, r0 @@ -869539,7 +869539,7 @@ sub_81D1ED4: ; 81D1ED4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3 - bls @081D1F1C + bls _081D1F1C adds r1, r3, r5 movs r2, 0x96 lsls r2, 1 @@ -869553,7 +869553,7 @@ sub_81D1ED4: ; 81D1ED4 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 @@ -869585,7 +869585,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 @@ -869603,7 +869603,7 @@ sub_81D1F84: ; 81D1F84 adds r7, 0x1 mov r10, r7 mov r12, r4 -@081D1FBC: +_081D1FBC: lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -869621,7 +869621,7 @@ sub_81D1F84: ; 81D1F84 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x8 - bls @081D1FBC + bls _081D1FBC lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -869646,7 +869646,7 @@ sub_81D1F84: ; 81D1F84 str r4, [sp, 0x4] movs r0, 0x1 mov r12, r0 -@081D2012: +_081D2012: lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -869665,7 +869665,7 @@ sub_81D1F84: ; 81D1F84 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0x8 - bls @081D2012 + bls _081D2012 lsls r0, r3, 2 adds r0, r3 lsls r0, 2 @@ -869680,7 +869680,7 @@ sub_81D1F84: ; 81D1F84 lsls r0, r7, 16 lsrs r7, r0, 16 cmp r7, 0x4 - bls @081D1F98 + bls _081D1F98 ldr r1, =0x00000352 add r1, r8 movs r0, 0 @@ -869704,11 +869704,11 @@ sub_81D2074: ; 81D2074 adds r4, r1, r0 ldrh r0, [r4] cmp r0, 0x9 - bls @081D208C + bls _081D208C movs r0, 0 - b @081D20A6 + b _081D20A6 .pool -@081D208C: +_081D208C: adds r0, r1, 0 bl sub_81D2230 ldrh r1, [r4] @@ -869721,7 +869721,7 @@ sub_81D2074: ; 81D2074 negs r0, r1 orrs r0, r1 lsrs r0, 31 -@081D20A6: +_081D20A6: pop {r4} pop {r1} bx r1 @@ -869745,19 +869745,19 @@ sub_81D20BC: ; 81D20BC 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 .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, =gUnknown_08625404 ldm r1!, {r2,r3,r5} @@ -869769,9 +869769,9 @@ sub_81D20BC: ; 81D20BC ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -@081D20FA: +_081D20FA: movs r0, 0 -@081D20FC: +_081D20FC: add sp, 0xC pop {r4,r5} pop {r1} @@ -869793,7 +869793,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 @@ -869822,7 +869822,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 @@ -869865,13 +869865,13 @@ sub_81D2108: ; 81D2108 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 @@ -869889,9 +869889,9 @@ sub_81D21DC: ; 81D21DC 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 @@ -869933,7 +869933,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] @@ -869948,7 +869948,7 @@ sub_81D2230: ; 81D2230 lsls r0, 16 lsrs r4, r0, 16 cmp r4, 0x4 - bls @081D2244 + bls _081D2244 movs r1, 0xD5 lsls r1, 2 add r1, r12 @@ -869982,7 +869982,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] @@ -869990,8 +869990,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] @@ -870002,26 +870002,26 @@ sub_81D2278: ; 81D2278 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 @@ -870034,9 +870034,9 @@ sub_81D2278: ; 81D2278 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 @@ -870051,12 +870051,12 @@ sub_81D2278: ; 81D2278 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 @@ -870069,13 +870069,13 @@ sub_81D2278: ; 81D2278 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 @@ -870092,11 +870092,11 @@ sub_81D2278: ; 81D2278 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] @@ -870109,10 +870109,10 @@ sub_81D2278: ; 81D2278 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 @@ -870127,15 +870127,15 @@ sub_81D2278: ; 81D2278 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcc @081D2398 -@081D23B6: + bcc _081D2398 +_081D23B6: subs r0, r6, 0x4 - b @081D248C + b _081D248C .pool -@081D23C0: +_081D23C0: ldr r1, [sp, 0xC] cmp r1, 0 - bge @081D2464 + bge _081D2464 mov r0, r10 subs r0, 0x38 lsls r0, 2 @@ -870148,7 +870148,7 @@ sub_81D2278: ; 81D2278 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 @@ -870157,8 +870157,8 @@ sub_81D2278: ; 81D2278 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 @@ -870166,7 +870166,7 @@ sub_81D2278: ; 81D2278 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 @@ -870176,13 +870176,13 @@ sub_81D2278: ; 81D2278 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] @@ -870195,10 +870195,10 @@ sub_81D2278: ; 81D2278 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 @@ -870213,12 +870213,12 @@ sub_81D2278: ; 81D2278 lsls r0, 16 lsrs r5, r0, 16 cmp r5, r8 - bcc @081D243C -@081D245A: + bcc _081D243C +_081D245A: subs r0, r7, 0x4 - b @081D248C + b _081D248C .pool -@081D2464: +_081D2464: ldr r1, [sp] movs r2, 0xD4 lsls r2, 2 @@ -870238,13 +870238,13 @@ sub_81D2278: ; 81D2278 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 @@ -870269,7 +870269,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 @@ -870285,8 +870285,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 @@ -870302,7 +870302,7 @@ sub_81D24A4: ; 81D24A4 str r0, [sp, 0x4] adds r0, r4, 0 bl sub_81D2278 -@081D2500: +_081D2500: movs r1, 0xA0 lsls r1, 1 adds r5, r4, r1 @@ -870330,9 +870330,9 @@ sub_81D24A4: ; 81D24A4 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 @@ -870347,13 +870347,13 @@ sub_81D24A4: ; 81D24A4 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 @@ -870365,8 +870365,8 @@ sub_81D24A4: ; 81D24A4 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 @@ -870376,13 +870376,13 @@ sub_81D24A4: ; 81D24A4 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 @@ -870393,8 +870393,8 @@ sub_81D24A4: ; 81D24A4 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 @@ -870404,14 +870404,14 @@ sub_81D24A4: ; 81D24A4 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 @@ -870419,7 +870419,7 @@ sub_81D24A4: ; 81D24A4 movs r1, 0xA1 lsls r1, 1 adds r5, r4, r1 -@081D25E0: +_081D25E0: adds r0, r2, 0 subs r0, 0x38 lsls r0, 2 @@ -870431,8 +870431,8 @@ sub_81D24A4: ; 81D24A4 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 @@ -870441,25 +870441,25 @@ sub_81D24A4: ; 81D24A4 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} @@ -870480,7 +870480,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 @@ -870495,8 +870495,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 @@ -870513,7 +870513,7 @@ sub_81D2634: ; 81D2634 str r0, [sp, 0x4] adds r0, r4, 0 bl sub_81D2278 -@081D2690: +_081D2690: movs r0, 0x92 lsls r0, 2 adds r5, r4, r0 @@ -870530,19 +870530,19 @@ sub_81D2634: ; 81D2634 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 @@ -870552,7 +870552,7 @@ sub_81D2634: ; 81D2634 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 @@ -870560,14 +870560,14 @@ sub_81D2634: ; 81D2634 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 @@ -870578,43 +870578,43 @@ sub_81D2634: ; 81D2634 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} @@ -870648,7 +870648,7 @@ sub_81D2754: ; 81D2754 mov r9, r2 ldr r3, =gUnknown_08329F40 mov r10, r3 -@081D2786: +_081D2786: adds r0, r7, 0 adds r0, 0x33 lsls r0, 24 @@ -870661,19 +870661,19 @@ sub_81D2754: ; 81D2754 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, =gUnknown_08625410 adds r0, r2 @@ -870704,23 +870704,23 @@ sub_81D2754: ; 81D2754 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 @@ -870748,7 +870748,7 @@ sub_81D2824: ; 81D2824 movs r2, 0x20 bl gpu_pal_apply movs r4, 0 -@081D284A: +_081D284A: adds r0, r4, 0 movs r1, 0x11 bl FillWindowPixelBuffer @@ -870756,9 +870756,9 @@ sub_81D2824: ; 81D2824 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 PutWindowTilemap movs r0, 0 @@ -870766,9 +870766,9 @@ sub_81D2824: ; 81D2824 movs r2, 0x1 movs r3, 0xE bl SetWindowBorderStyle - b @081D288E + b _081D288E .pool -@081D287C: +_081D287C: movs r0, 0x1 bl PutWindowTilemap movs r0, 0x1 @@ -870776,7 +870776,7 @@ sub_81D2824: ; 81D2824 movs r2, 0x1 movs r3, 0xE bl SetWindowBorderStyle -@081D288E: +_081D288E: movs r0, 0x2 bl PutWindowTilemap movs r0, 0x3 @@ -870819,14 +870819,14 @@ 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 .pool -@081D28F0: +_081D28F0: movs r0, 0x6 strh r0, [r3, 0xE] -@081D28F4: +_081D28F4: ldrb r0, [r3, 0xE] pop {r4-r7} pop {r1} @@ -870913,13 +870913,13 @@ sub_81D28FC: ; 81D28FC movs r0, 0x2 negs r0, r0 cmp r9, r0 - bne @081D29C4 + bne _081D29C4 movs r0, 0 movs r1, 0x2 bl CopyWindowToVram - b @081D2AB6 + b _081D2AB6 .pool -@081D29C4: +_081D29C4: mov r1, r9 lsls r0, r1, 1 add r0, r9 @@ -870964,18 +870964,18 @@ sub_81D28FC: ; 81D28FC bl Print ldrb r0, [r6, 0x1] cmp r0, 0x1 - bhi @081D2A3C + bhi _081D2A3C ldr r5, =gUnknown_085E8D45 - b @081D2A4A + b _081D2A4A .pool -@081D2A3C: +_081D2A3C: ldrb r1, [r6, 0x1] add r0, sp, 0xC movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalString add r5, sp, 0xC -@081D2A4A: +_081D2A4A: movs r0, 0x19 str r0, [sp] movs r0, 0xFF @@ -870988,18 +870988,18 @@ sub_81D28FC: ; 81D28FC bl Print ldrb r0, [r6, 0x3] cmp r0, 0 - bne @081D2A70 + bne _081D2A70 ldr r5, =gUnknown_085E8D45 - b @081D2A7E + b _081D2A7E .pool -@081D2A70: +_081D2A70: ldrb r1, [r6, 0x3] add r0, sp, 0xC movs r2, 0 movs r3, 0x3 bl ConvertIntToDecimalString add r5, sp, 0xC -@081D2A7E: +_081D2A7E: movs r0, 0x29 str r0, [sp] movs r0, 0xFF @@ -871026,7 +871026,7 @@ sub_81D28FC: ; 81D28FC adds r2, r5, 0 movs r3, 0 bl Print -@081D2AB6: +_081D2AB6: add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -871099,13 +871099,13 @@ sub_81D2ACC: ; 81D2ACC movs r0, 0x2 negs r0, r0 cmp r4, r0 - bne @081D2B6C + bne _081D2B6C movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram - b @081D2BB8 + b _081D2BB8 .pool -@081D2B6C: +_081D2B6C: lsls r4, 3 ldr r0, =gContestMoves adds r4, r0 @@ -871141,7 +871141,7 @@ sub_81D2ACC: ; 81D2ACC movs r0, 0x1 movs r1, 0x2 bl CopyWindowToVram -@081D2BB8: +_081D2BB8: add sp, 0xC pop {r3} mov r8, r3 @@ -871158,10 +871158,10 @@ sub_81D2BD0: ; 81D2BD0 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 @@ -871239,12 +871239,12 @@ sub_81D2C68: ; 81D2C68 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 @@ -871252,36 +871252,36 @@ sub_81D2C68: ; 81D2C68 adds r1, r2, 0 adds r2, r3, 0 bl pokemon_getattr - b @081D2CCA + b _081D2CCA .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 .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 @@ -871317,15 +871317,15 @@ sub_81D2CD0: ; 81D2CD0 movs r3, 0 bl sub_81D2C68 cmp r0, 0 - beq @081D2D20 + beq _081D2D20 ldr r1, =gUnknown_085E8264 adds r0, r5, 0 movs r2, 0 movs r3, 0xC bl CopyStringPadded - b @081D2E70 + b _081D2E70 .pool -@081D2D20: +_081D2D20: adds r0, r4, 0 adds r1, r6, 0 movs r2, 0x2 @@ -871341,7 +871341,7 @@ sub_81D2CD0: ; 81D2CD0 lsls r0, 16 lsrs r7, r0, 16 cmp r4, 0xE - bne @081D2D70 + bne _081D2D70 movs r0, 0x64 adds r4, r6, 0 muls r4, r0 @@ -871357,9 +871357,9 @@ sub_81D2CD0: ; 81D2CD0 bl pokemon_get_gender lsls r0, 24 lsrs r6, r0, 24 - b @081D2D92 + b _081D2D92 .pool -@081D2D70: +_081D2D70: lsls r0, r4, 24 lsrs r0, 24 lsls r1, r6, 24 @@ -871374,12 +871374,12 @@ sub_81D2CD0: ; 81D2CD0 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 @@ -871388,18 +871388,18 @@ sub_81D2CD0: ; 81D2CD0 adds r0, r5, 0 bl CompareString cmp r0, 0 - bne @081D2DB0 + bne _081D2DB0 movs r6, 0xFF -@081D2DB0: +_081D2DB0: adds r3, r5, 0 - b @081D2DBA + b _081D2DBA .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 @@ -871410,12 +871410,12 @@ sub_81D2CD0: ; 81D2CD0 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 @@ -871433,8 +871433,8 @@ sub_81D2CD0: ; 81D2CD0 strb r0, [r3] adds r3, 0x1 movs r0, 0xB5 - b @081D2E24 -@081D2E02: + b _081D2E24 +_081D2E02: strb r1, [r3] adds r3, 0x1 movs r0, 0x1 @@ -871452,7 +871452,7 @@ sub_81D2CD0: ; 81D2CD0 strb r0, [r3] adds r3, 0x1 movs r0, 0xB6 -@081D2E24: +_081D2E24: strb r0, [r3] adds r3, 0x1 movs r0, 0xFC @@ -871490,7 +871490,7 @@ sub_81D2CD0: ; 81D2CD0 movs r0, 0xFF strb r0, [r3] adds r0, r3, 0 -@081D2E70: +_081D2E70: pop {r3} mov r8, r3 pop {r4-r7} @@ -871504,8 +871504,8 @@ sub_81D2E7C: ; 81D2E7C 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 @@ -871513,11 +871513,11 @@ sub_81D2E7C: ; 81D2E7C 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 @@ -871525,9 +871525,9 @@ sub_81D2E7C: ; 81D2E7C 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 @@ -871537,8 +871537,8 @@ sub_81D2E7C: ; 81D2E7C 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 @@ -871566,13 +871566,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 @@ -871588,50 +871588,50 @@ sub_81D2ED4: ; 81D2ED4 movs r0, 0x9 strb r0, [r5, 0x4] cmp r7, 0xE - bne @081D2F2C + bne _081D2F2C adds r0, r5, 0x5 ldr r1, =gUnknown_085EBFCE - b @081D2F3A + b _081D2F3A .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 @@ -871663,13 +871663,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 @@ -871725,7 +871725,7 @@ sub_81D2F78: ; 81D2F78 movs r3, 0 bl sub_81D2C68 cmp r0, 0xFF - beq @081D3044 + beq _081D3044 adds r0, r7, 0 adds r1, r6, 0 movs r2, 0x30 @@ -871733,10 +871733,10 @@ sub_81D2F78: ; 81D2F78 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 @@ -871746,8 +871746,8 @@ sub_81D2F78: ; 81D2F78 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 @@ -871756,7 +871756,7 @@ sub_81D2F78: ; 81D2F78 lsls r3, r1, 2 movs r5, 0x9B movs r4, 0x5B -@081D306C: +_081D306C: adds r0, r2, r1 add r0, r8 strb r6, [r0] @@ -871769,8 +871769,8 @@ sub_81D2F78: ; 81D2F78 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 @@ -871802,13 +871802,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 @@ -871844,7 +871844,7 @@ sub_81D3094: ; 81D3094 bl species_and_otid_get_pal mov r1, r9 bl LZ77UnCompWram -@081D311A: +_081D311A: add sp, 0x4 pop {r3,r4} mov r8, r3 @@ -871864,10 +871864,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 @@ -871889,9 +871889,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 @@ -871916,12 +871916,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} @@ -871942,12 +871942,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} @@ -872022,7 +872022,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] @@ -872032,7 +872032,7 @@ sub_81D321C: ; 81D321C 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} @@ -872040,7 +872040,7 @@ sub_81D321C: ; 81D321C 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] @@ -872054,7 +872054,7 @@ sub_81D321C: ; 81D321C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x2 - bls @081D327A + bls _081D327A add sp, 0x50 pop {r3} mov r8, r3 @@ -872093,12 +872093,12 @@ 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 @@ -872112,12 +872112,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 str r0, [r2, 0x1C] -@081D330C: +_081D330C: pop {r0} bx r0 .pool @@ -872135,7 +872135,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 @@ -872157,9 +872157,9 @@ sub_81D3314: ; 81D3314 adds r0, r2 ldrh r0, [r0] adds r0, r1 - b @081D337E + b _081D337E .pool -@081D3360: +_081D3360: ldr r1, =gUnknown_08625B2C movs r5, 0x2E ldrsh r0, [r4, r5] @@ -872175,7 +872175,7 @@ sub_81D3314: ; 81D3314 adds r0, r1 ldrh r0, [r0] adds r0, 0x68 -@081D337E: +_081D337E: strh r0, [r4, 0x22] pop {r4,r5} pop {r0} @@ -872194,13 +872194,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 @@ -872211,16 +872211,16 @@ sub_81D338C: ; 81D338C 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 str r0, [r1, 0x1C] - b @081D33F0 + b _081D33F0 .pool -@081D33D0: +_081D33D0: ldr r0, [r4] bl sub_81D3314 ldr r0, [r4] @@ -872235,12 +872235,12 @@ sub_81D338C: ; 81D338C 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} @@ -872261,13 +872261,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 -@081D3428: +_081D3428: lsls r1, r2, 4 adds r1, r2 lsls r1, 2 @@ -872289,8 +872289,8 @@ sub_81D3408: ; 81D3408 ldrsh r0, [r4, r1] adds r0, 0x1 cmp r3, r0 - blt @081D3428 -@081D3454: + blt _081D3428 +_081D3454: pop {r4-r7} pop {r0} bx r0 @@ -872303,7 +872303,7 @@ sub_81D3464: ; 81D3464 adds r2, r0, 0 movs r1, 0 movs r3, 0 -@081D346C: +_081D346C: lsls r0, r1, 2 adds r0, r2 str r3, [r0] @@ -872311,7 +872311,7 @@ sub_81D3464: ; 81D3464 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x9 - bls @081D346C + bls _081D346C pop {r0} bx r0 thumb_func_end sub_81D3464 @@ -872334,8 +872334,8 @@ sub_81D3480: ; 81D3480 movs r5, 0 adds r0, r7, 0x1 cmp r9, r0 - bge @081D34FE -@081D34A2: + bge _081D34FE +_081D34A2: ldr r0, =gUnknown_08625B14 movs r1, 0 movs r2, 0 @@ -872345,7 +872345,7 @@ sub_81D3480: ; 81D3480 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 @@ -872364,22 +872364,22 @@ sub_81D3480: ; 81D3480 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 .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] @@ -872403,22 +872403,22 @@ 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 RemoveObjectAndFreeTiles 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 @@ -872444,12 +872444,12 @@ sub_81D3564: ; 81D3564 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 SeekObjectImageAnim @@ -872460,7 +872460,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 @@ -872469,7 +872469,7 @@ sub_81D3564: ; 81D3564 movs r0, 0x10 ands r0, r1 cmp r0, 0 - beq @081D35DC + beq _081D35DC adds r2, r4, 0 adds r2, 0x3E ldrb r0, [r2] @@ -872481,23 +872481,23 @@ sub_81D3564: ; 81D3564 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 - b @081D35DA + b _081D35DA .pool -@081D35D0: +_081D35D0: ldr r0, =sub_81D32D4 - b @081D35DA + b _081D35DA .pool -@081D35D8: +_081D35D8: ldr r0, =DummyObjectCallback -@081D35DA: +_081D35DA: str r0, [r4, 0x1C] -@081D35DC: +_081D35DC: pop {r4} pop {r0} bx r0 @@ -872516,11 +872516,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 @@ -872544,8 +872544,8 @@ sub_81D35E8: ; 81D35E8 ldrsh r0, [r6, r2] adds r0, 0x1 cmp r5, r0 - blt @081D3604 -@081D3636: + blt _081D3604 +_081D3636: pop {r4-r7} pop {r0} bx r0 @@ -872622,7 +872622,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 @@ -872649,9 +872649,9 @@ sub_81D3640: ; 81D3640 ldrsh r0, [r4, r1] ldr r1, =gUnknown_085EEA76 cmp r0, 0 - blt @081D3704 + blt _081D3704 ldr r1, =gUnknown_085EEA73 -@081D3704: +_081D3704: adds r0, r6, 0 bl CopyString mov r0, r10 @@ -872668,18 +872668,18 @@ sub_81D3640: ; 81D3640 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 @@ -872699,7 +872699,7 @@ sub_81D3640: ; 81D3640 lsls r0, 16 lsrs r7, r0, 16 cmp r7, 0x5 - bls @081D36CA + bls _081D36CA add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -872765,7 +872765,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 @@ -872774,12 +872774,12 @@ sub_81D3784: ; 81D3784 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 @@ -872831,7 +872831,7 @@ sub_81D3784: ; 81D3784 lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0x5 - bls @081D37EE + bls _081D37EE add sp, 0x2C pop {r3-r5} mov r8, r3 @@ -872907,12 +872907,12 @@ 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 @@ -872925,24 +872925,24 @@ sub_81D3920: ; 81D3920 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 @@ -872951,12 +872951,12 @@ sub_81D3920: ; 81D3920 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 @@ -872969,7 +872969,7 @@ sub_81D396C: ; 81D396C ldrb r0, [r4] subs r0, 0x1 cmp r0, 0x7 - bhi @081D398E + bhi _081D398E adds r0, r4, 0 adds r0, 0x8 movs r1, 0xEE @@ -872977,12 +872977,12 @@ 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 @@ -873011,12 +873011,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 @@ -873048,8 +873048,8 @@ sub_81D3998: ; 81D3998 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 @@ -873071,16 +873071,16 @@ sub_81D3998: ; 81D3998 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 @@ -873103,7 +873103,7 @@ sub_81D3998: ; 81D3998 movs r2, 0xA4 lsls r2, 1 bl memcpy -@081D3A7E: +_081D3A7E: mov r0, r8 adds r0, 0x8 movs r1, 0xEE @@ -873115,13 +873115,13 @@ sub_81D3998: ; 81D3998 mov r1, r8 bl sub_8153634 cmp r0, 0x1 - bne @081D3AA4 + bne _081D3AA4 movs r0, 0x1 - b @081D3AA6 + b _081D3AA6 .pool -@081D3AA4: +_081D3AA4: movs r0, 0 -@081D3AA6: +_081D3AA6: pop {r3} mov r8, r3 pop {r4-r7} @@ -873157,7 +873157,7 @@ sub_81D3AD8: ; 81D3AD8 movs r0, 0x1E bl sub_81535DC cmp r0, 0x1 - bne @081D3B04 + bne _081D3B04 ldr r2, =0x00000ee8 adds r0, r5, 0 adds r1, r4, 0 @@ -873165,13 +873165,13 @@ sub_81D3AD8: ; 81D3AD8 adds r0, r5, 0 bl sub_81D396C cmp r0, 0 - beq @081D3B04 + beq _081D3B04 movs r0, 0x1 - b @081D3B06 + b _081D3B06 .pool -@081D3B04: +_081D3B04: movs r0, 0 -@081D3B06: +_081D3B06: pop {r4,r5} pop {r1} bx r1 @@ -873223,16 +873223,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 @@ -873244,30 +873244,30 @@ sub_81D3B54: ; 81D3B54 movs r0, 0x13 ands r0, r1 cmp r0, 0x10 - bne @081D3BA0 + bne _081D3BA0 movs r4, 0 - b @081D3BC2 + b _081D3BC2 .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 @@ -873291,16 +873291,16 @@ sub_81D3BE8: ; 81D3BE8 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 @@ -873312,30 +873312,30 @@ sub_81D3BE8: ; 81D3BE8 movs r0, 0x13 ands r0, r1 cmp r0, 0x10 - bne @081D3C34 + bne _081D3C34 movs r4, 0 - b @081D3C56 + b _081D3C56 .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 @@ -873412,12 +873412,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} @@ -873461,49 +873461,49 @@ 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 .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 .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 .pool -@081D3DE8: +_081D3DE8: bl sub_81D3D34 adds r0, r4, 0 adds r1, r5, 0 @@ -873512,19 +873512,19 @@ sub_81D3D70: ; 81D3D70 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 .pool -@081D3E18: +_081D3E18: ldr r2, =0x030012e6 ldrh r0, [r2] adds r0, 0x1 @@ -873536,53 +873536,53 @@ sub_81D3D70: ; 81D3D70 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 .pool -@081D3E64: +_081D3E64: bl sub_81D413C ldr r1, =0x030012c8 movs r0, 0x2 strb r0, [r1, 0x2] - b @081D3ECC + b _081D3ECC .pool -@081D3E74: +_081D3E74: bl sub_81D3CBC ldr r1, =0x030012c8 movs r0, 0x5 strb r0, [r1, 0x1] - b @081D3ECC + b _081D3ECC .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 @@ -873590,24 +873590,24 @@ sub_81D3D70: ; 81D3D70 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 .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] @@ -873632,17 +873632,17 @@ 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 .pool -@081D3F0C: +_081D3F0C: ldr r1, =0x030012c8 movs r0, 0 -@081D3F10: +_081D3F10: strb r0, [r1] pop {r1} bx r1 @@ -873657,7 +873657,7 @@ sub_81D3F1C: ; 81D3F1C ldr r3, =0x030012c8 ldrb r0, [r3] cmp r0, 0 - beq @081D3F54 + beq _081D3F54 ldr r2, =0x04000128 ldrh r0, [r2] movs r1, 0x1 @@ -873670,14 +873670,14 @@ sub_81D3F1C: ; 81D3F1C adds r0, 0x1 str r0, [r3, 0x10] bl sub_81D3F68 - b @081D3F5C + b _081D3F5C .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 @@ -873723,20 +873723,20 @@ sub_81D3FAC: ; 81D3FAC 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 .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 @@ -873751,59 +873751,59 @@ sub_81D3FAC: ; 81D3FAC 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 .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 @@ -873814,21 +873814,21 @@ sub_81D3FAC: ; 81D3FAC ldr r1, [r1] adds r0, r1 str r0, [r3, 0x14] - b @081D40BA + b _081D40BA .pool -@081D4074: +_081D4074: ldr r1, =0x04000120 ldr r0, [r3, 0x14] - b @081D40B8 + b _081D40B8 .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 @@ -873837,62 +873837,62 @@ sub_81D3FAC: ; 81D3FAC 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 .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 .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] @@ -873904,14 +873904,14 @@ sub_81D3FAC: ; 81D3FAC 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} @@ -874093,7 +874093,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] @@ -874103,7 +874103,7 @@ sub_81D427C: ; 81D427C lsrs r0, 24 mov r8, r0 cmp r0, 0x3 - bls @081D42CA + bls _081D42CA ldr r2, =0x02037350 ldr r0, =0x02037590 ldrb r1, [r0, 0x5] @@ -874116,14 +874116,14 @@ sub_81D427C: ; 81D427C 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 VarGet lsls r0, 16 @@ -874131,18 +874131,18 @@ sub_81D427C: ; 81D427C 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 .pool -@081D4338: +_081D4338: ldrb r0, [r5, 0x1] movs r1, 0x20 orrs r0, r1 -@081D433E: +_081D433E: strb r0, [r5, 0x1] ldr r0, =0x0000403a bl VarGet @@ -874152,17 +874152,17 @@ sub_81D427C: ; 81D427C bl __umodsi3 lsls r0, 16 cmp r0, 0 - bne @081D4360 -@081D4356: + bne _081D4360 +_081D4356: movs r0, 0 - b @081D4816 + b _081D4816 .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 @@ -874183,9 +874183,9 @@ sub_81D427C: ; 81D427C 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, =gUnknown_0862608E adds r0, r7, r1 @@ -874194,27 +874194,27 @@ sub_81D427C: ; 81D427C 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 .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 @@ -874227,7 +874227,7 @@ sub_81D427C: ; 81D427C movs r6, 0x14 ldrsh r0, [r0, r6] cmp r2, r0 - bne @081D4446 + bne _081D4446 ldrh r0, [r5, 0x10] adds r0, 0x1 lsls r0, 16 @@ -874237,14 +874237,14 @@ sub_81D427C: ; 81D427C bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq @081D4446 -@081D4408: + beq _081D4446 +_081D4408: movs r0, 0x4 - b @081D4816 + b _081D4816 .pool -@081D4410: +_081D4410: cmp r0, 0 - bge @081D4446 + bge _081D4446 movs r3, 0x10 ldrsh r2, [r5, r3] subs r2, 0x1 @@ -874257,7 +874257,7 @@ sub_81D427C: ; 81D427C movs r6, 0x14 ldrsh r0, [r0, r6] cmp r2, r0 - bne @081D4446 + bne _081D4446 ldrh r0, [r5, 0x10] subs r0, 0x1 lsls r0, 16 @@ -874267,9 +874267,9 @@ sub_81D427C: ; 81D427C 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 @@ -874281,12 +874281,12 @@ sub_81D427C: ; 81D427C 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 @@ -874295,12 +874295,12 @@ sub_81D427C: ; 81D427C bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq @081D449E -@081D447C: + beq _081D449E +_081D447C: movs r0, 0x2 - b @081D4816 + b _081D4816 .pool -@081D4488: +_081D4488: movs r2, 0x10 ldrsh r0, [r5, r2] ldrh r1, [r5, 0x12] @@ -874310,8 +874310,8 @@ sub_81D427C: ; 81D427C 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 @@ -874330,9 +874330,9 @@ sub_81D427C: ; 81D427C 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 @@ -874340,27 +874340,27 @@ sub_81D427C: ; 81D427C 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 .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 @@ -874373,7 +874373,7 @@ sub_81D427C: ; 81D427C 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] @@ -874383,14 +874383,14 @@ sub_81D427C: ; 81D427C bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq @081D4576 -@081D4538: + beq _081D4576 +_081D4538: movs r0, 0x1 - b @081D4816 + b _081D4816 .pool -@081D4540: +_081D4540: cmp r0, 0 - bge @081D4576 + bge _081D4576 movs r3, 0x12 ldrsh r2, [r5, r3] subs r2, 0x1 @@ -874403,7 +874403,7 @@ sub_81D427C: ; 81D427C 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] @@ -874413,9 +874413,9 @@ sub_81D427C: ; 81D427C 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 @@ -874427,12 +874427,12 @@ sub_81D427C: ; 81D427C 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 @@ -874440,12 +874440,12 @@ sub_81D427C: ; 81D427C bl sub_81D4834 lsls r0, 24 cmp r0, 0 - beq @081D45D0 -@081D45AA: + beq _081D45D0 +_081D45AA: movs r0, 0x3 - b @081D4816 + b _081D4816 .pool -@081D45B8: +_081D45B8: ldrh r0, [r5, 0x10] adds r0, 0x1 lsls r0, 16 @@ -874455,135 +874455,135 @@ sub_81D427C: ; 81D427C 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] @@ -874597,7 +874597,7 @@ sub_81D427C: ; 81D427C 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 @@ -874606,9 +874606,9 @@ sub_81D427C: ; 81D427C 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] @@ -874622,7 +874622,7 @@ sub_81D427C: ; 81D427C 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 @@ -874631,9 +874631,9 @@ sub_81D427C: ; 81D427C 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] @@ -874643,9 +874643,9 @@ sub_81D427C: ; 81D427C 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] @@ -874655,14 +874655,14 @@ sub_81D427C: ; 81D427C 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] @@ -874676,7 +874676,7 @@ sub_81D427C: ; 81D427C movs r4, 0x10 ldrsh r0, [r5, r4] cmp r1, r0 - ble @081D47AA + ble _081D47AA subs r0, r2, 0x1 lsls r0, 16 asrs r0, 16 @@ -874685,9 +874685,9 @@ sub_81D427C: ; 81D427C 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] @@ -874701,7 +874701,7 @@ sub_81D427C: ; 81D427C movs r3, 0x10 ldrsh r0, [r5, r3] cmp r1, r0 - bge @081D47DC + bge _081D47DC adds r0, r2, 0x1 lsls r0, 16 asrs r0, 16 @@ -874710,9 +874710,9 @@ sub_81D427C: ; 81D427C 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 @@ -874722,9 +874722,9 @@ sub_81D427C: ; 81D427C 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 @@ -874734,15 +874734,15 @@ sub_81D427C: ; 81D427C 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 @@ -874771,17 +874771,17 @@ 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 .pool -@081D4870: +_081D4870: lsls r0, r3, 16 asrs r0, 16 lsls r1, r4, 16 @@ -874792,7 +874792,7 @@ sub_81D4834: ; 81D4834 bl sub_8088E64 lsls r0, 24 lsrs r0, 24 -@081D4888: +_081D4888: pop {r4} pop {r1} bx r1 @@ -874815,14 +874815,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] @@ -874833,9 +874833,9 @@ sub_81D4890: ; 81D4890 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 @@ -874843,7 +874843,7 @@ sub_81D4890: ; 81D4890 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -@081D48E8: +_081D48E8: ldrh r0, [r4, 0x10] adds r0, 0x1 lsls r0, 16 @@ -874854,9 +874854,9 @@ sub_81D4890: ; 81D4890 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 @@ -874864,7 +874864,7 @@ sub_81D4890: ; 81D4890 adds r0, r5, 0x1 lsls r0, 24 lsrs r5, r0, 24 -@081D4912: +_081D4912: movs r1, 0x10 ldrsh r0, [r4, r1] ldrh r1, [r4, 0x12] @@ -874875,16 +874875,16 @@ sub_81D4890: ; 81D4890 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 @@ -874895,9 +874895,9 @@ sub_81D4890: ; 81D4890 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 @@ -874905,13 +874905,13 @@ sub_81D4890: ; 81D4890 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 .pool -@081D4974: +_081D4974: ldr r4, =0x030012fc ldr r0, =0x0000403a bl VarGet @@ -874920,7 +874920,7 @@ sub_81D4890: ; 81D4890 adds r1, r5, 0 bl __modsi3 adds r0, r4 -@081D4988: +_081D4988: ldrb r0, [r0] pop {r4-r6} pop {r1} @@ -874941,23 +874941,23 @@ 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 VarSet - b @081D49E0 + b _081D49E0 .pool -@081D49D8: +_081D49D8: adds r0, r4, 0 adds r1, r2, 0 bl VarSet -@081D49E0: +_081D49E0: pop {r4} pop {r0} bx r0 @@ -874973,16 +874973,16 @@ FieldObjectIsFarawayIslandMew: ; 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 .pool -@081D4A0C: +_081D4A0C: movs r0, 0 -@081D4A0E: +_081D4A0E: pop {r1} bx r1 thumb_func_end FieldObjectIsFarawayIslandMew @@ -874995,26 +874995,26 @@ unown_chamber_related: ; 81D4A14 ldrh r1, [r0, 0x4] ldr r0, =0x0000391a cmp r1, r0 - bne @081D4A50 + bne _081D4A50 movs r0, 0xE5 lsls r0, 1 bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081D4A50 + beq _081D4A50 ldr r0, =0x000002ce bl FlagGet lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 - beq @081D4A50 + beq _081D4A50 movs r0, 0x1 - b @081D4A52 + b _081D4A52 .pool -@081D4A50: +_081D4A50: movs r0, 0 -@081D4A52: +_081D4A52: pop {r1} bx r1 thumb_func_end unown_chamber_related @@ -875028,7 +875028,7 @@ sub_81D4A58: ; 81D4A58 lsls r0, 16 ldr r1, =0xffff0000 cmp r0, r1 - beq @081D4A88 + beq _081D4A88 adds r0, r4, 0 bl VarGet lsls r0, 16 @@ -875036,13 +875036,13 @@ sub_81D4A58: ; 81D4A58 lsls r1, 10 ands r1, r0 cmp r1, 0 - bne @081D4A88 + bne _081D4A88 movs r0, 0x1 - b @081D4A8A + b _081D4A8A .pool -@081D4A88: +_081D4A88: movs r0, 0 -@081D4A8A: +_081D4A8A: pop {r4} pop {r1} bx r1 @@ -875068,7 +875068,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 @@ -875093,9 +875093,9 @@ sub_81D4A90: ; 81D4A90 adds r0, r3 adds r0, 0x43 strb r4, [r0] - b @081D4BC4 + b _081D4BC4 .pool -@081D4AF8: +_081D4AF8: ldr r0, =0x0000403a ldr r1, =0x0000ffff bl VarSet @@ -875119,7 +875119,7 @@ sub_81D4A90: ; 81D4A90 ldr r0, =0x020375f4 ldrh r0, [r0] cmp r0, 0x2 - beq @081D4B3A + beq _081D4B3A ldrb r0, [r5, 0x4] lsls r1, r0, 4 adds r1, r0 @@ -875128,7 +875128,7 @@ sub_81D4A90: ; 81D4A90 adds r1, 0x43 movs r0, 0x1 strb r0, [r1] -@081D4B3A: +_081D4B3A: ldr r4, =gFieldEffectObjectPaletteInfo1 adds r0, r4, 0 bl LoadTaggedObjectPalette @@ -875172,7 +875172,7 @@ sub_81D4A90: ; 81D4A90 lsls r0, 24 lsrs r0, 24 cmp r0, 0x40 - beq @081D4BC4 + beq _081D4BC4 ldrb r0, [r1] lsls r1, r0, 4 adds r1, r0 @@ -875193,7 +875193,7 @@ sub_81D4A90: ; 81D4A90 strb r0, [r1, 0x5] ldr r0, =DummyObjectCallback str r0, [r1, 0x1C] -@081D4BC4: +_081D4BC4: add sp, 0x4 pop {r4-r6} pop {r0} @@ -875207,7 +875207,7 @@ sub_81D4BEC: ; 81D4BEC ldr r1, =0x0203cf50 ldrb r0, [r1] cmp r0, 0x40 - beq @081D4C06 + beq _081D4C06 adds r1, r0, 0 lsls r0, r1, 4 adds r0, r1 @@ -875215,7 +875215,7 @@ sub_81D4BEC: ; 81D4BEC ldr r1, =0x02020630 adds r0, r1 bl RemoveObjectAndFreeTiles -@081D4C06: +_081D4C06: pop {r0} bx r0 .pool @@ -875231,7 +875231,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] @@ -875241,17 +875241,17 @@ 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 .pool -@081D4C50: +_081D4C50: movs r0, 0 -@081D4C52: +_081D4C52: pop {r4} pop {r1} bx r1 @@ -875267,7 +875267,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 @@ -875277,17 +875277,17 @@ 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 .pool -@081D4C94: +_081D4C94: movs r0, 0 -@081D4C96: +_081D4C96: pop {r4} pop {r1} bx r1 @@ -875303,7 +875303,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] @@ -875313,17 +875313,17 @@ 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 .pool -@081D4CD8: +_081D4CD8: movs r0, 0 -@081D4CDA: +_081D4CDA: pop {r4} pop {r1} bx r1 @@ -875339,7 +875339,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 @@ -875349,17 +875349,17 @@ 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 .pool -@081D4D1C: +_081D4D1C: movs r0, 0 -@081D4D1E: +_081D4D1E: pop {r4} pop {r1} bx r1 @@ -875468,21 +875468,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] @@ -875535,24 +875535,24 @@ 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 .pool -@081D4EB8: +_081D4EB8: movs r0, 0 -@081D4EBA: +_081D4EBA: add sp, 0xC pop {r1} bx r1 @@ -875564,17 +875564,17 @@ sub_81D4EC0: ; 81D4EC0 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 @@ -875589,141 +875589,141 @@ 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 .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 .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 .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 .pool -@081D500C: +_081D500C: movs r0, 0 -@081D500E: +_081D500E: pop {r4,r5} pop {r1} bx r1 @@ -875781,14 +875781,14 @@ 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 @@ -875805,155 +875805,155 @@ 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 .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, =gUnknown_085EDFD6 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 .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, =gUnknown_085EDFF5 bl mevent_0814257C cmp r0, 0 - bne @081D517C - b @081D548A -@081D517C: + bne _081D517C + b _081D548A +_081D517C: ldr r0, =gUnknown_085EE014 bl sub_8018884 adds r0, r4, 0 bl sub_81D505C movs r0, 0x5 strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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 .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 .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 @@ -875961,34 +875961,34 @@ sub_81D5084: ; 81D5084 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, =gUnknown_085EE05C 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 .pool -@081D5268: +_081D5268: ldr r0, =gUnknown_085EE097 bl sub_8018884 ldr r0, =0x03006370 @@ -875998,125 +875998,125 @@ sub_81D5084: ; 81D5084 bl sub_81D4D50 movs r0, 0x9 strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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 .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, =gUnknown_085EE120 bl sub_8018884 movs r0, 0xB strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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, =gUnknown_085EE0DC bl sub_8018884 -@081D52FC: +_081D52FC: movs r0, 0xD strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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 .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, =gUnknown_085EE097 bl sub_8018884 movs r0, 0xE strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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] @@ -876124,47 +876124,47 @@ sub_81D5084: ; 81D5084 bl sub_800ABF4 movs r0, 0x10 strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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 .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, =gUnknown_085EE0FA bl sub_8018884 adds r0, r4, 0 bl sub_81D505C movs r0, 0x12 strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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, =gUnknown_085EE107 bl sub_8018884 movs r0, 0xB9 @@ -876172,64 +876172,64 @@ sub_81D5084: ; 81D5084 bl fanfare_play movs r0, 0x13 strb r0, [r4, 0x8] - b @081D548A + b _081D548A .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 .pool -@081D5430: +_081D5430: adds r0, r4, 0 adds r0, 0x9 ldr r1, =gUnknown_085EE06B bl mevent_0814257C -@081D543A: +_081D543A: cmp r0, 0 - beq @081D548A + beq _081D548A movs r0, 0x1A strb r0, [r4, 0x8] - b @081D548A + b _081D548A .pool -@081D5448: +_081D5448: adds r0, r4, 0 adds r0, 0x9 ldr r1, =gUnknown_085EE0A3 - b @081D5466 + b _081D5466 .pool -@081D5454: +_081D5454: adds r0, r4, 0 adds r0, 0x9 ldr r1, =gUnknown_085EE0BF - b @081D5466 + b _081D5466 .pool -@081D5460: +_081D5460: adds r0, r4, 0 adds r0, 0x9 ldr r1, =gUnknown_085EE12D -@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 .pool -@081D5478: +_081D5478: ldr r0, [r4, 0x10] bl Free adds r0, r5, 0 bl remove_task ldr r0, =sub_80186A4 bl SetMainCallback2 -@081D548A: +_081D548A: pop {r4,r5} pop {r0} bx r0 @@ -876280,7 +876280,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 @@ -876288,7 +876288,7 @@ sub_81D54BC: ; 81D54BC adds r5, 0x4 subs r4, 0x1 cmp r4, 0 - bge @081D54EE + bge _081D54EE pop {r4-r6} pop {r0} bx r0 @@ -876340,14 +876340,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 @@ -876404,7 +876404,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 @@ -876419,7 +876419,7 @@ sub_81D55D0: ; 81D55D0 lsls r0, 3 adds r0, r6 lsls r7, r0, 3 -@081D560A: +_081D560A: ldr r0, =0x0203cf58 ldr r4, [r0] mov r1, r12 @@ -876441,7 +876441,7 @@ sub_81D55D0: ; 81D55D0 strb r0, [r4] adds r5, 0x1 cmp r5, 0xA - ble @081D560A + ble _081D560A ldr r1, =0x0203cf58 ldr r4, [r1] adds r4, 0x16 @@ -876464,7 +876464,7 @@ sub_81D55D0: ; 81D55D0 strb r0, [r4] mov r6, r9 cmp r6, 0x1 - ble @081D55EE + ble _081D55EE ldr r1, =0x03005d8c ldr r0, [r1] ldr r1, =0x00003d64 @@ -876487,11 +876487,11 @@ sub_81D5694: ; 81D5694 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 @@ -876504,7 +876504,7 @@ sub_81D56B0: ; 81D56B0 ldr r4, =0x0203cf54 ldr r0, [r4] cmp r0, 0 - bne @081D56EC + bne _081D56EC ldr r0, =0x00000eec bl AllocZeroed str r0, [r4] @@ -876527,7 +876527,7 @@ sub_81D56B0: ; 81D56B0 ldr r2, =0x040003ba bl CpuSet bl nullsub_2 -@081D56EC: +_081D56EC: pop {r4} pop {r0} bx r0 @@ -876540,11 +876540,11 @@ sub_81D5710: ; 81D5710 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 @@ -876568,19 +876568,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 @@ -876599,9 +876599,9 @@ sub_81D572C: ; 81D572C adds r0, r1 adds r0, 0x10 bl ConvertBattleFrontierTrainerSpeechToString - b @081D580E + b _081D580E .pool -@081D5790: +_081D5790: ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 @@ -876620,9 +876620,9 @@ sub_81D572C: ; 81D572C adds r0, r1 adds r0, 0x1C bl ConvertBattleFrontierTrainerSpeechToString - b @081D580E + b _081D580E .pool -@081D57BC: +_081D57BC: ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 @@ -876641,9 +876641,9 @@ sub_81D572C: ; 81D572C adds r0, r1 adds r0, 0x28 bl ConvertBattleFrontierTrainerSpeechToString - b @081D580E + b _081D580E .pool -@081D57E8: +_081D57E8: ldr r0, =0x0203cf54 lsls r1, r2, 4 subs r1, r2 @@ -876662,7 +876662,7 @@ sub_81D572C: ; 81D572C adds r0, r1 adds r0, 0x34 bl ConvertBattleFrontierTrainerSpeechToString -@081D580E: +_081D580E: bl sub_81D5710 pop {r4-r6} pop {r0} @@ -876676,7 +876676,7 @@ sub_81D581C: ; 81D581C bl nullsub_2 bl sub_81D3B34 cmp r0, 0 - bne @081D5844 + bne _081D5844 ldr r3, =0x03005d8c ldr r1, [r3] ldr r0, =0x00003d6e @@ -876684,9 +876684,9 @@ sub_81D581C: ; 81D581C ldrb r0, [r1] movs r2, 0x20 orrs r0, r2 - b @081D5854 + b _081D5854 .pool -@081D5844: +_081D5844: ldr r3, =0x03005d8c ldr r1, [r3] ldr r0, =0x00003d6e @@ -876695,7 +876695,7 @@ sub_81D581C: ; 81D581C movs r0, 0x21 negs r0, r0 ands r0, r2 -@081D5854: +_081D5854: strb r0, [r1] adds r6, r3, 0 ldr r0, [r6] @@ -876767,19 +876767,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 @@ -876801,7 +876801,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] @@ -876812,21 +876812,21 @@ 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 .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 @@ -876848,12 +876848,12 @@ sub_81D5924: ; 81D5924 strb r0, [r1] ldr r0, =0x020375f0 strh r4, [r0] - b @081D59C0 + b _081D59C0 .pool -@081D59BC: +_081D59BC: ldr r0, =0x020375f0 strh r6, [r0] -@081D59C0: +_081D59C0: pop {r3} mov r8, r3 pop {r4-r7} @@ -876876,12 +876876,12 @@ 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 .pool -@081D59FC: +_081D59FC: ldr r1, =0x00003d68 adds r0, r2, r1 bl free_203F458 @@ -876890,7 +876890,7 @@ sub_81D59D0: ; 81D59D0 adds r1, r2, r3 ldr r1, [r1] cmp r0, r1 - bls @081D5A48 + bls _081D5A48 adds r3, 0x4 adds r0, r2, r3 bl sub_81D5DF4 @@ -876908,13 +876908,13 @@ sub_81D59D0: ; 81D59D0 str r0, [r1] ldr r0, =0x020375f0 strh r5, [r0] - b @081D5A4E + b _081D5A4E .pool -@081D5A48: +_081D5A48: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -@081D5A4E: +_081D5A4E: ldr r0, =0x03005d8c ldr r1, [r0] ldr r3, =0x00003d6e @@ -876940,21 +876940,21 @@ 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 .pool -@081D5AA8: +_081D5AA8: adds r0, r2, 0 bl sub_80008DC -@081D5AAE: +_081D5AAE: pop {r0} bx r0 thumb_func_end sub_81D5A70 @@ -876984,32 +876984,32 @@ 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 .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 .pool -@081D5B1C: +_081D5B1C: ldr r1, =0x020375f0 movs r0, 0x2 -@081D5B20: +_081D5B20: strh r0, [r1] pop {r0} bx r0 @@ -877026,9 +877026,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 @@ -877080,7 +877080,7 @@ sub_81D5BBC: ; 81D5BBC ldr r1, [r0] ldrb r0, [r1, 0x6] cmp r0, 0x4 - beq @081D5BEC + beq _081D5BEC ldr r0, =0x02021cc4 ldrb r1, [r1, 0x6] movs r2, 0 @@ -877088,12 +877088,12 @@ sub_81D5BBC: ; 81D5BBC bl ConvertIntToDecimalString ldr r1, =0x020375f0 movs r0, 0 - b @081D5BF0 + b _081D5BF0 .pool -@081D5BEC: +_081D5BEC: ldr r1, =0x020375f0 movs r0, 0x1 -@081D5BF0: +_081D5BF0: strh r0, [r1] bl sub_81D5710 pop {r0} @@ -877121,7 +877121,7 @@ sub_81D5C18: ; 81D5C18 bl VarGet lsls r0, 16 cmp r0, 0 - beq @081D5C42 + beq _081D5C42 ldr r0, =0x03005d8c ldr r0, [r0] ldr r1, =0x00003d6e @@ -877130,18 +877130,18 @@ sub_81D5C18: ; 81D5C18 movs r0, 0x4 ands r0, r1 cmp r0, 0 - bne @081D5C42 + bne _081D5C42 bl GetCurrentTrainerHillMapId lsls r0, 24 cmp r0, 0 - bne @081D5C54 -@081D5C42: + bne _081D5C54 +_081D5C42: movs r0, 0 - b @081D5C56 + b _081D5C56 .pool -@081D5C54: +_081D5C54: movs r0, 0x1 -@081D5C56: +_081D5C56: pop {r1} bx r1 thumb_func_end sub_81D5C18 @@ -877153,16 +877153,16 @@ sub_81D5C5C: ; 81D5C5C lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 - bne @081D5C74 + bne _081D5C74 ldr r0, =0x020375f0 strh r1, [r0] - b @081D5C7A + b _081D5C7A .pool -@081D5C74: +_081D5C74: ldr r1, =0x020375f0 movs r0, 0x1 strh r0, [r1] -@081D5C7A: +_081D5C7A: pop {r0} bx r0 .pool @@ -877213,7 +877213,7 @@ sub_81D5C8C: ; 81D5C8C mov r10, r4 ldr r1, =0x02021fc4 mov r9, r1 -@081D5CD6: +_081D5CD6: lsls r3, r7, 24 lsrs r3, 24 ldr r0, =gUnknown_0862A5F4 @@ -877301,7 +877301,7 @@ sub_81D5C8C: ; 81D5C8C add r8, r1 mov r0, r8 cmp r0, 0x3 - ble @081D5CD6 + ble _081D5CD6 movs r0, 0 bl PutWindowTilemap movs r0, 0 @@ -877347,14 +877347,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 @@ -877366,7 +877366,7 @@ sub_81D5DF8: ; 81D5DF8 lsls r0, 24 lsrs r7, r0, 24 cmp r7, 0x1 - bls @081D5E26 + bls _081D5E26 movs r0, 0 str r0, [sp] ldr r0, =0x03005d8c @@ -877384,7 +877384,7 @@ sub_81D5DF8: ; 81D5DF8 movs r7, 0 ldr r3, =0x0203cf54 mov r10, r3 -@081D5E64: +_081D5E64: lsls r4, r7, 1 mov r8, r4 adds r5, r4, r7 @@ -877466,9 +877466,9 @@ sub_81D5DF8: ; 81D5DF8 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 @@ -877550,18 +877550,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 @@ -877579,33 +877579,33 @@ sub_81D5FB4: ; 81D5FB4 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 @@ -877615,14 +877615,14 @@ sub_81D5FB4: ; 81D5FB4 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 @@ -877644,9 +877644,9 @@ InTrainerHill: ; 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 @@ -877661,46 +877661,46 @@ GetCurrentTrainerHillMapId: ; 81D609C ldrh r2, [r0, 0x12] ldr r0, =0x0000019f cmp r2, r0 - bne @081D60B4 + bne _081D60B4 movs r1, 0x1 - b @081D60F8 + b _081D60F8 .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 .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 .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 @@ -877714,9 +877714,9 @@ sub_81D6100: ; 81D6100 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 @@ -877742,14 +877742,14 @@ sub_81D6134: ; 81D6134 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 .pool -@081D614C: +_081D614C: bl sub_81D6490 lsls r0, 24 lsrs r2, r0, 24 @@ -877758,9 +877758,9 @@ sub_81D6134: ; 81D6134 adds r0, r1 lsrs r0, 24 cmp r0, 0x3 - bls @081D6162 + bls _081D6162 movs r2, 0x4 -@081D6162: +_081D6162: ldr r1, =gUnknown_0862A688 subs r0, r2, 0x1 lsls r0, 2 @@ -877770,7 +877770,7 @@ sub_81D6134: ; 81D6134 bl get_mapheader_by_bank_and_number ldr r0, [r0, 0x4] ldr r0, [r0, 0x8] -@081D6176: +_081D6176: pop {r1} bx r1 .pool @@ -877841,7 +877841,7 @@ sub_81D61E8: ; 81D61E8 ldr r1, =gUnknown_0832A328 mov r12, r1 adds r5, r6, 0 -@081D6204: +_081D6204: ldr r2, [r5] lsls r0, r3, 1 ldr r7, =0x00000cb4 @@ -877851,7 +877851,7 @@ sub_81D61E8: ; 81D61E8 mov r1, r8 ldrh r1, [r1] cmp r0, r1 - bne @081D6240 + bne _081D6240 movs r7, 0xEE lsls r7, 4 adds r2, r7 @@ -877862,27 +877862,27 @@ sub_81D61E8: ; 81D61E8 ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - b @081D624A + b _081D624A .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, =gUnknown_0832A328 mov r8, r0 -@081D6260: +_081D6260: ldr r2, [r6] lsls r0, r3, 1 ldr r7, =0x00000cb4 @@ -877891,7 +877891,7 @@ sub_81D61E8: ; 81D61E8 ldrh r0, [r1] ldrh r1, [r5] cmp r0, r1 - bne @081D6298 + bne _081D6298 movs r7, 0xEE lsls r7, 4 adds r2, r7 @@ -877902,15 +877902,15 @@ sub_81D61E8: ; 81D61E8 ldrb r1, [r2] orrs r0, r1 strb r0, [r2] - b @081D62A2 + b _081D62A2 .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} @@ -877954,7 +877954,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 @@ -877969,12 +877969,12 @@ sub_81D62CC: ; 81D62CC mov r5, r9 adds r0, r5, 0x3 cmp r5, r0 - bge @081D6366 + bge _081D6366 ldr r1, =gUnknown_0862A698 lsls r0, r6, 1 adds r0, r6 adds r7, r0, r1 -@081D6316: +_081D6316: ldrb r2, [r7] movs r0, 0x64 adds r4, r5, 0 @@ -878012,10 +878012,10 @@ sub_81D62CC: ; 81D62CC 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 @@ -878093,20 +878093,20 @@ sub_81D63C8: ; 81D63C8 adds r4, r0 ldrb r3, [r4] ldr r1, =gUnknown_0862A3B4 -@081D6406: +_081D6406: ldrb r0, [r1] cmp r0, r3 - bne @081D641C + bne _081D641C ldrb r0, [r1, 0x1] - b @081D6426 + b _081D6426 .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 @@ -878192,12 +878192,12 @@ sub_81D64C0: ; 81D64C0 push {lr} bl sub_81D6534 cmp r0, 0x1 - bne @081D64D4 + bne _081D64D4 ldr r0, =gUnknown_0862A5D4 movs r1, 0x70 movs r2, 0x20 bl gpu_pal_apply -@081D64D4: +_081D64D4: pop {r0} bx r0 .pool @@ -878251,23 +878251,23 @@ sub_81D6534: ; 81D6534 bl sub_81D5C18 lsls r0, 24 cmp r0, 0 - beq @081D6560 + beq _081D6560 bl GetCurrentTrainerHillMapId 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 .pool -@081D6560: +_081D6560: movs r0, 0 -@081D6562: +_081D6562: pop {r1} bx r1 thumb_func_end sub_81D6534 @@ -878283,15 +878283,15 @@ 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 .pool -@081D6590: +_081D6590: ldr r1, =0x020375f0 movs r0, 0x1 -@081D6594: +_081D6594: strh r0, [r1] pop {r0} bx r0 @@ -878339,7 +878339,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 @@ -878360,12 +878360,12 @@ sub_81D65E8: ; 81D65E8 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 @@ -878384,7 +878384,7 @@ sub_81D6640: ; 81D6640 movs r2, 0 ldr r0, =0x0203cf54 ldr r4, [r0] -@081D664A: +_081D664A: lsls r0, r2, 4 subs r0, r2 lsls r0, 3 @@ -878399,12 +878399,12 @@ sub_81D6640: ; 81D6640 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 @@ -878415,18 +878415,18 @@ sub_81D6640: ; 81D6640 bl FlagGet 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 .pool -@081D66A0: +_081D66A0: movs r0, 0 -@081D66A2: +_081D66A2: bl sub_81D65E8 lsls r0, 24 lsrs r2, r0, 24 @@ -878438,13 +878438,13 @@ sub_81D6640: ; 81D6640 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, =gUnknown_0862A5CC lsls r0, r4, 2 adds r0, r1 @@ -878460,21 +878460,21 @@ sub_81D6640: ; 81D6640 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] @@ -878583,7 +878583,7 @@ sub_81D6800: ; 81D6800 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081D6830 + bne _081D6830 bl ResetAllObjectData bl ResetObjectPaletteAllocator ldr r4, =0x0203cf60 @@ -878594,7 +878594,7 @@ sub_81D6800: ; 81D6800 bl Free adds r0, r5, 0 bl remove_task -@081D6830: +_081D6830: pop {r4,r5} pop {r0} bx r0 @@ -878614,23 +878614,23 @@ 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 - b @081D68B0 + b _081D68B0 .pool -@081D6888: +_081D6888: ldr r4, =0x00002006 adds r1, r4 ldrb r0, [r1] @@ -878651,9 +878651,9 @@ sub_81D6840: ; 81D6840 lsls r0, 2 adds r0, r3 ldr r0, [r0] -@081D68B0: +_081D68B0: str r0, [r1] -@081D68B2: +_081D68B2: pop {r4-r6} pop {r0} bx r0 @@ -878715,37 +878715,37 @@ 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 .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 @@ -878832,12 +878832,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 @@ -878870,25 +878870,25 @@ 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 .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 @@ -878917,9 +878917,9 @@ sub_81D6A20: ; 81D6A20 mov r0, r12 movs r4, 0x4 ldrsh r1, [r0, r4] - b @081D6B5E + b _081D6B5E .pool -@081D6AE4: +_081D6AE4: ldr r2, =0x02020630 mov r0, r12 movs r3, 0x2 @@ -878947,9 +878947,9 @@ sub_81D6A20: ; 81D6A20 adds r0, r2 movs r1, 0x1 negs r1, r1 - b @081D6B58 + b _081D6B58 .pool -@081D6B24: +_081D6B24: ldr r2, =0x02020630 mov r3, r12 movs r4, 0x2 @@ -878976,17 +878976,17 @@ sub_81D6A20: ; 81D6A20 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 @@ -879192,12 +879192,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] @@ -879300,7 +879300,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] @@ -879311,22 +879311,22 @@ sub_81D6D20: ; 81D6D20 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 .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 @@ -879406,8 +879406,8 @@ sub_81D6D20: ; 81D6D20 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] @@ -879475,8 +879475,8 @@ sub_81D6D20: ; 81D6D20 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 @@ -879520,14 +879520,14 @@ sub_81D6D20: ; 81D6D20 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 @@ -879604,11 +879604,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, =gUnknown_08DA3988 ldr r4, =0x0203cf60 ldr r1, [r4] @@ -879689,7 +879689,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 @@ -879703,9 +879703,9 @@ task_add_00_WIN0V_open_close_above_and_more: ; 81D7134 adds r0, r6, r0 ldr r1, =sub_81D691C str r1, [r0] - b @081D71EE + b _081D71EE .pool -@081D71CC: +_081D71CC: bl sub_81D7664 lsls r0, 24 lsrs r0, 24 @@ -879720,7 +879720,7 @@ task_add_00_WIN0V_open_close_above_and_more: ; 81D7134 ldr r1, =sub_81D736C str r1, [r0] bl sub_80A2F30 -@081D71EE: +_081D71EE: movs r4, 0x1 negs r4, r4 adds r0, r4, 0 @@ -879761,12 +879761,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] @@ -879774,11 +879774,11 @@ sub_81D7228: ; 81D7228 strh r0, [r2] adds r1, r5 ldrh r0, [r3] - b @081D72CA + b _081D72CA .pool -@081D726C: +_081D726C: cmp r1, 0x3F - bgt @081D7280 + bgt _081D7280 lsls r1, 1 adds r2, r1, r4 ldrh r0, [r3, 0x2] @@ -879786,10 +879786,10 @@ sub_81D7228: ; 81D7228 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] @@ -879797,10 +879797,10 @@ sub_81D7228: ; 81D7228 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] @@ -879808,10 +879808,10 @@ sub_81D7228: ; 81D7228 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] @@ -879819,8 +879819,8 @@ sub_81D7228: ; 81D7228 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] @@ -879828,7 +879828,7 @@ sub_81D7228: ; 81D7228 strh r0, [r2] adds r1, r5 ldrh r0, [r3, 0xA] -@081D72CA: +_081D72CA: lsrs r0, 8 strh r0, [r1] movs r1, 0x80 @@ -879837,13 +879837,13 @@ sub_81D7228: ; 81D7228 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 @@ -879870,9 +879870,9 @@ sub_81D7228: ; 81D7228 strh r0, [r3, 0x6] ldrh r0, [r3, 0x8] adds r0, 0xC0 - b @081D735E + b _081D735E .pool -@081D7324: +_081D7324: movs r1, 0xC0 lsls r1, 2 adds r0, r1, 0 @@ -879902,7 +879902,7 @@ sub_81D7228: ; 81D7228 adds r0, r1, 0 ldrh r1, [r3, 0x8] adds r0, r1 -@081D735E: +_081D735E: strh r0, [r3, 0x8] ldrh r0, [r3, 0xA] adds r0, 0x80 @@ -879930,40 +879930,40 @@ 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 .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 @@ -880002,11 +880002,11 @@ sub_81D736C: ; 81D736C 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 @@ -880156,23 +880156,23 @@ sub_81D752C: ; 81D752C movs r0, 0x1 bl GetBgY 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 ChangeBgY -@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 @@ -880183,7 +880183,7 @@ sub_81D752C: ; 81D752C lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@081D75A6: +_081D75A6: pop {r4,r5} pop {r0} bx r0 @@ -880244,7 +880244,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 @@ -880262,7 +880262,7 @@ sub_81D7600: ; 81D7600 adds r0, r6, r0 ldr r1, =sub_81D6840 str r1, [r0] -@081D7652: +_081D7652: pop {r4-r7} pop {r0} bx r0 @@ -880352,12 +880352,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 @@ -880390,25 +880390,25 @@ 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 .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 @@ -880437,9 +880437,9 @@ sub_81D7700: ; 81D7700 mov r0, r12 movs r4, 0x4 ldrsh r1, [r0, r4] - b @081D7842 + b _081D7842 .pool -@081D77C8: +_081D77C8: ldr r2, =0x02020630 mov r0, r12 movs r3, 0x2 @@ -880467,9 +880467,9 @@ sub_81D7700: ; 81D7700 adds r0, r2 movs r1, 0x1 negs r1, r1 - b @081D783C + b _081D783C .pool -@081D7808: +_081D7808: ldr r2, =0x02020630 mov r3, r12 movs r4, 0x2 @@ -880496,17 +880496,17 @@ sub_81D7700: ; 81D7700 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 @@ -880523,7 +880523,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] @@ -880555,7 +880555,7 @@ sub_81D7860: ; 81D7860 ldrh r1, [r0, 0x22] adds r1, 0x8 strh r1, [r0, 0x22] -@081D78B0: +_081D78B0: pop {r4} pop {r0} bx r0 @@ -880763,12 +880763,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] @@ -880871,7 +880871,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] @@ -880882,22 +880882,22 @@ sub_81D7A60: ; 81D7A60 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 .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 @@ -880977,8 +880977,8 @@ sub_81D7A60: ; 81D7A60 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] @@ -881046,8 +881046,8 @@ sub_81D7A60: ; 81D7A60 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 @@ -881091,14 +881091,14 @@ sub_81D7A60: ; 81D7A60 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 @@ -881115,7 +881115,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] @@ -881228,7 +881228,7 @@ sub_81D7D14: ; 81D7D14 ldrh r1, [r0, 0x22] adds r1, 0x8 strh r1, [r0, 0x22] -@081D7E08: +_081D7E08: pop {r0} bx r0 .pool @@ -881309,11 +881309,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, =gUnknown_08DA3988 ldr r4, =0x0203cf60 ldr r1, [r4] @@ -881403,27 +881403,27 @@ 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 .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] @@ -881441,12 +881441,12 @@ sub_81D7FC0: ; 81D7FC0 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 @@ -881458,20 +881458,20 @@ sub_81D7FC0: ; 81D7FC0 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 @@ -881488,7 +881488,7 @@ sub_81D7FC0: ; 81D7FC0 ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] -@081D8078: +_081D8078: movs r1, 0xF0 lsls r1, 7 movs r2, 0xC0 @@ -881509,8 +881509,8 @@ sub_81D7FC0: ; 81D7FC0 movs r0, 0x2 movs r3, 0x78 bl SetBgAffine - b @081D815A -@081D80A4: + b _081D815A +_081D80A4: ldrh r0, [r4, 0x2] adds r0, 0x1 strh r0, [r4, 0x2] @@ -881545,12 +881545,12 @@ sub_81D7FC0: ; 81D7FC0 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 @@ -881559,7 +881559,7 @@ sub_81D7FC0: ; 81D7FC0 ldrsh r1, [r4, r3] ldr r0, =0x00000127 cmp r1, r0 - ble @081D815A + ble _081D815A ldrh r0, [r4] adds r0, 0x1 strh r0, [r4] @@ -881570,9 +881570,9 @@ sub_81D7FC0: ; 81D7FC0 movs r2, 0 movs r3, 0x10 bl pal_fade_maybe - b @081D815A + b _081D815A .pool -@081D8124: +_081D8124: ldrh r0, [r4, 0x4] adds r0, 0x10 strh r0, [r4, 0x4] @@ -881598,7 +881598,7 @@ sub_81D7FC0: ; 81D7FC0 bl SetBgAffine adds r0, r6, 0 bl sub_81D8164 -@081D815A: +_081D815A: add sp, 0x10 pop {r4-r6} pop {r0} @@ -881615,7 +881615,7 @@ sub_81D8164: ; 81D8164 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @081D8192 + bne _081D8192 movs r0, 0 bl SetVBlankCallback bl ResetAllObjectData @@ -881627,7 +881627,7 @@ sub_81D8164: ; 81D8164 adds r1, r0 ldr r0, =sub_81D6840 str r0, [r1] -@081D8192: +_081D8192: pop {r4} pop {r0} bx r0 @@ -881648,7 +881648,7 @@ sub_81D81A4: ; 81D81A4 movs r0, 0x3 ands r0, r1 cmp r0, 0 - bne @081D8254 + bne _081D8254 ldr r0, =gUnknown_0862AAA0 ldr r3, =gUnknown_0862AAB8 movs r1, 0 @@ -881706,19 +881706,19 @@ 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 .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 @@ -881731,10 +881731,10 @@ sub_81D8260: ; 81D8260 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, =gUnknown_0862AAB8 movs r3, 0x2E ldrsh r0, [r2, r3] @@ -881756,7 +881756,7 @@ sub_81D8260: ; 81D8260 asrs r0, 24 ldrh r1, [r2, 0x26] adds r0, r1 -@081D829A: +_081D829A: strh r0, [r2, 0x26] ldrh r0, [r2, 0x30] adds r0, 0x1 @@ -881847,12 +881847,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, =gUnknown_08DA7AAC ldr r5, =0x0203cf60 ldr r1, [r5] @@ -881919,7 +881919,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 @@ -881927,20 +881927,20 @@ 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 .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 @@ -881951,29 +881951,29 @@ sub_81D844C: ; 81D844C 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 .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 @@ -882051,26 +882051,26 @@ 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 .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 @@ -882080,8 +882080,8 @@ sub_81D857C: ; 81D857C movs r3, 0 bl pal_fade_maybe strh r4, [r5, 0x2] - b @081D864E -@081D85DC: + b _081D864E +_081D85DC: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 @@ -882089,12 +882089,12 @@ sub_81D857C: ; 81D857C 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 @@ -882103,30 +882103,30 @@ sub_81D857C: ; 81D857C bl SetHBlankCallback movs r0, 0x3 bl EnableInterrupts - b @081D8674 + b _081D8674 .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] @@ -882134,15 +882134,15 @@ sub_81D857C: ; 81D857C 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 @@ -882157,7 +882157,7 @@ sub_81D857C: ; 81D857C adds r0, r1 ldr r1, =sub_81D8684 str r1, [r0] -@081D8674: +_081D8674: add sp, 0x4 pop {r4,r5} pop {r0} @@ -882175,7 +882175,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 @@ -882189,7 +882189,7 @@ sub_81D8684: ; 81D8684 adds r1, r0 ldr r0, =sub_81D6840 str r0, [r1] -@081D86B8: +_081D86B8: pop {r4} pop {r0} bx r0 @@ -882263,74 +882263,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] @@ -882344,14 +882344,14 @@ sub_81D874C: ; 81D874C 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] @@ -882365,7 +882365,7 @@ sub_81D874C: ; 81D874C ldrh r1, [r0, 0x26] adds r1, 0x1 strh r1, [r0, 0x26] -@081D8818: +_081D8818: ldrh r0, [r4, 0x4] adds r0, 0x1 strh r0, [r4, 0x4] @@ -882459,11 +882459,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, =gUnknown_08DA8D6C ldr r4, =0x0203cf60 ldr r1, [r4] @@ -882550,43 +882550,43 @@ 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 .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] @@ -882595,13 +882595,13 @@ sub_81D89E0: ; 81D89E0 movs r3, 0 bl pal_fade_maybe 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] @@ -882615,26 +882615,26 @@ sub_81D89E0: ; 81D89E0 lsls r0, 3 adds r0, r2 ldr r1, =sub_81D8B2C - b @081D8AC4 + b _081D8AC4 .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 @@ -882648,9 +882648,9 @@ sub_81D89E0: ; 81D89E0 lsls r0, 3 adds r0, r1 ldr r1, =sub_81D8BEC -@081D8AC4: +_081D8AC4: str r1, [r0] -@081D8AC6: +_081D8AC6: add sp, 0x4 pop {r4-r6} pop {r0} @@ -882672,7 +882672,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 @@ -882690,7 +882690,7 @@ sub_81D8AD8: ; 81D8AD8 adds r1, r4, 0 movs r2, 0 bl ChangeBgY -@081D8B1C: +_081D8B1C: ldrh r0, [r5, 0x1E] adds r0, 0x1 strh r0, [r5, 0x1E] @@ -882713,7 +882713,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 @@ -882730,11 +882730,11 @@ sub_81D8B2C: ; 81D8B2C movs r1, 0x1 negs r1, r1 adds r0, r1, 0 - b @081D8BAA + b _081D8BAA .pool -@081D8B70: +_081D8B70: cmp r0, 0x1 - bne @081D8BAC + bne _081D8BAC movs r0, 0x2 ldrsh r1, [r4, r0] lsls r1, 8 @@ -882756,13 +882756,13 @@ sub_81D8B2C: ; 81D8B2C 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 @@ -882812,7 +882812,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 @@ -882823,7 +882823,7 @@ sub_81D8BEC: ; 81D8BEC adds r0, r5, r0 ldr r1, =sub_81D6840 str r1, [r0] -@081D8C26: +_081D8C26: pop {r4-r6} pop {r0} bx r0 @@ -882899,11 +882899,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, =gUnknown_08DAAE54 ldr r4, =0x0203cf60 ldr r1, [r4] @@ -883053,25 +883053,25 @@ 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 .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 @@ -883082,8 +883082,8 @@ sub_81D8E80: ; 81D8E80 movs r3, 0 bl pal_fade_maybe strh r5, [r4, 0x2] - b @081D8F30 -@081D8EDE: + b _081D8F30 +_081D8EDE: ldr r2, =0x02020630 movs r0, 0xA ldrsh r1, [r4, r0] @@ -883095,39 +883095,39 @@ sub_81D8E80: ; 81D8E80 ldr r1, [r0] ldr r0, =sub_81D97E0 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 .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 @@ -883137,7 +883137,7 @@ sub_81D8E80: ; 81D8E80 lsls r0, 16 asrs r4, r0, 16 cmp r4, 0 - bne @081D8FA0 + bne _081D8FA0 ldr r0, =0x0000fffe ldr r1, =0x0000ffff str r1, [sp] @@ -883156,9 +883156,9 @@ sub_81D8E80: ; 81D8E80 movs r2, 0x10 movs r3, 0 bl sub_80A2C44 - b @081D8FA0 + b _081D8FA0 .pool -@081D8F84: +_081D8F84: movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -883172,7 +883172,7 @@ sub_81D8E80: ; 81D8E80 adds r0, r7, r0 ldr r1, =sub_81D9034 str r1, [r0] -@081D8FA0: +_081D8FA0: add sp, 0xC pop {r3} mov r8, r3 @@ -883196,7 +883196,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 @@ -883224,27 +883224,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] @@ -883271,12 +883271,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 @@ -883284,24 +883284,24 @@ sub_81D9034: ; 81D9034 bl ResetObjectPaletteAllocator 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 str r1, [r0] - b @081D90A0 + b _081D90A0 .pool -@081D909C: +_081D909C: adds r0, r1, 0x1 strh r0, [r4, 0x2] -@081D90A0: +_081D90A0: pop {r4-r7} pop {r0} bx r0 @@ -883622,11 +883622,11 @@ pokemon_alive_on_battle_side: ; 81D9338 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 @@ -883640,9 +883640,9 @@ pokemon_alive_on_battle_side: ; 81D9338 adds r0, r2 ldrh r1, [r0, 0x20] subs r1, r3 - b @081D939E + b _081D939E .pool -@081D9370: +_081D9370: ldrh r2, [r4, 0x3A] ldrh r1, [r4, 0x20] adds r0, r2, r1 @@ -883666,7 +883666,7 @@ pokemon_alive_on_battle_side: ; 81D9338 ldrh r1, [r4, 0x3A] ldrh r2, [r0, 0x20] adds r1, r2 -@081D939E: +_081D939E: strh r1, [r0, 0x20] ldrh r1, [r4, 0x38] adds r1, 0x1 @@ -883678,19 +883678,19 @@ pokemon_alive_on_battle_side: ; 81D9338 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, =DummyObjectCallback str r0, [r4, 0x1C] - b @081D93D2 + b _081D93D2 .pool -@081D93CC: +_081D93CC: ldrh r0, [r4, 0x36] adds r0, 0x1 strh r0, [r4, 0x36] -@081D93D2: +_081D93D2: pop {r4} pop {r0} bx r0 @@ -883737,19 +883737,19 @@ sub_81D9420: ; 81D9420 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] @@ -883760,7 +883760,7 @@ sub_81D9420: ; 81D9420 lsls r0, 24 ldr r2, =0x02020630 cmp r0, 0 - bne @081D9470 + bne _081D9470 ldrh r0, [r4, 0x20] subs r0, 0x2 strh r0, [r4, 0x20] @@ -883773,7 +883773,7 @@ sub_81D9420: ; 81D9420 ldrh r1, [r0, 0x20] subs r1, 0x2 strh r1, [r0, 0x20] -@081D9470: +_081D9470: movs r1, 0x2E ldrsh r0, [r4, r1] lsls r1, r0, 4 @@ -883782,9 +883782,9 @@ sub_81D9420: ; 81D9420 adds r1, r2 movs r0, 0 strh r0, [r1, 0x26] - b @081D94C4 + b _081D94C4 .pool -@081D9488: +_081D9488: ldr r2, =0x02020630 movs r0, 0x2E ldrsh r1, [r4, r0] @@ -883802,7 +883802,7 @@ sub_81D9420: ; 81D9420 movs r0, 0xF ands r0, r1 cmp r0, 0 - bne @081D94C4 + bne _081D94C4 ldrh r0, [r4, 0x22] adds r0, 0x1 strh r0, [r4, 0x22] @@ -883815,7 +883815,7 @@ sub_81D9420: ; 81D9420 ldrh r1, [r0, 0x22] adds r1, 0x1 strh r1, [r0, 0x22] -@081D94C4: +_081D94C4: pop {r4} pop {r0} bx r0 @@ -883873,24 +883873,24 @@ 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 .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, =gUnknown_0862ACF0 mov r8, r2 mov r0, r8 @@ -883948,36 +883948,36 @@ sub_81D9528: ; 81D9528 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 .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] @@ -883995,7 +883995,7 @@ sub_81D961C: ; 81D961C 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] @@ -884012,9 +884012,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 @@ -884040,35 +884040,35 @@ sub_81D961C: ; 81D961C lsls r0, 2 adds r0, r5 strh r2, [r0, 0x38] - b @081D979E + b _081D979E .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] @@ -884086,22 +884086,22 @@ sub_81D961C: ; 81D961C adds r0, r2 movs r1, 0x3 strh r1, [r0, 0x38] - b @081D96F2 + b _081D96F2 .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 .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 @@ -884126,16 +884126,16 @@ sub_81D961C: ; 81D961C ldr r0, =sub_81D98B4 movs r1, 0 bl AddTask - b @081D979E + b _081D979E .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 @@ -884155,26 +884155,26 @@ sub_81D961C: ; 81D961C bl sub_81D9868 ldr r0, =sub_81D97E0 str r0, [r4, 0x1C] - b @081D97D2 + b _081D97D2 .pool -@081D9790: +_081D9790: ldr r0, =sub_81D8E80 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 @@ -884187,11 +884187,11 @@ sub_81D961C: ; 81D961C 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 @@ -884213,7 +884213,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 @@ -884237,33 +884237,33 @@ 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 .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] @@ -884324,18 +884324,18 @@ 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 .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 @@ -884354,25 +884354,25 @@ sub_81D98B4: ; 81D98B4 bl SetGpuRegBits 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 @@ -884386,14 +884386,14 @@ sub_81D98B4: ; 81D98B4 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] @@ -884423,7 +884423,7 @@ sub_81D98B4: ; 81D98B4 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] @@ -884432,15 +884432,15 @@ sub_81D98B4: ; 81D98B4 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 ResetGpuRegBits adds r0, r5, 0 bl remove_task -@081D99B4: +_081D99B4: add sp, 0x10 pop {r4,r5} pop {r0} @@ -884452,18 +884452,18 @@ 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 CopyString movs r0, 0x1 - b @081D99DE + b _081D99DE .pool -@081D99DC: +_081D99DC: movs r0, 0 -@081D99DE: +_081D99DE: pop {r4} pop {r1} bx r1 @@ -884504,31 +884504,31 @@ 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 .pool -@081D9A44: +_081D9A44: cmp r0, 0x2 - bne @081D9A68 + bne _081D9A68 bl sub_80D2578 cmp r0, 0 - beq @081D9A5C + beq _081D9A5C ldr r0, =gUnknown_085EE49A bl sub_80D255C - b @081D9A68 + b _081D9A68 .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 @@ -884551,21 +884551,21 @@ sub_81D9A98: ; 81D9A98 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 CompareString 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 @@ -884603,7 +884603,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] @@ -884612,7 +884612,7 @@ sub_81D9AC4: ; 81D9AC4 ldrh r0, [r0] ldrh r1, [r7] bl sub_80D2524 -@081D9B1E: +_081D9B1E: mov r1, r8 ldrh r0, [r1] bl sub_80D2480 @@ -884634,21 +884634,21 @@ sub_81D9B40: ; 81D9B40 lsrs r2, r0, 24 movs r1, 0 ldr r3, =gUnknown_0862AD14 -@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 .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 @@ -884675,10 +884675,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 @@ -884687,16 +884687,16 @@ sub_81D9B68: ; 81D9B68 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 @@ -884708,7 +884708,7 @@ sub_81D9B68: ; 81D9B68 adds r5, 0x5 subs r4, 0x1 cmp r4, 0 - bge @081D9BBC + bge _081D9BBC movs r0, 0x2 str r0, [sp] add r0, sp, 0x4 @@ -884726,7 +884726,7 @@ sub_81D9B68: ; 81D9B68 movs r2, 0x3 bl sub_81D9DAC cmp r4, r0 - bne @081D9C7E + bne _081D9C7E add r0, sp, 0x4 movs r1, 0x9 movs r2, 0x15 @@ -884756,7 +884756,7 @@ sub_81D9B68: ; 81D9B68 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 @@ -884771,7 +884771,7 @@ sub_81D9B68: ; 81D9B68 ands r0, r5 eors r1, r0 cmp r3, r1 - bne @081D9C7E + bne _081D9C7E add r0, sp, 0x4 ldrh r0, [r0] mov r1, r10 @@ -884786,10 +884786,10 @@ sub_81D9B68: ; 81D9B68 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 @@ -884807,8 +884807,8 @@ sub_81D9C90: ; 81D9C90 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 @@ -884818,10 +884818,10 @@ sub_81D9C90: ; 81D9C90 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 @@ -884833,14 +884833,14 @@ sub_81D9C90: ; 81D9C90 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 @@ -884859,8 +884859,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 @@ -884868,8 +884868,8 @@ sub_81D9CDC: ; 81D9CDC strb r0, [r2] adds r4, 0x1 cmp r4, r5 - bcc @081D9CF4 -@081D9D04: + bcc _081D9CF4 +_081D9D04: pop {r4-r6} pop {r0} bx r0 @@ -884887,9 +884887,9 @@ 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 @@ -884940,30 +884940,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 @@ -884983,8 +884983,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 @@ -884994,8 +884994,8 @@ sub_81D9DAC: ; 81D9DAC orrs r4, r0 adds r5, 0x1 cmp r5, r6 - bcc @081D9DC0 -@081D9DD6: + bcc _081D9DC0 +_081D9DD6: adds r0, r4, 0 pop {r3} mov r8, r3 @@ -885017,21 +885017,21 @@ 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 .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] @@ -885040,9 +885040,9 @@ sub_81D9DE4: ; 81D9DE4 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x32 - b @081D9EB4 + b _081D9EB4 .pool -@081D9E44: +_081D9E44: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -885051,9 +885051,9 @@ sub_81D9DE4: ; 81D9DE4 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x33 - b @081D9EB4 + b _081D9EB4 .pool -@081D9E64: +_081D9E64: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -885062,9 +885062,9 @@ sub_81D9DE4: ; 81D9DE4 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x34 - b @081D9EB4 + b _081D9EB4 .pool -@081D9E84: +_081D9E84: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -885073,9 +885073,9 @@ sub_81D9DE4: ; 81D9DE4 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x35 - b @081D9EB4 + b _081D9EB4 .pool -@081D9EA4: +_081D9EA4: ldr r4, =0x02039f31 ldr r0, =0x02039f24 ldrb r1, [r0] @@ -885084,7 +885084,7 @@ sub_81D9DE4: ; 81D9DE4 ldr r1, =0x020244ec adds r0, r1 movs r1, 0x36 -@081D9EB4: +_081D9EB4: bl pokemon_getattr strb r0, [r4] ldr r5, =0x02039e00 @@ -885177,12 +885177,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 @@ -885195,54 +885195,54 @@ sub_81D9F68: ; 81D9F68 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 .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 @@ -885255,16 +885255,16 @@ sub_81D9F68: ; 81D9F68 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 @@ -885273,63 +885273,63 @@ sub_81D9F68: ; 81D9F68 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 .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 @@ -885337,14 +885337,14 @@ sub_81D9F68: ; 81D9F68 ldr r0, =0x02039f30 ldrb r0, [r0] cmp r0, 0x3 - bhi @081DA0E8 + bhi _081DA0E8 ldr r1, =sub_81DA488 ldr r2, =sub_81DA10C adds r0, r6, 0 bl set_task_function_and_args_14_15 - b @081DA0F6 + b _081DA0F6 .pool -@081DA0E8: +_081DA0E8: ldr r0, =0x03005e00 lsls r1, r6, 2 adds r1, r6 @@ -885352,7 +885352,7 @@ sub_81D9F68: ; 81D9F68 adds r1, r0 ldr r0, =sub_81DA10C str r0, [r1] -@081DA0F6: +_081DA0F6: add sp, 0x8 pop {r3,r4} mov r8, r3 @@ -885415,28 +885415,28 @@ 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 .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 @@ -885445,25 +885445,25 @@ sub_81DA160: ; 81DA160 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 .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 @@ -885481,8 +885481,8 @@ sub_81DA160: ; 81DA160 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 @@ -885491,7 +885491,7 @@ sub_81DA160: ; 81DA160 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@081DA224: +_081DA224: pop {r3} mov r8, r3 pop {r4-r7} @@ -885513,45 +885513,45 @@ 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 .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 .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 @@ -885561,11 +885561,11 @@ sub_81DA244: ; 81DA244 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 @@ -885592,7 +885592,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 @@ -885601,42 +885601,42 @@ 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 .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 @@ -885644,7 +885644,7 @@ sub_81DA2E8: ; 81DA2E8 mov r2, sp movs r5, 0x80 lsls r5, 1 -@081DA37C: +_081DA37C: ldrh r0, [r4] strh r0, [r2] strh r0, [r3] @@ -885654,8 +885654,8 @@ sub_81DA2E8: ; 81DA2E8 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 @@ -885663,7 +885663,7 @@ sub_81DA2E8: ; 81DA2E8 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@081DA39E: +_081DA39E: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -885695,7 +885695,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 @@ -885704,42 +885704,42 @@ 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 .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 @@ -885747,7 +885747,7 @@ sub_81DA3B8: ; 81DA3B8 mov r2, sp movs r5, 0x80 lsls r5, 1 -@081DA44C: +_081DA44C: ldrh r0, [r4] strh r0, [r2] strh r0, [r3] @@ -885757,8 +885757,8 @@ sub_81DA3B8: ; 81DA3B8 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 @@ -885766,7 +885766,7 @@ sub_81DA3B8: ; 81DA3B8 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@081DA46E: +_081DA46E: add sp, 0xC pop {r3-r5} mov r8, r3 @@ -885793,32 +885793,32 @@ 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 .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 @@ -885830,19 +885830,19 @@ sub_81DA488: ; 81DA488 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 .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 @@ -885856,19 +885856,19 @@ sub_81DA488: ; 81DA488 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 @@ -885877,7 +885877,7 @@ sub_81DA488: ; 81DA488 ldrh r0, [r1, 0x8] adds r0, 0x1 strh r0, [r1, 0x8] -@081DA55C: +_081DA55C: pop {r3} mov r8, r3 pop {r4-r7} @@ -885893,7 +885893,7 @@ sub_81DA57C: ; 81DA57C bl FlagGet lsls r0, 24 cmp r0, 0 - beq @081DA5CA + beq _081DA5CA bl GenerateRandomNumber lsls r0, 16 lsrs r0, 16 @@ -885902,24 +885902,24 @@ sub_81DA57C: ; 81DA57C lsls r0, 16 lsrs r0, 16 cmp r0, 0x1E - bhi @081DA5CA + bhi _081DA5CA movs r0, 0x5B bl FlagGet lsls r0, 24 cmp r0, 0 - beq @081DA5C0 + beq _081DA5C0 ldr r0, =gUnknown_0862AD34 movs r1, 0x8 movs r2, 0x5 bl sub_81DA5D4 - b @081DA5CA + b _081DA5CA .pool -@081DA5C0: +_081DA5C0: ldr r0, =gUnknown_0862AD44 movs r1, 0x7 movs r2, 0x1 bl sub_81DA5D4 -@081DA5CA: +_081DA5CA: pop {r0} bx r0 .pool @@ -885941,9 +885941,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] @@ -885952,30 +885952,30 @@ sub_81DA5D4: ; 81DA5D4 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] @@ -885984,20 +885984,20 @@ sub_81DA5D4: ; 81DA5D4 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 @@ -886006,18 +886006,18 @@ sub_81DA5D4: ; 81DA5D4 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] @@ -886025,25 +886025,25 @@ sub_81DA5D4: ; 81DA5D4 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 .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 @@ -886060,7 +886060,7 @@ sub_81DA6CC: ; 81DA6CC adds r5, r0, 0 movs r4, 0 ldr r6, =gUnknown_085500A4 -@081DA6D4: +_081DA6D4: lsls r0, r4, 1 lsls r1, r5, 4 adds r0, r1 @@ -886069,16 +886069,16 @@ sub_81DA6CC: ; 81DA6CC bl trainer_flag_check lsls r0, 24 cmp r0, 0 - bne @081DA6F0 + bne _081DA6F0 adds r0, r4, 0 - b @081DA6F8 + b _081DA6F8 .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 @@ -886150,22 +886150,22 @@ 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 .pool -@081DA7A8: +_081DA7A8: cmp r7, 0x2 - beq @081DA7E4 -@081DA7AC: + beq _081DA7E4 +_081DA7AC: ldr r6, =0x02020630 lsls r3, r5, 4 - b @081DA7F8 + b _081DA7F8 .pool -@081DA7B8: +_081DA7B8: ldr r2, =0x02020630 lsls r3, r5, 4 adds r0, r3, r5 @@ -886174,31 +886174,31 @@ sub_81DA74C: ; 81DA74C movs r1, 0x78 strh r1, [r0, 0x2E] movs r1, 0x2D - b @081DA7F4 + b _081DA7F4 .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 .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 @@ -886248,54 +886248,54 @@ 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, =DummyObjectCallback str r0, [r3, 0x1C] - b @081DA8B4 + b _081DA8B4 .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 @@ -886345,22 +886345,22 @@ 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 .pool -@081DA924: +_081DA924: cmp r5, 0x2 - beq @081DA960 -@081DA928: + beq _081DA960 +_081DA928: ldr r2, =0x02020630 lsls r3, r6, 4 - b @081DA972 + b _081DA972 .pool -@081DA934: +_081DA934: ldr r2, =0x02020630 lsls r3, r6, 4 adds r0, r3, r6 @@ -886369,30 +886369,30 @@ sub_81DA8BC: ; 81DA8BC movs r1, 0x78 strh r1, [r0, 0x2E] movs r1, 0x2D - b @081DA970 + b _081DA970 .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 .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 @@ -886465,15 +886465,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, =DummyObjectCallback str r0, [r4, 0x1C] -@081DAA16: +_081DAA16: pop {r4} pop {r0} bx r0 @@ -886533,7 +886533,7 @@ sub_81DAA74: ; 81DAA74 ldr r4, [r0] ldr r0, =DummyObjectCallback cmp r4, r0 - bne @081DAAC4 + bne _081DAAC4 movs r0, 0x12 ldrsh r1, [r3, r0] lsls r0, r1, 4 @@ -886542,7 +886542,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 @@ -886551,13 +886551,13 @@ sub_81DAA74: ; 81DAA74 adds r1, r5 ldr r0, [r1] cmp r0, r2 - bne @081DAAC4 + bne _081DAAC4 movs r0, 0x1 - b @081DAAC6 + b _081DAAC6 .pool -@081DAAC4: +_081DAAC4: movs r0, 0 -@081DAAC6: +_081DAAC6: pop {r4,r5} pop {r1} bx r1 @@ -886570,7 +886570,7 @@ sub_81DAACC: ; 81DAACC movs r1, 0xA ldrsh r0, [r4, r1] cmp r0, 0 - beq @081DAB20 + beq _081DAB20 bl sub_81DA700 ldr r1, =0x00003f41 movs r0, 0x50 @@ -886598,9 +886598,9 @@ sub_81DAACC: ; 81DAACC adds r0, 0x1 strh r0, [r4, 0x8] movs r0, 0x1 - b @081DAB46 + b _081DAB46 .pool -@081DAB20: +_081DAB20: movs r1, 0x80 lsls r1, 6 movs r0, 0 @@ -886617,7 +886617,7 @@ sub_81DAACC: ; 81DAACC adds r0, 0x1 strh r0, [r4, 0xA] movs r0, 0 -@081DAB46: +_081DAB46: pop {r4} pop {r1} bx r1 @@ -886631,22 +886631,22 @@ sub_81DAB4C: ; 81DAB4C movs r1, 0xC ldrsh r0, [r4, r1] cmp r0, 0 - bne @081DAB64 + bne _081DAB64 movs r1, 0x80 lsls r1, 1 movs r0, 0 bl SetGpuRegBits -@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 @@ -886658,12 +886658,12 @@ sub_81DAB4C: ; 81DAB4C 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] @@ -886675,7 +886675,7 @@ sub_81DAB4C: ; 81DAB4C lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@081DABB0: +_081DABB0: movs r0, 0 add sp, 0x4 pop {r4} @@ -886691,11 +886691,11 @@ sub_81DABBC: ; 81DABBC 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} @@ -886713,7 +886713,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 @@ -886723,7 +886723,7 @@ sub_81DABDC: ; 81DABDC bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DABEE + bne _081DABEE pop {r4,r5} pop {r0} bx r0 @@ -886794,7 +886794,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 @@ -886802,7 +886802,7 @@ sub_81DAC80: ; 81DAC80 lsls r0, 24 lsrs r0, 24 bl remove_task -@081DACA4: +_081DACA4: movs r0, 0 pop {r1} bx r1 @@ -886820,7 +886820,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 @@ -886830,7 +886830,7 @@ sub_81DACB4: ; 81DACB4 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DACC6 + bne _081DACC6 pop {r4,r5} pop {r0} bx r0 @@ -886901,7 +886901,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 @@ -886909,7 +886909,7 @@ sub_81DAD58: ; 81DAD58 lsls r0, 24 lsrs r0, 24 bl remove_task -@081DAD7C: +_081DAD7C: movs r0, 0 pop {r1} bx r1 @@ -886927,7 +886927,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 @@ -886937,7 +886937,7 @@ sub_81DAD8C: ; 81DAD8C bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DAD9E + bne _081DAD9E pop {r4,r5} pop {r0} bx r0 @@ -887017,7 +887017,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 @@ -887025,7 +887025,7 @@ sub_81DAE44: ; 81DAE44 lsls r0, 24 lsrs r0, 24 bl remove_task -@081DAE68: +_081DAE68: movs r0, 0 pop {r1} bx r1 @@ -887043,7 +887043,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 @@ -887053,7 +887053,7 @@ sub_81DAE78: ; 81DAE78 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DAE8A + bne _081DAE8A pop {r4,r5} pop {r0} bx r0 @@ -887135,7 +887135,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 @@ -887143,7 +887143,7 @@ sub_81DAF34: ; 81DAF34 lsls r0, 24 lsrs r0, 24 bl remove_task -@081DAF58: +_081DAF58: movs r0, 0 pop {r1} bx r1 @@ -887161,7 +887161,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 @@ -887171,7 +887171,7 @@ sub_81DAF68: ; 81DAF68 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DAF7A + bne _081DAF7A pop {r4,r5} pop {r0} bx r0 @@ -887186,7 +887186,7 @@ sub_81DAFA0: ; 81DAFA0 movs r0, 0xA ldrsh r2, [r4, r0] cmp r2, 0 - bne @081DAFCC + bne _081DAFCC movs r1, 0x33 negs r1, r1 str r2, [sp] @@ -887200,10 +887200,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 @@ -887219,10 +887219,10 @@ sub_81DAFA0: ; 81DAFA0 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] @@ -887240,7 +887240,7 @@ sub_81DAFA0: ; 81DAFA0 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@081DB01A: +_081DB01A: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -887260,7 +887260,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 @@ -887268,7 +887268,7 @@ sub_81DB02C: ; 81DB02C lsls r0, 24 lsrs r0, 24 bl remove_task -@081DB050: +_081DB050: movs r0, 0 pop {r1} bx r1 @@ -887286,7 +887286,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 @@ -887296,7 +887296,7 @@ sub_81DB060: ; 81DB060 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DB072 + bne _081DB072 pop {r4,r5} pop {r0} bx r0 @@ -887311,7 +887311,7 @@ sub_81DB098: ; 81DB098 movs r0, 0xA ldrsh r1, [r4, r0] cmp r1, 0 - bne @081DB0C4 + bne _081DB0C4 str r1, [sp] movs r0, 0x8 negs r0, r0 @@ -887325,10 +887325,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] @@ -887343,10 +887343,10 @@ sub_81DB098: ; 81DB098 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 @@ -887365,7 +887365,7 @@ sub_81DB098: ; 81DB098 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@081DB112: +_081DB112: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -887385,7 +887385,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 @@ -887393,7 +887393,7 @@ sub_81DB124: ; 81DB124 lsls r0, 24 lsrs r0, 24 bl remove_task -@081DB148: +_081DB148: movs r0, 0 pop {r1} bx r1 @@ -887411,7 +887411,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 @@ -887421,7 +887421,7 @@ sub_81DB158: ; 81DB158 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DB16A + bne _081DB16A pop {r4,r5} pop {r0} bx r0 @@ -887436,7 +887436,7 @@ sub_81DB190: ; 81DB190 movs r0, 0xA ldrsh r1, [r4, r0] cmp r1, 0 - bne @081DB1BE + bne _081DB1BE movs r0, 0x80 str r0, [sp] str r1, [sp, 0x4] @@ -887451,10 +887451,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 @@ -887471,10 +887471,10 @@ sub_81DB190: ; 81DB190 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 @@ -887494,7 +887494,7 @@ sub_81DB190: ; 81DB190 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@081DB212: +_081DB212: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -887514,7 +887514,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 @@ -887522,7 +887522,7 @@ sub_81DB224: ; 81DB224 lsls r0, 24 lsrs r0, 24 bl remove_task -@081DB248: +_081DB248: movs r0, 0 pop {r1} bx r1 @@ -887540,7 +887540,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 @@ -887550,7 +887550,7 @@ sub_81DB258: ; 81DB258 bl _call_via_r1 lsls r0, 24 cmp r0, 0 - bne @081DB26A + bne _081DB26A pop {r4,r5} pop {r0} bx r0 @@ -887565,7 +887565,7 @@ sub_81DB290: ; 81DB290 movs r0, 0xA ldrsh r1, [r4, r0] cmp r1, 0 - bne @081DB2C2 + bne _081DB2C2 movs r2, 0x8E lsls r2, 1 movs r0, 0x83 @@ -887582,10 +887582,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 @@ -887602,10 +887602,10 @@ sub_81DB290: ; 81DB290 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 @@ -887625,7 +887625,7 @@ sub_81DB290: ; 81DB290 ldrh r0, [r4, 0x8] adds r0, 0x1 strh r0, [r4, 0x8] -@081DB316: +_081DB316: ldrh r0, [r4, 0xA] adds r0, 0x1 strh r0, [r4, 0xA] @@ -887645,7 +887645,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 @@ -887653,7 +887653,7 @@ sub_81DB328: ; 81DB328 lsls r0, 24 lsrs r0, 24 bl remove_task -@081DB34C: +_081DB34C: movs r0, 0 pop {r1} bx r1 @@ -887704,12 +887704,12 @@ GetStringWidthDifference: ; 81DB384 asrs r2, 16 bl GetStringWidth 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 @@ -887720,23 +887720,23 @@ 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 GetStringWidth 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} @@ -887755,8 +887755,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 @@ -887766,13 +887766,13 @@ sub_81DB3D8: ; 81DB3D8 movs r2, 0 bl GetStringWidth 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} @@ -887791,9 +887791,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 @@ -887801,28 +887801,28 @@ sub_81DB41C: ; 81DB41C movs r2, 0 bl GetStringWidth 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 @@ -887855,7 +887855,7 @@ sub_81DB494: ; 81DB494 adds r5, r2, 0 adds r7, r3, 0 cmp r5, 0 - beq @081DB4B6 + beq _081DB4B6 adds r1, r5, 0 bl CopyString adds r4, r0, 0 @@ -887864,14 +887864,14 @@ sub_81DB494: ; 81DB494 adds r1, r5, 0 movs r2, 0 bl GetStringWidth - 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 @@ -887882,7 +887882,7 @@ sub_81DB494: ; 81DB494 adds r4, 0x1 movs r0, 0xFF strb r0, [r4] -@081DB4D4: +_081DB4D4: adds r0, r4, 0 pop {r4-r7} pop {r1} @@ -887901,12 +887901,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] @@ -887914,18 +887914,18 @@ sub_81DB4DC: ; 81DB4DC 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] @@ -887942,15 +887942,15 @@ sub_81DB52C: ; 81DB52C lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi @081DB546 + bhi _081DB546 adds r0, r4, 0 movs r1, 0x1 bl StopMusicWhileStringIsPrinted - b @081DB54C -@081DB546: + b _081DB54C +_081DB546: adds r0, r4, 0 bl StripExtendedControlCodes -@081DB54C: +_081DB54C: pop {r4} pop {r0} bx r0 @@ -887966,41 +887966,41 @@ sub_81DB554: ; 81DB554 lsls r0, 16 lsrs r0, 16 cmp r0, 0x5 - bhi @081DB572 + bhi _081DB572 adds r0, r4, 0 movs r1, 0x1 bl StopMusicWhileStringIsPrinted - b @081DB5A4 -@081DB572: + b _081DB5A4 +_081DB572: cmp r5, 0xFC - bne @081DB57E + bne _081DB57E adds r0, r4, 0 bl StripExtendedControlCodes - 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 @@ -888013,25 +888013,25 @@ sub_81DB5AC: ; 81DB5AC 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 @@ -888039,7 +888039,7 @@ sub_81DB5AC: ; 81DB5AC strb r0, [r2] movs r0, 0xFF strb r0, [r2, 0x1] -@081DB5E4: +_081DB5E4: pop {r0} bx r0 thumb_func_end sub_81DB5AC @@ -888066,15 +888066,15 @@ sub_81DB604: ; 81DB604 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 @@ -888098,16 +888098,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 @@ -888119,8 +888119,8 @@ sub_81DB620: ; 81DB620 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 6c0729f49..3edc8c458 100644 --- a/asm/gpu_bg.s +++ b/asm/gpu_bg.s @@ -47,11 +47,11 @@ ResetBgControlStructs: ; 8001334 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 .pool @@ -67,14 +67,14 @@ Unused_ResetBgControlStruct: ; 8001354 bl IsInvalidBg lsls r0, 24 cmp r0, 0 - bne @08001372 + bne _08001372 ldr r1, =0x030008e0 lsls r0, r4, 2 adds r0, r1 ldr r1, =gZeroedBgControlStruct ldr r1, [r1] str r1, [r0] -@08001372: +_08001372: pop {r4} pop {r0} bx r0 @@ -125,12 +125,12 @@ SetBgControlAttributes: ; 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 @@ -141,9 +141,9 @@ SetBgControlAttributes: ; 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 @@ -154,10 +154,10 @@ SetBgControlAttributes: ; 8001380 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 @@ -169,10 +169,10 @@ SetBgControlAttributes: ; 8001380 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 @@ -181,9 +181,9 @@ SetBgControlAttributes: ; 8001380 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 @@ -194,9 +194,9 @@ SetBgControlAttributes: ; 8001380 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 @@ -207,10 +207,10 @@ SetBgControlAttributes: ; 8001380 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 @@ -219,7 +219,7 @@ SetBgControlAttributes: ; 8001380 ands r0, r2 orrs r0, r3 strb r0, [r1] -@08001484: +_08001484: ldr r1, [sp] lsls r0, r1, 2 add r0, r8 @@ -230,7 +230,7 @@ SetBgControlAttributes: ; 8001380 movs r2, 0x1 orrs r1, r2 strb r1, [r0] -@08001498: +_08001498: add sp, 0x10 pop {r3-r5} mov r8, r3 @@ -254,7 +254,7 @@ GetBgControlAttribute: ; 80014AC bl IsInvalidBg lsls r0, 24 cmp r0, 0 - bne @08001558 + bne _08001558 ldr r1, =0x030008e0 lsls r2, r4, 2 adds r0, r2, r1 @@ -262,75 +262,75 @@ GetBgControlAttribute: ; 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 .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 @@ -356,32 +356,32 @@ LoadBgVram: ; 8001560 bl IsInvalidBg 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 .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 @@ -398,13 +398,13 @@ LoadBgVram: ; 8001560 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} @@ -422,14 +422,14 @@ ShowBgInternal: ; 80015E8 bl IsInvalidBg 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] @@ -468,7 +468,7 @@ ShowBgInternal: ; 80015E8 ldr r1, =0x00000f07 ands r0, r1 strh r0, [r5, 0x10] -@08001656: +_08001656: pop {r4,r5} pop {r0} bx r0 @@ -485,7 +485,7 @@ HideBgInternal: ; 8001664 bl IsInvalidBg lsls r0, 24 cmp r0, 0 - bne @0800168A + bne _0800168A ldr r2, =0x030008e0 adds r0, r4, 0 adds r0, 0x8 @@ -496,7 +496,7 @@ HideBgInternal: ; 8001664 ldr r1, =0x00000f07 ands r0, r1 strh r0, [r2, 0x10] -@0800168A: +_0800168A: pop {r4} pop {r0} bx r0 @@ -566,24 +566,24 @@ SetBgAffineInternal: ; 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 .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 @@ -625,7 +625,7 @@ SetBgAffineInternal: ; 80016D8 ldrh r1, [r4, 0xE] movs r0, 0x2E bl SetGpuReg -@08001796: +_08001796: add sp, 0x24 pop {r3} mov r8, r3 @@ -641,12 +641,12 @@ IsInvalidBg: ; 80017A4 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 IsInvalidBg @@ -668,11 +668,11 @@ ResetBgsAndClearDma3BusyFlags: ; 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} @@ -698,7 +698,7 @@ InitBgsFromTemplates: ; 80017E8 bl SetBgModeInternal bl ResetBgControlStructs cmp r4, 0 - beq @08001894 + beq _08001894 movs r7, 0 ldr r0, =0x030008f8 mov r9, r0 @@ -707,12 +707,12 @@ InitBgsFromTemplates: ; 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 @@ -761,15 +761,15 @@ InitBgsFromTemplates: ; 80017E8 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 @@ -791,7 +791,7 @@ InitBgFromTemplate: ; 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 @@ -839,7 +839,7 @@ InitBgFromTemplate: ; 80018B0 adds r4, 0xC adds r5, r4 str r6, [r5] -@08001920: +_08001920: add sp, 0x10 pop {r4-r7} pop {r0} @@ -878,7 +878,7 @@ LoadBgTiles: ; 8001944 bl GetBgControlAttribute lsls r0, 16 cmp r0, 0 - bne @08001980 + bne _08001980 ldr r1, =0x030008f8 lsls r0, r5, 4 adds r0, r1 @@ -887,9 +887,9 @@ LoadBgTiles: ; 8001944 lsrs r0, 22 adds r0, r4 lsls r0, 21 - b @08001990 + b _08001990 .pool -@08001980: +_08001980: ldr r1, =0x030008f8 lsls r0, r5, 4 adds r0, r1 @@ -898,7 +898,7 @@ LoadBgTiles: ; 8001944 lsrs r0, 22 adds r0, r4 lsls r0, 22 -@08001990: +_08001990: lsrs r4, r0, 16 movs r6, 0x1 str r6, [sp] @@ -911,11 +911,11 @@ LoadBgTiles: ; 8001944 lsrs r1, r2, 24 adds r7, r1, 0 cmp r1, 0xFF - bne @080019B8 + bne _080019B8 ldr r0, =0x0000ffff - b @080019E6 + b _080019E6 .pool -@080019B8: +_080019B8: ldr r0, =0x03000938 lsrs r2, 29 lsls r2, 2 @@ -930,16 +930,16 @@ LoadBgTiles: ; 8001944 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 DummiedOutFireRedLeafGreenTileAllocFunc -@080019E4: +_080019E4: adds r0, r7, 0 -@080019E6: +_080019E6: add sp, 0x4 pop {r3} mov r8, r3 @@ -966,7 +966,7 @@ LoadBgTilemap: ; 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 @@ -979,11 +979,11 @@ LoadBgTilemap: ; 80019FC orrs r0, r1 str r0, [r2] adds r0, r3, 0 - b @08001A3E + b _08001A3E .pool -@08001A3C: +_08001A3C: ldr r0, =0x0000ffff -@08001A3E: +_08001A3E: add sp, 0x4 pop {r4} pop {r1} @@ -1005,7 +1005,7 @@ Unused_LoadBgPalette: ; 8001A4C adds r0, r4, 0 bl IsInvalidBg_ cmp r0, 0 - bne @08001A98 + bne _08001A98 ldr r1, =0x030008f8 lsls r0, r4, 4 adds r0, r1 @@ -1029,18 +1029,18 @@ Unused_LoadBgPalette: ; 8001A4C movs r0, 0x1 negs r0, r0 cmp r1, r0 - bne @08001AA4 -@08001A98: + bne _08001AA4 +_08001A98: ldr r0, =0x0000ffff - b @08001AC8 + b _08001AC8 .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 @@ -1054,7 +1054,7 @@ Unused_LoadBgPalette: ; 8001A4C orrs r0, r1 str r0, [r2] lsrs r0, r3, 24 -@08001AC8: +_08001AC8: pop {r4-r7} pop {r1} bx r1 @@ -1068,12 +1068,12 @@ IsDma3ManagerBusyWithBgCopy: ; 8001AD4 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 @@ -1088,27 +1088,27 @@ IsDma3ManagerBusyWithBgCopy: ; 8001AD4 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 .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 @@ -1151,23 +1151,23 @@ SetBgAttribute: ; 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 .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] @@ -1175,8 +1175,8 @@ SetBgAttribute: ; 8001B58 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] @@ -1185,8 +1185,8 @@ SetBgAttribute: ; 8001B58 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] @@ -1196,35 +1196,35 @@ SetBgAttribute: ; 8001B58 movs r1, 0xFF movs r2, 0xFF bl SetBgControlAttributes - 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 SetBgControlAttributes - b @08001C12 -@08001BFC: + b _08001C12 +_08001BFC: movs r0, 0xFF str r0, [sp] str r0, [sp, 0x4] @@ -1235,7 +1235,7 @@ SetBgAttribute: ; 8001B58 movs r2, 0xFF movs r3, 0xFF bl SetBgControlAttributes -@08001C12: +_08001C12: add sp, 0x10 pop {r4} pop {r0} @@ -1252,102 +1252,102 @@ GetBgAttribute: ; 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 .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 GetBgControlAttribute - b @08001CDE -@08001C6E: + b _08001CDE +_08001C6E: adds r0, r4, 0 movs r1, 0x3 bl GetBgControlAttribute - b @08001CDE -@08001C78: + b _08001CDE +_08001C78: adds r0, r4, 0 movs r1, 0x4 bl GetBgControlAttribute - b @08001CDE -@08001C82: + b _08001CDE +_08001C82: adds r0, r4, 0 movs r1, 0x5 bl GetBgControlAttribute - b @08001CDE -@08001C8C: + b _08001CDE +_08001C8C: adds r0, r4, 0 movs r1, 0x6 bl GetBgControlAttribute - b @08001CDE -@08001C96: + b _08001CDE +_08001C96: adds r0, r4, 0 movs r1, 0x7 bl GetBgControlAttribute - b @08001CDE -@08001CA0: + b _08001CDE +_08001CA0: adds r0, r4, 0 movs r1, 0x8 bl GetBgControlAttribute - b @08001CDE -@08001CAA: + b _08001CDE +_08001CAA: adds r0, r4, 0 bl GetBgType 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 GetBgMetricTextMode lsls r0, 27 lsrs r0, 16 - b @08001CFA -@08001CCA: + b _08001CFA +_08001CCA: adds r0, r4, 0 movs r1, 0 bl GetBgMetricAffineMode lsls r0, 24 lsrs r0, 16 - b @08001CFA -@08001CD8: + b _08001CFA +_08001CD8: adds r0, r4, 0 bl GetBgType -@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 .pool -@08001CF8: +_08001CF8: ldr r0, =0x0000ffff -@08001CFA: +_08001CFA: pop {r4} pop {r1} bx r1 @@ -1366,100 +1366,100 @@ ChangeBgX: ; 8001D04 adds r0, r4, 0 bl IsInvalidBg_ cmp r0, 0 - bne @08001D28 + bne _08001D28 adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 .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 .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 GetBgMode 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 .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 SetGpuReg - b @08001E2C + b _08001E2C .pool -@08001DAC: +_08001DAC: ldr r0, =0x030008f8 ldr r0, [r0, 0x18] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x14 bl SetGpuReg - b @08001E2C + b _08001E2C .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 SetGpuReg - b @08001E2C + b _08001E2C .pool -@08001DD8: +_08001DD8: ldr r0, =0x030008f8 ldr r0, [r0, 0x28] lsrs r1, r0, 16 @@ -1470,22 +1470,22 @@ ChangeBgX: ; 8001D04 movs r0, 0x28 adds r1, r4, 0 bl SetGpuReg - b @08001E2C + b _08001E2C .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 SetGpuReg - b @08001E2C + b _08001E2C .pool -@08001E10: +_08001E10: cmp r0, 0x2 - bne @08001E2C + bne _08001E2C ldr r0, =0x030008f8 ldr r0, [r0, 0x38] lsrs r1, r0, 16 @@ -1496,12 +1496,12 @@ ChangeBgX: ; 8001D04 movs r0, 0x38 adds r1, r4, 0 bl SetGpuReg -@08001E2C: +_08001E2C: ldr r0, =0x030008f8 adds r0, 0x8 adds r0, r5, r0 ldr r0, [r0] -@08001E34: +_08001E34: pop {r4-r6} pop {r1} bx r1 @@ -1517,24 +1517,24 @@ GetBgX: ; 8001E40 adds r4, r0, 0 bl IsInvalidBg_ cmp r0, 0 - bne @08001E70 + bne _08001E70 adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 .pool -@08001E70: +_08001E70: movs r0, 0x1 negs r0, r0 -@08001E74: +_08001E74: pop {r4} pop {r1} bx r1 @@ -1552,100 +1552,100 @@ ChangeBgY: ; 8001E7C adds r0, r4, 0 bl IsInvalidBg_ cmp r0, 0 - bne @08001EA0 + bne _08001EA0 adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 .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 .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 GetBgMode 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 .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 SetGpuReg - b @08001FA4 + b _08001FA4 .pool -@08001F24: +_08001F24: ldr r0, =0x030008f8 ldr r0, [r0, 0x1C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x16 bl SetGpuReg - b @08001FA4 + b _08001FA4 .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 SetGpuReg - b @08001FA4 + b _08001FA4 .pool -@08001F50: +_08001F50: ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsrs r1, r0, 16 @@ -1656,22 +1656,22 @@ ChangeBgY: ; 8001E7C movs r0, 0x2C adds r1, r4, 0 bl SetGpuReg - b @08001FA4 + b _08001FA4 .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 SetGpuReg - b @08001FA4 + b _08001FA4 .pool -@08001F88: +_08001F88: cmp r0, 0x2 - bne @08001FA4 + bne _08001FA4 ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsrs r1, r0, 16 @@ -1682,12 +1682,12 @@ ChangeBgY: ; 8001E7C movs r0, 0x3C adds r1, r4, 0 bl SetGpuReg -@08001FA4: +_08001FA4: ldr r0, =0x030008f8 adds r0, 0xC adds r0, r5, r0 ldr r0, [r0] -@08001FAC: +_08001FAC: pop {r4-r6} pop {r1} bx r1 @@ -1706,100 +1706,100 @@ ChangeBgY_ScreenOff: ; 8001FB8 adds r0, r4, 0 bl IsInvalidBg_ cmp r0, 0 - bne @08001FDC + bne _08001FDC adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 .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 .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 GetBgMode 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 .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 SetGpuReg_ScreenOff - b @080020E0 + b _080020E0 .pool -@08002060: +_08002060: ldr r0, =0x030008f8 ldr r0, [r0, 0x1C] lsls r0, 8 lsrs r1, r0, 16 movs r0, 0x16 bl SetGpuReg_ScreenOff - b @080020E0 + b _080020E0 .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 SetGpuReg_ScreenOff - b @080020E0 + b _080020E0 .pool -@0800208C: +_0800208C: ldr r0, =0x030008f8 ldr r0, [r0, 0x2C] lsrs r1, r0, 16 @@ -1810,22 +1810,22 @@ ChangeBgY_ScreenOff: ; 8001FB8 movs r0, 0x2C adds r1, r4, 0 bl SetGpuReg_ScreenOff - b @080020E0 + b _080020E0 .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 SetGpuReg_ScreenOff - b @080020E0 + b _080020E0 .pool -@080020C4: +_080020C4: cmp r0, 0x2 - bne @080020E0 + bne _080020E0 ldr r0, =0x030008f8 ldr r0, [r0, 0x3C] lsrs r1, r0, 16 @@ -1836,12 +1836,12 @@ ChangeBgY_ScreenOff: ; 8001FB8 movs r0, 0x3C adds r1, r4, 0 bl SetGpuReg_ScreenOff -@080020E0: +_080020E0: ldr r0, =0x030008f8 adds r0, 0xC adds r0, r5, r0 ldr r0, [r0] -@080020E8: +_080020E8: pop {r4-r6} pop {r1} bx r1 @@ -1857,24 +1857,24 @@ GetBgY: ; 80020F4 adds r4, r0, 0 bl IsInvalidBg_ cmp r0, 0 - bne @08002124 + bne _08002124 adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 .pool -@08002124: +_08002124: movs r0, 0x1 negs r0, r0 -@08002128: +_08002128: pop {r4} pop {r1} bx r1 @@ -1937,85 +1937,85 @@ Unused_AdjustBgMosaic: ; 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 .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 @@ -2048,19 +2048,19 @@ SetBgTilemap: ; 8002250 adds r0, r4, 0 bl IsInvalidBg_ cmp r0, 0 - bne @0800227A + bne _0800227A adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 @@ -2077,19 +2077,19 @@ UnsetBgTilemap: ; 8002284 bl IsInvalidBg_ adds r5, r0, 0 cmp r5, 0 - bne @080022AE + bne _080022AE adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 @@ -2105,23 +2105,23 @@ GetBgTilemap: ; 80022B8 adds r4, r0, 0 bl IsInvalidBg_ cmp r0, 0 - bne @080022E8 + bne _080022E8 adds r0, r4, 0 movs r1, 0x1 bl GetBgControlAttribute 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 .pool -@080022E8: +_080022E8: movs r0, 0 -@080022EA: +_080022EA: pop {r4} pop {r1} bx r1 @@ -2147,13 +2147,13 @@ CopyToBgTilemapBuffer: ; 80022F0 adds r0, r4, 0 bl IsInvalidBg_ 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 @@ -2164,9 +2164,9 @@ CopyToBgTilemapBuffer: ; 80022F0 lsrs r2, r7, 17 mov r0, r10 bl CpuSet - b @08002358 + b _08002358 .pool -@08002340: +_08002340: ldr r0, =0x030008f8 mov r2, r9 lsls r1, r2, 4 @@ -2178,7 +2178,7 @@ CopyToBgTilemapBuffer: ; 80022F0 adds r1, r0 mov r0, r10 bl LZ77UnCompWram -@08002358: +_08002358: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -2199,33 +2199,33 @@ CopyBgTilemapBufferToVram: ; 800236C adds r0, r4, 0 bl IsInvalidBg_ 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 GetBgType 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 GetBgMetricTextMode lsls r0, 27 - b @080023B0 -@080023A6: + b _080023B0 +_080023A6: adds r0, r4, 0 movs r1, 0 bl GetBgMetricAffineMode lsls r0, 24 -@080023B0: +_080023B0: lsrs r2, r0, 16 -@080023B2: +_080023B2: ldr r0, =0x030008f8 lsls r1, r4, 4 adds r0, 0x4 @@ -2236,7 +2236,7 @@ CopyBgTilemapBufferToVram: ; 800236C adds r0, r4, 0 movs r3, 0 bl LoadBgVram -@080023C8: +_080023C8: add sp, 0x4 pop {r4} pop {r0} @@ -2271,41 +2271,41 @@ CopyToBgTilemapBufferRect: ; 80023D4 adds r0, r5, 0 bl IsInvalidBg_ 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 GetBgType 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 @@ -2316,15 +2316,15 @@ CopyToBgTilemapBufferRect: ; 80023D4 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 .pool -@08002470: +_08002470: mov r4, r8 adds r0, r5, 0 movs r1, 0x1 @@ -2335,24 +2335,24 @@ CopyToBgTilemapBufferRect: ; 80023D4 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 @@ -2363,13 +2363,13 @@ CopyToBgTilemapBufferRect: ; 80023D4 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 @@ -2478,15 +2478,15 @@ CopyRectToBgTilemapBufferRect: ; 800251C ldr r0, [sp, 0x4] bl IsInvalidBg_ 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 GetBgControlAttribute @@ -2508,11 +2508,11 @@ CopyRectToBgTilemapBufferRect: ; 800251C ldr r0, [sp, 0x4] bl GetBgType 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 @@ -2523,21 +2523,21 @@ CopyRectToBgTilemapBufferRect: ; 800251C 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 @@ -2550,7 +2550,7 @@ CopyRectToBgTilemapBufferRect: ; 800251C lsls r0, r1, 16 asrs r0, 16 mov r8, r0 -@0800261E: +_0800261E: ldr r2, [sp, 0x2C] str r2, [sp] adds r0, r4, 0 @@ -2578,8 +2578,8 @@ CopyRectToBgTilemapBufferRect: ; 800251C 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 @@ -2588,10 +2588,10 @@ CopyRectToBgTilemapBufferRect: ; 800251C lsrs r5, r0, 16 ldr r0, [sp, 0x38] cmp r5, r0 - blt @080025F8 - b @080026EE + blt _080025F8 + b _080026EE .pool -@08002674: +_08002674: ldr r1, [sp, 0x10] adds r0, r1, 0 muls r0, r7 @@ -2607,7 +2607,7 @@ CopyRectToBgTilemapBufferRect: ; 800251C 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] @@ -2617,21 +2617,21 @@ CopyRectToBgTilemapBufferRect: ; 800251C 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 @@ -2645,8 +2645,8 @@ CopyRectToBgTilemapBufferRect: ; 800251C 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] @@ -2654,8 +2654,8 @@ CopyRectToBgTilemapBufferRect: ; 800251C 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 @@ -2696,40 +2696,40 @@ FillBgTilemapBufferRect_Palette0: ; 8002704 adds r0, r6, 0 bl IsInvalidBg_ 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 GetBgType 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 @@ -2739,15 +2739,15 @@ FillBgTilemapBufferRect_Palette0: ; 8002704 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 .pool -@080027A0: +_080027A0: adds r0, r6, 0 movs r1, 0x1 bl GetBgMetricAffineMode @@ -2757,24 +2757,24 @@ FillBgTilemapBufferRect_Palette0: ; 8002704 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 @@ -2784,13 +2784,13 @@ FillBgTilemapBufferRect_Palette0: ; 8002704 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 @@ -2875,15 +2875,15 @@ WriteSequenceToBgTilemapBuffer: ; 8002840 mov r0, r9 bl IsInvalidBg_ 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 GetBgControlAttribute @@ -2905,30 +2905,30 @@ WriteSequenceToBgTilemapBuffer: ; 8002840 mov r0, r9 bl GetBgType 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 @@ -2965,17 +2965,17 @@ WriteSequenceToBgTilemapBuffer: ; 8002840 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 .pool -@0800295C: +_0800295C: mov r0, r9 movs r1, 0x1 bl GetBgMetricAffineMode @@ -2985,19 +2985,19 @@ WriteSequenceToBgTilemapBuffer: ; 8002840 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] @@ -3011,7 +3011,7 @@ WriteSequenceToBgTilemapBuffer: ; 8002840 ldr r7, =0x000003ff adds r5, r7, 0 adds r6, r0, 0 -@080029A2: +_080029A2: ldr r0, [sp, 0x28] ldr r1, [r0] adds r0, r3, r4 @@ -3030,15 +3030,15 @@ WriteSequenceToBgTilemapBuffer: ; 8002840 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 @@ -3064,57 +3064,57 @@ GetBgMetricTextMode: ; 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 @@ -3134,43 +3134,43 @@ GetBgMetricAffineMode: ; 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 @@ -3187,22 +3187,22 @@ GetTileMapIndexFromCoords: ; 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} @@ -3218,11 +3218,11 @@ CopyTileMapEntry: ; 8002AEC 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 @@ -3230,9 +3230,9 @@ CopyTileMapEntry: ; 8002AEC ands r0, r1 adds r1, r2, r5 lsls r1, 12 - b @08002B3A + b _08002B3A .pool -@08002B14: +_08002B14: ldrh r1, [r6] movs r0, 0xFC lsls r0, 8 @@ -3245,15 +3245,15 @@ CopyTileMapEntry: ; 8002AEC adds r1, r3, 0 ands r0, r1 orrs r0, r2 - b @08002B3C + b _08002B3C .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] @@ -3273,40 +3273,40 @@ GetBgType: ; 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 @@ -3320,12 +3320,12 @@ IsInvalidBg_: ; 8002B9C 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 IsInvalidBg_ @@ -3342,15 +3342,15 @@ 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 .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 26140cfeb..5c5707dfd 100644 --- a/asm/gpu_obj.s +++ b/asm/gpu_obj.s @@ -33,7 +33,7 @@ CallObjectCallbacks: ; 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 @@ CallObjectCallbacks: ; 80069C0 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 @@ CallObjectCallbacks: ; 80069C0 adds r0, r7, 0 ands r0, r1 cmp r0, 0 - beq @080069F6 + beq _080069F6 adds r0, r4, 0 bl AnimateObject -@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 @@ -110,7 +110,7 @@ UpdateObjectOamCoords: ; 8006A58 ldr r0, =0x000001ff adds r5, r0, 0 ldr r6, =0xfffffe00 -@08006A64: +_08006A64: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -121,11 +121,11 @@ UpdateObjectOamCoords: ; 8006A58 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 @@ -157,9 +157,9 @@ UpdateObjectOamCoords: ; 8006A58 adds r0, r1 ldrb r2, [r2] adds r0, r2 - b @08006B08 + b _08006B08 .pool -@08006AD8: +_08006AD8: movs r2, 0x20 ldrsh r1, [r3, r2] movs r2, 0x24 @@ -184,14 +184,14 @@ UpdateObjectOamCoords: ; 8006A58 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 @@ -204,7 +204,7 @@ BuildObjectPriorityList: ; 8006B1C movs r2, 0 ldr r4, =0x02020630 ldr r3, =0x02021774 -@08006B24: +_08006B24: lsls r0, r2, 4 adds r0, r2 lsls r0, 2 @@ -224,7 +224,7 @@ BuildObjectPriorityList: ; 8006B1C lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0x3F - bls @08006B24 + bls _08006B24 pop {r4} pop {r0} bx r0 @@ -248,7 +248,7 @@ SortObjectsByPriority: ; 8006B5C mov r9, r3 ldr r6, =0xc0000300 mov r8, r6 -@08006B78: +_08006B78: mov r5, r12 mov r0, r12 subs r0, 0x1 @@ -278,71 +278,71 @@ SortObjectsByPriority: ; 8006B5C 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 .pool -@08006C38: +_08006C38: mov r1, r10 adds r3, r5, r1 ldrb r4, [r3] @@ -380,80 +380,80 @@ SortObjectsByPriority: ; 8006B5C 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 @@ -472,7 +472,7 @@ CopyTransformationMatricesToSprites: ; 8006D1C movs r4, 0 ldr r5, =0x030022c0 ldr r6, =0x02021bc0 -@08006D24: +_08006D24: lsls r2, r4, 2 lsls r1, r4, 5 adds r1, r5 @@ -499,7 +499,7 @@ CopyTransformationMatricesToSprites: ; 8006D1C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x1F - bls @08006D24 + bls _08006D24 pop {r4-r6} pop {r0} bx r0 @@ -514,7 +514,7 @@ PopulateSprites: ; 8006D68 movs r4, 0 mov r0, sp strb r4, [r0] -@08006D72: +_08006D72: ldr r0, =0x020217f4 adds r0, r4, r0 ldrb r1, [r0] @@ -529,31 +529,31 @@ PopulateSprites: ; 8006D68 movs r0, 0x5 ands r0, r1 cmp r0, 0x1 - bne @08006D9E + bne _08006D9E adds r0, r2, 0 mov r1, sp bl AddSprite 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, =gDefaultOamAttributes ldr r2, [r0] ldr r3, [r0, 0x4] -@08006DBE: +_08006DBE: ldrb r0, [r1] lsls r0, 3 adds r0, r5 @@ -566,8 +566,8 @@ PopulateSprites: ; 8006D68 lsrs r0, 24 ldrb r6, [r4] cmp r0, r6 - bcc @08006DBE -@08006DD8: + bcc _08006DBE +_08006DD8: add sp, 0x4 pop {r4-r6} pop {r0} @@ -588,7 +588,7 @@ AddObjectToFront: ; 8006DF4 mov r12, r0 lsls r5, r1, 16 lsls r6, r2, 16 -@08006E08: +_08006E08: lsls r0, r3, 4 adds r0, r3 lsls r0, 2 @@ -597,7 +597,7 @@ AddObjectToFront: ; 8006DF4 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne @08006E34 + bne _08006E34 str r4, [sp] adds r0, r3, 0 adds r1, r7, 0 @@ -606,16 +606,16 @@ AddObjectToFront: ; 8006DF4 bl AddObject lsls r0, 24 lsrs r0, 24 - b @08006E40 + b _08006E40 .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} @@ -640,7 +640,7 @@ AddObjectToBack: ; 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 @@ -651,7 +651,7 @@ AddObjectToBack: ; 8006E48 ldrb r0, [r0] lsls r0, 31 cmp r0, 0 - bne @08006E98 + bne _08006E98 lsls r0, r3, 24 lsrs r0, 24 str r6, [sp] @@ -661,17 +661,17 @@ AddObjectToBack: ; 8006E48 bl AddObject lsls r0, 24 lsrs r0, 24 - b @08006EA6 + b _08006EA6 .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 @@ -693,7 +693,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 @@ -708,11 +708,11 @@ obj_add_empty_with_callback: ; 8006EB4 adds r1, r4 str r6, [r1] adds r0, r5, 0 - b @08006EF6 + b _08006EF6 .pool -@08006EF4: +_08006EF4: movs r0, 0x40 -@08006EF6: +_08006EF6: pop {r4-r6} pop {r1} bx r1 @@ -796,7 +796,7 @@ AddObject: ; 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] @@ -810,13 +810,13 @@ AddObject: ; 8006EFC asrs r0, 16 asrs r1, r4, 16 cmp r0, r1 - bne @08006FC8 + bne _08006FC8 adds r0, r7, 0 bl RemoveObject movs r0, 0x40 - b @08007040 + b _08007040 .pool -@08006FC8: +_08006FC8: ldr r1, =0x000003ff adds r0, r1, 0 ands r2, r0 @@ -836,9 +836,9 @@ AddObject: ; 8006EFC adds r1, 0x40 movs r0, 0 strh r0, [r1] - b @0800700C + b _0800700C .pool -@08006FF8: +_08006FF8: mov r1, r8 ldrh r0, [r1] bl GetObjectTileRangeStartByTag @@ -847,22 +847,22 @@ AddObject: ; 8006EFC 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 IndexOfObjectPaletteTag @@ -872,9 +872,9 @@ AddObject: ; 8006EFC 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 @@ -904,7 +904,7 @@ AddObjectAndAnimateForOneFrame: ; 8007054 mov r12, r1 lsls r2, 16 mov r8, r2 -@08007074: +_08007074: lsls r0, r3, 4 adds r0, r3 lsls r6, r0, 2 @@ -914,7 +914,7 @@ AddObjectAndAnimateForOneFrame: ; 8007054 ldrb r0, [r7] lsls r0, 31 cmp r0, 0 - bne @080070CC + bne _080070CC mov r0, r9 str r0, [sp] adds r0, r3, 0 @@ -928,7 +928,7 @@ AddObjectAndAnimateForOneFrame: ; 8007054 lsrs r0, 24 adds r5, r0, 0 cmp r5, 0x40 - beq @080070D6 + beq _080070D6 ldr r1, =0x0202064c adds r0, r6, r1 ldr r1, [r0] @@ -937,22 +937,22 @@ AddObjectAndAnimateForOneFrame: ; 8007054 ldrb r0, [r7] lsls r0, 31 cmp r0, 0 - beq @080070C0 + beq _080070C0 adds r0, r4, 0 bl AnimateObject -@080070C0: +_080070C0: adds r0, r5, 0 - b @080070D8 + b _080070D8 .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 @@ -973,14 +973,14 @@ RemoveObjectAndFreeTiles: ; 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 @@ -990,12 +990,12 @@ RemoveObjectAndFreeTiles: ; 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 @@ -1009,11 +1009,11 @@ RemoveObjectAndFreeTiles: ; 80070E8 lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bcc @08007122 -@0800713E: + bcc _08007122 +_0800713E: adds r0, r5, 0 bl RemoveObject -@08007144: +_08007144: pop {r4-r7} pop {r0} bx r0 @@ -1029,10 +1029,10 @@ ResetSpriteRange: ; 8007150 lsrs r4, r1, 24 lsrs r3, r0, 24 cmp r3, r4 - bcs @08007178 + bcs _08007178 ldr r6, =0x030022f8 ldr r5, =gDefaultOamAttributes -@08007162: +_08007162: lsls r0, r3, 3 adds r0, r6 ldr r1, [r5] @@ -1043,8 +1043,8 @@ ResetSpriteRange: ; 8007150 lsls r0, 24 lsrs r3, r0, 24 cmp r3, r4 - bcc @08007162 -@08007178: + bcc _08007162 +_08007178: pop {r4-r6} pop {r0} bx r0 @@ -1062,14 +1062,14 @@ LoadOamFromSprites: ; 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 .pool @@ -1088,7 +1088,7 @@ ClearObjectCopyRequests: ; 80071B8 ldr r4, =0x02021838 movs r3, 0 adds r5, r4, 0x4 -@080071CC: +_080071CC: lsls r0, r2, 1 adds r0, r2 lsls r0, 2 @@ -1101,7 +1101,7 @@ ClearObjectCopyRequests: ; 80071B8 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls @080071CC + bls _080071CC pop {r4,r5} pop {r0} bx r0 @@ -1117,7 +1117,7 @@ ResetSpriteTransformationMatrices: ; 80071F8 movs r3, 0 movs r2, 0x80 lsls r2, 1 -@08007204: +_08007204: lsls r0, r1, 3 adds r0, r4 strh r2, [r0] @@ -1128,7 +1128,7 @@ ResetSpriteTransformationMatrices: ; 80071F8 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x1F - bls @08007204 + bls _08007204 pop {r4} pop {r0} bx r0 @@ -1187,12 +1187,12 @@ CalcVecFromObjectCenterToObjectUpperLeft: ; 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] @@ -1214,17 +1214,17 @@ AllocObjectTiles: ; 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 @@ -1238,23 +1238,23 @@ AllocObjectTiles: ; 800729C lsls r0, 16 lsrs r3, r0, 16 cmp r3, r4 - bls @080072BE -@080072DA: + bls _080072BE +_080072DA: movs r0, 0 - b @080073A4 + b _080073A4 .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] @@ -1263,16 +1263,16 @@ AllocObjectTiles: ; 800729C 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] @@ -1281,22 +1281,22 @@ AllocObjectTiles: ; 800729C 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] @@ -1305,16 +1305,16 @@ AllocObjectTiles: ; 800729C 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 @@ -1322,13 +1322,13 @@ AllocObjectTiles: ; 800729C 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 @@ -1342,10 +1342,10 @@ AllocObjectTiles: ; 800729C 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 @@ -1372,7 +1372,7 @@ Unused_ObjectTileAllocationBitArrayOp: ; 80073B8 adds r4, r2, 0 movs r5, 0 cmp r1, 0 - bne @080073F0 + bne _080073F0 movs r0, 0x1 lsls r0, r2 mvns r0, r0 @@ -1383,11 +1383,11 @@ Unused_ObjectTileAllocationBitArrayOp: ; 80073B8 ldrb r1, [r0] ands r2, r1 strb r2, [r0] - b @0800741C + b _0800741C .pool -@080073F0: +_080073F0: cmp r1, 0x1 - bne @0800740C + bne _0800740C lsls r1, r2 lsls r0, r1, 24 lsrs r2, r0, 24 @@ -1396,9 +1396,9 @@ Unused_ObjectTileAllocationBitArrayOp: ; 80073B8 ldrb r1, [r0] orrs r2, r1 strb r2, [r0] - b @0800741C + b _0800741C .pool -@0800740C: +_0800740C: movs r0, 0x80 lsls r0, 17 lsls r0, r4 @@ -1407,7 +1407,7 @@ Unused_ObjectTileAllocationBitArrayOp: ; 80073B8 adds r0, r6, r0 ldrb r0, [r0] ands r5, r0 -@0800741C: +_0800741C: adds r0, r5, 0 pop {r4-r6} pop {r1} @@ -1428,16 +1428,16 @@ ProcessObjectCopyRequests: ; 800742C 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 @@ -1456,12 +1456,12 @@ ProcessObjectCopyRequests: ; 800742C 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 @@ -1480,7 +1480,7 @@ AddPicToObjectCopyRequests: ; 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 @@ -1511,7 +1511,7 @@ AddPicToObjectCopyRequests: ; 8007488 ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] -@080074D8: +_080074D8: pop {r4-r6} pop {r0} bx r0 @@ -1529,7 +1529,7 @@ AddTilesToObjectCopyRequests: ; 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 @@ -1553,7 +1553,7 @@ AddTilesToObjectCopyRequests: ; 80074EC ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] -@0800752C: +_0800752C: pop {r4-r6} pop {r0} bx r0 @@ -1568,14 +1568,14 @@ Unused_CopyFromObjects: ; 800753C 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 @@ -1590,14 +1590,14 @@ Unused_CopyToObjects: ; 8007564 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 @@ -1609,7 +1609,7 @@ Unused_CopyToObjects: ; 8007564 RemoveAllObjects: ; 800758C push {r4,r5,lr} movs r4, 0 -@08007590: +_08007590: lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1623,7 +1623,7 @@ RemoveAllObjects: ; 800758C lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x3F - bls @08007590 + bls _08007590 lsls r0, r4, 4 adds r0, r4 lsls r0, 2 @@ -1643,10 +1643,10 @@ FreeObjectTiles: ; 80075C8 ldrh r1, [r2] ldr r0, =0x0000ffff cmp r1, r0 - beq @080075DA + beq _080075DA adds r0, r1, 0 bl FreeObjectTilesByTag -@080075DA: +_080075DA: pop {r0} bx r0 .pool @@ -1674,7 +1674,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 @@ -1684,7 +1684,7 @@ obj_free_rotscale_entry: ; 80075F4 negs r0, r0 ands r0, r1 strb r0, [r4, 0x1] -@0800761A: +_0800761A: pop {r4} pop {r0} bx r0 @@ -1725,7 +1725,7 @@ AnimateObject: ; 8007640 ldr r0, =0x02021cc0 ldrb r0, [r0] cmp r0, 0 - bne @08007676 + bne _08007676 ldr r0, =gUnknown_082EC6CC ldrb r1, [r5] lsls r1, 28 @@ -1735,7 +1735,7 @@ AnimateObject: ; 8007640 ldr r1, [r1] adds r0, r4, 0 bl _call_via_r1 -@08007676: +_08007676: pop {r4,r5} pop {r0} bx r0 @@ -1782,7 +1782,7 @@ BeginObjectImageAnim: ; 8007688 movs r0, 0x1 negs r0, r0 cmp r1, r0 - beq @0800776C + beq _0800776C ldrb r1, [r5] subs r0, 0x4 ands r0, r1 @@ -1803,11 +1803,11 @@ BeginObjectImageAnim: ; 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 @@ -1823,17 +1823,17 @@ BeginObjectImageAnim: ; 8007688 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] @@ -1846,9 +1846,9 @@ BeginObjectImageAnim: ; 8007688 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - b @0800776C + b _0800776C .pool -@0800775C: +_0800775C: mov r1, r8 lsrs r0, r1, 16 ldrh r1, [r4, 0x4] @@ -1856,7 +1856,7 @@ BeginObjectImageAnim: ; 8007688 lsrs r1, 22 ldr r2, [r4, 0xC] bl AddPicToObjectCopyRequests -@0800776C: +_0800776C: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -1875,7 +1875,7 @@ ContinueObjectImageAnim: ; 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 @@ -1901,16 +1901,16 @@ ContinueObjectImageAnim: ; 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] @@ -1930,11 +1930,11 @@ ContinueObjectImageAnim: ; 8007778 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, =gUnknown_082EC6D4 lsls r1, r2, 16 asrs r1, 14 @@ -1942,7 +1942,7 @@ ContinueObjectImageAnim: ; 8007778 ldr r1, [r1] adds r0, r4, 0 bl _call_via_r1 -@0800780E: +_0800780E: pop {r4} pop {r0} bx r0 @@ -1977,11 +1977,11 @@ ImageAnimCmd_frame: ; 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 @@ -1997,19 +1997,19 @@ ImageAnimCmd_frame: ; 8007818 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] @@ -2022,16 +2022,16 @@ ImageAnimCmd_frame: ; 8007818 ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - b @080078BA + b _080078BA .pool -@080078AC: +_080078AC: mov r0, r8 ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 22 ldr r2, [r4, 0xC] bl AddPicToObjectCopyRequests -@080078BA: +_080078BA: pop {r3} mov r8, r3 pop {r4-r7} @@ -2096,11 +2096,11 @@ ImageAnimCmd_jump: ; 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 @@ -2116,19 +2116,19 @@ ImageAnimCmd_jump: ; 80078DC 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] @@ -2141,16 +2141,16 @@ ImageAnimCmd_jump: ; 80078DC ands r0, r2 orrs r0, r1 strh r0, [r4, 0x4] - b @0800799A + b _0800799A .pool -@0800798C: +_0800798C: mov r0, r8 ldrh r1, [r4, 0x4] lsls r1, 22 lsrs r1, 22 ldr r2, [r4, 0xC] bl AddPicToObjectCopyRequests -@0800799A: +_0800799A: pop {r3} mov r8, r3 pop {r4-r7} @@ -2166,14 +2166,14 @@ ImageAnimCmd_loop: ; 80079A4 adds r0, 0x2D ldrb r0, [r0] cmp r0, 0 - beq @080079B8 + beq _080079B8 adds r0, r1, 0 bl ContinueImageAnimLoop - b @080079BE -@080079B8: + b _080079BE +_080079B8: adds r0, r1, 0 bl BeginImageAnimLoop -@080079BE: +_080079BE: pop {r0} bx r0 thumb_func_end ImageAnimCmd_loop @@ -2236,7 +2236,7 @@ JumpToTopOfImageAnimLoop: ; 8007A1C adds r0, 0x2D ldrb r0, [r0] cmp r0, 0 - beq @08007A88 + beq _08007A88 mov r3, r12 adds r3, 0x2B ldrb r0, [r3] @@ -2260,13 +2260,13 @@ JumpToTopOfImageAnimLoop: ; 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] @@ -2282,12 +2282,12 @@ JumpToTopOfImageAnimLoop: ; 8007A1C 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 @@ -2305,14 +2305,14 @@ BeginObjectRotScalAnim: ; 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 @@ -2349,14 +2349,14 @@ BeginObjectRotScalAnim: ; 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} @@ -2375,7 +2375,7 @@ ContinueObjectRotScalAnim: ; 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 @@ -2388,20 +2388,20 @@ ContinueObjectRotScalAnim: ; 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 .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] @@ -2418,12 +2418,12 @@ ContinueObjectRotScalAnim: ; 8007B24 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, =gUnknown_082EC6E4 lsls r1, r2, 16 asrs r1, 14 @@ -2432,21 +2432,21 @@ ContinueObjectRotScalAnim: ; 8007B24 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 @@ -2466,7 +2466,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 @@ -2474,7 +2474,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} @@ -2495,17 +2495,17 @@ RotScalAnimCmd_loop: ; 8007C0C adds r0, r1 ldrb r0, [r0, 0x3] cmp r0, 0 - beq @08007C34 + beq _08007C34 adds r0, r2, 0 adds r1, r3, 0 bl ContinueRotScalAnimLoop - b @08007C3C + b _08007C3C .pool -@08007C34: +_08007C34: adds r0, r2, 0 adds r1, r3, 0 bl BeginRotScalAnimLoop -@08007C3C: +_08007C3C: pop {r0} bx r0 thumb_func_end RotScalAnimCmd_loop @@ -2582,19 +2582,19 @@ JumpToTopOfRotScalAnimLoop: ; 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 .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 @@ -2612,15 +2612,15 @@ JumpToTopOfRotScalAnimLoop: ; 8007CAC 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 @@ -2758,11 +2758,11 @@ 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 @@ -2789,14 +2789,14 @@ sub_8007E28: ; 8007E28 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 @@ -2825,7 +2825,7 @@ obj_update_pos2: ; 8007E54 lsls r0, 4 mov r9, r0 cmp r6, r9 - beq @08007EA2 + beq _08007EA2 ldr r2, =gUnknown_082EC6F4 lsrs r1, 6 lsls r1, 3 @@ -2848,9 +2848,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, =gUnknown_082EC6F4 ldrb r1, [r5, 0x3] lsrs r1, 6 @@ -2875,7 +2875,7 @@ obj_update_pos2: ; 8007E54 mov r2, r8 bl sub_8007E28 strh r0, [r5, 0x26] -@08007EDA: +_08007EDA: pop {r3,r4} mov r8, r3 mov r9, r4 @@ -3043,7 +3043,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 @@ -3054,7 +3054,7 @@ 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 @@ -3071,7 +3071,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 @@ -3080,7 +3080,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} @@ -3243,21 +3243,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} @@ -3291,10 +3291,10 @@ StartObjectImageAnimIfDifferent: ; 80081C0 adds r0, 0x2A ldrb r0, [r0] cmp r0, r1 - beq @080081D6 + beq _080081D6 adds r0, r2, 0 bl StartObjectImageAnim -@080081D6: +_080081D6: pop {r0} bx r0 thumb_func_end StartObjectImageAnimIfDifferent @@ -3343,7 +3343,7 @@ SeekObjectImageAnim: ; 80081DC movs r0, 0x3F ands r0, r2 cmp r0, 0 - beq @08008244 + beq _08008244 lsls r0, r2, 26 lsrs r0, 26 adds r0, 0x1 @@ -3353,7 +3353,7 @@ SeekObjectImageAnim: ; 80081DC ands r1, r2 orrs r1, r0 strb r1, [r4] -@08008244: +_08008244: lsls r2, r6, 6 ldrb r1, [r4] adds r0, r5, 0 @@ -3407,11 +3407,11 @@ StartObjectRotScalAnimIfDifferent: ; 8008284 adds r1, r2 ldrb r0, [r1] cmp r0, r4 - beq @080082AC + beq _080082AC adds r0, r5, 0 adds r1, r4, 0 bl StartObjectRotScalAnim -@080082AC: +_080082AC: pop {r4,r5} pop {r0} bx r0 @@ -3463,11 +3463,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 @@ -3483,7 +3483,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] @@ -3500,9 +3500,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] @@ -3515,7 +3515,7 @@ sub_8008324: ; 8008324 ands r0, r2 orrs r0, r1 strh r0, [r3, 0x4] -@08008370: +_08008370: pop {r0} bx r0 .pool @@ -3533,14 +3533,14 @@ rotscale_reset_all: ; 800837C str r0, [r1] bl ResetSpriteTransformationMatrices 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 @@ -3556,26 +3556,26 @@ rotscale_alloc_entry: ; 80083B0 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 .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 @@ -3592,15 +3592,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] @@ -3626,7 +3626,7 @@ obj_alloc_rotscale_entry: ; 8008428 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] @@ -3653,7 +3653,7 @@ 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 @@ -3731,7 +3731,7 @@ LoadObjectPic: ; 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] @@ -3746,11 +3746,11 @@ LoadObjectPic: ; 80084F8 lsrs r2, 1 bl CpuSet adds r0, r4, 0 - b @08008536 + b _08008536 .pool -@08008534: +_08008534: movs r0, 0 -@08008536: +_08008536: pop {r4-r6} pop {r1} bx r1 @@ -3764,8 +3764,8 @@ LoadObjectPics: ; 800853C movs r4, 0 ldr r0, [r5] cmp r0, 0 - beq @08008560 -@08008548: + beq _08008560 +_08008548: lsls r0, r4, 3 adds r0, r5, r0 bl LoadObjectPic @@ -3776,8 +3776,8 @@ LoadObjectPics: ; 800853C adds r0, r5 ldr r0, [r0] cmp r0, 0 - bne @08008548 -@08008560: + bne _08008548 +_08008560: pop {r4,r5} pop {r0} bx r0 @@ -3795,7 +3795,7 @@ FreeObjectTilesByTag: ; 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 @@ -3808,13 +3808,13 @@ FreeObjectTilesByTag: ; 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 @@ -3828,13 +3828,13 @@ FreeObjectTilesByTag: ; 8008568 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} @@ -3854,7 +3854,7 @@ FreeAllObjectTiles: ; 80085E0 ldr r4, =0x03000a70 movs r3, 0 adds r5, r4, 0x2 -@080085F0: +_080085F0: lsls r1, r2, 1 adds r1, r7 ldrh r0, [r1] @@ -3869,7 +3869,7 @@ FreeAllObjectTiles: ; 80085E0 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x3F - bls @080085F0 + bls _080085F0 pop {r4-r7} pop {r0} bx r0 @@ -3886,16 +3886,16 @@ GetObjectTileRangeStartByTag: ; 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 .pool -@08008640: +_08008640: ldr r0, =0x0000ffff -@08008642: +_08008642: pop {r1} bx r1 .pool @@ -3909,23 +3909,23 @@ IndexOfObjectTilesTag: ; 800864C 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 .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 IndexOfObjectTilesTag @@ -3940,28 +3940,28 @@ GetTagByObjectTileRangeStart: ; 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 .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 @@ -4013,7 +4013,7 @@ ResetObjectPaletteAllocator: ; 800870C ldr r4, =0x03000cf0 ldr r0, =0x0000ffff adds r3, r0, 0 -@0800871C: +_0800871C: lsls r0, r2, 1 adds r0, r4 ldrh r1, [r0] @@ -4023,7 +4023,7 @@ ResetObjectPaletteAllocator: ; 800870C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0xF - bls @0800871C + bls _0800871C pop {r4} pop {r0} bx r0 @@ -4040,16 +4040,16 @@ LoadTaggedObjectPalette: ; 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 IndexOfObjectPaletteTag lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0xFF - beq @08008788 + beq _08008788 ldr r1, =0x03000cf0 lsls r0, r4, 1 adds r0, r1 @@ -4059,11 +4059,11 @@ LoadTaggedObjectPalette: ; 8008744 lsls r1, r4, 4 bl LoadObjectPalette adds r0, r4, 0 - b @0800878A + b _0800878A .pool -@08008788: +_08008788: movs r0, 0xFF -@0800878A: +_0800878A: pop {r4,r5} pop {r1} bx r1 @@ -4075,24 +4075,24 @@ LoadTaggedObjectPalettes: ; 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 LoadTaggedObjectPalette lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - bne @08008798 -@080087B6: + bne _08008798 +_080087B6: pop {r4,r5} pop {r0} bx r0 @@ -4124,17 +4124,17 @@ AllocObjectPalette: ; 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 .pool -@080087FC: +_080087FC: movs r0, 0xFF -@080087FE: +_080087FE: pop {r4} pop {r1} bx r1 @@ -4149,26 +4149,26 @@ IndexOfObjectPaletteTag: ; 8008804 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 .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 IndexOfObjectPaletteTag @@ -4195,13 +4195,13 @@ FreeObjectPaletteByTag: ; 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 .pool @@ -4227,22 +4227,22 @@ AddSprite: ; 8008880 ldrb r0, [r3] ldrb r1, [r1] cmp r0, r1 - bcc @08008898 + bcc _08008898 movs r0, 0x1 - b @080088E0 + b _080088E0 .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 @@ -4256,9 +4256,9 @@ AddSprite: ; 8008880 adds r0, 0x1 strb r0, [r3] movs r0, 0 - b @080088E0 + b _080088E0 .pool -@080088CC: +_080088CC: ldrb r1, [r3] lsls r1, 3 ldr r0, =0x030022f8 @@ -4268,7 +4268,7 @@ AddSprite: ; 8008880 bl AddSpritesFromSpriteOamTable lsls r0, 24 lsrs r0, 24 -@080088E0: +_080088E0: pop {r4} pop {r1} bx r1 @@ -4291,12 +4291,12 @@ AddSpritesFromSpriteOamTable: ; 80088EC ldrb r1, [r2] ldrb r0, [r0] cmp r1, r0 - bcc @08008910 -@08008908: + bcc _08008910 +_08008908: movs r0, 0x1 - b @08008AE6 + b _08008AE6 .pool -@08008910: +_08008910: adds r0, r3, 0 adds r0, 0x42 ldrb r1, [r0] @@ -4307,11 +4307,11 @@ AddSpritesFromSpriteOamTable: ; 80088EC 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] @@ -4322,8 +4322,8 @@ AddSpritesFromSpriteOamTable: ; 80088EC 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 @@ -4369,19 +4369,19 @@ AddSpritesFromSpriteOamTable: ; 80088EC 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 @@ -4396,7 +4396,7 @@ AddSpritesFromSpriteOamTable: ; 80088EC 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 @@ -4419,10 +4419,10 @@ AddSpritesFromSpriteOamTable: ; 80088EC 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 @@ -4445,7 +4445,7 @@ AddSpritesFromSpriteOamTable: ; 80088EC adds r0, 0x1 lsls r0, 16 lsrs r5, r0, 16 -@08008A2E: +_08008A2E: mov r1, r9 lsls r0, r1, 3 ldr r2, [sp] @@ -4512,7 +4512,7 @@ AddSpritesFromSpriteOamTable: ; 80088EC movs r0, 0xC0 ands r0, r1 cmp r0, 0x80 - beq @08008ACA + beq _08008ACA ldr r0, [r7, 0x4] adds r0, r6, r0 ldr r1, [r0] @@ -4524,7 +4524,7 @@ AddSpritesFromSpriteOamTable: ; 80088EC ands r0, r2 orrs r0, r1 strb r0, [r3, 0x5] -@08008ACA: +_08008ACA: mov r0, r9 adds r0, 0x1 lsls r0, 24 @@ -4536,11 +4536,11 @@ AddSpritesFromSpriteOamTable: ; 80088EC 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 cb4b9b6d9..0af0efef1 100644 --- a/asm/gpu_reg_manager.s +++ b/asm/gpu_reg_manager.s @@ -14,7 +14,7 @@ InitGpuRegManager: ; 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 @@ InitGpuRegManager: ; 8000FE4 strb r0, [r1] adds r2, 0x1 cmp r2, 0x5F - ble @08000FFE + ble _08000FFE movs r0, 0 strb r0, [r7] mov r1, r12 @@ -46,7 +46,7 @@ CopyBufferedValueToGpuReg: ; 800103C lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x4 - bne @08001068 + bne _08001068 ldr r2, =0x04000004 ldrh r1, [r2] ldr r0, =0x0000ffe7 @@ -57,9 +57,9 @@ CopyBufferedValueToGpuReg: ; 800103C ldrh r1, [r1] orrs r0, r1 strh r0, [r2] - b @08001076 + b _08001076 .pool -@08001068: +_08001068: movs r0, 0x80 lsls r0, 19 adds r0, r2, r0 @@ -67,7 +67,7 @@ CopyBufferedValueToGpuReg: ; 800103C adds r1, r2, r1 ldrh r1, [r1] strh r1, [r0] -@08001076: +_08001076: pop {r0} bx r0 .pool @@ -80,21 +80,21 @@ CopyBufferedValuesToGpuRegs: ; 8001080 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 CopyBufferedValueToGpuReg 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 @@ -110,7 +110,7 @@ SetGpuReg: ; 80010B4 lsls r1, 16 lsrs r1, 16 cmp r4, 0x5F - bhi @08001130 + bhi _08001130 ldr r0, =0x03000818 adds r0, r4, r0 strh r1, [r0] @@ -122,24 +122,24 @@ SetGpuReg: ; 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 CopyBufferedValueToGpuReg - b @08001130 + b _08001130 .pool -@080010F8: +_080010F8: movs r0, 0 strb r0, [r5] - b @08001130 -@080010FE: + b _08001130 +_080010FE: ldr r2, =0x030008d8 movs r0, 0x1 strb r0, [r2] @@ -149,25 +149,25 @@ SetGpuReg: ; 80010B4 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 @@ -183,7 +183,7 @@ SetGpuReg_ScreenOff: ; 8001140 lsls r1, 16 lsrs r1, 16 cmp r4, 0x5F - bhi @080011A8 + bhi _080011A8 ldr r0, =0x03000818 adds r0, r4, r0 strh r1, [r0] @@ -193,16 +193,16 @@ SetGpuReg_ScreenOff: ; 8001140 movs r0, 0x80 ands r0, r1 cmp r0, 0 - beq @08001176 + beq _08001176 adds r0, r4, 0 bl CopyBufferedValueToGpuReg - b @080011A8 + b _080011A8 .pool -@08001170: +_08001170: movs r0, 0 strb r0, [r5] - b @080011A8 -@08001176: + b _080011A8 +_08001176: ldr r2, =0x030008d8 movs r0, 0x1 strb r0, [r2] @@ -212,25 +212,25 @@ SetGpuReg_ScreenOff: ; 8001140 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 @@ -245,23 +245,23 @@ GetGpuReg: ; 80011B8 lsrs r0, 24 adds r1, r0, 0 cmp r1, 0x4 - bne @080011CC + bne _080011CC ldr r0, =0x04000004 - b @080011DE + b _080011DE .pool -@080011CC: +_080011CC: cmp r1, 0x6 - beq @080011DC + beq _080011DC ldr r0, =0x03000818 adds r0, r1, r0 ldrh r0, [r0] - b @080011E0 + b _080011E0 .pool -@080011DC: +_080011DC: ldr r0, =0x04000006 -@080011DE: +_080011DE: ldrh r0, [r0] -@080011E0: +_080011E0: pop {r1} bx r1 .pool @@ -312,7 +312,7 @@ SyncIEReg: ; 8001228 ldr r5, =0x030008d9 ldrb r0, [r5] cmp r0, 0 - beq @08001246 + beq _08001246 ldr r2, =0x04000208 ldrh r1, [r2] movs r4, 0 @@ -323,7 +323,7 @@ SyncIEReg: ; 8001228 strh r0, [r3] strh r1, [r2] strb r4, [r5] -@08001246: +_08001246: pop {r4,r5} pop {r0} bx r0 @@ -395,15 +395,15 @@ SetDispstatVBlankHBlankInterrupts: ; 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 SetGpuReg -@080012EA: +_080012EA: pop {r4} pop {r0} bx r0 diff --git a/asm/libagbbackup.s b/asm/libagbbackup.s index fe3234b5c..7691280a8 100644 --- a/asm/libagbbackup.s +++ b/asm/libagbbackup.s @@ -37,16 +37,16 @@ ReadFlashID: ; 82E1880 add r1, sp, 0x40 ldr r2, =0x00004e20 adds r0, r2, 0 - b @082E18B8 + b _082E18B8 .pool -@082E18B4: +_082E18B4: ldrh r0, [r1] subs r0, 0x1 -@082E18B8: +_082E18B8: strh r0, [r1] ldrh r0, [r1] cmp r0, 0 - bne @082E18B4 + bne _082E18B4 ldr r0, =0x0e000001 bl _call_via_r5 lsls r0, 24 @@ -69,16 +69,16 @@ ReadFlashID: ; 82E1880 add r1, sp, 0x40 ldr r2, =0x00004e20 adds r0, r2, 0 - b @082E1908 + b _082E1908 .pool -@082E1904: +_082E1904: ldrh r0, [r1] subs r0, 0x1 -@082E1908: +_082E1908: strh r0, [r1] ldrh r0, [r1] cmp r0, 0 - bne @082E1904 + bne _082E1904 adds r0, r4, 0 add sp, 0x44 pop {r4,r5} @@ -93,17 +93,17 @@ FlashTimerIntr: ; 82E191C ldr r1, =0x03001a72 ldrh r0, [r1] cmp r0, 0 - beq @082E1938 + beq _082E1938 ldrh r0, [r1] subs r0, 0x1 strh r0, [r1] lsls r0, 16 cmp r0, 0 - bne @082E1938 + bne _082E1938 ldr r1, =0x03007840 movs r0, 0x1 strb r0, [r1] -@082E1938: +_082E1938: pop {r0} bx r0 .pool @@ -117,7 +117,7 @@ SetFlashTimerIntr: ; 82E1944 lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0x3 - bhi @082E1978 + bhi _082E1978 ldr r0, =0x03001a70 strb r1, [r0] ldr r1, =0x03001a74 @@ -129,11 +129,11 @@ SetFlashTimerIntr: ; 82E1944 ldr r0, =FlashTimerIntr str r0, [r2] movs r0, 0 - b @082E197A + b _082E197A .pool -@082E1978: +_082E1978: movs r0, 0x1 -@082E197A: +_082E197A: pop {r1} bx r1 thumb_func_end SetFlashTimerIntr @@ -258,19 +258,19 @@ SetReadFlash1: ; 82E1A70 ldr r1, =ReadFlash1 subs r0, r1 lsls r0, 15 - b @082E1AA4 + b _082E1AA4 .pool -@082E1A98: +_082E1A98: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r0, r1, 0x1 lsls r0, 16 -@082E1AA4: +_082E1AA4: lsrs r1, r0, 16 cmp r1, 0 - bne @082E1A98 + bne _082E1A98 pop {r0} bx r0 thumb_func_end SetReadFlash1 @@ -281,18 +281,18 @@ ReadFlash_Core: ; 82E1AB0 adds r4, r0, 0 subs r3, r2, 0x1 cmp r2, 0 - beq @082E1ACC + beq _082E1ACC movs r2, 0x1 negs r2, r2 -@082E1ABE: +_082E1ABE: ldrb r0, [r4] strb r0, [r1] adds r4, 0x1 adds r1, 0x1 subs r3, 0x1 cmp r3, r2 - bne @082E1ABE -@082E1ACC: + bne _082E1ABE +_082E1ACC: pop {r4} pop {r0} bx r0 @@ -320,14 +320,14 @@ ReadFlash: ; 82E1AD4 movs r0, 0x80 lsls r0, 10 cmp r1, r0 - bne @082E1B0C + bne _082E1B0C lsrs r0, r3, 20 lsls r0, 24 lsrs r0, 24 bl SwitchFlashBank movs r0, 0xF ands r4, r0 -@082E1B0C: +_082E1B0C: ldr r3, =ReadFlash_Core movs r0, 0x1 eors r3, r0 @@ -336,19 +336,19 @@ ReadFlash: ; 82E1AD4 ldr r1, =ReadFlash_Core subs r0, r1 lsls r0, 15 - b @082E1B40 + b _082E1B40 .pool -@082E1B34: +_082E1B34: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r0, r1, 0x1 lsls r0, 16 -@082E1B40: +_082E1B40: lsrs r1, r0, 16 cmp r1, 0 - bne @082E1B34 + bne _082E1B34 mov r3, sp adds r3, 0x1 ldr r0, =0x03007850 @@ -377,25 +377,25 @@ VerifyFlashSector_Core: ; 82E1B70 adds r3, r1, 0 subs r4, r2, 0x1 cmp r2, 0 - beq @082E1B96 + beq _082E1B96 movs r2, 0x1 negs r2, r2 -@082E1B80: +_082E1B80: ldrb r1, [r3] ldrb r0, [r5] adds r5, 0x1 adds r3, 0x1 cmp r1, r0 - beq @082E1B90 + beq _082E1B90 subs r0, r3, 0x1 - b @082E1B98 -@082E1B90: + b _082E1B98 +_082E1B90: subs r4, 0x1 cmp r4, r2 - bne @082E1B80 -@082E1B96: + bne _082E1B80 +_082E1B96: movs r0, 0 -@082E1B98: +_082E1B98: pop {r4,r5} pop {r1} bx r1 @@ -421,14 +421,14 @@ VerifyFlashSector: ; 82E1BA0 movs r0, 0x80 lsls r0, 10 cmp r1, r0 - bne @082E1BD4 + bne _082E1BD4 lsrs r0, r3, 20 lsls r0, 24 lsrs r0, 24 bl SwitchFlashBank movs r0, 0xF ands r4, r0 -@082E1BD4: +_082E1BD4: ldr r3, =VerifyFlashSector_Core movs r0, 0x1 eors r3, r0 @@ -437,19 +437,19 @@ VerifyFlashSector: ; 82E1BA0 ldr r1, =VerifyFlashSector_Core subs r0, r1 lsls r0, 15 - b @082E1C08 + b _082E1C08 .pool -@082E1BFC: +_082E1BFC: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r0, r1, 0x1 lsls r0, 16 -@082E1C08: +_082E1C08: lsrs r1, r0, 16 cmp r1, 0 - bne @082E1BFC + bne _082E1BFC mov r3, sp adds r3, 0x1 ldr r0, =0x03007850 @@ -484,14 +484,14 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38 movs r0, 0x80 lsls r0, 10 cmp r1, r0 - bne @082E1C60 + bne _082E1C60 lsrs r0, r2, 20 lsls r0, 24 lsrs r0, 24 bl SwitchFlashBank movs r0, 0xF ands r4, r0 -@082E1C60: +_082E1C60: ldr r2, =0x04000204 ldrh r0, [r2] ldr r1, =0x0000fffc @@ -507,19 +507,19 @@ VerifyFlashSectorFirstNBytes: ; 82E1C38 ldr r1, =VerifyFlashSector_Core subs r0, r1 lsls r0, 15 - b @082E1CA0 + b _082E1CA0 .pool -@082E1C94: +_082E1C94: ldrh r0, [r3] strh r0, [r2] adds r3, 0x2 adds r2, 0x2 subs r0, r1, 0x1 lsls r0, 16 -@082E1CA0: +_082E1CA0: lsrs r1, r0, 16 cmp r1, 0 - bne @082E1C94 + bne _082E1C94 mov r3, sp adds r3, 0x1 ldr r0, =0x03007850 @@ -547,14 +547,14 @@ ProgramFlashSectorsAndVerify: ; 82E1CD0 lsls r0, 16 lsrs r4, r0, 16 movs r6, 0 - b @082E1CE2 -@082E1CDC: + b _082E1CE2 +_082E1CDC: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -@082E1CE2: +_082E1CE2: cmp r6, 0x2 - bhi @082E1D08 + bhi _082E1D08 ldr r0, =0x0300784c ldr r2, [r0] adds r0, r4, 0 @@ -563,14 +563,14 @@ ProgramFlashSectorsAndVerify: ; 82E1CD0 lsls r0, 16 lsrs r2, r0, 16 cmp r2, 0 - bne @082E1CDC + bne _082E1CDC adds r0, r4, 0 adds r1, r5, 0 bl VerifyFlashSector adds r2, r0, 0 cmp r2, 0 - bne @082E1CDC -@082E1D08: + bne _082E1CDC +_082E1D08: adds r0, r2, 0 pop {r4-r6} pop {r1} @@ -586,14 +586,14 @@ ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14 lsls r0, 16 lsrs r4, r0, 16 movs r6, 0 - b @082E1D28 -@082E1D22: + b _082E1D28 +_082E1D22: adds r0, r6, 0x1 lsls r0, 24 lsrs r6, r0, 24 -@082E1D28: +_082E1D28: cmp r6, 0x2 - bhi @082E1D50 + bhi _082E1D50 ldr r0, =0x0300784c ldr r2, [r0] adds r0, r4, 0 @@ -602,15 +602,15 @@ ProgramFlashSectorsVerifyFirstNBytes: ; 82E1D14 lsls r0, 16 lsrs r3, r0, 16 cmp r3, 0 - bne @082E1D22 + bne _082E1D22 adds r0, r4, 0 adds r1, r5, 0 adds r2, r7, 0 bl VerifyFlashSectorFirstNBytes adds r3, r0, 0 cmp r3, 0 - bne @082E1D22 -@082E1D50: + bne _082E1D22 +_082E1D50: adds r0, r3, 0 pop {r4-r7} pop {r1} @@ -634,22 +634,22 @@ IdentifyFlash: ; 82E1D5C lsrs r3, r0, 16 ldr r2, =gUnknown_089A30D0 movs r4, 0x1 - b @082E1D8A + b _082E1D8A .pool -@082E1D88: +_082E1D88: adds r2, 0x4 -@082E1D8A: +_082E1D8A: ldr r1, [r2] adds r0, r1, 0 adds r0, 0x2C ldrb r0, [r0] cmp r0, 0 - beq @082E1D9E + beq _082E1D9E ldrh r0, [r1, 0x2C] cmp r3, r0 - bne @082E1D88 + bne _082E1D88 movs r4, 0 -@082E1D9E: +_082E1D9E: ldr r1, =0x03007854 ldr r0, [r2] ldr r0, [r0] @@ -703,57 +703,57 @@ PollingSR_COMMON: ; 82E1DFC ldr r6, =0x03007844 ldr r1, =0x0e005555 mov r9, r1 - b @082E1E60 + b _082E1E60 .pool -@082E1E28: +_082E1E28: movs r0, 0xF0 mov r1, r9 strb r0, [r1] movs r0, 0xA0 lsls r0, 8 - b @082E1E56 -@082E1E34: + b _082E1E56 +_082E1E34: ldr r0, =0x03007840 ldrb r0, [r0] cmp r0, 0 - beq @082E1E60 + beq _082E1E60 ldr r1, [r6] adds r0, r4, 0 bl _call_via_r1 lsls r0, 24 lsrs r0, 24 cmp r0, r5 - beq @082E1E88 + beq _082E1E88 movs r0, 0xF0 mov r1, r9 strb r0, [r1] movs r0, 0xC0 lsls r0, 8 -@082E1E56: +_082E1E56: orrs r7, r0 mov r8, r7 - b @082E1E88 + b _082E1E88 .pool -@082E1E60: +_082E1E60: ldr r1, [r6] adds r0, r4, 0 bl _call_via_r1 lsls r0, 24 lsrs r1, r0, 24 cmp r1, r5 - beq @082E1E88 + beq _082E1E88 movs r0, 0x20 ands r0, r1 cmp r0, 0 - beq @082E1E34 + beq _082E1E34 ldr r1, [r6] adds r0, r4, 0 bl _call_via_r1 lsls r0, 24 lsrs r0, 24 cmp r0, r5 - bne @082E1E28 -@082E1E88: + bne _082E1E28 +_082E1E88: bl StopFlashTimer mov r0, r8 pop {r3,r4} @@ -822,11 +822,11 @@ EraseFlashSector: ; 82E1F10 ldr r0, [r0] ldrh r0, [r0, 0xA] cmp r6, r0 - bcc @082E1F30 + bcc _082E1F30 ldr r0, =0x000080ff - b @082E1FD0 + b _082E1FD0 .pool -@082E1F30: +_082E1F30: lsrs r0, r6, 4 lsls r0, 24 lsrs r0, 24 @@ -834,7 +834,7 @@ EraseFlashSector: ; 82E1F10 movs r0, 0xF ands r6, r0 movs r7, 0 -@082E1F40: +_082E1F40: ldr r3, =0x04000204 ldrh r1, [r3] ldr r0, =0x0000fffc @@ -877,15 +877,15 @@ EraseFlashSector: ; 82E1F10 lsls r0, 8 ands r0, r3 cmp r0, 0 - beq @082E1FC0 + beq _082E1FC0 cmp r7, 0x3 - bhi @082E1FC0 + bhi _082E1FC0 adds r0, r7, 0x1 lsls r0, 16 lsrs r7, r0, 16 - b @082E1F40 + b _082E1F40 .pool -@082E1FC0: +_082E1FC0: ldr r2, =0x04000204 ldrh r0, [r2] ldr r1, =0x0000fffc @@ -894,7 +894,7 @@ EraseFlashSector: ; 82E1F10 orrs r0, r1 strh r0, [r2] adds r0, r3, 0 -@082E1FD0: +_082E1FD0: add sp, 0x40 pop {r4-r7} pop {r1} @@ -915,7 +915,7 @@ ProgramFlashByte: ; 82E1FE0 ldr r0, [r5] ldr r0, [r0, 0x4] cmp r6, r0 - bcs @082E2068 + bcs _082E2068 lsrs r0, r1, 20 lsls r0, 24 lsrs r0, 24 @@ -956,12 +956,12 @@ ProgramFlashByte: ; 82E1FE0 bl _call_via_r3 lsls r0, 16 lsrs r0, 16 - b @082E206C + b _082E206C .pool -@082E2068: +_082E2068: movs r0, 0x80 lsls r0, 8 -@082E206C: +_082E206C: add sp, 0x40 pop {r4-r7} pop {r1} @@ -1005,17 +1005,17 @@ ProgramFlashSector: ; 82E20AC ldr r0, [r0] ldrh r0, [r0, 0xA] cmp r4, r0 - bcc @082E20CC + bcc _082E20CC ldr r0, =0x000080ff - b @082E2146 + b _082E2146 .pool -@082E20CC: +_082E20CC: adds r0, r4, 0 bl EraseFlashSector lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - bne @082E2144 + bne _082E2144 lsrs r0, r4, 4 lsls r0, 24 lsrs r0, 24 @@ -1042,28 +1042,28 @@ ProgramFlashSector: ; 82E20AC lsls r0, 20 adds r4, r0 adds r6, r1, 0 - b @082E212E + b _082E212E .pool -@082E2124: +_082E2124: ldrh r0, [r6] subs r0, 0x1 strh r0, [r6] adds r7, 0x1 adds r4, 0x1 -@082E212E: +_082E212E: ldrh r0, [r6] cmp r0, 0 - beq @082E2144 + beq _082E2144 adds r0, r7, 0 adds r1, r4, 0 bl ProgramFlashByteInternal lsls r0, 16 lsrs r5, r0, 16 cmp r5, 0 - beq @082E2124 -@082E2144: + beq _082E2124 +_082E2144: adds r0, r5, 0 -@082E2146: +_082E2146: add sp, 0x40 pop {r4-r7} pop {r1} diff --git a/asm/libgcnmultiboot.s b/asm/libgcnmultiboot.s index 8ca22b587..ecd71e23a 100644 --- a/asm/libgcnmultiboot.s +++ b/asm/libgcnmultiboot.s @@ -12,15 +12,15 @@ GameCubeMultiBoot_Hash: ; 82DED70 eors r3, r1 movs r2, 0x20 -@loop: +.loop: lsrs r3, 1 - bcc @skipExclusiveOr + bcc .skipExclusiveOr eors r3, r4 -@skipExclusiveOr: +.skipExclusiveOr: subs r2, 0x1 - bne @loop + bne .loop pop {r4,pc} thumb_func_end GameCubeMultiBoot_Hash @@ -175,14 +175,14 @@ pool_NintendoLogo: .4byte RomHeaderNintendoLogo GameCubeMultiBoot_ExecuteProgram: ; 82DEE84 ldrb r1, [r0, 0x2] cmp r1, 0x2 - bne @unableToExecute + bne .unableToExecute ldr r3, pool_InterruptRegs movs r1, 0 strh r1, [r3, OFFSET_REG_IME - 0x200] ldr r1, pool_MultiBootLoadAddr adds r1, 0xC0 bx r1 -@unableToExecute: +.unableToExecute: bx lr thumb_func_end GameCubeMultiBoot_ExecuteProgram @@ -213,10 +213,10 @@ GameCubeMultiBoot_Init: ; 82DEE98 adds r3, GCMB_STRUCT_BASE_DEST_PTR ; clear all but the last 3 fields of the struct -@clearStructLoop: +.clearStructLoop: stm r0!, {r1} cmp r0, r3 - blo @clearStructLoop + blo .clearStructLoop pop {r0,r3} lsrs r3, 1 diff --git a/asm/librtc.s b/asm/librtc.s index cd6a3194e..5a1771a56 100644 --- a/asm/librtc.s +++ b/asm/librtc.s @@ -40,10 +40,10 @@ RTC_Init: ; 82E2180 lsls r1, r0, 24 lsrs r0, r1, 24 cmp r0, 0 - bne @082E219A + bne _082E219A movs r0, 0 - b @082E224E -@082E219A: + b _082E224E +_082E219A: adds r0, r7, 0 movs r1, 0 strb r1, [r0] @@ -56,7 +56,7 @@ RTC_Init: ; 82E2180 lsls r1, r2, 24 lsrs r0, r1, 24 cmp r0, 0x80 - beq @082E21CA + beq _082E21CA adds r0, r7, 0x4 ldrb r1, [r0, 0x7] movs r2, 0xC0 @@ -66,17 +66,17 @@ RTC_Init: ; 82E2180 lsls r1, r2, 24 lsrs r0, r1, 24 cmp r0, 0 - bne @082E21E8 - b @082E21CA -@082E21CA: + bne _082E21E8 + b _082E21CA +_082E21CA: bl RTC_Reset lsls r1, r0, 24 lsrs r0, r1, 24 cmp r0, 0 - bne @082E21DA + bne _082E21DA movs r0, 0 - b @082E224E -@082E21DA: + b _082E224E +_082E21DA: adds r1, r7, 0 adds r0, r7, 0 adds r1, r7, 0 @@ -84,7 +84,7 @@ RTC_Init: ; 82E2180 adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] -@082E21E8: +_082E21E8: adds r1, r7, 0x4 adds r0, r1, 0 bl RTC_GetTime @@ -97,12 +97,12 @@ RTC_Init: ; 82E2180 lsls r1, r2, 24 lsrs r0, r1, 24 cmp r0, 0 - beq @082E2236 + beq _082E2236 bl RTC_Reset lsls r1, r0, 24 lsrs r0, r1, 24 cmp r0, 0 - bne @082E2228 + bne _082E2228 adds r0, r7, 0 ldrb r1, [r0] lsls r0, r1, 4 @@ -114,8 +114,8 @@ RTC_Init: ; 82E2180 lsls r0, r1, 24 lsrs r1, r0, 24 adds r0, r1, 0 - b @082E224E -@082E2228: + b _082E224E +_082E2228: adds r1, r7, 0 adds r0, r7, 0 adds r1, r7, 0 @@ -123,7 +123,7 @@ RTC_Init: ; 82E2180 adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] -@082E2236: +_082E2236: adds r0, r7, 0 ldrb r1, [r0] lsls r0, r1, 4 @@ -135,8 +135,8 @@ RTC_Init: ; 82E2180 lsls r0, r1, 24 lsrs r1, r0, 24 adds r0, r1, 0 - b @082E224E -@082E224E: + b _082E224E +_082E224E: add sp, 0x10 pop {r7} pop {r1} @@ -152,11 +152,11 @@ RTC_Reset: ; 82E2258 ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E2270 + bne _082E2270 movs r0, 0 - b @082E22D4 + b _082E22D4 .pool -@082E2270: +_082E2270: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -198,9 +198,9 @@ RTC_Reset: ; 82E2258 adds r0, r7, 0 ldrb r1, [r0] adds r0, r1, 0 - b @082E22D4 + b _082E22D4 .pool -@082E22D4: +_082E22D4: add sp, 0x10 pop {r7} pop {r1} @@ -217,11 +217,11 @@ RTC_GetControlReg: ; 82E22DC ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E22F4 + bne _082E22F4 movs r0, 0 - b @082E23A0 + b _082E23A0 .pool -@082E22F4: +_082E22F4: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -299,9 +299,9 @@ RTC_GetControlReg: ; 82E22DC movs r1, 0 strb r1, [r0] movs r0, 0x1 - b @082E23A0 + b _082E23A0 .pool -@082E23A0: +_082E23A0: add sp, 0x8 pop {r4,r7} pop {r1} @@ -318,11 +318,11 @@ RTC_SetControlReg: ; 82E23A8 ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E23C0 + bne _082E23C0 movs r0, 0 - b @082E2448 + b _082E2448 .pool -@082E23C0: +_082E23C0: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -381,9 +381,9 @@ RTC_SetControlReg: ; 82E23A8 movs r1, 0 strb r1, [r0] movs r0, 0x1 - b @082E2448 + b _082E2448 .pool -@082E2448: +_082E2448: add sp, 0x8 pop {r4,r7} pop {r1} @@ -400,11 +400,11 @@ RTC_GetDateTime: ; 82E2450 ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E2468 + bne _082E2468 movs r0, 0 - b @082E24F8 + b _082E24F8 .pool -@082E2468: +_082E2468: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -425,14 +425,14 @@ RTC_GetDateTime: ; 82E2450 adds r0, r7, 0x4 movs r1, 0 strb r1, [r0] -@082E2492: +_082E2492: adds r0, r7, 0x4 ldrb r1, [r0] cmp r1, 0x6 - bls @082E24A8 - b @082E24C6 + bls _082E24A8 + b _082E24C6 .pool -@082E24A8: +_082E24A8: bl RTC_ReadByte adds r1, r7, 0x4 ldrb r2, [r1] @@ -446,8 +446,8 @@ RTC_GetDateTime: ; 82E2450 adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] - b @082E2492 -@082E24C6: + b _082E2492 +_082E24C6: ldr r1, [r7] adds r0, r1, 0x4 ldr r2, [r7] @@ -468,9 +468,9 @@ RTC_GetDateTime: ; 82E2450 movs r1, 0 strb r1, [r0] movs r0, 0x1 - b @082E24F8 + b _082E24F8 .pool -@082E24F8: +_082E24F8: add sp, 0x8 pop {r7} pop {r1} @@ -487,11 +487,11 @@ RTC_SetDateTime: ; 82E2500 ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E2518 + bne _082E2518 movs r0, 0 - b @082E2594 + b _082E2594 .pool -@082E2518: +_082E2518: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -509,14 +509,14 @@ RTC_SetDateTime: ; 82E2500 adds r0, r7, 0x4 movs r1, 0 strb r1, [r0] -@082E253C: +_082E253C: adds r0, r7, 0x4 ldrb r1, [r0] cmp r1, 0x6 - bls @082E2554 - b @082E2574 + bls _082E2554 + b _082E2574 .pool -@082E2554: +_082E2554: adds r0, r7, 0x4 ldrb r1, [r0] ldr r2, [r7] @@ -531,8 +531,8 @@ RTC_SetDateTime: ; 82E2500 adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] - b @082E253C -@082E2574: + b _082E253C +_082E2574: ldr r0, =GPIOPortData movs r1, 0x1 strh r1, [r0] @@ -543,9 +543,9 @@ RTC_SetDateTime: ; 82E2500 movs r1, 0 strb r1, [r0] movs r0, 0x1 - b @082E2594 + b _082E2594 .pool -@082E2594: +_082E2594: add sp, 0x8 pop {r7} pop {r1} @@ -562,11 +562,11 @@ RTC_GetTime: ; 82E259C ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E25B4 + bne _082E25B4 movs r0, 0 - b @082E2648 + b _082E2648 .pool -@082E25B4: +_082E25B4: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -587,14 +587,14 @@ RTC_GetTime: ; 82E259C adds r0, r7, 0x4 movs r1, 0 strb r1, [r0] -@082E25DE: +_082E25DE: adds r0, r7, 0x4 ldrb r1, [r0] cmp r1, 0x2 - bls @082E25F4 - b @082E2614 + bls _082E25F4 + b _082E2614 .pool -@082E25F4: +_082E25F4: bl RTC_ReadByte adds r1, r7, 0x4 ldrb r2, [r1] @@ -609,8 +609,8 @@ RTC_GetTime: ; 82E259C adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] - b @082E25DE -@082E2614: + b _082E25DE +_082E2614: ldr r1, [r7] adds r0, r1, 0x4 ldr r2, [r7] @@ -631,9 +631,9 @@ RTC_GetTime: ; 82E259C movs r1, 0 strb r1, [r0] movs r0, 0x1 - b @082E2648 + b _082E2648 .pool -@082E2648: +_082E2648: add sp, 0x8 pop {r7} pop {r1} @@ -650,11 +650,11 @@ RTC_SetTime: ; 82E2650 ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E2668 + bne _082E2668 movs r0, 0 - b @082E26E4 + b _082E26E4 .pool -@082E2668: +_082E2668: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -672,14 +672,14 @@ RTC_SetTime: ; 82E2650 adds r0, r7, 0x4 movs r1, 0 strb r1, [r0] -@082E268C: +_082E268C: adds r0, r7, 0x4 ldrb r1, [r0] cmp r1, 0x2 - bls @082E26A4 - b @082E26C6 + bls _082E26A4 + b _082E26C6 .pool -@082E26A4: +_082E26A4: adds r0, r7, 0x4 ldrb r1, [r0] ldr r2, [r7] @@ -695,8 +695,8 @@ RTC_SetTime: ; 82E2650 adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] - b @082E268C -@082E26C6: + b _082E268C +_082E26C6: ldr r0, =GPIOPortData movs r1, 0x1 strh r1, [r0] @@ -707,9 +707,9 @@ RTC_SetTime: ; 82E2650 movs r1, 0 strb r1, [r0] movs r0, 0x1 - b @082E26E4 + b _082E26E4 .pool -@082E26E4: +_082E26E4: add sp, 0x8 pop {r7} pop {r1} @@ -726,11 +726,11 @@ RTC_SetUnknownData: ; 82E26EC ldr r0, =0x03001a7e ldrb r1, [r0] cmp r1, 0x1 - bne @082E2704 + bne _082E2704 movs r0, 0 - b @082E2818 + b _082E2818 .pool -@082E2704: +_082E2704: ldr r0, =0x03001a7e movs r1, 0x1 strb r1, [r0] @@ -768,7 +768,7 @@ RTC_SetUnknownData: ; 82E26EC adds r0, 0x8 ldrb r1, [r0] cmp r1, 0xB - bhi @082E2770 + bhi _082E2770 adds r0, r7, 0 adds r0, 0x8 ldr r1, [r7] @@ -781,9 +781,9 @@ RTC_SetUnknownData: ; 82E26EC orrs r2, r1 adds r1, r2, 0 strb r1, [r0] - b @082E278E + b _082E278E .pool -@082E2770: +_082E2770: adds r0, r7, 0 adds r0, 0x8 ldr r1, [r7] @@ -799,7 +799,7 @@ RTC_SetUnknownData: ; 82E26EC orrs r2, r1 adds r1, r2, 0 strb r1, [r0] -@082E278E: +_082E278E: adds r0, r7, 0 adds r0, 0x8 ldr r1, [r7] @@ -826,14 +826,14 @@ RTC_SetUnknownData: ; 82E26EC adds r0, r7, 0x4 movs r1, 0 strb r1, [r0] -@082E27C4: +_082E27C4: adds r0, r7, 0x4 ldrb r1, [r0] cmp r1, 0x1 - bls @082E27D8 - b @082E27FA + bls _082E27D8 + b _082E27FA .pool -@082E27D8: +_082E27D8: adds r0, r7, 0 adds r0, 0x8 adds r1, r7, 0x4 @@ -849,8 +849,8 @@ RTC_SetUnknownData: ; 82E26EC adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] - b @082E27C4 -@082E27FA: + b _082E27C4 +_082E27FA: ldr r0, =GPIOPortData movs r1, 0x1 strh r1, [r0] @@ -861,9 +861,9 @@ RTC_SetUnknownData: ; 82E26EC movs r1, 0 strb r1, [r0] movs r0, 0x1 - b @082E2818 + b _082E2818 .pool -@082E2818: +_082E2818: add sp, 0xC pop {r4,r7} pop {r1} @@ -882,13 +882,13 @@ RTC_WriteByte: ; 82E2820 adds r1, r7, 0x1 movs r2, 0 strb r2, [r1] -@082E2832: +_082E2832: adds r1, r7, 0x1 ldrb r2, [r1] cmp r2, 0x7 - bls @082E283C - b @082E28BC -@082E283C: + bls _082E283C + b _082E28BC +_082E283C: adds r1, r7, 0x2 adds r3, r7, 0 ldrb r2, [r3] @@ -950,9 +950,9 @@ RTC_WriteByte: ; 82E2820 adds r2, r3, 0x1 adds r3, r2, 0 strb r3, [r1] - b @082E2832 + b _082E2832 .pool -@082E28BC: +_082E28BC: add sp, 0x4 pop {r4,r5,r7} pop {r1} @@ -971,13 +971,13 @@ RTC_WriteByteReversed: ; 82E28C4 adds r1, r7, 0x1 movs r2, 0 strb r2, [r1] -@082E28D6: +_082E28D6: adds r1, r7, 0x1 ldrb r2, [r1] cmp r2, 0x7 - bls @082E28E0 - b @082E295C -@082E28E0: + bls _082E28E0 + b _082E295C +_082E28E0: adds r1, r7, 0x2 adds r3, r7, 0 ldrb r2, [r3] @@ -1037,9 +1037,9 @@ RTC_WriteByteReversed: ; 82E28C4 adds r2, r3, 0x1 adds r3, r2, 0 strb r3, [r1] - b @082E28D6 + b _082E28D6 .pool -@082E295C: +_082E295C: add sp, 0x4 pop {r4,r7} pop {r1} @@ -1055,13 +1055,13 @@ RTC_ReadByte: ; 82E2964 adds r0, r7, 0 movs r1, 0 strb r1, [r0] -@082E2970: +_082E2970: adds r0, r7, 0 ldrb r1, [r0] cmp r1, 0x7 - bls @082E297A - b @082E29E0 -@082E297A: + bls _082E297A + b _082E29E0 +_082E297A: ldr r0, =GPIOPortData movs r1, 0x4 strh r1, [r0] @@ -1109,14 +1109,14 @@ RTC_ReadByte: ; 82E2964 adds r1, r2, 0x1 adds r2, r1, 0 strb r2, [r0] - b @082E2970 + b _082E2970 .pool -@082E29E0: +_082E29E0: adds r0, r7, 0x2 ldrb r1, [r0] adds r0, r1, 0 - b @082E29E8 -@082E29E8: + b _082E29E8 +_082E29E8: add sp, 0x4 pop {r7} pop {r1} diff --git a/asm/main.s b/asm/main.s index 5d622298a..6d1528045 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 SetMainCallback2 -@08000414: +_08000414: ldr r2, =0x030022b4 strb r4, [r2] ldr r1, =0x03000000 @@ -52,35 +52,35 @@ Main: movs r0, 0 mov r8, r0 adds r6, r2, 0 -@0800042A: +_0800042A: bl ReadKeypad 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 Reset -@08000454: +_08000454: bl sub_8087634 cmp r0, 0x1 - bne @0800048C + bne _0800048C strb r0, [r6] bl HandleLinkConnectionAndCallMainCallbacks movs r0, 0 strb r0, [r6] - b @080004B2 + b _080004B2 .pool -@0800048C: +_0800048C: ldr r5, =0x030022b4 movs r0, 0 strb r0, [r5] @@ -88,7 +88,7 @@ Main: bl sub_80875C8 adds r4, r0, 0 cmp r4, 0x1 - bne @080004B2 + bne _080004B2 movs r0, 0 strh r0, [r7, 0x2E] bl ClearObjectCopyRequests @@ -96,11 +96,11 @@ Main: bl HandleLinkConnectionAndCallMainCallbacks mov r2, r8 strb r2, [r5] -@080004B2: +_080004B2: bl gametime_increment bl sound_something bl WaitForVBlankIntr - b @0800042A + b _0800042A .pool thumb_func_end Main @@ -111,9 +111,9 @@ HandleLinkConnectionAndCallMainCallbacks: ; 80004C4 bl HandleLinkConnection lsls r0, 24 cmp r0, 0 - bne @080004D4 + bne _080004D4 bl CallMainCallbacks -@080004D4: +_080004D4: pop {r0} bx r0 thumb_func_end HandleLinkConnectionAndCallMainCallbacks @@ -149,14 +149,14 @@ CallMainCallbacks: ; 800051C 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 @@ -276,61 +276,61 @@ ReadKeypad: ; 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 .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 .pool @@ -345,12 +345,12 @@ InitIntrHandlers: ; 8000684 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] @@ -431,17 +431,17 @@ VBlankIntr: ; 8000738 ldr r0, =0x030030fc ldrb r0, [r0] cmp r0, 0 - beq @0800074C + beq _0800074C bl rfu_syncVBlank__ - b @08000758 + b _08000758 .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 @@ -450,20 +450,20 @@ VBlankIntr: ; 8000738 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] @@ -481,16 +481,16 @@ VBlankIntr: ; 8000738 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,9 +527,9 @@ HBlankIntr: ; 8000814 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 @@ -552,9 +552,9 @@ VCountIntr: ; 8000844 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] @@ -578,9 +578,9 @@ SerialIntr: ; 8000878 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 @@ -616,15 +616,15 @@ WaitForVBlankIntr: ; 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 .pool diff --git a/asm/main_menu.s b/asm/main_menu.s index 81a76e38d..12fde9e95 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -125,7 +125,7 @@ InitMainMenu: ; 802F6F4 bl ResetAllObjectData bl ResetObjectPaletteAllocator cmp r4, 0 - beq @0802F7EC + beq _0802F7EC movs r0, 0x1 negs r0, r0 str r5, [sp] @@ -133,9 +133,9 @@ InitMainMenu: ; 802F6F4 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @0802F7FE + b _0802F7FE .pool -@0802F7EC: +_0802F7EC: movs r0, 0x1 negs r0, r0 ldr r1, =0x0000ffff @@ -144,7 +144,7 @@ InitMainMenu: ; 802F6F4 movs r2, 0x10 movs r3, 0 bl pal_fade_maybe -@0802F7FE: +_0802F7FE: movs r0, 0 bl ResetBgsAndClearDma3BusyFlags ldr r1, =gUnknown_082FF0E8 @@ -240,9 +240,9 @@ Task_MainMenuCheckSaveFile: ; 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 SetGpuReg @@ -267,53 +267,53 @@ Task_MainMenuCheckSaveFile: ; 802F8D8 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 .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_MainMenuCheckBattery - b @0802F9FC + b _0802F9FC .pool -@0802F990: +_0802F990: ldr r0, =gUnknown_085E8405 bl CreateMainMenuErrorWindow strh r5, [r4] mov r0, r8 subs r0, 0x8 adds r0, r7, r0 - b @0802F9FA + b _0802F9FA .pool -@0802F9A4: +_0802F9A4: ldr r0, =gUnknown_085E83C2 bl CreateMainMenuErrorWindow mov r0, r8 @@ -325,13 +325,13 @@ Task_MainMenuCheckSaveFile: ; 802F8D8 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 .pool -@0802F9D0: +_0802F9D0: movs r0, 0 strh r0, [r4] ldr r1, =0x03005e00 @@ -340,51 +340,51 @@ Task_MainMenuCheckSaveFile: ; 802F8D8 lsls r0, 3 adds r0, r1 ldr r1, =Task_MainMenuCheckBattery - b @0802F9FC + b _0802F9FC .pool -@0802F9EC: +_0802F9EC: ldr r0, =gUnknown_085E8440 bl CreateMainMenuErrorWindow mov r0, r8 subs r0, 0x8 adds r0, r7, r0 strh r5, [r0, 0x8] -@0802F9FA: +_0802F9FA: ldr r1, =Task_WaitForSaveFileErrorWindow -@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 .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 @@ -393,7 +393,7 @@ Task_MainMenuCheckSaveFile: ; 802F8D8 ldrh r0, [r4] adds r0, 0x2 strh r0, [r4, 0x18] -@0802FA4E: +_0802FA4E: pop {r3} mov r8, r3 pop {r4-r7} @@ -413,13 +413,13 @@ Task_WaitForSaveFileErrorWindow: ; 802FA5C bl IsTextPrinterActive 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 ClearWindowTilemap ldr r0, =gUnknown_082FF070 @@ -431,7 +431,7 @@ Task_WaitForSaveFileErrorWindow: ; 802FA5C adds r0, r1 ldr r1, =Task_MainMenuCheckBattery str r1, [r0] -@0802FA98: +_0802FA98: pop {r4} pop {r0} bx r0 @@ -450,7 +450,7 @@ Task_MainMenuCheckBattery: ; 802FAB0 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @0802FB3C + bne _0802FB3C movs r0, 0x40 movs r1, 0 bl SetGpuReg @@ -477,7 +477,7 @@ Task_MainMenuCheckBattery: ; 802FAB0 lsls r1, 4 ands r1, r0 cmp r1, 0 - bne @0802FB28 + bne _0802FB28 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -485,9 +485,9 @@ Task_MainMenuCheckBattery: ; 802FAB0 adds r1, r0 ldr r0, =Task_DisplayMainMenu str r0, [r1] - b @0802FB3C + b _0802FB3C .pool -@0802FB28: +_0802FB28: ldr r0, =gUnknown_085E8453 bl CreateMainMenuErrorWindow ldr r1, =0x03005e00 @@ -497,7 +497,7 @@ Task_MainMenuCheckBattery: ; 802FAB0 adds r0, r1 ldr r1, =Task_WaitForBatteryDryErrorWindow str r1, [r0] -@0802FB3C: +_0802FB3C: pop {r4,r5} pop {r0} bx r0 @@ -515,13 +515,13 @@ Task_WaitForBatteryDryErrorWindow: ; 802FB50 bl IsTextPrinterActive 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 ClearWindowTilemap ldr r0, =gUnknown_082FF070 @@ -533,7 +533,7 @@ Task_WaitForBatteryDryErrorWindow: ; 802FB50 adds r0, r1 ldr r1, =Task_DisplayMainMenu str r1, [r0] -@0802FB8C: +_0802FB8C: pop {r4} pop {r0} bx r0 @@ -562,9 +562,9 @@ Task_DisplayMainMenu: ; 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 SetGpuReg @@ -619,7 +619,7 @@ Task_DisplayMainMenu: ; 802FBA4 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 @@ -628,9 +628,9 @@ Task_DisplayMainMenu: ; 802FBA4 movs r1, 0xF1 movs r2, 0x2 bl gpu_pal_apply - b @0802FC96 + b _0802FC96 .pool -@0802FC84: +_0802FC84: add r1, sp, 0xC ldr r2, =0x0000547f adds r0, r2, 0 @@ -639,7 +639,7 @@ Task_DisplayMainMenu: ; 802FBA4 movs r1, 0xF1 movs r2, 0x2 bl gpu_pal_apply -@0802FC96: +_0802FC96: ldr r0, =0x03005e00 mov r8, r0 lsls r1, r7, 2 @@ -650,17 +650,17 @@ Task_DisplayMainMenu: ; 802FBA4 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 FillWindowPixelBuffer @@ -704,9 +704,9 @@ Task_DisplayMainMenu: ; 802FBA4 adds r1, r5, 0 bl DrawMainMenuWindowFrame adds r4, 0x8 - b @0802FED4 + b _0802FED4 .pool -@0802FD44: +_0802FD44: movs r0, 0x2 movs r1, 0xAA bl FillWindowPixelBuffer @@ -772,9 +772,9 @@ Task_DisplayMainMenu: ; 802FBA4 adds r1, r5, 0 bl DrawMainMenuWindowFrame adds r4, 0x10 - b @0802FED4 + b _0802FED4 .pool -@0802FE00: +_0802FE00: movs r0, 0x2 movs r1, 0xAA bl FillWindowPixelBuffer @@ -861,13 +861,13 @@ Task_DisplayMainMenu: ; 802FBA4 adds r1, r5, 0 bl DrawMainMenuWindowFrame adds r4, 0x18 -@0802FED4: +_0802FED4: adds r0, r4, 0 adds r1, r5, 0 bl DrawMainMenuWindowFrame - b @0803005E + b _0803005E .pool -@0802FEFC: +_0802FEFC: movs r0, 0x2 movs r1, 0xAA bl FillWindowPixelBuffer @@ -995,7 +995,7 @@ Task_DisplayMainMenu: ; 802FBA4 str r1, [r0] ldrh r0, [r4] cmp r0, 0x4 - bne @0803005E + bne _0803005E movs r4, 0x80 lsls r4, 6 movs r0, 0 @@ -1016,7 +1016,7 @@ Task_DisplayMainMenu: ; 802FBA4 add r0, r8 movs r1, 0x1 strh r1, [r0, 0x26] -@0803005E: +_0803005E: ldr r0, =0x03005e00 mov r2, r9 adds r1, r2, r7 @@ -1024,7 +1024,7 @@ Task_DisplayMainMenu: ; 802FBA4 adds r1, r0 ldr r0, =Task_HighlightSelectedMainMenuItem str r0, [r1] -@0803006C: +_0803006C: add sp, 0x10 pop {r3,r4} mov r8, r3 @@ -1076,7 +1076,7 @@ HandleMainMenuInput: ; 80300E0 movs r0, 0x1 ands r0, r2 cmp r0, 0 - beq @08030130 + beq _08030130 movs r0, 0x5 bl audio_play bl sub_80093CC @@ -1092,15 +1092,15 @@ HandleMainMenuInput: ; 80300E0 adds r0, r4, r0 ldr r1, =Task_HandleMainMenuAPressed str r1, [r0] - b @08030240 + b _08030240 .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 @@ -1122,27 +1122,27 @@ HandleMainMenuInput: ; 80300E0 adds r0, r4, r0 ldr r1, =Task_HandleMainMenuBPressed str r1, [r0] - b @08030240 + b _08030240 .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 @@ -1161,35 +1161,35 @@ HandleMainMenuInput: ; 80300E0 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 @@ -1211,19 +1211,19 @@ HandleMainMenuInput: ; 80300E0 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 .pool -@08030240: +_08030240: movs r0, 0 -@08030242: +_08030242: add sp, 0x4 pop {r4-r7} pop {r1} @@ -1240,7 +1240,7 @@ Task_HandleMainMenuInput: ; 803024C bl HandleMainMenuInput lsls r0, 24 cmp r0, 0 - beq @0803026C + beq _0803026C ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -1248,7 +1248,7 @@ Task_HandleMainMenuInput: ; 803024C adds r1, r0 ldr r0, =Task_HighlightSelectedMainMenuItem str r0, [r1] -@0803026C: +_0803026C: pop {r4} pop {r0} bx r0 @@ -1267,9 +1267,9 @@ Task_HandleMainMenuAPressed: ; 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 @@ -1279,12 +1279,12 @@ Task_HandleMainMenuAPressed: ; 803027C 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 @@ -1315,76 +1315,76 @@ Task_HandleMainMenuAPressed: ; 803027C 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 .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 .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 @@ -1392,27 +1392,27 @@ Task_HandleMainMenuAPressed: ; 803027C 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 .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 @@ -1420,14 +1420,14 @@ Task_HandleMainMenuAPressed: ; 803027C adds r1, r0 movs r0, 0x2 strh r0, [r1, 0x8] - b @080303DA + b _080303DA .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 @@ -1437,23 +1437,23 @@ Task_HandleMainMenuAPressed: ; 803027C movs r2, 0 bl ChangeBgY 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 .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] @@ -1465,41 +1465,41 @@ Task_HandleMainMenuAPressed: ; 803027C adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_1 str r1, [r0] - b @08030514 + b _08030514 .pool -@08030444: +_08030444: ldr r0, =0x02037714 movs r1, 0 strh r1, [r0] ldr r0, =0x02037b14 strh r1, [r0] ldr r0, =sub_8086230 - b @0803048A + b _0803048A .pool -@08030460: +_08030460: ldr r0, =0x030022c0 ldr r1, =CB2_ReinitMainMenu str r1, [r0, 0x8] ldr r0, =CB2_OptionsMenu - b @0803048A + b _0803048A .pool -@08030478: +_08030478: ldr r0, =c2_mystery_gift - b @0803048A + b _0803048A .pool -@08030480: +_08030480: ldr r0, =sub_8178974 - b @0803048A + b _0803048A .pool -@08030488: +_08030488: ldr r0, =sub_801867C -@0803048A: +_0803048A: bl SetMainCallback2 adds r0, r6, 0 bl remove_task - b @08030514 + b _08030514 .pool -@0803049C: +_0803049C: ldr r1, =0x03005e00 adds r0, r7, r6 lsls r0, 3 @@ -1542,18 +1542,18 @@ Task_HandleMainMenuAPressed: ; 803027C movs r2, 0x10 movs r3, 0 bl pal_fade_maybe - b @08030536 + b _08030536 .pool -@08030514: +_08030514: bl FreeAllWindowBuffers cmp r5, 0x2 - beq @08030528 + beq _08030528 ldr r1, =0x02022d06 movs r0, 0 strh r0, [r1] - b @08030536 + b _08030536 .pool -@08030528: +_08030528: ldr r0, =0x02022d06 ldrh r1, [r0] movs r3, 0x80 @@ -1561,7 +1561,7 @@ Task_HandleMainMenuAPressed: ; 803027C adds r2, r3, 0 orrs r1, r2 strh r1, [r0] -@08030536: +_08030536: add sp, 0x4 pop {r4-r7} pop {r0} @@ -1583,7 +1583,7 @@ Task_HandleMainMenuBPressed: ; 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 @@ -1592,12 +1592,12 @@ Task_HandleMainMenuBPressed: ; 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 FreeAllWindowBuffers @@ -1605,7 +1605,7 @@ Task_HandleMainMenuBPressed: ; 8030544 bl SetMainCallback2 adds r0, r5, 0 bl remove_task -@0803058C: +_0803058C: pop {r4,r5} pop {r0} bx r0 @@ -1627,20 +1627,20 @@ Task_DisplayMainMenuInvalidActionError: ; 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 .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 @@ -1653,30 +1653,30 @@ Task_DisplayMainMenuInvalidActionError: ; 80305A4 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, =gUnknown_085E82BE bl CreateMainMenuErrorWindow - b @08030622 + b _08030622 .pool -@08030610: +_08030610: ldr r0, =gUnknown_085E82E5 bl CreateMainMenuErrorWindow - b @08030622 + b _08030622 .pool -@0803061C: +_0803061C: ldr r0, =gUnknown_085E8328 bl CreateMainMenuErrorWindow -@08030622: +_08030622: ldr r0, =0x03005e00 lsls r1, r5, 2 adds r1, r5 @@ -1685,33 +1685,33 @@ Task_DisplayMainMenuInvalidActionError: ; 80305A4 ldrh r0, [r1, 0xA] adds r0, 0x1 strh r0, [r1, 0xA] - b @08030688 + b _08030688 .pool -@0803063C: +_0803063C: ldr r0, =0x02037fd4 ldrb r1, [r0, 0x7] movs r0, 0x80 ands r0, r1 - b @08030658 + b _08030658 .pool -@0803064C: +_0803064C: bl RunTextPrinters movs r0, 0x7 bl IsTextPrinterActive 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 @@ -1723,7 +1723,7 @@ Task_DisplayMainMenuInvalidActionError: ; 80305A4 bl pal_fade_maybe ldr r0, =Task_HandleMainMenuBPressed str r0, [r4] -@08030688: +_08030688: add sp, 0x8 pop {r4,r5} pop {r0} @@ -1745,124 +1745,124 @@ HighlightSelectedMainMenuItem: ; 8030698 movs r0, 0x40 bl SetGpuReg 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 .pool -@080306D4: +_080306D4: ldr r1, =0x0000213f - b @0803078E + b _0803078E .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 .pool -@080306F0: +_080306F0: ldr r1, =0x0000415f - b @0803078E + b _0803078E .pool -@080306F8: +_080306F8: ldr r1, =0x0000617f - b @0803078E + b _0803078E .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 .pool -@08030718: +_08030718: ldr r1, =0x0000415f - b @0803078E + b _0803078E .pool -@08030720: +_08030720: ldr r1, =0x0000617f - b @0803078E + b _0803078E .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 .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 .pool -@08030758: +_08030758: cmp r6, 0 - beq @08030764 + beq _08030764 ldr r1, =0x0000213f - b @0803078E + b _0803078E .pool -@08030764: +_08030764: ldr r1, =0x0000415f - b @0803078E + b _0803078E .pool -@0803076C: +_0803076C: cmp r6, 0 - beq @08030778 + beq _08030778 ldr r1, =0x0000415f - b @0803078E + b _0803078E .pool -@08030778: +_08030778: ldr r1, =0x0000617f - b @0803078E + b _0803078E .pool -@08030780: +_08030780: cmp r6, 0 - beq @0803078C + beq _0803078C ldr r1, =0x0000617f - b @0803078E + b _0803078E .pool -@0803078C: +_0803078C: ldr r1, =0x0000819f -@0803078E: +_0803078E: movs r0, 0x44 bl SetGpuReg - b @080307A4 + b _080307A4 .pool -@0803079C: +_0803079C: ldr r1, =0x0000819f movs r0, 0x44 bl SetGpuReg -@080307A4: +_080307A4: pop {r4-r6} pop {r0} bx r0 @@ -1977,12 +1977,12 @@ 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 .pool -@080308D4: +_080308D4: ldrb r0, [r4, 0x18] ldr r2, =0x02020630 lsls r1, r0, 4 @@ -2016,7 +2016,7 @@ task_new_game_prof_birch_speech_2: ; 80308B0 strh r0, [r4, 0x16] ldr r0, =task_new_game_prof_birch_speech_3 str r0, [r4] -@0803091A: +_0803091A: pop {r4,r5} pop {r0} bx r0 @@ -2037,7 +2037,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] @@ -2054,12 +2054,12 @@ 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 .pool -@08030970: +_08030970: ldr r0, =gUnknown_082FF080 bl InitWindows movs r0, 0 @@ -2086,7 +2086,7 @@ task_new_game_prof_birch_speech_3: ; 8030928 bl AddTextPrinterForMessage ldr r0, =task_new_game_prof_birch_speech_4 str r0, [r4] -@080309B6: +_080309B6: pop {r4} pop {r0} bx r0 @@ -2103,11 +2103,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 @@ -2123,7 +2123,7 @@ task_new_game_prof_birch_speech_4: ; 80309CC bl AddTextPrinterWithCallbackForMessage ldr r0, =0x03000dd0 strb r4, [r0] -@08030A0A: +_08030A0A: pop {r4} pop {r0} bx r0 @@ -2138,7 +2138,7 @@ task_new_game_prof_birch_speech_5: ; 8030A2C bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne @08030A58 + bne _08030A58 ldr r0, =0x02021fc4 ldr r1, =gUnknown_082C8A1F bl ExpandStringRefs @@ -2151,7 +2151,7 @@ task_new_game_prof_birch_speech_5: ; 8030A2C adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_6 str r1, [r0] -@08030A58: +_08030A58: pop {r4} pop {r0} bx r0 @@ -2263,28 +2263,28 @@ 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 .pool -@08030B64: +_08030B64: ldr r1, [r3, 0x1C] ldr r0, =DummyObjectCallback 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 .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] @@ -2293,8 +2293,8 @@ sub_8030B14: ; 8030B14 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] @@ -2304,16 +2304,16 @@ sub_8030B14: ; 8030B14 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} @@ -2331,7 +2331,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 @@ -2346,7 +2346,7 @@ task_new_game_prof_birch_speech_6: ; 8030BCC adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_7 str r1, [r0] -@08030BFE: +_08030BFE: pop {r4} pop {r0} bx r0 @@ -2361,7 +2361,7 @@ task_new_game_prof_birch_speech_7: ; 8030C18 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne @08030C7C + bne _08030C7C ldr r5, =0x02020630 ldr r0, =0x03005e00 lsls r4, r6, 2 @@ -2402,7 +2402,7 @@ task_new_game_prof_birch_speech_7: ; 8030C18 strh r0, [r4, 0x16] ldr r0, =task_new_game_prof_birch_speech_8 str r0, [r4] -@08030C7C: +_08030C7C: pop {r4-r6} pop {r0} bx r0 @@ -2425,20 +2425,20 @@ 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 SetGpuReg - b @08030CC8 + b _08030CC8 .pool -@08030CC0: +_08030CC0: ldr r0, =0x0000ffc4 strh r0, [r2, 0x10] ldr r0, =task_new_game_prof_birch_speech_9 str r0, [r2] -@08030CC8: +_08030CC8: pop {r0} bx r0 .pool @@ -2458,7 +2458,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] @@ -2485,12 +2485,12 @@ 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 .pool -@08030D34: +_08030D34: ldrb r3, [r4, 0x1C] lsls r1, r3, 4 adds r1, r3 @@ -2524,7 +2524,7 @@ task_new_game_prof_birch_speech_9: ; 8030CD4 bl sub_8031D34 ldr r0, =task_new_game_prof_birch_speech_10 str r0, [r4] -@08030D7A: +_08030D7A: pop {r4-r7} pop {r0} bx r0 @@ -2544,7 +2544,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] @@ -2559,7 +2559,7 @@ task_new_game_prof_birch_speech_10: ; 8030D84 strb r0, [r1, 0x1] ldr r0, =task_new_game_prof_birch_speech_11 str r0, [r3] -@08030DB8: +_08030DB8: pop {r0} bx r0 .pool @@ -2599,7 +2599,7 @@ task_new_game_prof_birch_speech_12: ; 8030E08 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne @08030E2A + bne _08030E2A bl sub_8031D74 ldr r0, =0x03005e00 lsls r1, r4, 2 @@ -2608,7 +2608,7 @@ task_new_game_prof_birch_speech_12: ; 8030E08 adds r1, r0 ldr r0, =task_new_game_prof_birch_speech_13 str r0, [r1] -@08030E2A: +_08030E2A: pop {r4} pop {r0} bx r0 @@ -2624,12 +2624,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 @@ -2646,7 +2646,7 @@ task_new_game_prof_birch_speech_13: ; 8030E38 ldr r1, =task_new_game_prof_birch_speech_14 str r1, [r0] adds r4, r2, 0 -@08030E76: +_08030E76: bl GetMenuCursorPos lsls r0, 24 lsrs r3, r0, 24 @@ -2657,7 +2657,7 @@ task_new_game_prof_birch_speech_13: ; 8030E38 movs r1, 0x14 ldrsh r0, [r4, r1] cmp r3, r0 - beq @08030EB8 + beq _08030EB8 strh r3, [r4, 0x14] ldr r2, =0x02020630 movs r0, 0xC @@ -2678,7 +2678,7 @@ task_new_game_prof_birch_speech_13: ; 8030E38 bl sub_8031ACC ldr r0, =sub_8030ED4 str r0, [r4] -@08030EB8: +_08030EB8: pop {r4,r5} pop {r0} bx r0 @@ -2700,7 +2700,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 @@ -2709,9 +2709,9 @@ sub_8030ED4: ; 8030ED4 ldrh r0, [r1, 0x20] adds r0, 0x4 strh r0, [r1, 0x20] - b @08030F72 + b _08030F72 .pool -@08030F0C: +_08030F0C: ldr r3, =0x02020630 lsls r0, r5, 4 adds r0, r5 @@ -2725,13 +2725,13 @@ sub_8030ED4: ; 8030ED4 movs r1, 0x14 ldrsh r0, [r4, r1] cmp r0, 0 - beq @08030F30 + beq _08030F30 ldrb r5, [r4, 0x1E] - b @08030F32 + b _08030F32 .pool -@08030F30: +_08030F30: ldrb r5, [r4, 0x1C] -@08030F32: +_08030F32: lsls r2, r5, 4 adds r2, r5 lsls r2, 2 @@ -2763,7 +2763,7 @@ sub_8030ED4: ; 8030ED4 bl sub_8031BAC ldr r0, =sub_8030F7C str r0, [r4] -@08030F72: +_08030F72: pop {r4-r7} pop {r0} bx r0 @@ -2790,18 +2790,18 @@ 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 .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 @@ -2809,7 +2809,7 @@ sub_8030F7C: ; 8030F7C strb r1, [r2, 0x1] ldr r0, =task_new_game_prof_birch_speech_13 str r0, [r3] -@08030FCA: +_08030FCA: pop {r4} pop {r0} bx r0 @@ -2850,7 +2850,7 @@ task_new_game_prof_birch_speech_15: ; 8031014 bl sub_8197224 lsls r0, 16 cmp r0, 0 - bne @08031032 + bne _08031032 ldr r0, =0x03005e00 lsls r1, r4, 2 adds r1, r4 @@ -2858,7 +2858,7 @@ task_new_game_prof_birch_speech_15: ; 8031014 adds r1, r0 ldr r0, =task_new_game_prof_birch_speech_16 str r0, [r1] -@08031032: +_08031032: pop {r4} pop {r0} bx r0 @@ -2876,12 +2876,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 @@ -2896,7 +2896,7 @@ task_new_game_prof_birch_speech_16: ; 8031040 adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_17 str r1, [r0] -@0803107A: +_0803107A: add sp, 0x4 pop {r4} pop {r0} @@ -2917,7 +2917,7 @@ task_new_game_prof_birch_speech_17: ; 8031090 lsls r0, 24 lsrs r5, r0, 24 cmp r5, 0 - bne @080310EC + bne _080310EC bl FreeAllWindowBuffers ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -2945,7 +2945,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} @@ -2988,7 +2988,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 @@ -3005,7 +3005,7 @@ task_new_game_prof_birch_speech_part2_3: ; 8031144 adds r0, r1 ldr r1, =task_new_game_prof_birch_speech_part2_4 str r1, [r0] -@08031178: +_08031178: add sp, 0x8 pop {r4} pop {r0} @@ -3022,19 +3022,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 @@ -3064,9 +3064,9 @@ task_new_game_prof_birch_speech_part2_4: ; 8031188 bl sub_8031C88 ldr r0, =task_new_game_prof_birch_speech_part2_5 str r0, [r4] - b @08031210 + b _08031210 .pool -@080311FC: +_080311FC: movs r0, 0x5 bl audio_play ldr r0, =0x03005e00 @@ -3076,7 +3076,7 @@ task_new_game_prof_birch_speech_part2_4: ; 8031188 adds r1, r0 ldr r0, =task_new_game_prof_birch_speech_11 str r0, [r1] -@08031210: +_08031210: pop {r4,r5} pop {r0} bx r0 @@ -3097,18 +3097,18 @@ 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 SetGpuReg - b @08031250 + b _08031250 .pool -@0803124C: +_0803124C: ldr r0, =task_new_game_prof_birch_speech_part2_6 str r0, [r1] -@08031250: +_08031250: pop {r0} bx r0 .pool @@ -3127,7 +3127,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] @@ -3211,7 +3211,7 @@ task_new_game_prof_birch_speech_part2_6: ; 8031258 bl AddTextPrinterForMessage ldr r0, =task_new_game_prof_birch_speech_part2_7 str r0, [r7] -@08031320: +_08031320: pop {r4-r7} pop {r0} bx r0 @@ -3231,7 +3231,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] @@ -3258,7 +3258,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 @@ -3292,7 +3292,7 @@ task_new_game_prof_birch_speech_part2_7: ; 803133C strh r0, [r4, 0x16] ldr r0, =task_new_game_prof_birch_speech_part2_8 str r0, [r4] -@080313D2: +_080313D2: pop {r4-r7} pop {r0} bx r0 @@ -3313,7 +3313,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] @@ -3340,23 +3340,23 @@ 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 .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 .pool -@08031458: +_08031458: ldrb r5, [r4, 0x1C] -@0803145A: +_0803145A: lsls r1, r5, 4 adds r1, r5 lsls r1, 2 @@ -3396,7 +3396,7 @@ task_new_game_prof_birch_speech_part2_8: ; 80313E4 bl AddTextPrinterForMessage ldr r0, =task_new_game_prof_birch_speech_part2_9 str r0, [r4] -@080314B0: +_080314B0: pop {r4-r7} pop {r0} bx r0 @@ -3419,7 +3419,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] @@ -3437,7 +3437,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 @@ -3476,7 +3476,7 @@ task_new_game_prof_birch_speech_part2_9: ; 80314C4 bl play_sound_effect ldr r0, =task_new_game_prof_birch_speech_part2_10 str r0, [r6] -@0803155C: +_0803155C: add sp, 0x4 pop {r3} mov r8, r3 @@ -3506,10 +3506,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 str r0, [r3] -@080315AA: +_080315AA: pop {r0} bx r0 .pool @@ -3526,7 +3526,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 @@ -3554,7 +3554,7 @@ task_new_game_prof_birch_speech_part2_11: ; 80315BC bl pal_fade_maybe ldr r0, =task_new_game_prof_birch_speech_part2_12 str r0, [r4] -@0803160A: +_0803160A: add sp, 0x4 pop {r4} pop {r0} @@ -3572,7 +3572,7 @@ task_new_game_prof_birch_speech_part2_12: ; 8031630 movs r0, 0x80 ands r0, r1 cmp r0, 0 - bne @08031666 + bne _08031666 bl FreeAllWindowBuffers ldr r1, =0x03005e00 lsls r0, r4, 2 @@ -3586,7 +3586,7 @@ task_new_game_prof_birch_speech_part2_12: ; 8031630 bl SetMainCallback2 adds r0, r4, 0 bl remove_task -@08031666: +_08031666: pop {r4} pop {r0} bx r0 @@ -3711,16 +3711,16 @@ 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 .pool -@080317DC: +_080317DC: strh r0, [r4, 0x14] ldrb r3, [r4, 0x1C] -@080317E0: +_080317E0: ldr r0, =0x02020630 lsls r1, r3, 4 adds r1, r3 @@ -4019,7 +4019,7 @@ sub_8031A5C: ; 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 @@ -4030,18 +4030,18 @@ sub_8031A5C: ; 8031A5C strh r0, [r1, 0x12] adds r0, r3, 0 bl remove_task - b @08031AC4 + b _08031AC4 .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 @@ -4057,7 +4057,7 @@ sub_8031A5C: ; 8031A5C lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@08031AC4: +_08031AC4: pop {r4,r5} pop {r0} bx r0 @@ -4129,7 +4129,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 @@ -4140,18 +4140,18 @@ sub_8031B3C: ; 8031B3C strh r0, [r1, 0x12] adds r0, r3, 0 bl remove_task - b @08031BA4 + b _08031BA4 .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 @@ -4167,7 +4167,7 @@ sub_8031B3C: ; 8031B3C lsrs r1, 16 movs r0, 0x52 bl SetGpuReg -@08031BA4: +_08031BA4: pop {r4,r5} pop {r0} bx r0 @@ -4240,30 +4240,30 @@ 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 .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 @@ -4276,7 +4276,7 @@ sub_8031C1C: ; 8031C1C movs r1, 0x1 movs r2, 0x10 bl gpu_pal_apply -@08031C7C: +_08031C7C: pop {r4} pop {r0} bx r0 @@ -4329,30 +4329,30 @@ 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 .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 @@ -4365,7 +4365,7 @@ sub_8031CC8: ; 8031CC8 movs r1, 0x1 movs r2, 0x10 bl gpu_pal_apply -@08031D28: +_08031D28: pop {r4} pop {r0} bx r0 @@ -4451,19 +4451,19 @@ set_default_player_name: ; 8031DC4 ldrb r0, [r0, 0x8] adds r5, r1, 0 cmp r0, 0 - bne @08031DE4 + bne _08031DE4 ldr r1, =gUnknown_082FF128 - b @08031DE6 + b _08031DE6 .pool -@08031DE4: +_08031DE4: ldr r1, =gUnknown_082FF178 -@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 @@ -4473,7 +4473,7 @@ set_default_player_name: ; 8031DC4 lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0x6 - bls @08031DF0 + bls _08031DF0 ldr r1, [r5] movs r0, 0xFF strb r0, [r1, 0x7] @@ -4642,18 +4642,18 @@ 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 .pool -@08031FA4: +_08031FA4: movs r0, 0x1 bl sub_80C0844 -@08031FAA: +_08031FAA: lsls r0, 16 lsrs r7, r0, 16 ldr r4, =0x02021fc4 @@ -4691,7 +4691,7 @@ fmt_pokedex: ; 8031F7C movs r1, 0x1 movs r3, 0x21 bl box_print -@08031FFE: +_08031FFE: add sp, 0x2C pop {r4-r7} pop {r0} @@ -4705,21 +4705,21 @@ fmt_badges: ; 8032014 sub sp, 0x2C movs r7, 0 ldr r4, =0x00000867 -@0803201C: +_0803201C: lsls r0, r4, 16 lsrs r0, 16 bl FlagGet 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, =gUnknown_085EDCD7 adds r0, r4, 0 @@ -5065,11 +5065,11 @@ sub_80322E0: ; 80322E0 adds r0, r5, 0 bl ClearWindowTilemap cmp r4, 0x1 - bne @0803230E + bne _0803230E adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@0803230E: +_0803230E: pop {r4,r5} pop {r0} bx r0 @@ -5148,17 +5148,17 @@ sub_80323A0: ; 80323A0 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 movs r1, 0 bl AddTask -@080323C0: +_080323C0: pop {r0} bx r0 .pool @@ -5238,11 +5238,11 @@ unknown_rbox_to_vram: ; 803243C adds r0, r5, 0 bl PutWindowTilemap cmp r4, 0x1 - bne @0803246A + bne _0803246A adds r0, r5, 0 movs r1, 0x3 bl CopyWindowToVram -@0803246A: +_0803246A: pop {r4,r5} pop {r0} bx r0 @@ -5454,13 +5454,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 str r0, [r4] -@08032644: +_08032644: pop {r4} pop {r0} bx r0 diff --git a/asm/malloc.s b/asm/malloc.s index 1c3dc135b..32f538132 100644 --- a/asm/malloc.s +++ b/asm/malloc.s @@ -37,25 +37,25 @@ AllocInternal: ; 80009B8 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 @@ -70,21 +70,21 @@ AllocInternal: ; 80009B8 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 @@ -95,7 +95,7 @@ AllocInternal: ; 80009B8 FreeInternal: ; 8000A20 push {r4,r5,lr} cmp r1, 0 - beq @08000A7C + beq _08000A7C adds r5, r0, 0 adds r2, r1, 0 subs r2, 0x10 @@ -103,10 +103,10 @@ FreeInternal: ; 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] @@ -117,23 +117,23 @@ FreeInternal: ; 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] @@ -141,7 +141,7 @@ FreeInternal: ; 8000A20 ldr r2, [r2, 0x4] adds r1, r2 str r1, [r0, 0x4] -@08000A7C: +_08000A7C: pop {r4,r5} pop {r0} bx r0 @@ -156,15 +156,15 @@ AllocZeroedInternal: ; 8000A84 bl AllocInternal 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 @@ -175,7 +175,7 @@ AllocZeroedInternal: ; 8000A84 mov r0, sp adds r1, r5, 0 bl CpuSet -@08000AB8: +_08000AB8: adds r0, r5, 0 add sp, 0x4 pop {r4,r5} @@ -193,43 +193,43 @@ CheckMemBlockInternal: ; 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 .pool -@08000B14: +_08000B14: movs r0, 0x1 -@08000B16: +_08000B16: pop {r4,r5} pop {r1} bx r1 @@ -308,23 +308,23 @@ CheckHeap: ; 8000B88 ldr r0, =0x03000004 ldr r4, [r0] adds r5, r0, 0 -@08000B90: +_08000B90: ldr r0, [r5] adds r1, r4, 0 adds r1, 0x10 bl CheckMemBlockInternal 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 .pool -@08000BB0: +_08000BB0: movs r0, 0 -@08000BB2: +_08000BB2: pop {r4,r5} pop {r1} bx r1 diff --git a/asm/multiboot.s b/asm/multiboot.s index 0c09538ff..cecfa8ba7 100644 --- a/asm/multiboot.s +++ b/asm/multiboot.s @@ -37,25 +37,25 @@ MultiBootMain: ; 81BA70C adds r7, r0, 0 bl MultiBootCheckComplete 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 @@ -63,79 +63,79 @@ MultiBootMain: ; 81BA70C movs r5, 0xFC ands r5, r0 cmp r5, 0x8 - beq @081BA760 + beq _081BA760 adds r0, r7, 0 bl MultiBootInit movs r0, 0x8 eors r0, r5 - b @081BAAEC + b _081BAAEC .pool -@081BA760: +_081BA760: ldrb r0, [r7, 0x18] cmp r0, 0xDF - bls @081BA7B2 + bls _081BA7B2 adds r0, r7, 0 bl MultiBootHandShake 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 MultiBootCheckComplete cmp r0, 0 - bne @081BA790 - b @081BAADA -@081BA790: + bne _081BA790 + b _081BAADA +_081BA790: adds r0, r7, 0 bl MultiBootCheckComplete 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 MultiBootInit 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 @@ -145,19 +145,19 @@ MultiBootMain: ; 81BA70C 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] @@ -169,14 +169,14 @@ MultiBootMain: ; 81BA70C movs r1, 0x1 ands r0, r1 cmp r0, 0 - beq @081BA82C + beq _081BA82C ldr r0, =0x00007208 - b @081BA852 + b _081BA852 .pool -@081BA82C: +_081BA82C: subs r5, 0x1 cmp r5, 0 - beq @081BA858 + beq _081BA858 lsls r0, r5, 1 ldr r1, =0x04000120 adds r0, r1 @@ -187,48 +187,48 @@ MultiBootMain: ; 81BA70C 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 MultiBootStartProbe - b @081BA892 + b _081BA892 .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 @@ -236,7 +236,7 @@ MultiBootMain: ; 81BA70C movs r5, 0x3 mov r12, r1 ldr r3, =0x0300129c -@081BA8A0: +_081BA8A0: lsls r0, r5, 1 ldr r2, =0x04000120 adds r0, r2 @@ -245,7 +245,7 @@ MultiBootMain: ; 81BA70C 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] @@ -254,28 +254,28 @@ MultiBootMain: ; 81BA70C 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 .pool -@081BA8F0: +_081BA8F0: movs r5, 0x3 movs r0, 0x49 adds r0, r7 @@ -286,14 +286,14 @@ MultiBootMain: ; 81BA70C 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] @@ -301,18 +301,18 @@ MultiBootMain: ; 81BA70C 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 .pool -@081BA93C: +_081BA93C: movs r3, 0x1 movs r5, 0x3 movs r0, 0x49 @@ -322,7 +322,7 @@ MultiBootMain: ; 81BA70C adds r6, 0x19 ldr r1, =0x0300129c mov r8, r1 -@081BA94E: +_081BA94E: lsls r0, r5, 1 ldr r2, =0x04000120 adds r0, r2 @@ -337,48 +337,48 @@ MultiBootMain: ; 81BA70C 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 MultiBootSend - b @081BAAEC + b _081BAAEC .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 @@ -389,49 +389,49 @@ MultiBootMain: ; 81BA70C adds r0, r7, 0 adds r1, r3, 0 bl MultiBootSend - 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 .pool -@081BAA18: +_081BAA18: adds r0, r7, 0 bl MultiBootInit 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 @@ -439,7 +439,7 @@ MultiBootMain: ; 81BA70C mov r8, r12 movs r0, 0x1 mov r9, r0 -@081BAA36: +_081BAA36: mov r1, r8 ldrb r6, [r1] adds r0, r6, 0 @@ -447,7 +447,7 @@ MultiBootMain: ; 81BA70C mov r2, r9 ands r0, r2 cmp r0, 0 - beq @081BAA70 + beq _081BAA70 lsls r0, r5, 1 ldr r1, =0x04000120 adds r0, r1 @@ -461,49 +461,49 @@ MultiBootMain: ; 81BA70C 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 .pool -@081BAA90: +_081BAA90: mov r1, r12 ldrb r0, [r1] cmp r0, 0 - bne @081BAAA2 + bne _081BAAA2 adds r0, r7, 0 bl MultiBootInit 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 @@ -517,23 +517,23 @@ MultiBootMain: ; 81BA70C bl MultiBootSend 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 MultiBootWaitSendDone - b @081BA736 -@081BAAE0: + b _081BA736 +_081BAAE0: adds r0, r7, 0 bl MultiBootInit movs r0, 0x60 - b @081BAAEC -@081BAAEA: + b _081BAAEC +_081BAAEA: movs r0, 0 -@081BAAEC: +_081BAAEC: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -555,7 +555,7 @@ MultiBootSend: ; 81BAAFC movs r4, 0x8C ands r4, r0 cmp r4, 0x8 - bne @081BAB34 + bne _081BAB34 ldr r0, =0x0400012a strh r1, [r0] ldr r1, =0x00002083 @@ -566,15 +566,15 @@ MultiBootSend: ; 81BAAFC movs r0, 0x1 strb r0, [r1] movs r0, 0 - b @081BAB40 + b _081BAB40 .pool -@081BAB34: +_081BAB34: adds r0, r2, 0 bl MultiBootInit movs r0, 0x8 eors r4, r0 adds r0, r4, 0 -@081BAB40: +_081BAB40: pop {r4} pop {r1} bx r1 @@ -587,18 +587,18 @@ MultiBootStartProbe: ; 81BAB48 adds r1, r0, 0 ldrb r0, [r1, 0x18] cmp r0, 0 - beq @081BAB5A + beq _081BAB5A adds r0, r1, 0 bl MultiBootInit - 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 MultiBootStartProbe @@ -617,15 +617,15 @@ MultiBootStartMaster: ; 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 @@ -635,13 +635,13 @@ MultiBootStartMaster: ; 81BAB6C adds r1, r2, r0 ldr r0, =0x0003ff00 cmp r1, r0 - bls @081BABB4 -@081BABA8: + bls _081BABB4 +_081BABA8: adds r0, r4, 0 bl MultiBootInit - b @081BAC28 + b _081BAC28 .pool -@081BABB4: +_081BABB4: adds r0, r6, r2 str r0, [r4, 0x24] lsls r1, r7, 24 @@ -651,41 +651,41 @@ MultiBootStartMaster: ; 81BAB6C 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 .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 @@ -696,7 +696,7 @@ MultiBootStartMaster: ; 81BAB6C strb r0, [r4, 0x1C] movs r0, 0xD0 strb r0, [r4, 0x18] -@081BAC28: +_081BAC28: pop {r4-r7} pop {r0} bx r0 @@ -708,12 +708,12 @@ MultiBootCheckComplete: ; 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 MultiBootCheckComplete @@ -725,17 +725,17 @@ MultiBootHandShake: ; 81BAC44 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] @@ -743,28 +743,28 @@ MultiBootHandShake: ; 81BAC44 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] @@ -772,7 +772,7 @@ MultiBootHandShake: ; 81BAC44 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 @@ -784,18 +784,18 @@ MultiBootHandShake: ; 81BAC44 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 MultiBootSend - b @081BAD28 + b _081BAD28 .pool -@081BACD0: +_081BACD0: lsls r0, r4, 1 ldr r1, =0x04000120 adds r0, r1 @@ -806,21 +806,21 @@ MultiBootHandShake: ; 81BAC44 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 @@ -831,16 +831,16 @@ MultiBootHandShake: ; 81BAC44 orrs r1, r0 str r1, [r3] str r1, [r3, 0x4] - b @081BACC0 + b _081BACC0 .pool -@081BAD1C: +_081BAD1C: adds r0, r3, 0 bl MultiBootInit movs r0, 0x71 - b @081BAD28 -@081BAD26: + b _081BAD28 +_081BAD26: movs r0, 0 -@081BAD28: +_081BAD28: pop {r4-r6} pop {r1} bx r1 @@ -853,14 +853,14 @@ MultiBootWaitCycles: ; 81BAD30 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 MultiBootWaitCycles @@ -874,19 +874,19 @@ MultiBootWaitSendDone: ; 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 MultiBootWaitCycles diff --git a/asm/pixel_buffer.s b/asm/pixel_buffer.s index 7f866010c..d353a1d20 100644 --- a/asm/pixel_buffer.s +++ b/asm/pixel_buffer.s @@ -77,11 +77,11 @@ BlitBitmapRect4Bit: ; 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 @@ -89,10 +89,10 @@ BlitBitmapRect4Bit: ; 8002C20 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 @@ -108,14 +108,14 @@ BlitBitmapRect4Bit: ; 8002C20 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 @@ -123,7 +123,7 @@ BlitBitmapRect4Bit: ; 8002C20 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] @@ -140,7 +140,7 @@ BlitBitmapRect4Bit: ; 8002C20 mov r12, r0 lsls r0, r1, 29 lsrs r3, r0, 27 -@08002CE4: +_08002CE4: asrs r0, r5, 1 ands r0, r7 ldr r2, [sp] @@ -183,21 +183,21 @@ BlitBitmapRect4Bit: ; 8002C20 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 @@ -205,7 +205,7 @@ BlitBitmapRect4Bit: ; 8002C20 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 @@ -224,7 +224,7 @@ BlitBitmapRect4Bit: ; 8002C20 mov r12, r0 lsls r0, r1, 29 lsrs r7, r0, 27 -@08002D84: +_08002D84: asrs r0, r5, 1 mov r1, r9 ands r0, r1 @@ -258,7 +258,7 @@ BlitBitmapRect4Bit: ; 8002C20 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 @@ -269,18 +269,18 @@ BlitBitmapRect4Bit: ; 8002C20 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 @@ -319,17 +319,17 @@ FillBitmapRect4Bit: ; 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 @@ -345,19 +345,19 @@ FillBitmapRect4Bit: ; 8002E00 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 @@ -371,28 +371,28 @@ FillBitmapRect4Bit: ; 8002E00 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 @@ -453,24 +453,24 @@ BlitBitmapRect4BitTo8Bit: ; 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 @@ -488,14 +488,14 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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] @@ -506,7 +506,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 lsrs r0, r7, 3 lsls r0, 5 str r0, [sp, 0x30] -@08002F88: +_08002F88: ldr r0, [sp] ldr r1, [r0] ldr r3, [sp, 0x2C] @@ -530,7 +530,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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 @@ -539,7 +539,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 lsls r0, r5, 29 lsrs r0, 26 mov r9, r0 -@08002FC8: +_08002FC8: movs r0, 0x7 ands r0, r4 ldr r5, [sp, 0x4] @@ -554,11 +554,11 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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 @@ -573,7 +573,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 ldrb r1, [r6] movs r0, 0xF ands r0, r1 -@08003008: +_08003008: ldr r1, [sp, 0x14] adds r0, r1, r0 strb r0, [r5] @@ -581,20 +581,20 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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] @@ -602,7 +602,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 ldr r1, [sp, 0x34] ands r1, r0 str r1, [sp, 0x34] -@0800303C: +_0800303C: ldr r3, [sp] ldr r1, [r3] ldr r7, [sp, 0x34] @@ -627,7 +627,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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 @@ -636,17 +636,17 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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 @@ -662,8 +662,8 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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 @@ -680,7 +680,7 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 ands r2, r0 ldr r0, [sp, 0x10] cmp r2, r0 - beq @080030F2 + beq _080030F2 adds r0, r4, 0 movs r1, 0x7 ands r0, r1 @@ -695,21 +695,21 @@ BlitBitmapRect4BitTo8Bit: ; 8002EC8 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 @@ -749,16 +749,16 @@ FillBitmapRect8Bit: ; 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 @@ -766,13 +766,13 @@ FillBitmapRect8Bit: ; 8003118 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 @@ -781,7 +781,7 @@ FillBitmapRect8Bit: ; 8003118 lsls r4, r0, 6 lsls r0, r1, 29 lsrs r2, r0, 26 -@08003186: +_08003186: adds r0, r3, 0 mov r6, r12 ands r0, r6 @@ -797,12 +797,12 @@ FillBitmapRect8Bit: ; 8003118 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/rtc.s b/asm/rtc.s index 310ba104d..dd25ace60 100644 --- a/asm/rtc.s +++ b/asm/rtc.s @@ -29,15 +29,15 @@ GameFreakRTC_ConvertFromBCD: ; 802F0F8 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 @@ -45,7 +45,7 @@ GameFreakRTC_ConvertFromBCD: ; 802F0F8 adds r0, r1 lsls r0, 1 adds r0, r3 -@0802F11C: +_0802F11C: pop {r1} bx r1 thumb_func_end GameFreakRTC_ConvertFromBCD @@ -58,25 +58,25 @@ GameFreakRTC_IsLeapYear: ; 802F120 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 @@ -98,8 +98,8 @@ GameFreakRTC_ConvertYearMonthDayToNumDays: ; 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 @@ -109,41 +109,41 @@ GameFreakRTC_ConvertYearMonthDayToNumDays: ; 802F154 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, =gDaysInEachMonth 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 GameFreakRTC_IsLeapYear 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 @@ -204,18 +204,18 @@ GameFreakRTC_Init: ; 802F21C movs r0, 0xF ands r0, r4 cmp r0, 0x1 - beq @0802F250 + beq _0802F250 movs r0, 0x1 strh r0, [r5] - b @0802F26E + b _0802F26E .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 @@ -224,7 +224,7 @@ GameFreakRTC_Init: ; 802F21C bl GameFreakRTC_TestForErrors ldr r1, =0x03000db8 strh r0, [r1] -@0802F26E: +_0802F26E: pop {r4,r5} pop {r0} bx r0 @@ -251,17 +251,17 @@ GameFreakRTC_GetRTCDateTime: ; 802F288 lsls r0, 4 ands r0, r1 cmp r0, 0 - beq @0802F2AC + beq _0802F2AC adds r1, r2, 0 ldr r0, =gDefaultRTCInfo ldm r0!, {r2-r4} stm r1!, {r2-r4} - b @0802F2B2 + b _0802F2B2 .pool -@0802F2AC: +_0802F2AC: adds r0, r2, 0 bl GameFreakRTC_GetControlRegAndRTCDateTime -@0802F2B2: +_0802F2B2: pop {r4} pop {r0} bx r0 @@ -327,49 +327,49 @@ GameFreakRTC_TestForErrors: ; 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 GameFreakRTC_ConvertFromBCD 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 GameFreakRTC_ConvertFromBCD 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 GameFreakRTC_ConvertFromBCD 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 GameFreakRTC_IsLeapYear lsls r0, 24 @@ -377,60 +377,60 @@ GameFreakRTC_TestForErrors: ; 802F2FC ldr r1, =gDaysInEachMonth ldr r1, [r1, 0x4] adds r0, r1 - b @0802F38E + b _0802F38E .pool -@0802F384: +_0802F384: ldr r0, =gDaysInEachMonth 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 GameFreakRTC_ConvertFromBCD 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 GameFreakRTC_ConvertFromBCD 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 GameFreakRTC_ConvertFromBCD 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 @@ -614,38 +614,38 @@ GameFreakRTC_GetRTCDelta: ; 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 @@ -731,37 +731,37 @@ GameFreakRTC_GetDelta: ; 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 diff --git a/asm/string_util.s b/asm/string_util.s index 8b8db7bd1..f3d3736cb 100644 --- a/asm/string_util.s +++ b/asm/string_util.s @@ -5,7 +5,7 @@ CopyString_Limit10: ; 8008B10 adds r4, r0, 0 movs r5, 0xA movs r3, 0 -@08008B18: +_08008B18: adds r2, r4, r3 adds r0, r1, r3 ldrb r0, [r0] @@ -13,19 +13,19 @@ CopyString_Limit10: ; 8008B10 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 @@ -38,23 +38,23 @@ GetStringEnd_Limit7: ; 8008B44 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 @@ -67,7 +67,7 @@ CopyString_Limit7: ; 8008B70 adds r4, r0, 0 movs r5, 0x7 movs r3, 0 -@08008B78: +_08008B78: adds r2, r4, r3 adds r0, r1, r3 ldrb r0, [r0] @@ -75,17 +75,17 @@ CopyString_Limit7: ; 8008B70 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 @@ -96,16 +96,16 @@ CopyString_Limit7: ; 8008B70 CopyString: ; 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 @@ -118,13 +118,13 @@ CopyString: ; 8008BA0 AppendString: ; 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 CopyString pop {r1} @@ -142,9 +142,9 @@ CopyString_LimitN: ; 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] @@ -153,8 +153,8 @@ CopyString_LimitN: ; 8008BD8 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} @@ -168,13 +168,13 @@ AppendString_LimitN: ; 8008C08 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 CopyString_LimitN pop {r1} @@ -189,16 +189,16 @@ GetStringLength: ; 8008C24 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 @@ -209,24 +209,24 @@ GetStringLength: ; 8008C24 CompareString: ; 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 CompareString @@ -236,27 +236,27 @@ CompareString: ; 8008C44 CompareString_LimitN: ; 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 @@ -269,25 +269,25 @@ IsStringLengthLessThanN: ; 8008C94 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 IsStringLengthLessThanN @@ -308,19 +308,19 @@ ConvertIntToDecimalString: ; 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, =gDigits mov r8, r0 -@08008CEE: +_08008CEE: adds r0, r6, 0 adds r1, r5, 0 bl __divsi3 @@ -331,56 +331,56 @@ ConvertIntToDecimalString: ; 8008CC0 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 .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 @@ -407,19 +407,19 @@ ConvertUnsignedIntToDecimalString: ; 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, =gDigits mov r8, r0 -@08008D9E: +_08008D9E: adds r0, r6, 0 adds r1, r5, 0 bl __udivsi3 @@ -430,56 +430,56 @@ ConvertUnsignedIntToDecimalString: ; 8008D70 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 .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 @@ -505,30 +505,30 @@ ConvertIntToHexString: ; 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, =gDigits mov r9, r0 -@08008E5E: +_08008E5E: mov r0, r8 adds r1, r5, 0 str r3, [sp] @@ -541,53 +541,53 @@ ConvertIntToHexString: ; 8008E20 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 .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 @@ -606,28 +606,28 @@ ExpandStringRefs: ; 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 .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 GetExpandedStringRef @@ -635,8 +635,8 @@ ExpandStringRefs: ; 8008EE0 adds r0, r4, 0 bl ExpandStringRefs adds r4, r0, 0 - b @08008EE6 -@08008F2C: + b _08008EE6 +_08008F2C: strb r2, [r4] adds r4, 0x1 ldrb r2, [r5] @@ -645,57 +645,57 @@ ExpandStringRefs: ; 8008EE0 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 .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 @@ -722,30 +722,30 @@ sub_8008FCC: ; 8008FCC bl memcpy adds r0, r5, 0 mov r1, sp -@08008FEE: +_08008FEE: bl CopyString 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 .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 @@ -803,13 +803,13 @@ StringRef_GetDummiedOutGenderDependentString: ; 8009058 ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq @08009070 + beq _08009070 ldr r0, =gUnknown_085E821A - b @08009072 + b _08009072 .pool -@08009070: +_08009070: ldr r0, =gUnknown_085E8219 -@08009072: +_08009072: pop {r1} bx r1 .pool @@ -823,13 +823,13 @@ StringRef_GetRivalName: ; 800907C ldr r0, [r0] ldrb r0, [r0, 0x8] cmp r0, 0 - beq @08009094 + beq _08009094 ldr r0, =gUnknown_085E8258 - b @08009096 + b _08009096 .pool -@08009094: +_08009094: ldr r0, =gUnknown_085E8260 -@08009096: +_08009096: pop {r1} bx r1 .pool @@ -896,17 +896,17 @@ StringRef_GetGroudonString: ; 80090D0 GetExpandedStringRef: ; 80090D8 push {lr} cmp r0, 0xD - bhi @080090F0 + bhi _080090F0 ldr r1, =gStringRefFunctionTable lsls r0, 2 adds r0, r1 ldr r0, [r0] bl _call_via_r0 - b @080090F2 + b _080090F2 .pool -@080090F0: +_080090F0: ldr r0, =gUnknown_085E8218 -@080090F2: +_080090F2: pop {r1} bx r1 .pool @@ -923,16 +923,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 @@ -950,37 +950,37 @@ CopyStringPadded: ; 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 @@ -1011,29 +1011,29 @@ CopyString_LimitN_Multibyte: ; 800918C 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 @@ -1048,19 +1048,19 @@ GetStringLength_Multibyte: ; 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 @@ -1077,25 +1077,25 @@ WriteColorChangeControlCode: ; 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 @@ -1110,24 +1110,24 @@ WriteColorChangeControlCode: ; 80091EC 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 @@ -1139,28 +1139,28 @@ sub_800924C: ; 800924C 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 @@ -1174,11 +1174,11 @@ GetExtendedControlCodeLength: ; 800927C lsrs r1, r0, 24 movs r0, 0 cmp r1, 0x18 - bhi @0800928E + bhi _0800928E ldr r0, =gExtendedControlCodeLengths adds r0, r1, r0 ldrb r0, [r0] -@0800928E: +_0800928E: pop {r1} bx r1 .pool @@ -1189,18 +1189,18 @@ GetExtendedControlCodeLength: ; 800927C SkipExtendedControlCode: ; 8009298 push {r4,lr} adds r4, r0, 0 - b @080092AC -@0800929E: + b _080092AC +_0800929E: adds r4, 0x1 ldrb r0, [r4] bl GetExtendedControlCodeLength 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} @@ -1214,22 +1214,22 @@ CompareStringWithoutExtendedControlCodes: ; 80092BC 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 SkipExtendedControlCode adds r4, r0, 0 @@ -1239,12 +1239,12 @@ CompareStringWithoutExtendedControlCodes: ; 80092BC 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} @@ -1259,7 +1259,7 @@ StopMusicWhileStringIsPrinted: ; 8009308 lsls r1, 24 lsrs r1, 24 cmp r1, 0x1 - bne @08009368 + bne _08009368 bl StripExtendedControlCodes adds r0, r4, 0 bl GetStringLength @@ -1287,22 +1287,22 @@ StopMusicWhileStringIsPrinted: ; 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 @@ -1317,12 +1317,12 @@ StripExtendedControlCodes: ; 8009370 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 @@ -1334,8 +1334,8 @@ StripExtendedControlCodes: ; 8009370 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 @@ -1348,12 +1348,12 @@ StripExtendedControlCodes: ; 8009370 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] diff --git a/asm/task.s b/asm/task.s index e44100bba..9deaabd20 100644 --- a/asm/task.s +++ b/asm/task.s @@ -6,7 +6,7 @@ clear_tasks: ; 80A8F50 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 @@ clear_tasks: ; 80A8F50 lsls r4, 24 lsrs r4, 24 cmp r4, 0xF - bls @080A8F5A + bls _080A8F5A ldr r0, =0x03005e00 movs r1, 0xFE strb r1, [r0, 0x5] @@ -54,14 +54,14 @@ AddTask: ; 80A8FB0 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 @@ -75,16 +75,16 @@ AddTask: ; 80A8FB0 movs r0, 0x1 strb r0, [r4, 0x4] adds r0, r6, 0 - b @080A8FFC + b _080A8FFC .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 @@ -102,7 +102,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 @@ -112,9 +112,9 @@ insert_task_in_order_by_priority: ; 80A9004 strb r1, [r0, 0x5] movs r1, 0xFF strb r1, [r0, 0x6] - b @080A9090 + b _080A9090 .pool -@080A9034: +_080A9034: ldr r6, =0x03005e00 lsls r0, r4, 2 mov r12, r0 @@ -122,7 +122,7 @@ insert_task_in_order_by_priority: ; 80A9004 adds r0, r4 lsls r0, 3 adds r2, r0, r6 -@080A9042: +_080A9042: lsls r0, r1, 2 adds r0, r1 lsls r5, r0, 3 @@ -131,30 +131,30 @@ insert_task_in_order_by_priority: ; 80A9004 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 .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 @@ -164,7 +164,7 @@ insert_task_in_order_by_priority: ; 80A9004 ldrb r1, [r2, 0x6] strb r1, [r0, 0x6] strb r4, [r2, 0x6] -@080A9090: +_080A9090: pop {r3} mov r8, r3 pop {r4-r7} @@ -185,28 +185,28 @@ 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 .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 @@ -214,8 +214,8 @@ remove_task: ; 80A909C 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 @@ -229,7 +229,7 @@ remove_task: ; 80A909C adds r0, r4 ldrb r1, [r2, 0x5] strb r1, [r0, 0x5] -@080A9106: +_080A9106: pop {r4} pop {r0} bx r0 @@ -243,9 +243,9 @@ run_active_tasks: ; 80A910C 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 @@ -254,8 +254,8 @@ run_active_tasks: ; 80A910C bl _call_via_r1 ldrb r0, [r4, 0x6] cmp r0, 0xFF - bne @080A911C -@080A9130: + bne _080A911C +_080A9130: pop {r4,r5} pop {r0} bx r0 @@ -271,27 +271,27 @@ get_first_active_task: ; 80A913C 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 @@ -366,28 +366,28 @@ is_function_an_active_task: ; 80A91E4 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 .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 @@ -400,24 +400,24 @@ get_task_id_by_function: ; 80A921C 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 .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 @@ -428,23 +428,23 @@ sub_80A924C: ; 80A924C 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 @@ -460,7 +460,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 @@ -476,7 +476,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 @@ -491,10 +491,10 @@ get_word_task_arg: ; 80A92B4 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 @@ -512,7 +512,7 @@ get_word_task_arg: ; 80A92B4 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 901b8bcb7..e54b6ceff 100644 --- a/asm/text_renderer.s +++ b/asm/text_renderer.s @@ -15,11 +15,11 @@ DeactivateAllTextPrinters: ; 80045B0 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 .pool @@ -125,11 +125,11 @@ AddTextPrinter: ; 800467C ldr r0, =0x03002f80 ldr r0, [r0] cmp r0, 0 - bne @08004698 + bne _08004698 movs r0, 0 - b @08004766 + b _08004766 .pool -@08004698: +_08004698: ldr r0, =0x0202018c movs r2, 0 movs r1, 0x1 @@ -141,12 +141,12 @@ AddTextPrinter: ; 800467C 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} @@ -169,9 +169,9 @@ AddTextPrinter: ; 800467C lsrs r2, 4 bl GenerateFontHalfRowLookupTable 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] @@ -188,35 +188,35 @@ AddTextPrinter: ; 800467C stm r1!, {r2,r3,r7} ldm r0!, {r2,r4,r7} stm r1!, {r2,r4,r7} - b @0800475E + b _0800475E .pool -@08004718: +_08004718: ldr r1, =0x0202018c movs r0, 0 strb r0, [r1, 0x1D] movs r4, 0 ldr r7, =0x000003ff - b @08004732 + b _08004732 .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 RenderFont 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 CopyWindowToVram -@0800474E: +_0800474E: ldr r2, =0x020201b0 ldrb r1, [r6, 0x4] lsls r0, r1, 3 @@ -225,12 +225,12 @@ AddTextPrinter: ; 800467C 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 @@ -246,61 +246,61 @@ RunTextPrinters: ; 8004778 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 RenderFont 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 .pool -@080047B8: +_080047B8: cmp r4, 0x3 - beq @080047C6 - b @080047E8 -@080047BE: + beq _080047C6 + b _080047E8 +_080047BE: ldrb r0, [r5] movs r1, 0x2 bl CopyWindowToVram -@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 .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} @@ -328,7 +328,7 @@ IsTextPrinterActive: ; 8004800 RenderFont: ; 8004818 push {r4,lr} adds r4, r0, 0 -@0800481C: +_0800481C: ldrb r1, [r4, 0x5] ldr r0, =0x03002f80 ldr r2, [r0] @@ -342,7 +342,7 @@ RenderFont: ; 8004818 lsls r0, 16 lsrs r0, 16 cmp r0, 0x2 - beq @0800481C + beq _0800481C pop {r4} pop {r1} bx r1 @@ -1010,34 +1010,34 @@ GetLastTextColor: ; 8004D58 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 .pool -@08004D80: +_08004D80: ldr r0, =0x030009ea ldrb r0, [r0] - b @08004D9A + b _08004D9A .pool -@08004D8C: +_08004D8C: ldr r0, =0x030009ee ldrb r0, [r0] - b @08004D9A + b _08004D9A .pool -@08004D98: +_08004D98: movs r0, 0 -@08004D9A: +_08004D9A: pop {r1} bx r1 thumb_func_end GetLastTextColor @@ -1068,9 +1068,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] @@ -1079,9 +1079,9 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1090,11 +1090,11 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1104,9 +1104,9 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1114,7 +1114,7 @@ CopyGlyphToWindow: ; 8004DA0 adds r0, r1, 0x1 mov r10, r0 cmp r4, r8 - bcs @08004E72 + bcs _08004E72 movs r2, 0x7 mov r12, r2 lsrs r0, r1, 3 @@ -1125,12 +1125,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1151,19 +1151,19 @@ CopyGlyphToWindow: ; 8004DA0 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 .pool -@08004E84: +_08004E84: mov r1, r8 str r3, [sp, 0x14] ldr r3, [sp] @@ -1181,8 +1181,8 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1190,7 +1190,7 @@ CopyGlyphToWindow: ; 8004DA0 adds r2, r1, 0x1 mov r8, r2 cmp r4, r12 - bcs @08004F06 + bcs _08004F06 movs r3, 0x7 mov r10, r3 lsrs r0, r1, 3 @@ -1201,12 +1201,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1227,17 +1227,17 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1249,9 +1249,9 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1259,7 +1259,7 @@ CopyGlyphToWindow: ; 8004DA0 adds r2, r1, 0x1 mov r10, r2 cmp r4, r8 - bcs @08004F86 + bcs _08004F86 movs r3, 0x7 mov r12, r3 lsrs r0, r1, 3 @@ -1270,12 +1270,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1296,23 +1296,23 @@ CopyGlyphToWindow: ; 8004DA0 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 .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] @@ -1328,8 +1328,8 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1337,7 +1337,7 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1346,12 +1346,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1372,17 +1372,17 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1395,9 +1395,9 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1405,7 +1405,7 @@ CopyGlyphToWindow: ; 8004DA0 adds r3, r1, 0x1 mov r10, r3 cmp r4, r8 - bcs @08005096 + bcs _08005096 movs r0, 0x7 mov r12, r0 lsrs r0, r1, 3 @@ -1416,12 +1416,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1442,19 +1442,19 @@ CopyGlyphToWindow: ; 8004DA0 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 .pool -@080050A4: +_080050A4: mov r1, r8 str r5, [sp, 0x44] ldr r3, [sp] @@ -1473,8 +1473,8 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1482,7 +1482,7 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1491,12 +1491,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1517,17 +1517,17 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1540,8 +1540,8 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1549,7 +1549,7 @@ CopyGlyphToWindow: ; 8004DA0 adds r3, r1, 0x1 mov r10, r3 cmp r4, r8 - bcs @080051A4 + bcs _080051A4 movs r0, 0x7 mov r12, r0 lsrs r0, r1, 3 @@ -1560,12 +1560,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1586,17 +1586,17 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1608,8 +1608,8 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1617,7 +1617,7 @@ CopyGlyphToWindow: ; 8004DA0 adds r2, r1, 0x1 mov r10, r2 cmp r4, r8 - bcs @08005222 + bcs _08005222 movs r3, 0x7 mov r12, r3 lsrs r0, r1, 3 @@ -1628,12 +1628,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1654,17 +1654,17 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1677,8 +1677,8 @@ CopyGlyphToWindow: ; 8004DA0 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] @@ -1686,7 +1686,7 @@ CopyGlyphToWindow: ; 8004DA0 adds r0, r1, 0x1 mov r10, r0 cmp r4, r8 - bcs @080052A2 + bcs _080052A2 movs r2, 0x7 mov r12, r2 lsrs r0, r1, 3 @@ -1697,12 +1697,12 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1723,17 +1723,17 @@ CopyGlyphToWindow: ; 8004DA0 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 @@ -1755,7 +1755,7 @@ ClearTextSpan: ; 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 @@ -1790,7 +1790,7 @@ ClearTextSpan: ; 80052C8 str r0, [sp, 0x4] add r0, sp, 0x8 bl FillBitmapRect4Bit -@0800531E: +_0800531E: add sp, 0x10 pop {r4-r6} pop {r0} @@ -1809,7 +1809,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 @@ -1819,7 +1819,7 @@ Font0Func: ; 800533C movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@08005360: +_08005360: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -1839,7 +1839,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 @@ -1851,7 +1851,7 @@ Font1Func: ; 8005370 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@08005398: +_08005398: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -1871,7 +1871,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 @@ -1883,7 +1883,7 @@ Font2Func: ; 80053A8 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@080053D0: +_080053D0: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -1903,7 +1903,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 @@ -1915,7 +1915,7 @@ Font3Func: ; 80053E0 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@08005408: +_08005408: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -1935,7 +1935,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 @@ -1947,7 +1947,7 @@ Font4Func: ; 8005418 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@08005440: +_08005440: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -1967,7 +1967,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 @@ -1979,7 +1979,7 @@ Font5Func: ; 8005450 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@08005478: +_08005478: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -1999,7 +1999,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 @@ -2011,7 +2011,7 @@ Font7Func: ; 8005488 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@080054B0: +_080054B0: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -2031,7 +2031,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 @@ -2043,7 +2043,7 @@ Font8Func: ; 80054C0 movs r1, 0x80 orrs r0, r1 strb r0, [r3, 0x1] -@080054E8: +_080054E8: adds r0, r2, 0 bl RenderText lsls r0, 16 @@ -2063,12 +2063,12 @@ TextPrinterInitDownArrowCounters: ; 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 .pool -@08005514: +_08005514: ldrb r0, [r2, 0x1] movs r1, 0x61 negs r1, r1 @@ -2077,7 +2077,7 @@ TextPrinterInitDownArrowCounters: ; 80054F8 negs r0, r0 ands r1, r0 strb r1, [r2, 0x1] -@08005524: +_08005524: pop {r0} bx r0 thumb_func_end TextPrinterInitDownArrowCounters @@ -2095,12 +2095,12 @@ TextPrinterDrawDownArrow: ; 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 @@ -2109,9 +2109,9 @@ TextPrinterDrawDownArrow: ; 8005528 ands r0, r1 movs r1, 0x20 negs r1, r1 - b @080055E8 + b _080055E8 .pool -@08005560: +_08005560: ldrb r0, [r5, 0x4] ldrb r2, [r5, 0xD] lsls r2, 28 @@ -2129,16 +2129,16 @@ TextPrinterDrawDownArrow: ; 8005528 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 .pool -@08005594: +_08005594: ldr r7, =gDarkDownArrowTiles -@08005596: +_08005596: ldrb r0, [r5, 0x4] ldr r2, =gDownArrowYCoords ldr r1, [r6] @@ -2178,11 +2178,11 @@ TextPrinterDrawDownArrow: ; 8005528 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} @@ -2226,14 +2226,14 @@ TextPrinterWaitAutoMode: ; 8005634 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 TextPrinterWaitAutoMode @@ -2249,14 +2249,14 @@ TextPrinterWaitWithDownArrow: ; 8005650 movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @08005674 + beq _08005674 adds r0, r2, 0 bl TextPrinterWaitAutoMode lsls r0, 24 lsrs r4, r0, 24 - b @0800568E + b _0800568E .pool -@08005674: +_08005674: adds r0, r2, 0 bl TextPrinterDrawDownArrow ldr r0, =0x030022c0 @@ -2264,11 +2264,11 @@ TextPrinterWaitWithDownArrow: ; 8005650 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} @@ -2287,24 +2287,24 @@ TextPrinterWait: ; 800569C movs r0, 0x4 ands r0, r1 cmp r0, 0 - beq @080056C0 + beq _080056C0 adds r0, r2, 0 bl TextPrinterWaitAutoMode lsls r0, 24 lsrs r4, r0, 24 - b @080056D4 + b _080056D4 .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} @@ -2340,11 +2340,11 @@ DrawDownArrow: ; 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 @@ -2358,22 +2358,22 @@ DrawDownArrow: ; 80056E0 adds r3, r7, 0 bl FillWindowPixelRect 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 .pool -@08005754: +_08005754: ldr r6, =gDarkDownArrowTiles -@08005756: +_08005756: ldr r2, =gDownArrowYCoords mov r0, r10 ldrb r1, [r0] @@ -2406,7 +2406,7 @@ DrawDownArrow: ; 80056E0 ldrb r0, [r5] adds r0, 0x1 strb r0, [r5] -@0800579A: +_0800579A: add sp, 0x18 pop {r3-r5} mov r8, r3 @@ -2427,45 +2427,45 @@ RenderText: ; 80057B4 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 .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 @@ -2473,44 +2473,44 @@ RenderText: ; 80057B4 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 .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 .pool -@08005874: +_08005874: ldrb r0, [r6, 0x1D] -@08005876: +_08005876: strb r0, [r6, 0x1E] ldr r0, [r6] ldrb r3, [r0] @@ -2519,26 +2519,26 @@ RenderText: ; 80057B4 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 .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] @@ -2553,54 +2553,54 @@ RenderText: ; 80057B4 adds r1, r0 ldrb r0, [r6, 0x9] adds r0, r1 - b @08005ABA + b _08005ABA .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 .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 @@ -2617,8 +2617,8 @@ RenderText: ; 80057B4 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 @@ -2636,8 +2636,8 @@ RenderText: ; 80057B4 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 @@ -2650,8 +2650,8 @@ RenderText: ; 80057B4 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 @@ -2683,20 +2683,20 @@ RenderText: ; 80057B4 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 GenerateFontHalfRowLookupTable -@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 @@ -2708,8 +2708,8 @@ RenderText: ; 80057B4 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] @@ -2717,8 +2717,8 @@ RenderText: ; 80057B4 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 @@ -2726,17 +2726,17 @@ RenderText: ; 80057B4 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 .pool -@08005A58: +_08005A58: movs r0, 0x5 - b @08005D56 -@08005A5C: + b _08005D56 +_08005A5C: ldr r0, [r6] ldrb r3, [r0] adds r1, r0, 0x1 @@ -2748,8 +2748,8 @@ RenderText: ; 80057B4 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 @@ -2761,20 +2761,20 @@ RenderText: ; 80057B4 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 @@ -2785,44 +2785,44 @@ RenderText: ; 80057B4 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 .pool -@08005ACC: +_08005ACC: ldr r0, =0x03007420 bl m4aMPlayContinue - b @08005A0A + b _08005A0A .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 ClearTextSpan 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] @@ -2832,50 +2832,50 @@ RenderText: ; 80057B4 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 ClearTextSpan 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 TextPrinterInitDownArrowCounters -@08005B56: +_08005B56: movs r0, 0x3 - b @08005D6E -@08005B5A: + b _08005D6E +_08005B5A: ldr r0, [r6] ldrb r3, [r0] movs r2, 0x80 @@ -2884,8 +2884,8 @@ RenderText: ; 80057B4 orrs r3, r1 adds r0, 0x1 str r0, [r6] - b @08005B90 -@08005B6C: + b _08005B90 +_08005B6C: ldr r0, [r6] ldrb r3, [r0] adds r0, 0x1 @@ -2900,73 +2900,73 @@ RenderText: ; 80057B4 strb r0, [r1] ldrb r3, [r6, 0xA] adds r0, r3 - b @08005C6A + b _08005C6A .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 .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] @@ -2977,61 +2977,61 @@ RenderText: ; 80057B4 ldrb r0, [r1] subs r4, r2, r0 cmp r4, 0 - ble @08005C70 + ble _08005C70 adds r0, r6, 0 adds r1, r4, 0 bl ClearTextSpan ldrb r0, [r6, 0x8] adds r0, r4 - b @08005C6E + b _08005C6E .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 .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 .pool -@08005C78: +_08005C78: adds r0, r6, 0 bl TextPrinterWait 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 TextPrinterWaitWithDownArrow 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 @@ -3045,15 +3045,15 @@ RenderText: ; 80057B4 ldrb r0, [r6, 0x7] strb r0, [r6, 0x9] strb r1, [r6, 0x1C] - b @08005B56 -@08005CB8: + b _08005B56 +_08005CB8: adds r0, r6, 0 bl TextPrinterWaitWithDownArrow lsls r0, 16 cmp r0, 0 - bne @08005CC6 - b @08005B56 -@08005CC6: + bne _08005CC6 + b _08005B56 +_08005CC6: adds r0, r6, 0 bl TextPrinterClearDownArrow ldrb r1, [r6, 0x5] @@ -3071,19 +3071,19 @@ RenderText: ; 80057B4 strb r0, [r6, 0x8] movs r0, 0x4 strb r0, [r6, 0x1C] - b @08005B56 + b _08005B56 .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 @@ -3093,9 +3093,9 @@ RenderText: ; 80057B4 movs r1, 0 bl ScrollWindow movs r0, 0 - b @08005D38 + b _08005D38 .pool -@08005D20: +_08005D20: ldrb r0, [r6, 0x4] ldrb r1, [r6, 0xD] lsls r1, 28 @@ -3107,39 +3107,39 @@ RenderText: ; 80057B4 bl ScrollWindow ldrb r0, [r6, 0x1F] subs r0, r4 -@08005D38: +_08005D38: strb r0, [r6, 0x1F] ldrb r0, [r6, 0x4] movs r1, 0x2 bl CopyWindowToVram - 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 @@ -3160,41 +3160,41 @@ GetStringWidthFixedWidthFont: ; 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 .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] @@ -3202,73 +3202,73 @@ GetStringWidthFixedWidthFont: ; 8005D74 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 .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 GetFontAttribute @@ -3294,21 +3294,21 @@ 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 .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 @@ -3336,226 +3336,226 @@ GetStringWidth: ; 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 GetFontAttribute 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 .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 .pool -@08005F98: +_08005F98: ldr r6, =0x02021dc4 - b @08005FA2 + b _08005FA2 .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 .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 .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 GetFontAttribute 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 @@ -3564,59 +3564,59 @@ GetStringWidth: ; 8005ED8 orrs r0, r1 mov r1, r9 bl _call_via_r8 - b @080060E2 -@080060D6: + b _080060E2 +_080060D6: adds r4, 0x1 ldrb r0, [r4] bl GetKeypadIconWidth 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 @@ -3661,69 +3661,69 @@ RenderTextFont9: ; 8006140 bl GenerateFontHalfRowLookupTable 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 .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 .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] @@ -3732,54 +3732,54 @@ RenderTextFont9: ; 8006140 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 GenerateFontHalfRowLookupTable - 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 @@ -3794,12 +3794,12 @@ RenderTextFont9: ; 8006140 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 @@ -3915,99 +3915,99 @@ GetFontAttribute: ; 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 .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 .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 .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 .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 .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 .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 .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 .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 .pool @@ -4035,7 +4035,7 @@ DecompressGlyphFont0: ; 8006478 lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne @080064C4 + bne _080064C4 lsrs r2, r0, 20 lsls r2, 9 movs r0, 0xF @@ -4061,9 +4061,9 @@ DecompressGlyphFont0: ; 8006478 adds r4, 0x81 movs r0, 0xC strb r0, [r4] - b @08006534 + b _08006534 .pool -@080064C4: +_080064C4: lsls r1, r3, 6 ldr r0, =gFont0LatinGlyphs adds r5, r1, r0 @@ -4075,7 +4075,7 @@ DecompressGlyphFont0: ; 8006478 adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi @08006500 + bhi _08006500 adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4084,9 +4084,9 @@ DecompressGlyphFont0: ; 8006478 adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b @0800652C + b _0800652C .pool -@08006500: +_08006500: adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4105,12 +4105,12 @@ DecompressGlyphFont0: ; 8006478 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 @@ -4124,15 +4124,15 @@ GetGlyphWidthFont0: ; 8006540 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 .pool -@08006558: +_08006558: movs r0, 0x8 -@0800655A: +_0800655A: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont0 @@ -4144,7 +4144,7 @@ DecompressGlyphFont7: ; 8006560 lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne @080065AC + bne _080065AC lsrs r2, r0, 20 lsls r2, 9 movs r5, 0xF @@ -4170,9 +4170,9 @@ DecompressGlyphFont7: ; 8006560 strb r0, [r1] adds r4, 0x81 strb r5, [r4] - b @0800661C + b _0800661C .pool -@080065AC: +_080065AC: lsls r1, r3, 6 ldr r0, =gFont7LatinGlyphs adds r6, r1, r0 @@ -4184,7 +4184,7 @@ DecompressGlyphFont7: ; 8006560 adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi @080065E8 + bhi _080065E8 adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4193,9 +4193,9 @@ DecompressGlyphFont7: ; 8006560 adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b @08006614 + b _08006614 .pool -@080065E8: +_080065E8: adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4214,12 +4214,12 @@ DecompressGlyphFont7: ; 8006560 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 @@ -4233,15 +4233,15 @@ GetGlyphWidthFont7: ; 8006628 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 .pool -@08006640: +_08006640: movs r0, 0x8 -@08006642: +_08006642: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont7 @@ -4253,7 +4253,7 @@ DecompressGlyphFont8: ; 8006648 lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne @08006694 + bne _08006694 lsrs r2, r0, 20 lsls r2, 9 movs r0, 0xF @@ -4279,9 +4279,9 @@ DecompressGlyphFont8: ; 8006648 adds r4, 0x81 movs r0, 0xC strb r0, [r4] - b @08006704 + b _08006704 .pool -@08006694: +_08006694: lsls r1, r3, 6 ldr r0, =gFont8LatinGlyphs adds r5, r1, r0 @@ -4293,7 +4293,7 @@ DecompressGlyphFont8: ; 8006648 adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi @080066D0 + bhi _080066D0 adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4302,9 +4302,9 @@ DecompressGlyphFont8: ; 8006648 adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b @080066FC + b _080066FC .pool -@080066D0: +_080066D0: adds r0, r5, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4323,12 +4323,12 @@ DecompressGlyphFont8: ; 8006648 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 @@ -4342,15 +4342,15 @@ GetGlyphWidthFont8: ; 8006710 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 .pool -@08006728: +_08006728: movs r0, 0x8 -@0800672A: +_0800672A: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont8 @@ -4362,7 +4362,7 @@ DecompressGlyphFont2: ; 8006730 lsls r0, 16 lsrs r6, r0, 16 cmp r1, 0x1 - bne @080067A0 + bne _080067A0 lsrs r2, r0, 19 lsls r2, 9 movs r0, 0x7 @@ -4402,9 +4402,9 @@ DecompressGlyphFont2: ; 8006730 adds r1, 0x81 movs r0, 0xE strb r0, [r1] - b @08006810 + b _08006810 .pool -@080067A0: +_080067A0: lsls r1, r6, 6 ldr r0, =gFont2LatinGlyphs adds r4, r1, r0 @@ -4416,7 +4416,7 @@ DecompressGlyphFont2: ; 8006730 adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi @080067DC + bhi _080067DC adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -4425,9 +4425,9 @@ DecompressGlyphFont2: ; 8006730 adds r1, r5, 0 adds r1, 0x40 bl DecompressGlyphTile - b @08006808 + b _08006808 .pool -@080067DC: +_080067DC: adds r0, r4, 0 adds r1, r5, 0 bl DecompressGlyphTile @@ -4446,12 +4446,12 @@ DecompressGlyphFont2: ; 8006730 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 @@ -4465,13 +4465,13 @@ GetGlyphWidthFont2: ; 800681C lsls r0, 16 lsrs r2, r0, 16 cmp r1, 0x1 - beq @08006830 + beq _08006830 ldr r0, =gFont2LatinGlyphWidths - b @08006832 + b _08006832 .pool -@08006830: +_08006830: ldr r0, =gFont2JapaneseGlyphWidths -@08006832: +_08006832: adds r0, r2, r0 ldrb r0, [r0] pop {r1} @@ -4486,7 +4486,7 @@ DecompressGlyphFont1: ; 8006840 lsls r0, 16 lsrs r3, r0, 16 cmp r1, 0x1 - bne @0800688C + bne _0800688C lsrs r2, r0, 20 lsls r2, 9 movs r5, 0xF @@ -4512,9 +4512,9 @@ DecompressGlyphFont1: ; 8006840 strb r0, [r1] adds r4, 0x81 strb r5, [r4] - b @080068FC + b _080068FC .pool -@0800688C: +_0800688C: lsls r1, r3, 6 ldr r0, =gFont1LatinGlyphs adds r6, r1, r0 @@ -4526,7 +4526,7 @@ DecompressGlyphFont1: ; 8006840 adds r0, 0x80 strb r1, [r0] cmp r1, 0x8 - bhi @080068C8 + bhi _080068C8 adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4535,9 +4535,9 @@ DecompressGlyphFont1: ; 8006840 adds r1, r4, 0 adds r1, 0x40 bl DecompressGlyphTile - b @080068F4 + b _080068F4 .pool -@080068C8: +_080068C8: adds r0, r6, 0 adds r1, r4, 0 bl DecompressGlyphTile @@ -4556,12 +4556,12 @@ DecompressGlyphFont1: ; 8006840 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 @@ -4575,15 +4575,15 @@ GetGlyphWidthFont1: ; 8006908 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 .pool -@08006920: +_08006920: movs r0, 0x8 -@08006922: +_08006922: pop {r1} bx r1 thumb_func_end GetGlyphWidthFont1 diff --git a/asm/tileset_animation.s b/asm/tileset_animation.s index 819764e26..2197fcd83 100644 --- a/asm/tileset_animation.s +++ b/asm/tileset_animation.s @@ -28,7 +28,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 @@ -52,7 +52,7 @@ sub_80A0980: ; 80A0980 ldrb r0, [r3] adds r0, 0x1 strb r0, [r3] -@080A09C0: +_080A09C0: pop {r4-r6} pop {r0} bx r0 @@ -67,12 +67,12 @@ sub_80A09D0: ; 80A09D0 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] @@ -86,8 +86,8 @@ sub_80A09D0: ; 80A09D0 adds r3, 0x1 ldrb r0, [r4] cmp r3, r0 - blt @080A09E6 -@080A0A02: + blt _080A09E6 +_080A0A02: movs r0, 0 strb r0, [r6] pop {r4-r6} @@ -127,10 +127,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 @@ -140,24 +140,24 @@ sub_80A0A38: ; 80A0A38 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 @@ -179,12 +179,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 .pool @@ -205,12 +205,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 .pool @@ -259,30 +259,30 @@ 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 @@ -296,10 +296,10 @@ sub_80A0BB4: ; 80A0BB4 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 @@ -758,56 +758,56 @@ 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 @@ -821,10 +821,10 @@ sub_80A10B8: ; 80A10B8 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 @@ -837,10 +837,10 @@ sub_80A10D0: ; 80A10D0 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 @@ -854,53 +854,53 @@ 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 @@ -915,17 +915,17 @@ 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 @@ -940,53 +940,53 @@ 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 @@ -1001,19 +1001,19 @@ 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 @@ -1027,10 +1027,10 @@ sub_80A122C: ; 80A122C 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 @@ -1043,12 +1043,12 @@ sub_80A1244: ; 80A1244 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 @@ -1062,10 +1062,10 @@ 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 @@ -1078,10 +1078,10 @@ sub_80A127C: ; 80A127C 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 @@ -1094,10 +1094,10 @@ sub_80A1294: ; 80A1294 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 @@ -1224,7 +1224,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 @@ -1248,9 +1248,9 @@ sub_80A1394: ; 80A1394 ldr r1, [r5] movs r2, 0x80 bl sub_80A0980 - b @080A141C + b _080A141C .pool -@080A13F0: +_080A13F0: movs r0, 0x3 ands r5, r0 ldr r0, =gUnknown_085153E4 @@ -1271,7 +1271,7 @@ sub_80A1394: ; 80A1394 ldr r1, [r4] movs r2, 0x80 bl sub_80A0980 -@080A141C: +_080A141C: pop {r4-r6} pop {r0} bx r0 @@ -1295,7 +1295,7 @@ sub_80A1434: ; 80A1434 adds r1, r0 ldr r2, [r1] cmp r2, 0 - beq @080A1464 + beq _080A1464 ldr r0, =gUnknown_08515804 lsls r1, r3, 2 adds r1, r0 @@ -1303,7 +1303,7 @@ sub_80A1434: ; 80A1434 adds r0, r2, 0 movs r2, 0x80 bl sub_80A0980 -@080A1464: +_080A1464: pop {r0} bx r0 .pool @@ -1477,10 +1477,10 @@ sub_80A15C0: ; 80A15C0 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 @@ -1493,10 +1493,10 @@ sub_80A15D8: ; 80A15D8 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 @@ -1510,17 +1510,17 @@ 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 @@ -1534,10 +1534,10 @@ sub_80A161C: ; 80A161C 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 @@ -1550,13 +1550,13 @@ sub_80A1634: ; 80A1634 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 @@ -1570,10 +1570,10 @@ sub_80A1658: ; 80A1658 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 @@ -1586,10 +1586,10 @@ sub_80A1670: ; 80A1670 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 @@ -1812,14 +1812,14 @@ sub_80A1818: ; 80A1818 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF - beq @080A1862 + beq _080A1862 ldr r1, =0x03000f44 ldr r0, =sub_80A1670 str r0, [r1] ldr r1, =0x03000f3c movs r0, 0x20 strh r0, [r1] -@080A1862: +_080A1862: pop {r0} bx r0 .pool @@ -1844,7 +1844,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 @@ -1862,10 +1862,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 .pool diff --git a/asm/window.s b/asm/window.s index 08c4db43c..1819ab1ac 100644 --- a/asm/window.s +++ b/asm/window.s @@ -16,22 +16,22 @@ InitWindows: ; 80031C0 movs r0, 0 mov r8, r0 ldr r4, =0x03002f70 -@080031D4: +_080031D4: mov r1, r8 lsls r0, r1, 24 lsrs r0, 24 bl GetBgTilemap cmp r0, 0 - beq @080031E4 + beq _080031E4 ldr r0, =nullsub_8 -@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 @@ InitWindows: ; 80031C0 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 @@ InitWindows: ; 80031C0 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,12 +80,12 @@ InitWindows: ; 80031C0 negs r0, r0 ldr r4, [sp] cmp r4, r0 - bne @08003268 -@08003250: + bne _08003268 +_08003250: movs r0, 0 - b @08003364 + b _08003364 .pool -@08003268: +_08003268: ldr r0, =0x03002f70 mov r9, r0 lsls r0, r7, 2 @@ -94,7 +94,7 @@ InitWindows: ; 80031C0 ldr r1, [r1] mov r10, r0 cmp r1, 0 - bne @080032CA + bne _080032CA adds r0, r7, 0 movs r1, 0x8 bl GetBgAttribute @@ -102,35 +102,35 @@ InitWindows: ; 80031C0 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq @080032CA + beq _080032CA adds r0, r5, 0 bl AllocZeroed adds r4, r0, 0 cmp r4, 0 - bne @080032A8 + bne _080032A8 bl FreeAllWindowBuffers - b @08003250 + b _08003250 .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 SetBgTilemap -@080032CA: +_080032CA: ldrb r1, [r6, 0x3] ldrb r0, [r6, 0x4] muls r0, r1 @@ -139,25 +139,25 @@ InitWindows: ; 80031C0 bl AllocZeroed 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 cmp r1, r0 - beq @08003250 + beq _08003250 adds r0, r1, 0 bl Free str r4, [r5] - b @08003250 + b _08003250 .pool -@0800330C: +_0800330C: ldr r1, =0x02020004 adds r0, r1, 0 adds r0, 0x8 @@ -172,7 +172,7 @@ InitWindows: ; 80031C0 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne @08003342 + bne _08003342 mov r4, sp ldrh r4, [r4] strh r4, [r2, 0x6] @@ -184,7 +184,7 @@ InitWindows: ; 80031C0 ldr r1, [sp] movs r3, 0x1 bl DummiedOutFireRedLeafGreenTileAllocFunc -@08003342: +_08003342: adds r6, 0x8 ldr r0, [sp, 0x4] adds r0, 0xC @@ -193,17 +193,17 @@ InitWindows: ; 80031C0 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 @@ -229,23 +229,23 @@ AddWindow: ; 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 @@ -253,7 +253,7 @@ AddWindow: ; 8003380 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne @080033E2 + bne _080033E2 mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -267,8 +267,8 @@ AddWindow: ; 8003380 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 @@ -276,7 +276,7 @@ AddWindow: ; 8003380 ldr r1, [r1] str r0, [sp] cmp r1, 0 - bne @08003432 + bne _08003432 adds r0, r7, 0 movs r1, 0x8 bl GetBgAttribute @@ -284,31 +284,31 @@ AddWindow: ; 8003380 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq @08003432 + beq _08003432 adds r0, r5, 0 bl AllocZeroed 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 SetBgTilemap -@08003432: +_08003432: mov r2, r8 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -318,27 +318,27 @@ AddWindow: ; 8003380 bl AllocZeroed 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 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 .pool -@08003484: +_08003484: ldr r2, =0x02020004 lsls r1, r6, 1 adds r1, r6 @@ -356,7 +356,7 @@ AddWindow: ; 8003380 ldr r0, =0x03002f54 ldr r0, [r0] cmp r0, 0x1 - bne @080034BE + bne _080034BE mov r0, r9 strh r0, [r2, 0x6] ldrb r0, [r2, 0x3] @@ -367,9 +367,9 @@ AddWindow: ; 8003380 mov r1, r9 movs r3, 0x1 bl DummiedOutFireRedLeafGreenTileAllocFunc -@080034BE: +_080034BE: adds r0, r6, 0 -@080034C0: +_080034C0: add sp, 0x4 pop {r3-r5} mov r8, r3 @@ -390,29 +390,29 @@ AddWindowWithoutTileMap: ; 80034D8 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 @@ -424,12 +424,12 @@ AddWindowWithoutTileMap: ; 80034D8 movs r0, 0x1 negs r0, r0 cmp r3, r0 - bne @08003534 -@08003528: + bne _08003534 +_08003528: movs r0, 0xFF - b @08003564 + b _08003564 .pool -@08003534: +_08003534: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -442,7 +442,7 @@ AddWindowWithoutTileMap: ; 80034D8 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] @@ -452,9 +452,9 @@ AddWindowWithoutTileMap: ; 80034D8 adds r1, r3, 0 movs r3, 0x1 bl DummiedOutFireRedLeafGreenTileAllocFunc -@08003562: +_08003562: adds r0, r4, 0 -@08003564: +_08003564: pop {r4-r6} pop {r1} bx r1 @@ -477,7 +477,7 @@ RemoveWindow: ; 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] @@ -485,7 +485,7 @@ RemoveWindow: ; 8003574 adds r0, r3, 0 movs r3, 0x2 bl DummiedOutFireRedLeafGreenTileAllocFunc -@080035A0: +_080035A0: ldr r0, =gDummyWindowTemplate ldr r1, [r0, 0x4] ldr r0, [r0] @@ -496,18 +496,18 @@ RemoveWindow: ; 8003574 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 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 @@ -516,11 +516,11 @@ RemoveWindow: ; 8003574 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 @@ -533,38 +533,38 @@ FreeAllWindowBuffers: ; 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 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 @@ -596,23 +596,23 @@ CopyWindowToVram: ; 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 .pool -@08003694: +_08003694: cmp r5, 0x3 - beq @080036B6 - b @080036CE -@0800369A: + beq _080036B6 + b _080036CE +_0800369A: mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram - b @080036CE -@080036A4: + b _080036CE +_080036A4: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -620,8 +620,8 @@ CopyWindowToVram: ; 8003658 ldrh r3, [r2, 0x6] adds r2, r4, 0 bl LoadBgTiles - b @080036CE -@080036B6: + b _080036CE +_080036B6: mov r0, sp ldrb r0, [r0] ldr r1, [sp, 0x8] @@ -632,7 +632,7 @@ CopyWindowToVram: ; 8003658 mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram -@080036CE: +_080036CE: add sp, 0xC pop {r4-r6} pop {r0} @@ -651,9 +651,9 @@ CopyWindowRectToVram: ; 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 @@ -678,23 +678,23 @@ CopyWindowRectToVram: ; 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 .pool -@08003730: +_08003730: cmp r5, 0x3 - beq @0800375E - b @08003782 -@08003736: + beq _0800375E + b _08003782 +_08003736: mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram - b @08003782 -@08003740: + b _08003782 +_08003740: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -708,8 +708,8 @@ CopyWindowRectToVram: ; 80036D8 lsls r3, 16 lsrs r3, 16 bl LoadBgTiles - b @08003782 -@0800375E: + b _08003782 +_0800375E: mov r0, sp ldrb r0, [r0] lsls r2, r4, 5 @@ -726,7 +726,7 @@ CopyWindowRectToVram: ; 80036D8 mov r0, sp ldrb r0, [r0] bl CopyBgTilemapBufferToVram -@08003782: +_08003782: add sp, 0xC pop {r4-r7} pop {r0} @@ -837,10 +837,10 @@ PutWindowRectTilemapOverridePalette: ; 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 @@ -865,8 +865,8 @@ PutWindowRectTilemapOverridePalette: ; 80037EC 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 @@ -968,10 +968,10 @@ PutWindowRectTilemap: ; 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 @@ -996,8 +996,8 @@ PutWindowRectTilemap: ; 80038F4 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 @@ -1312,7 +1312,7 @@ CopyToWindowPixelBuffer: ; 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 @@ -1325,9 +1325,9 @@ CopyToWindowPixelBuffer: ; 8003BF0 lsrs r2, r5, 17 adds r0, r6, 0 bl CpuSet - b @08003C3C + b _08003C3C .pool -@08003C24: +_08003C24: ldr r1, =0x02020004 lsls r0, r4, 1 adds r0, r4 @@ -1339,7 +1339,7 @@ CopyToWindowPixelBuffer: ; 8003BF0 adds r1, r2 adds r0, r6, 0 bl LZ77UnCompWram -@08003C3C: +_08003C3C: pop {r4-r6} pop {r0} bx r0 @@ -1429,29 +1429,29 @@ ScrollWindow: ; 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 @@ -1465,17 +1465,17 @@ ScrollWindow: ; 8003C94 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 .pool -@08003D34: +_08003D34: mov r2, r10 str r7, [r2] -@08003D38: +_08003D38: adds r3, 0x1 adds r2, r4, 0x4 adds r0, r3, 0 @@ -1492,16 +1492,16 @@ ScrollWindow: ; 8003C94 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 @@ -1519,16 +1519,16 @@ ScrollWindow: ; 8003C94 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 @@ -1546,16 +1546,16 @@ ScrollWindow: ; 8003C94 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 @@ -1573,16 +1573,16 @@ ScrollWindow: ; 8003C94 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 @@ -1600,16 +1600,16 @@ ScrollWindow: ; 8003C94 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 @@ -1627,16 +1627,16 @@ ScrollWindow: ; 8003C94 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 @@ -1652,39 +1652,39 @@ ScrollWindow: ; 8003C94 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 @@ -1698,16 +1698,16 @@ ScrollWindow: ; 8003C94 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 @@ -1724,16 +1724,16 @@ ScrollWindow: ; 8003C94 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 @@ -1751,16 +1751,16 @@ ScrollWindow: ; 8003C94 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 @@ -1778,16 +1778,16 @@ ScrollWindow: ; 8003C94 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 @@ -1805,16 +1805,16 @@ ScrollWindow: ; 8003C94 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 @@ -1832,16 +1832,16 @@ ScrollWindow: ; 8003C94 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 @@ -1859,16 +1859,16 @@ ScrollWindow: ; 8003C94 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 @@ -1884,24 +1884,24 @@ ScrollWindow: ; 8003C94 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 @@ -1963,24 +1963,24 @@ SetWindowAttribute: ; 80040A8 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 .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 @@ -1988,9 +1988,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strb r2, [r0, 0x1] movs r0, 0 - b @08004144 + b _08004144 .pool -@080040F8: +_080040F8: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -1998,9 +1998,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strb r2, [r0, 0x2] movs r0, 0 - b @08004144 + b _08004144 .pool -@0800410C: +_0800410C: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2008,9 +2008,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strb r2, [r0, 0x5] movs r0, 0 - b @08004144 + b _08004144 .pool -@08004120: +_08004120: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2018,9 +2018,9 @@ SetWindowAttribute: ; 80040A8 adds r0, r1 strh r2, [r0, 0x6] movs r0, 0 - b @08004144 + b _08004144 .pool -@08004134: +_08004134: ldr r1, =0x02020004 lsls r0, r3, 1 adds r0, r3 @@ -2028,9 +2028,9 @@ SetWindowAttribute: ; 80040A8 adds r1, 0x8 adds r0, r1 str r2, [r0] -@08004142: +_08004142: movs r0, 0x1 -@08004144: +_08004144: pop {r1} bx r1 .pool @@ -2045,87 +2045,87 @@ GetWindowAttribute: ; 800414C 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 .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 .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 .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 .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 .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 .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 .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 .pool -@08004214: +_08004214: ldr r0, =0x02020004 lsls r1, r2, 1 adds r1, r2 @@ -2133,11 +2133,11 @@ GetWindowAttribute: ; 800414C adds r0, 0x8 adds r1, r0 ldr r0, [r1] - b @0800422A + b _0800422A .pool -@08004228: +_08004228: movs r0, 0 -@0800422A: +_0800422A: pop {r1} bx r1 thumb_func_end GetWindowAttribute @@ -2151,18 +2151,18 @@ GetNumActiveWindowsOnBg: ; 8004230 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} @@ -2188,23 +2188,23 @@ AddWindow8Bit: ; 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 @@ -2215,7 +2215,7 @@ AddWindow8Bit: ; 8004260 add r0, r10 ldr r0, [r0] cmp r0, 0 - bne @080042EA + bne _080042EA adds r0, r7, 0 movs r1, 0x8 bl GetBgAttribute @@ -2223,32 +2223,32 @@ AddWindow8Bit: ; 8004260 lsrs r5, r0, 16 ldr r0, =0x0000ffff cmp r5, r0 - beq @080042EA + beq _080042EA adds r0, r5, 0 bl Alloc 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 SetBgTilemap -@080042EA: +_080042EA: mov r2, r9 ldrb r1, [r2, 0x3] ldrb r0, [r2, 0x4] @@ -2258,27 +2258,27 @@ AddWindow8Bit: ; 8004260 bl Alloc adds r4, r0, 0 cmp r4, 0 - bne @08004338 + bne _08004338 adds r0, r7, 0 bl GetNumActiveWindowsOnBg8Bit 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 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 .pool -@08004338: +_08004338: ldr r1, =0x02020004 lsls r2, r6, 1 adds r2, r6 @@ -2294,7 +2294,7 @@ AddWindow8Bit: ; 8004260 str r0, [r2] str r1, [r2, 0x4] adds r0, r6, 0 -@08004356: +_08004356: pop {r3-r5} mov r8, r3 mov r9, r4 @@ -2325,18 +2325,18 @@ FillWindowPixelBuffer8Bit: ; 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 @@ -2534,29 +2534,29 @@ CopyWindowToVram8Bit: ; 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 .pool -@08004540: +_08004540: cmp r5, 0x3 - beq @0800455C - b @08004570 -@08004546: + beq _0800455C + b _08004570 +_08004546: ldrb r0, [r3] bl CopyBgTilemapBufferToVram - b @08004570 -@0800454E: + b _08004570 +_0800454E: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] ldrh r3, [r3, 0x6] bl LoadBgTiles - b @08004570 -@0800455C: + b _08004570 +_0800455C: ldrb r0, [r3] ldr r1, [r3, 0x8] ldrh r2, [r4] @@ -2565,7 +2565,7 @@ CopyWindowToVram8Bit: ; 8004500 ldr r0, [r6] ldrb r0, [r0] bl CopyBgTilemapBufferToVram -@08004570: +_08004570: pop {r4-r6} pop {r0} bx r0 @@ -2580,18 +2580,18 @@ GetNumActiveWindowsOnBg8Bit: ; 8004578 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}